diff --git a/.core_files.yaml b/.core_files.yaml
index 9af81c59934..b1870654be0 100644
--- a/.core_files.yaml
+++ b/.core_files.yaml
@@ -27,6 +27,7 @@ base_platforms: &base_platforms
   - homeassistant/components/fan/**
   - homeassistant/components/geo_location/**
   - homeassistant/components/humidifier/**
+  - homeassistant/components/image/**
   - homeassistant/components/image_processing/**
   - homeassistant/components/light/**
   - homeassistant/components/lock/**
diff --git a/.coveragerc b/.coveragerc
index 8494ef357bf..6a2a0db3ea4 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -90,6 +90,8 @@ omit =
     homeassistant/components/atome/*
     homeassistant/components/aurora/__init__.py
     homeassistant/components/aurora/binary_sensor.py
+    homeassistant/components/aurora/coordinator.py
+    homeassistant/components/aurora/entity.py
     homeassistant/components/aurora/sensor.py
     homeassistant/components/avea/light.py
     homeassistant/components/avion/light.py
@@ -122,7 +124,6 @@ omit =
     homeassistant/components/bluetooth_tracker/*
     homeassistant/components/bmw_connected_drive/__init__.py
     homeassistant/components/bmw_connected_drive/binary_sensor.py
-    homeassistant/components/bmw_connected_drive/button.py
     homeassistant/components/bmw_connected_drive/coordinator.py
     homeassistant/components/bmw_connected_drive/lock.py
     homeassistant/components/bmw_connected_drive/notify.py
@@ -202,6 +203,9 @@ omit =
     homeassistant/components/discogs/sensor.py
     homeassistant/components/discord/__init__.py
     homeassistant/components/discord/notify.py
+    homeassistant/components/discovergy/__init__.py
+    homeassistant/components/discovergy/sensor.py
+    homeassistant/components/discovergy/coordinator.py
     homeassistant/components/dlib_face_detect/image_processing.py
     homeassistant/components/dlib_face_identify/image_processing.py
     homeassistant/components/dlink/data.py
@@ -302,22 +306,10 @@ omit =
     homeassistant/components/escea/climate.py
     homeassistant/components/escea/discovery.py
     homeassistant/components/esphome/__init__.py
-    homeassistant/components/esphome/binary_sensor.py
     homeassistant/components/esphome/bluetooth/*
-    homeassistant/components/esphome/button.py
     homeassistant/components/esphome/camera.py
-    homeassistant/components/esphome/climate.py
-    homeassistant/components/esphome/cover.py
     homeassistant/components/esphome/domain_data.py
     homeassistant/components/esphome/entry_data.py
-    homeassistant/components/esphome/fan.py
-    homeassistant/components/esphome/light.py
-    homeassistant/components/esphome/lock.py
-    homeassistant/components/esphome/media_player.py
-    homeassistant/components/esphome/number.py
-    homeassistant/components/esphome/select.py
-    homeassistant/components/esphome/sensor.py
-    homeassistant/components/esphome/switch.py
     homeassistant/components/etherscan/sensor.py
     homeassistant/components/eufy/*
     homeassistant/components/eufylife_ble/__init__.py
@@ -327,6 +319,7 @@ omit =
     homeassistant/components/ezviz/__init__.py
     homeassistant/components/ezviz/binary_sensor.py
     homeassistant/components/ezviz/camera.py
+    homeassistant/components/ezviz/light.py
     homeassistant/components/ezviz/coordinator.py
     homeassistant/components/ezviz/number.py
     homeassistant/components/ezviz/entity.py
@@ -362,10 +355,13 @@ omit =
     homeassistant/components/fitbit/*
     homeassistant/components/fivem/__init__.py
     homeassistant/components/fivem/binary_sensor.py
+    homeassistant/components/fivem/coordinator.py
+    homeassistant/components/fivem/entity.py
     homeassistant/components/fivem/sensor.py
     homeassistant/components/fixer/sensor.py
     homeassistant/components/fjaraskupan/__init__.py
     homeassistant/components/fjaraskupan/binary_sensor.py
+    homeassistant/components/fjaraskupan/coordinator.py
     homeassistant/components/fjaraskupan/fan.py
     homeassistant/components/fjaraskupan/light.py
     homeassistant/components/fjaraskupan/number.py
@@ -615,7 +611,6 @@ omit =
     homeassistant/components/kwb/sensor.py
     homeassistant/components/lacrosse/sensor.py
     homeassistant/components/lannouncer/notify.py
-    homeassistant/components/lastfm/sensor.py
     homeassistant/components/launch_library/__init__.py
     homeassistant/components/launch_library/sensor.py
     homeassistant/components/lcn/climate.py
@@ -946,6 +941,8 @@ omit =
     homeassistant/components/pyload/sensor.py
     homeassistant/components/qbittorrent/__init__.py
     homeassistant/components/qbittorrent/sensor.py
+    homeassistant/components/qnap/__init__.py
+    homeassistant/components/qnap/coordinator.py
     homeassistant/components/qnap/sensor.py
     homeassistant/components/qrcode/image_processing.py
     homeassistant/components/quantum_gateway/device_tracker.py
@@ -973,6 +970,10 @@ omit =
     homeassistant/components/rainmachine/switch.py
     homeassistant/components/rainmachine/update.py
     homeassistant/components/rainmachine/util.py
+    homeassistant/components/renson/__init__.py
+    homeassistant/components/renson/const.py
+    homeassistant/components/renson/entity.py
+    homeassistant/components/renson/sensor.py
     homeassistant/components/raspyrfm/*
     homeassistant/components/recollect_waste/sensor.py
     homeassistant/components/recorder/repack.py
@@ -1046,12 +1047,6 @@ omit =
     homeassistant/components/sense/__init__.py
     homeassistant/components/sense/binary_sensor.py
     homeassistant/components/sense/sensor.py
-    homeassistant/components/senseme/__init__.py
-    homeassistant/components/senseme/discovery.py
-    homeassistant/components/senseme/entity.py
-    homeassistant/components/senseme/fan.py
-    homeassistant/components/senseme/light.py
-    homeassistant/components/senseme/switch.py
     homeassistant/components/senz/__init__.py
     homeassistant/components/senz/api.py
     homeassistant/components/senz/climate.py
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 063342cc6b7..2ee32ca9dbc 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   BUILD_TYPE: core
-  DEFAULT_PYTHON: "3.10"
+  DEFAULT_PYTHON: "3.11"
 
 jobs:
   init:
@@ -24,7 +24,7 @@ jobs:
       publish: ${{ steps.version.outputs.publish }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 0
 
@@ -48,18 +48,6 @@ jobs:
         with:
           ignore-dev: true
 
-      - name: Generate meta info
-        shell: bash
-        run: |
-          echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > OFFICIAL_IMAGE
-
-      - name: Signing meta info file
-        uses: home-assistant/actions/helpers/codenotary@master
-        with:
-          source: file://${{ github.workspace }}/OFFICIAL_IMAGE
-          asset: OFFICIAL_IMAGE-${{ steps.version.outputs.version }}
-          token: ${{ secrets.CAS_TOKEN }}
-
   build_python:
     name: Build PyPi package
     environment: ${{ needs.init.outputs.channel }}
@@ -68,7 +56,7 @@ jobs:
     if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v4.6.1
@@ -101,12 +89,16 @@ jobs:
     if: github.repository_owner == 'home-assistant'
     needs: init
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
     strategy:
       matrix:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
@@ -182,7 +174,7 @@ jobs:
           # will drop the platform in the near future (they consider it
           # "flimsy" on 386). The following packages depend on pandas,
           # so we comment them out.
-          sed -i "s|env_canada|# env_canada|g" requirements_all.txt
+          sed -i "s|env-canada|# env-canada|g" requirements_all.txt
           sed -i "s|noaa-coops|# noaa-coops|g" requirements_all.txt
           sed -i "s|pyezviz|# pyezviz|g" requirements_all.txt
           sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
@@ -197,25 +189,20 @@ jobs:
         run: |
           echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v2.1.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2023.03.0
+        uses: home-assistant/builder@2023.06.1
         with:
           args: |
             $BUILD_ARGS \
             --${{ matrix.arch }} \
+            --cosign \
             --target /data \
             --generic ${{ needs.init.outputs.version }}
         env:
@@ -237,6 +224,10 @@ jobs:
     if: github.repository_owner == 'home-assistant'
     needs: ["init", "build_base"]
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
     strategy:
       matrix:
         machine:
@@ -262,7 +253,7 @@ jobs:
           - yellow
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Set build additional args
         run: |
@@ -275,25 +266,20 @@ jobs:
             echo "BUILD_ARGS=--additional-tag stable" >> $GITHUB_ENV
           fi
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v2.1.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2023.03.0
+        uses: home-assistant/builder@2023.06.1
         with:
           args: |
             $BUILD_ARGS \
             --target /data/machine \
+            --cosign \
             --machine "${{ needs.init.outputs.version }}=${{ matrix.machine }}"
         env:
           CAS_API_KEY: ${{ secrets.CAS_TOKEN }}
@@ -306,7 +292,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Initialize git
         uses: home-assistant/actions/helpers/git-init@master
@@ -338,34 +324,32 @@ jobs:
     if: github.repository_owner == 'home-assistant'
     needs: ["init", "build_base"]
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        registry:
-          - "ghcr.io/home-assistant"
-          - "homeassistant"
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
+
+      - name: Install Cosign
+        uses: sigstore/cosign-installer@v3.1.1
+        with:
+          cosign-release: "v2.0.2"
 
       - name: Login to DockerHub
-        if: matrix.registry == 'homeassistant'
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2.2.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@v2.1.0
+        uses: docker/login-action@v2.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install CAS tools
-        uses: home-assistant/actions/helpers/cas@master
-
       - name: Build Meta Image
         shell: bash
         run: |
@@ -375,55 +359,78 @@ jobs:
             local tag_l=${1}
             local tag_r=${2}
 
-            docker manifest create "${{ matrix.registry }}/home-assistant:${tag_l}" \
-              "${{ matrix.registry }}/amd64-homeassistant:${tag_r}" \
-              "${{ matrix.registry }}/i386-homeassistant:${tag_r}" \
-              "${{ matrix.registry }}/armhf-homeassistant:${tag_r}" \
-              "${{ matrix.registry }}/armv7-homeassistant:${tag_r}" \
-              "${{ matrix.registry }}/aarch64-homeassistant:${tag_r}"
+            for registry in "ghcr.io/home-assistant" "docker.io/homeassistant"
+            do
 
-            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
-              "${{ matrix.registry }}/amd64-homeassistant:${tag_r}" \
-              --os linux --arch amd64
+              docker manifest create "${registry}/home-assistant:${tag_l}" \
+                "${registry}/amd64-homeassistant:${tag_r}" \
+                "${registry}/i386-homeassistant:${tag_r}" \
+                "${registry}/armhf-homeassistant:${tag_r}" \
+                "${registry}/armv7-homeassistant:${tag_r}" \
+                "${registry}/aarch64-homeassistant:${tag_r}"
 
-            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
-              "${{ matrix.registry }}/i386-homeassistant:${tag_r}" \
-              --os linux --arch 386
+              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+                "${registry}/amd64-homeassistant:${tag_r}" \
+                --os linux --arch amd64
 
-            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
-              "${{ matrix.registry }}/armhf-homeassistant:${tag_r}" \
-              --os linux --arch arm --variant=v6
+              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+                "${registry}/i386-homeassistant:${tag_r}" \
+                --os linux --arch 386
 
-            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
-              "${{ matrix.registry }}/armv7-homeassistant:${tag_r}" \
-              --os linux --arch arm --variant=v7
+              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+                "${registry}/armhf-homeassistant:${tag_r}" \
+                --os linux --arch arm --variant=v6
 
-            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
-              "${{ matrix.registry }}/aarch64-homeassistant:${tag_r}" \
-              --os linux --arch arm64 --variant=v8
+              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+                "${registry}/armv7-homeassistant:${tag_r}" \
+                --os linux --arch arm --variant=v7
 
-            docker manifest push --purge "${{ matrix.registry }}/home-assistant:${tag_l}"
+              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+                "${registry}/aarch64-homeassistant:${tag_r}" \
+                --os linux --arch arm64 --variant=v8
+
+              docker manifest push --purge "${registry}/home-assistant:${tag_l}"
+              cosign sign --yes "${registry}/home-assistant:${tag_l}"
+
+            done
           }
 
           function validate_image() {
             local image=${1}
-            if ! cas authenticate --signerID notary@home-assistant.io "docker://${image}"; then
+            if ! cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp https://github.com/home-assistant/core/.* "${image}"; then
               echo "Invalid signature!"
               exit 1
             fi
           }
 
-          docker pull "${{ matrix.registry }}/amd64-homeassistant:${{ needs.init.outputs.version }}"
-          docker pull "${{ matrix.registry }}/i386-homeassistant:${{ needs.init.outputs.version }}"
-          docker pull "${{ matrix.registry }}/armhf-homeassistant:${{ needs.init.outputs.version }}"
-          docker pull "${{ matrix.registry }}/armv7-homeassistant:${{ needs.init.outputs.version }}"
-          docker pull "${{ matrix.registry }}/aarch64-homeassistant:${{ needs.init.outputs.version }}"
+          function push_dockerhub() {
+            local image=${1}
+            local tag=${2}
 
-          validate_image "${{ matrix.registry }}/amd64-homeassistant:${{ needs.init.outputs.version }}"
-          validate_image "${{ matrix.registry }}/i386-homeassistant:${{ needs.init.outputs.version }}"
-          validate_image "${{ matrix.registry }}/armhf-homeassistant:${{ needs.init.outputs.version }}"
-          validate_image "${{ matrix.registry }}/armv7-homeassistant:${{ needs.init.outputs.version }}"
-          validate_image "${{ matrix.registry }}/aarch64-homeassistant:${{ needs.init.outputs.version }}"
+            docker tag "ghcr.io/home-assistant/${image}:${tag}" "docker.io/homeassistant/${image}:${tag}"
+            docker push "docker.io/homeassistant/${image}:${tag}"
+            cosign sign --yes "docker.io/homeassistant/${image}:${tag}"
+          }
+
+          # Pull images from github container registry and verify signature
+          docker pull "ghcr.io/home-assistant/amd64-homeassistant:${{ needs.init.outputs.version }}"
+          docker pull "ghcr.io/home-assistant/i386-homeassistant:${{ needs.init.outputs.version }}"
+          docker pull "ghcr.io/home-assistant/armhf-homeassistant:${{ needs.init.outputs.version }}"
+          docker pull "ghcr.io/home-assistant/armv7-homeassistant:${{ needs.init.outputs.version }}"
+          docker pull "ghcr.io/home-assistant/aarch64-homeassistant:${{ needs.init.outputs.version }}"
+
+          validate_image "ghcr.io/home-assistant/amd64-homeassistant:${{ needs.init.outputs.version }}"
+          validate_image "ghcr.io/home-assistant/i386-homeassistant:${{ needs.init.outputs.version }}"
+          validate_image "ghcr.io/home-assistant/armhf-homeassistant:${{ needs.init.outputs.version }}"
+          validate_image "ghcr.io/home-assistant/armv7-homeassistant:${{ needs.init.outputs.version }}"
+          validate_image "ghcr.io/home-assistant/aarch64-homeassistant:${{ needs.init.outputs.version }}"
+
+          # Upload images to dockerhub
+          push_dockerhub "amd64-homeassistant" "${{ needs.init.outputs.version }}"
+          push_dockerhub "i386-homeassistant" "${{ needs.init.outputs.version }}"
+          push_dockerhub "armhf-homeassistant" "${{ needs.init.outputs.version }}"
+          push_dockerhub "armv7-homeassistant" "${{ needs.init.outputs.version }}"
+          push_dockerhub "aarch64-homeassistant" "${{ needs.init.outputs.version }}"
 
           # Create version tag
           create_manifest "${{ needs.init.outputs.version }}" "${{ needs.init.outputs.version }}"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d0438e674dd..bcc19bfb55d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -32,7 +32,7 @@ env:
   CACHE_VERSION: 5
   PIP_CACHE_VERSION: 4
   MYPY_CACHE_VERSION: 4
-  HA_SHORT_VERSION: 2023.6
+  HA_SHORT_VERSION: 2023.7
   DEFAULT_PYTHON: "3.10"
   ALL_PYTHON_VERSIONS: "['3.10', '3.11']"
   # 10.3 is the oldest supported version
@@ -82,7 +82,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Generate partial Python venv restore key
         id: generate_python_cache_key
         run: >-
@@ -206,7 +206,7 @@ jobs:
       - info
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v4.6.1
@@ -251,7 +251,7 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v4.6.1
         id: python
@@ -297,7 +297,7 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v4.6.1
         id: python
@@ -338,44 +338,6 @@ jobs:
           shopt -s globstar
           pre-commit run --hook-stage manual ruff --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/{*,**/*} --show-diff-on-failure
 
-  lint-isort:
-    name: Check isort
-    runs-on: ubuntu-22.04
-    needs:
-      - info
-      - pre-commit
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
-      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.1
-        id: python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          check-latest: true
-      - name: Restore base Python virtual environment
-        id: cache-venv
-        uses: actions/cache/restore@v3.3.1
-        with:
-          path: venv
-          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{
-              needs.info.outputs.pre-commit_cache_key }}
-      - name: Restore pre-commit environment from cache
-        id: cache-precommit
-        uses: actions/cache/restore@v3.3.1
-        with:
-          path: ${{ env.PRE_COMMIT_CACHE }}
-          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
-              needs.info.outputs.pre-commit_cache_key }}
-      - name: Run isort
-        run: |
-          . venv/bin/activate
-          pre-commit run --hook-stage manual isort --all-files --show-diff-on-failure
-
   lint-other:
     name: Check other linters
     runs-on: ubuntu-22.04
@@ -384,7 +346,7 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v4.6.1
         id: python
@@ -468,19 +430,6 @@ jobs:
         with:
           args: hadolint Dockerfile.dev
 
-      - name: Run bandit (fully)
-        if: needs.info.outputs.test_full_suite == 'true'
-        run: |
-          . venv/bin/activate
-          pre-commit run --hook-stage manual bandit --all-files --show-diff-on-failure
-      - name: Run bandit (partially)
-        if: needs.info.outputs.test_full_suite == 'false'
-        shell: bash
-        run: |
-          . venv/bin/activate
-          shopt -s globstar
-          pre-commit run --hook-stage manual bandit --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/{*,**/*} --show-diff-on-failure
-
   base:
     name: Prepare dependencies
     runs-on: ubuntu-22.04
@@ -491,7 +440,7 @@ jobs:
         python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ matrix.python-version }}
         id: python
         uses: actions/setup-python@v4.6.1
@@ -543,10 +492,10 @@ jobs:
           python -m venv venv
           . venv/bin/activate
           python --version
-          pip install --cache-dir=$PIP_CACHE -U "pip>=21.0,<23.2" setuptools wheel
+          pip install --cache-dir=$PIP_CACHE -U "pip>=21.3.1,<23.2" setuptools wheel
           pip install --cache-dir=$PIP_CACHE -r requirements_all.txt
           pip install --cache-dir=$PIP_CACHE -r requirements_test.txt
-          pip install -e .
+          pip install -e . --config-settings editable_mode=compat
 
   hassfest:
     name: Check hassfest
@@ -559,7 +508,7 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v4.6.1
@@ -591,7 +540,7 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v4.6.1
@@ -624,7 +573,7 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v4.6.1
@@ -668,7 +617,7 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v4.6.1
@@ -732,7 +681,6 @@ jobs:
       - base
       - gen-requirements-all
       - hassfest
-      - lint-isort
       - lint-other
       - lint-ruff
       - mypy
@@ -751,7 +699,7 @@ jobs:
             bluez \
             ffmpeg
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ matrix.python-version }}
         id: python
         uses: actions/setup-python@v4.6.1
@@ -857,7 +805,6 @@ jobs:
       - base
       - gen-requirements-all
       - hassfest
-      - lint-isort
       - lint-other
       - lint-ruff
       - mypy
@@ -877,7 +824,7 @@ jobs:
             ffmpeg \
             libmariadb-dev-compat
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ matrix.python-version }}
         id: python
         uses: actions/setup-python@v4.6.1
@@ -965,7 +912,6 @@ jobs:
       - base
       - gen-requirements-all
       - hassfest
-      - lint-isort
       - lint-other
       - lint-ruff
       - mypy
@@ -985,7 +931,7 @@ jobs:
             ffmpeg \
             postgresql-server-dev-14
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ matrix.python-version }}
         id: python
         uses: actions/setup-python@v4.6.1
@@ -1062,12 +1008,12 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Download all coverage artifacts
         uses: actions/download-artifact@v3
       - name: Upload coverage to Codecov (full coverage)
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: Wandalen/wretry.action@v1.0.36
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           action: codecov/codecov-action@v3.1.3
           with: |
@@ -1077,7 +1023,7 @@ jobs:
           attempt_delay: 30000
       - name: Upload coverage to Codecov (partial coverage)
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: Wandalen/wretry.action@v1.0.36
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           action: codecov/codecov-action@v3.1.3
           with: |
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
index c0593fa3a9a..2b5364fa950 100644
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -10,7 +10,7 @@ jobs:
     if: github.repository_owner == 'home-assistant'
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4.0.0
+      - uses: dessant/lock-threads@v4.0.1
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: "30"
diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
index 997543f0cf1..dd1f3d061a9 100644
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -10,7 +10,7 @@ on:
       - "**strings.json"
 
 env:
-  DEFAULT_PYTHON: "3.10"
+  DEFAULT_PYTHON: "3.11"
 
 jobs:
   upload:
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v4.6.1
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index c735a446938..16bd347d7cf 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -26,7 +26,7 @@ jobs:
       architectures: ${{ steps.info.outputs.architectures }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Get information
         id: info
@@ -47,10 +47,7 @@ jobs:
             echo "GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=true"
             echo "GRPC_PYTHON_BUILD_WITH_CYTHON=true"
             echo "GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=true"
-            # GRPC on armv7 needs -lexecinfo (issue #56669) since home assistant installs
-            # execinfo-dev when building wheels. The setuptools build setup does not have an option for
-            # adding a single LDFLAG so copy all relevant linux flags here (as of 1.43.0)
-            echo "GRPC_PYTHON_LDFLAGS=-lpthread -Wl,-wrap,memcpy -static-libgcc -lexecinfo"
+            echo "GRPC_PYTHON_LDFLAGS=-lpthread -Wl,-wrap,memcpy -static-libgcc"
 
             # Fix out of memory issues with rust
             echo "CARGO_NET_GIT_FETCH_WITH_CLI=true"
@@ -83,11 +80,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        abi: ["cp310", "cp311"]
+        abi: ["cp311"]
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Download env_file
         uses: actions/download-artifact@v3
@@ -113,100 +110,6 @@ jobs:
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements.txt"
 
-  integrations_cp310:
-    name: Build wheels ${{ matrix.abi }} for ${{ matrix.arch }}
-    if: github.repository_owner == 'home-assistant'
-    needs: init
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        abi: ["cp310"]
-        arch: ${{ fromJson(needs.init.outputs.architectures) }}
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
-
-      - name: Download env_file
-        uses: actions/download-artifact@v3
-        with:
-          name: env_file
-
-      - name: Download requirements_diff
-        uses: actions/download-artifact@v3
-        with:
-          name: requirements_diff
-
-      - name: Uncomment packages
-        run: |
-          requirement_files="requirements_all.txt requirements_diff.txt"
-          for requirement_file in ${requirement_files}; do
-            sed -i "s|# pybluez|pybluez|g" ${requirement_file}
-            sed -i "s|# beacontools|beacontools|g" ${requirement_file}
-            sed -i "s|# fritzconnection|fritzconnection|g" ${requirement_file}
-            sed -i "s|# pyuserinput|pyuserinput|g" ${requirement_file}
-            sed -i "s|# evdev|evdev|g" ${requirement_file}
-            sed -i "s|# pycups|pycups|g" ${requirement_file}
-            sed -i "s|# homekit|homekit|g" ${requirement_file}
-            sed -i "s|# decora_wifi|decora_wifi|g" ${requirement_file}
-            sed -i "s|# python-gammu|python-gammu|g" ${requirement_file}
-            sed -i "s|# opencv-python-headless|opencv-python-headless|g" ${requirement_file}
-          done
-
-      - name: Split requirements all
-        run: |
-          # We split requirements all into two different 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) / 2) requirements_all.txt requirements_all.txt
-
-      - name: Adjust build env
-        run: |
-          if [ "${{ matrix.arch }}" = "i386" ]; then
-            echo "NPY_DISABLE_SVML=1" >> .env_file
-          fi
-
-          (
-            # cmake > 3.22.2 have issue on arm
-            # Tested until 3.22.5
-            echo "cmake==3.22.2"
-          ) >> homeassistant/package_constraints.txt
-
-          # Do not pin numpy in wheels building
-          sed -i "/numpy/d" homeassistant/package_constraints.txt
-
-      - name: Build wheels (part 1)
-        uses: home-assistant/wheels@2023.04.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"
-          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
-          constraints: "homeassistant/package_constraints.txt"
-          requirements-diff: "requirements_diff.txt"
-          requirements: "requirements_all.txtaa"
-
-      - name: Build wheels (part 2)
-        uses: home-assistant/wheels@2023.04.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"
-          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
-          constraints: "homeassistant/package_constraints.txt"
-          requirements-diff: "requirements_diff.txt"
-          requirements: "requirements_all.txtab"
-
-  # Wheels building for the cp311 ABI is currently split
-  # This is mainly until we have figured out to get all wheels built.
-  # Without harming our current workflow.
   integrations_cp311:
     name: Build wheels ${{ matrix.abi }} for ${{ matrix.arch }}
     if: github.repository_owner == 'home-assistant'
@@ -219,31 +122,12 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
-      - name: Write alternative env-file for cp311
-        run: |
-          (
-            echo "GRPC_BUILD_WITH_BORING_SSL_ASM=false"
-            echo "GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=true"
-            echo "GRPC_PYTHON_BUILD_WITH_CYTHON=true"
-            echo "GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=true"
-
-            # GRPC on armv7 needed -lexecinfo (issue #56669) since home assistant installed
-            # execinfo-dev when building wheels. However, this package is no longer available
-            # Alpine 3.17, which we use for the cp311 ABI, so the flag should no longer be needed.
-            echo "GRPC_PYTHON_LDFLAGS=-lpthread -Wl,-wrap,memcpy -static-libgcc" # -lexecinfo
-
-            # Fix out of memory issues with rust
-            echo "CARGO_NET_GIT_FETCH_WITH_CLI=true"
-
-            # OpenCV headless installation
-            echo "CI_BUILD=1"
-            echo "ENABLE_HEADLESS=1"
-
-            # Use C-Extension for sqlalchemy
-            echo "REQUIRE_SQLALCHEMY_CEXT=1"
-          ) > .env_file
+      - name: Download env_file
+        uses: actions/download-artifact@v3
+        with:
+          name: env_file
 
       - name: Download requirements_diff
         uses: actions/download-artifact@v3
@@ -254,27 +138,12 @@ jobs:
         run: |
           requirement_files="requirements_all.txt requirements_diff.txt"
           for requirement_file in ${requirement_files}; do
-
-            # PyBluez no longer compiles. Commented it out for now.
-            # It need further cleanup down the line, as all machine images
-            # try to install it.
-            # sed -i "s|# pybluez|pybluez|g" ${requirement_file}
-
-            # beacontools requires PyBluez.
-            # sed -i "s|# beacontools|beacontools|g" ${requirement_file}
-
-            # It doesn't build for some reason, so we skip it for now.
-            # Bumping to the latest version (4.7.0.72) supporting Python 3.11
-            # doesn't help. Reverted bump in #91871. There are 8 registered
-            # instances using this integration according to analytics.
-            # sed -i "s|# opencv-python-headless|opencv-python-headless|g" ${requirement_file}
-
             sed -i "s|# fritzconnection|fritzconnection|g" ${requirement_file}
             sed -i "s|# pyuserinput|pyuserinput|g" ${requirement_file}
             sed -i "s|# evdev|evdev|g" ${requirement_file}
             sed -i "s|# pycups|pycups|g" ${requirement_file}
             sed -i "s|# homekit|homekit|g" ${requirement_file}
-            sed -i "s|# decora_wifi|decora_wifi|g" ${requirement_file}
+            sed -i "s|# decora-wifi|decora-wifi|g" ${requirement_file}
             sed -i "s|# python-gammu|python-gammu|g" ${requirement_file}
 
             # Some packages are not buildable on armhf anymore
@@ -284,7 +153,7 @@ jobs:
               # will drop the platform in the near future (they consider it
               # "flimsy" on 386). The following packages depend on pandas,
               # so we comment them out.
-              sed -i "s|env_canada|# env_canada|g" ${requirement_file}
+              sed -i "s|env-canada|# env-canada|g" ${requirement_file}
               sed -i "s|noaa-coops|# noaa-coops|g" ${requirement_file}
               sed -i "s|pyezviz|# pyezviz|g" ${requirement_file}
               sed -i "s|pykrakenapi|# pykrakenapi|g" ${requirement_file}
@@ -297,7 +166,7 @@ jobs:
           # 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) / 2) requirements_all.txt requirements_all.txt
+          split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 3) requirements_all.txt requirements_all.txt
 
       - name: Adjust build env
         run: |
@@ -305,13 +174,6 @@ jobs:
             echo "NPY_DISABLE_SVML=1" >> .env_file
           fi
 
-          # Probably not an issue anymore. Removing for now.
-          # (
-          #   # cmake > 3.22.2 have issue on arm
-          #   # Tested until 3.22.5
-          #   echo "cmake==3.22.2"
-          # ) >> homeassistant/package_constraints.txt
-
           # Do not pin numpy in wheels building
           sed -i "/numpy/d" homeassistant/package_constraints.txt
 
@@ -342,3 +204,17 @@ jobs:
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtab"
+
+      - name: Build wheels (part 3)
+        uses: home-assistant/wheels@2023.04.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"
+          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
+          constraints: "homeassistant/package_constraints.txt"
+          requirements-diff: "requirements_diff.txt"
+          requirements: "requirements_all.txtac"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8e8fef97697..d6cd3f43b10 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.262
+    rev: v0.0.272
     hooks:
       - id: ruff
         args:
@@ -22,19 +22,6 @@ repos:
           - --quiet-level=2
         exclude_types: [csv, json]
         exclude: ^tests/fixtures/|homeassistant/generated/
-  - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.4
-    hooks:
-      - id: bandit
-        args:
-          - --quiet
-          - --format=custom
-          - --configfile=tests/bandit.yaml
-        files: ^(homeassistant|script|tests)/.+\.py$
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
diff --git a/.strict-typing b/.strict-typing
index 801827df6dc..67ebca7aea7 100644
--- a/.strict-typing
+++ b/.strict-typing
@@ -172,6 +172,7 @@ homeassistant.components.huawei_lte.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
 homeassistant.components.ibeacon.*
+homeassistant.components.image.*
 homeassistant.components.image_processing.*
 homeassistant.components.image_upload.*
 homeassistant.components.imap.*
@@ -243,6 +244,7 @@ homeassistant.components.overkiz.*
 homeassistant.components.peco.*
 homeassistant.components.persistent_notification.*
 homeassistant.components.pi_hole.*
+homeassistant.components.ping.*
 homeassistant.components.powerwall.*
 homeassistant.components.proximity.*
 homeassistant.components.prusalink.*
@@ -275,7 +277,6 @@ homeassistant.components.scene.*
 homeassistant.components.schedule.*
 homeassistant.components.scrape.*
 homeassistant.components.select.*
-homeassistant.components.senseme.*
 homeassistant.components.sensibo.*
 homeassistant.components.sensirion_ble.*
 homeassistant.components.sensor.*
@@ -308,6 +309,7 @@ homeassistant.components.tag.*
 homeassistant.components.tailscale.*
 homeassistant.components.tautulli.*
 homeassistant.components.tcp.*
+homeassistant.components.text.*
 homeassistant.components.threshold.*
 homeassistant.components.tibber.*
 homeassistant.components.tile.*
diff --git a/CODEOWNERS b/CODEOWNERS
index 44b7e4bce36..3f8f27187f3 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -275,6 +275,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/discogs/ @thibmaek
 /homeassistant/components/discord/ @tkdrob
 /tests/components/discord/ @tkdrob
+/homeassistant/components/discovergy/ @jpbede
+/tests/components/discovergy/ @jpbede
 /homeassistant/components/discovery/ @home-assistant/core
 /tests/components/discovery/ @home-assistant/core
 /homeassistant/components/dlink/ @tkdrob
@@ -289,6 +291,8 @@ build.json @home-assistant/supervisor
 /tests/components/doorbird/ @oblogic7 @bdraco @flacjacket
 /homeassistant/components/dormakaba_dkey/ @emontnemery
 /tests/components/dormakaba_dkey/ @emontnemery
+/homeassistant/components/dremel_3d_printer/ @tkdrob
+/tests/components/dremel_3d_printer/ @tkdrob
 /homeassistant/components/dsmr/ @Robbie1221 @frenck
 /tests/components/dsmr/ @Robbie1221 @frenck
 /homeassistant/components/dsmr_reader/ @depl0y @glodenox
@@ -352,8 +356,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/eq3btsmart/ @rytilahti
 /homeassistant/components/escea/ @lazdavila
 /tests/components/escea/ @lazdavila
-/homeassistant/components/esphome/ @OttoWinter @jesserockz
-/tests/components/esphome/ @OttoWinter @jesserockz
+/homeassistant/components/esphome/ @OttoWinter @jesserockz @bdraco
+/tests/components/esphome/ @OttoWinter @jesserockz @bdraco
 /homeassistant/components/eufylife_ble/ @bdr99
 /tests/components/eufylife_ble/ @bdr99
 /homeassistant/components/evil_genius_labs/ @balloob
@@ -448,8 +452,8 @@ build.json @home-assistant/supervisor
 /tests/components/glances/ @engrbm87
 /homeassistant/components/goalzero/ @tkdrob
 /tests/components/goalzero/ @tkdrob
-/homeassistant/components/gogogate2/ @vangorra @bdraco
-/tests/components/gogogate2/ @vangorra @bdraco
+/homeassistant/components/gogogate2/ @vangorra
+/tests/components/gogogate2/ @vangorra
 /homeassistant/components/goodwe/ @mletenay @starkillerOG
 /tests/components/goodwe/ @mletenay @starkillerOG
 /homeassistant/components/google/ @allenporter
@@ -559,12 +563,14 @@ build.json @home-assistant/supervisor
 /tests/components/icloud/ @Quentame @nzapponi
 /homeassistant/components/ign_sismologia/ @exxamalte
 /tests/components/ign_sismologia/ @exxamalte
+/homeassistant/components/image/ @home-assistant/core
+/tests/components/image/ @home-assistant/core
 /homeassistant/components/image_processing/ @home-assistant/core
 /tests/components/image_processing/ @home-assistant/core
 /homeassistant/components/image_upload/ @home-assistant/core
 /tests/components/image_upload/ @home-assistant/core
-/homeassistant/components/imap/ @engrbm87 @jbouwh
-/tests/components/imap/ @engrbm87 @jbouwh
+/homeassistant/components/imap/ @jbouwh
+/tests/components/imap/ @jbouwh
 /homeassistant/components/incomfort/ @zxdavb
 /homeassistant/components/influxdb/ @mdegat01
 /tests/components/influxdb/ @mdegat01
@@ -697,6 +703,8 @@ build.json @home-assistant/supervisor
 /tests/components/logi_circle/ @evanjd
 /homeassistant/components/lookin/ @ANMalko @bdraco
 /tests/components/lookin/ @ANMalko @bdraco
+/homeassistant/components/loqed/ @mikewoudenberg
+/tests/components/loqed/ @mikewoudenberg
 /homeassistant/components/lovelace/ @home-assistant/frontend
 /tests/components/lovelace/ @home-assistant/frontend
 /homeassistant/components/luci/ @mzdrale
@@ -779,11 +787,12 @@ build.json @home-assistant/supervisor
 /tests/components/mutesync/ @currentoor
 /homeassistant/components/my/ @home-assistant/core
 /tests/components/my/ @home-assistant/core
-/homeassistant/components/myq/ @bdraco @ehendrix23
-/tests/components/myq/ @bdraco @ehendrix23
+/homeassistant/components/myq/ @ehendrix23
+/tests/components/myq/ @ehendrix23
 /homeassistant/components/mysensors/ @MartinHjelmare @functionpointer
 /tests/components/mysensors/ @MartinHjelmare @functionpointer
 /homeassistant/components/mystrom/ @fabaff
+/tests/components/mystrom/ @fabaff
 /homeassistant/components/nam/ @bieniu
 /tests/components/nam/ @bieniu
 /homeassistant/components/nanoleaf/ @milanmeu
@@ -878,6 +887,7 @@ build.json @home-assistant/supervisor
 /homeassistant/components/opengarage/ @danielhiversen
 /tests/components/opengarage/ @danielhiversen
 /homeassistant/components/openhome/ @bazwilliams
+/tests/components/openhome/ @bazwilliams
 /homeassistant/components/opensky/ @joostlek
 /homeassistant/components/opentherm_gw/ @mvn23
 /tests/components/opentherm_gw/ @mvn23
@@ -961,6 +971,8 @@ build.json @home-assistant/supervisor
 /tests/components/qingping/ @bdraco @skgsergio
 /homeassistant/components/qld_bushfire/ @exxamalte
 /tests/components/qld_bushfire/ @exxamalte
+/homeassistant/components/qnap/ @disforw
+/tests/components/qnap/ @disforw
 /homeassistant/components/qnap_qsw/ @Noltari
 /tests/components/qnap_qsw/ @Noltari
 /homeassistant/components/quantum_gateway/ @cisasteelersfan
@@ -999,6 +1011,8 @@ build.json @home-assistant/supervisor
 /tests/components/remote/ @home-assistant/core
 /homeassistant/components/renault/ @epenet
 /tests/components/renault/ @epenet
+/homeassistant/components/renson/ @jimmyd-be
+/tests/components/renson/ @jimmyd-be
 /homeassistant/components/reolink/ @starkillerOG
 /tests/components/reolink/ @starkillerOG
 /homeassistant/components/repairs/ @home-assistant/core
@@ -1068,8 +1082,6 @@ build.json @home-assistant/supervisor
 /tests/components/select/ @home-assistant/core
 /homeassistant/components/sense/ @kbickar
 /tests/components/sense/ @kbickar
-/homeassistant/components/senseme/ @mikelawrence @bdraco
-/tests/components/senseme/ @mikelawrence @bdraco
 /homeassistant/components/sensibo/ @andrey-git @gjohansson-ST
 /tests/components/sensibo/ @andrey-git @gjohansson-ST
 /homeassistant/components/sensirion_ble/ @akx
@@ -1292,6 +1304,8 @@ build.json @home-assistant/supervisor
 /tests/components/twentemilieu/ @frenck
 /homeassistant/components/twinkly/ @dr1rrb @Robbie1221
 /tests/components/twinkly/ @dr1rrb @Robbie1221
+/homeassistant/components/twitch/ @joostlek
+/tests/components/twitch/ @joostlek
 /homeassistant/components/ukraine_alarm/ @PaulAnnekov
 /tests/components/ukraine_alarm/ @PaulAnnekov
 /homeassistant/components/unifi/ @Kane610
diff --git a/Dockerfile.dev b/Dockerfile.dev
index de49bb77f12..857ccfa3997 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.10
+FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.11
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
diff --git a/README.rst b/README.rst
index 084949dc44e..0dc98a379a3 100644
--- a/README.rst
+++ b/README.rst
@@ -21,7 +21,7 @@ If you run into issues while using Home Assistant or during development
 of a component, check the `Home Assistant help section <https://home-assistant.io/help/>`__ of our website for further help and information.
 
 .. |Chat Status| image:: https://img.shields.io/discord/330944238910963714.svg
-   :target: https://discord.gg/c5DvZ4e
+   :target: https://www.home-assistant.io/join-chat/
 .. |screenshot-states| image:: https://raw.githubusercontent.com/home-assistant/core/master/docs/screenshots.png
    :target: https://demo.home-assistant.io
 .. |screenshot-integrations| image:: https://raw.githubusercontent.com/home-assistant/core/dev/docs/screenshot-integrations.png
diff --git a/build.yaml b/build.yaml
index b32aa38dff6..a181e9d1548 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,14 +1,16 @@
-image: homeassistant/{arch}-homeassistant
-shadow_repository: ghcr.io/home-assistant
+image: ghcr.io/home-assistant/{arch}-homeassistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2023.06.0
-  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2023.06.0
-  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2023.06.0
-  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2023.06.0
-  i386: ghcr.io/home-assistant/i386-homeassistant-base:2023.06.0
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2023.06.1
+  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2023.06.1
+  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2023.06.1
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2023.06.1
+  i386: ghcr.io/home-assistant/i386-homeassistant-base:2023.06.1
 codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io
+cosign:
+  base_identity: https://github.com/home-assistant/docker/.*
+  identity: https://github.com/home-assistant/core/.*
 labels:
   io.hass.type: core
   org.opencontainers.image.title: Home Assistant
diff --git a/homeassistant/auth/providers/command_line.py b/homeassistant/auth/providers/command_line.py
index f63d6d465f6..bfe8a2fdddb 100644
--- a/homeassistant/auth/providers/command_line.py
+++ b/homeassistant/auth/providers/command_line.py
@@ -13,8 +13,8 @@ from homeassistant.const import CONF_COMMAND
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 
-from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
+from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 CONF_ARGS = "args"
 CONF_META = "meta"
diff --git a/homeassistant/auth/providers/homeassistant.py b/homeassistant/auth/providers/homeassistant.py
index 050a0660a6b..6f621b93a6a 100644
--- a/homeassistant/auth/providers/homeassistant.py
+++ b/homeassistant/auth/providers/homeassistant.py
@@ -16,8 +16,8 @@ from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.storage import Store
 
-from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
+from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 STORAGE_VERSION = 1
 STORAGE_KEY = "auth_provider.homeassistant"
diff --git a/homeassistant/auth/providers/insecure_example.py b/homeassistant/auth/providers/insecure_example.py
index 47626686f9d..f7f01e74c27 100644
--- a/homeassistant/auth/providers/insecure_example.py
+++ b/homeassistant/auth/providers/insecure_example.py
@@ -11,8 +11,8 @@ from homeassistant.core import callback
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 
-from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
+from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 USER_SCHEMA = vol.Schema(
     {
diff --git a/homeassistant/auth/providers/legacy_api_password.py b/homeassistant/auth/providers/legacy_api_password.py
index 72ba3b1ecb3..0cadbf07589 100644
--- a/homeassistant/auth/providers/legacy_api_password.py
+++ b/homeassistant/auth/providers/legacy_api_password.py
@@ -15,8 +15,8 @@ from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
 
-from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
+from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 AUTH_PROVIDER_TYPE = "legacy_api_password"
 CONF_API_PASSWORD = "api_password"
diff --git a/homeassistant/auth/providers/trusted_networks.py b/homeassistant/auth/providers/trusted_networks.py
index 04db5fc287b..6962671cb2f 100644
--- a/homeassistant/auth/providers/trusted_networks.py
+++ b/homeassistant/auth/providers/trusted_networks.py
@@ -23,9 +23,9 @@ from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
 
-from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from .. import InvalidAuthError
 from ..models import Credentials, RefreshToken, UserMeta
+from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 IPAddress = IPv4Address | IPv6Address
 IPNetwork = IPv4Network | IPv6Network
diff --git a/homeassistant/backports/functools.py b/homeassistant/backports/functools.py
new file mode 100644
index 00000000000..c7ab0d08693
--- /dev/null
+++ b/homeassistant/backports/functools.py
@@ -0,0 +1,72 @@
+"""Functools backports from standard lib."""
+from __future__ import annotations
+
+from collections.abc import Callable
+from types import GenericAlias
+from typing import Any, Generic, TypeVar, overload
+
+from typing_extensions import Self
+
+_T = TypeVar("_T")
+_R = TypeVar("_R")
+
+
+class cached_property(Generic[_T, _R]):  # pylint: disable=invalid-name
+    """Backport of Python 3.12's cached_property.
+
+    Includes https://github.com/python/cpython/pull/101890/files
+    """
+
+    def __init__(self, func: Callable[[_T], _R]) -> None:
+        """Initialize."""
+        self.func = func
+        self.attrname: Any = None
+        self.__doc__ = func.__doc__
+
+    def __set_name__(self, owner: type[_T], name: str) -> None:
+        """Set name."""
+        if self.attrname is None:
+            self.attrname = name
+        elif name != self.attrname:
+            raise TypeError(
+                "Cannot assign the same cached_property to two different names "
+                f"({self.attrname!r} and {name!r})."
+            )
+
+    @overload
+    def __get__(self, instance: None, owner: type[_T]) -> Self:
+        ...
+
+    @overload
+    def __get__(self, instance: _T, owner: type[_T]) -> _R:
+        ...
+
+    def __get__(self, instance: _T | None, owner: type[_T] | None = None) -> _R | Self:
+        """Get."""
+        if instance is None:
+            return self
+        if self.attrname is None:
+            raise TypeError(
+                "Cannot use cached_property instance without calling __set_name__ on it."
+            )
+        try:
+            cache = instance.__dict__
+        # not all objects have __dict__ (e.g. class defines slots)
+        except AttributeError:
+            msg = (
+                f"No '__dict__' attribute on {type(instance).__name__!r} "
+                f"instance to cache {self.attrname!r} property."
+            )
+            raise TypeError(msg) from None
+        val = self.func(instance)
+        try:
+            cache[self.attrname] = val
+        except TypeError:
+            msg = (
+                f"The '__dict__' attribute on {type(instance).__name__!r} instance "
+                f"does not support item assignment for caching {self.attrname!r} property."
+            )
+            raise TypeError(msg) from None
+        return val
+
+    __class_getitem__ = classmethod(GenericAlias)
diff --git a/homeassistant/components/abode/alarm_control_panel.py b/homeassistant/components/abode/alarm_control_panel.py
index 2546f762912..66a2e3b0db5 100644
--- a/homeassistant/components/abode/alarm_control_panel.py
+++ b/homeassistant/components/abode/alarm_control_panel.py
@@ -34,6 +34,7 @@ class AbodeAlarm(AbodeDevice, alarm.AlarmControlPanelEntity):
     """An alarm_control_panel implementation for Abode."""
 
     _attr_icon = ICON
+    _attr_name = None
     _attr_code_arm_required = False
     _attr_supported_features = (
         AlarmControlPanelEntityFeature.ARM_HOME
diff --git a/homeassistant/components/abode/binary_sensor.py b/homeassistant/components/abode/binary_sensor.py
index 402b636e5d6..a10dbc8e664 100644
--- a/homeassistant/components/abode/binary_sensor.py
+++ b/homeassistant/components/abode/binary_sensor.py
@@ -42,6 +42,7 @@ async def async_setup_entry(
 class AbodeBinarySensor(AbodeDevice, BinarySensorEntity):
     """A binary sensor implementation for Abode device."""
 
+    _attr_name = None
     _device: ABBinarySensor
 
     @property
diff --git a/homeassistant/components/abode/camera.py b/homeassistant/components/abode/camera.py
index 17d7b820d45..afe017bfcc7 100644
--- a/homeassistant/components/abode/camera.py
+++ b/homeassistant/components/abode/camera.py
@@ -39,6 +39,7 @@ class AbodeCamera(AbodeDevice, Camera):
     """Representation of an Abode camera."""
 
     _device: AbodeCam
+    _attr_name = None
 
     def __init__(self, data: AbodeSystem, device: AbodeDev, event: Event) -> None:
         """Initialize the Abode device."""
diff --git a/homeassistant/components/abode/cover.py b/homeassistant/components/abode/cover.py
index 507b1284362..d504040ee90 100644
--- a/homeassistant/components/abode/cover.py
+++ b/homeassistant/components/abode/cover.py
@@ -29,6 +29,7 @@ class AbodeCover(AbodeDevice, CoverEntity):
     """Representation of an Abode cover."""
 
     _device: AbodeCV
+    _attr_name = None
 
     @property
     def is_closed(self) -> bool:
diff --git a/homeassistant/components/abode/light.py b/homeassistant/components/abode/light.py
index be69897431f..539b89a5546 100644
--- a/homeassistant/components/abode/light.py
+++ b/homeassistant/components/abode/light.py
@@ -42,6 +42,7 @@ class AbodeLight(AbodeDevice, LightEntity):
     """Representation of an Abode light."""
 
     _device: AbodeLT
+    _attr_name = None
 
     def turn_on(self, **kwargs: Any) -> None:
         """Turn on the light."""
diff --git a/homeassistant/components/abode/lock.py b/homeassistant/components/abode/lock.py
index 039b2423099..c110b3fd558 100644
--- a/homeassistant/components/abode/lock.py
+++ b/homeassistant/components/abode/lock.py
@@ -29,6 +29,7 @@ class AbodeLock(AbodeDevice, LockEntity):
     """Representation of an Abode lock."""
 
     _device: AbodeLK
+    _attr_name = None
 
     def lock(self, **kwargs: Any) -> None:
         """Lock the device."""
diff --git a/homeassistant/components/abode/sensor.py b/homeassistant/components/abode/sensor.py
index 546d57ab3e7..1e238783221 100644
--- a/homeassistant/components/abode/sensor.py
+++ b/homeassistant/components/abode/sensor.py
@@ -22,17 +22,14 @@ from .const import DOMAIN
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key=CONST.TEMP_STATUS_KEY,
-        name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
     ),
     SensorEntityDescription(
         key=CONST.HUMI_STATUS_KEY,
-        name="Humidity",
         device_class=SensorDeviceClass.HUMIDITY,
     ),
     SensorEntityDescription(
         key=CONST.LUX_STATUS_KEY,
-        name="Lux",
         device_class=SensorDeviceClass.ILLUMINANCE,
     ),
 )
diff --git a/homeassistant/components/abode/switch.py b/homeassistant/components/abode/switch.py
index ab83e3a20c1..14bdf4e0caf 100644
--- a/homeassistant/components/abode/switch.py
+++ b/homeassistant/components/abode/switch.py
@@ -44,6 +44,7 @@ class AbodeSwitch(AbodeDevice, SwitchEntity):
     """Representation of an Abode switch."""
 
     _device: AbodeSW
+    _attr_name = None
 
     def turn_on(self, **kwargs: Any) -> None:
         """Turn on the device."""
diff --git a/homeassistant/components/accuweather/weather.py b/homeassistant/components/accuweather/weather.py
index 6107285e376..20cb12179ee 100644
--- a/homeassistant/components/accuweather/weather.py
+++ b/homeassistant/components/accuweather/weather.py
@@ -4,10 +4,13 @@ from __future__ import annotations
 from typing import cast
 
 from homeassistant.components.weather import (
+    ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
+    ATTR_FORECAST_NATIVE_APPARENT_TEMP,
     ATTR_FORECAST_NATIVE_PRECIPITATION,
     ATTR_FORECAST_NATIVE_TEMP,
     ATTR_FORECAST_NATIVE_TEMP_LOW,
+    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED,
     ATTR_FORECAST_NATIVE_WIND_SPEED,
     ATTR_FORECAST_PRECIPITATION_PROBABILITY,
     ATTR_FORECAST_TIME,
@@ -29,7 +32,16 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.dt import utc_from_timestamp
 
 from . import AccuWeatherDataUpdateCoordinator
-from .const import API_METRIC, ATTR_FORECAST, ATTRIBUTION, CONDITION_CLASSES, DOMAIN
+from .const import (
+    API_METRIC,
+    ATTR_DIRECTION,
+    ATTR_FORECAST,
+    ATTR_SPEED,
+    ATTR_VALUE,
+    ATTRIBUTION,
+    CONDITION_CLASSES,
+    DOMAIN,
+)
 
 PARALLEL_UPDATES = 1
 
@@ -50,6 +62,7 @@ class AccuWeatherEntity(
     """Define an AccuWeather entity."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, coordinator: AccuWeatherDataUpdateCoordinator) -> None:
         """Initialize."""
@@ -78,35 +91,61 @@ class AccuWeatherEntity(
         except IndexError:
             return None
 
+    @property
+    def cloud_coverage(self) -> float:
+        """Return the Cloud coverage in %."""
+        return cast(float, self.coordinator.data["CloudCover"])
+
+    @property
+    def native_apparent_temperature(self) -> float:
+        """Return the apparent temperature."""
+        return cast(
+            float, self.coordinator.data["ApparentTemperature"][API_METRIC][ATTR_VALUE]
+        )
+
     @property
     def native_temperature(self) -> float:
         """Return the temperature."""
-        return cast(float, self.coordinator.data["Temperature"][API_METRIC]["Value"])
+        return cast(float, self.coordinator.data["Temperature"][API_METRIC][ATTR_VALUE])
 
     @property
     def native_pressure(self) -> float:
         """Return the pressure."""
-        return cast(float, self.coordinator.data["Pressure"][API_METRIC]["Value"])
+        return cast(float, self.coordinator.data["Pressure"][API_METRIC][ATTR_VALUE])
+
+    @property
+    def native_dew_point(self) -> float:
+        """Return the dew point."""
+        return cast(float, self.coordinator.data["DewPoint"][API_METRIC][ATTR_VALUE])
 
     @property
     def humidity(self) -> int:
         """Return the humidity."""
         return cast(int, self.coordinator.data["RelativeHumidity"])
 
+    @property
+    def native_wind_gust_speed(self) -> float:
+        """Return the wind gust speed."""
+        return cast(
+            float, self.coordinator.data["WindGust"][ATTR_SPEED][API_METRIC][ATTR_VALUE]
+        )
+
     @property
     def native_wind_speed(self) -> float:
         """Return the wind speed."""
-        return cast(float, self.coordinator.data["Wind"]["Speed"][API_METRIC]["Value"])
+        return cast(
+            float, self.coordinator.data["Wind"][ATTR_SPEED][API_METRIC][ATTR_VALUE]
+        )
 
     @property
     def wind_bearing(self) -> int:
         """Return the wind bearing."""
-        return cast(int, self.coordinator.data["Wind"]["Direction"]["Degrees"])
+        return cast(int, self.coordinator.data["Wind"][ATTR_DIRECTION]["Degrees"])
 
     @property
     def native_visibility(self) -> float:
         """Return the visibility."""
-        return cast(float, self.coordinator.data["Visibility"][API_METRIC]["Value"])
+        return cast(float, self.coordinator.data["Visibility"][API_METRIC][ATTR_VALUE])
 
     @property
     def forecast(self) -> list[Forecast] | None:
@@ -117,14 +156,23 @@ class AccuWeatherEntity(
         return [
             {
                 ATTR_FORECAST_TIME: utc_from_timestamp(item["EpochDate"]).isoformat(),
-                ATTR_FORECAST_NATIVE_TEMP: item["TemperatureMax"]["Value"],
-                ATTR_FORECAST_NATIVE_TEMP_LOW: item["TemperatureMin"]["Value"],
-                ATTR_FORECAST_NATIVE_PRECIPITATION: item["TotalLiquidDay"]["Value"],
+                ATTR_FORECAST_CLOUD_COVERAGE: item["CloudCoverDay"],
+                ATTR_FORECAST_NATIVE_TEMP: item["TemperatureMax"][ATTR_VALUE],
+                ATTR_FORECAST_NATIVE_TEMP_LOW: item["TemperatureMin"][ATTR_VALUE],
+                ATTR_FORECAST_NATIVE_APPARENT_TEMP: item["RealFeelTemperatureMax"][
+                    ATTR_VALUE
+                ],
+                ATTR_FORECAST_NATIVE_PRECIPITATION: item["TotalLiquidDay"][ATTR_VALUE],
                 ATTR_FORECAST_PRECIPITATION_PROBABILITY: item[
                     "PrecipitationProbabilityDay"
                 ],
-                ATTR_FORECAST_NATIVE_WIND_SPEED: item["WindDay"]["Speed"]["Value"],
-                ATTR_FORECAST_WIND_BEARING: item["WindDay"]["Direction"]["Degrees"],
+                ATTR_FORECAST_NATIVE_WIND_SPEED: item["WindDay"][ATTR_SPEED][
+                    ATTR_VALUE
+                ],
+                ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: item["WindGustDay"][ATTR_SPEED][
+                    ATTR_VALUE
+                ],
+                ATTR_FORECAST_WIND_BEARING: item["WindDay"][ATTR_DIRECTION]["Degrees"],
                 ATTR_FORECAST_CONDITION: [
                     k for k, v in CONDITION_CLASSES.items() if item["IconDay"] in v
                 ][0],
diff --git a/homeassistant/components/acmeda/base.py b/homeassistant/components/acmeda/base.py
index 138587bbad3..2fc106f75f5 100644
--- a/homeassistant/components/acmeda/base.py
+++ b/homeassistant/components/acmeda/base.py
@@ -14,6 +14,7 @@ class AcmedaBase(entity.Entity):
     """Base representation of an Acmeda roller."""
 
     _attr_should_poll = False
+    _attr_has_entity_name = True
 
     def __init__(self, roller: aiopulse.Roller) -> None:
         """Initialize the roller."""
@@ -72,11 +73,6 @@ class AcmedaBase(entity.Entity):
         """Return the ID of this roller."""
         return self.roller.id
 
-    @property
-    def name(self) -> str | None:
-        """Return the name of roller."""
-        return self.roller.name
-
     @property
     def device_info(self) -> entity.DeviceInfo:
         """Return the device info."""
diff --git a/homeassistant/components/acmeda/cover.py b/homeassistant/components/acmeda/cover.py
index 15a20cf6932..2af985033b6 100644
--- a/homeassistant/components/acmeda/cover.py
+++ b/homeassistant/components/acmeda/cover.py
@@ -45,7 +45,9 @@ async def async_setup_entry(
 
 
 class AcmedaCover(AcmedaBase, CoverEntity):
-    """Representation of a Acmeda cover device."""
+    """Representation of an Acmeda cover device."""
+
+    _attr_name = None
 
     @property
     def current_cover_position(self) -> int | None:
diff --git a/homeassistant/components/acmeda/sensor.py b/homeassistant/components/acmeda/sensor.py
index f92d9fcf57b..e8ccb30ada4 100644
--- a/homeassistant/components/acmeda/sensor.py
+++ b/homeassistant/components/acmeda/sensor.py
@@ -40,16 +40,11 @@ async def async_setup_entry(
 
 
 class AcmedaBattery(AcmedaBase, SensorEntity):
-    """Representation of a Acmeda cover device."""
+    """Representation of an Acmeda cover sensor."""
 
     _attr_device_class = SensorDeviceClass.BATTERY
     _attr_native_unit_of_measurement = PERCENTAGE
 
-    @property
-    def name(self) -> str:
-        """Return the name of roller."""
-        return f"{super().name} Battery"
-
     @property
     def native_value(self) -> float | int | None:
         """Return the state of the device."""
diff --git a/homeassistant/components/adax/climate.py b/homeassistant/components/adax/climate.py
index cc15872dafa..0db6a3615f6 100644
--- a/homeassistant/components/adax/climate.py
+++ b/homeassistant/components/adax/climate.py
@@ -1,7 +1,7 @@
 """Support for Adax wifi-enabled home heaters."""
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, cast
 
 from adax import Adax
 from adax_local import Adax as AdaxLocal
@@ -79,7 +79,10 @@ class AdaxDevice(ClimateEntity):
         self._attr_unique_id = f"{heater_data['homeId']}_{heater_data['id']}"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, heater_data["id"])},
-            name=self.name,
+            # Instead of setting the device name to the entity name, adax
+            # should be updated to set has_entity_name = True, and set the entity
+            # name to None
+            name=cast(str | None, self.name),
             manufacturer="Adax",
         )
 
diff --git a/homeassistant/components/adguard/sensor.py b/homeassistant/components/adguard/sensor.py
index f24aa20d28d..9f1c0a5b0fe 100644
--- a/homeassistant/components/adguard/sensor.py
+++ b/homeassistant/components/adguard/sensor.py
@@ -39,56 +39,56 @@ class AdGuardHomeEntityDescription(
 SENSORS: tuple[AdGuardHomeEntityDescription, ...] = (
     AdGuardHomeEntityDescription(
         key="dns_queries",
-        name="DNS queries",
+        translation_key="dns_queries",
         icon="mdi:magnify",
         native_unit_of_measurement="queries",
         value_fn=lambda adguard: adguard.stats.dns_queries(),
     ),
     AdGuardHomeEntityDescription(
         key="blocked_filtering",
-        name="DNS queries blocked",
+        translation_key="dns_queries_blocked",
         icon="mdi:magnify-close",
         native_unit_of_measurement="queries",
         value_fn=lambda adguard: adguard.stats.blocked_filtering(),
     ),
     AdGuardHomeEntityDescription(
         key="blocked_percentage",
-        name="DNS queries blocked ratio",
+        translation_key="dns_queries_blocked_ratio",
         icon="mdi:magnify-close",
         native_unit_of_measurement=PERCENTAGE,
         value_fn=lambda adguard: adguard.stats.blocked_percentage(),
     ),
     AdGuardHomeEntityDescription(
         key="blocked_parental",
-        name="Parental control blocked",
+        translation_key="parental_control_blocked",
         icon="mdi:human-male-girl",
         native_unit_of_measurement="requests",
         value_fn=lambda adguard: adguard.stats.replaced_parental(),
     ),
     AdGuardHomeEntityDescription(
         key="blocked_safebrowsing",
-        name="Safe browsing blocked",
+        translation_key="safe_browsing_blocked",
         icon="mdi:shield-half-full",
         native_unit_of_measurement="requests",
         value_fn=lambda adguard: adguard.stats.replaced_safebrowsing(),
     ),
     AdGuardHomeEntityDescription(
         key="enforced_safesearch",
-        name="Safe searches enforced",
+        translation_key="safe_searches_enforced",
         icon="mdi:shield-search",
         native_unit_of_measurement="requests",
         value_fn=lambda adguard: adguard.stats.replaced_safesearch(),
     ),
     AdGuardHomeEntityDescription(
         key="average_speed",
-        name="Average processing speed",
+        translation_key="average_processing_speed",
         icon="mdi:speedometer",
         native_unit_of_measurement=UnitOfTime.MILLISECONDS,
         value_fn=lambda adguard: adguard.stats.avg_processing_time(),
     ),
     AdGuardHomeEntityDescription(
         key="rules_count",
-        name="Rules count",
+        translation_key="rules_count",
         icon="mdi:counter",
         native_unit_of_measurement="rules",
         value_fn=lambda adguard: adguard.filtering.rules_count(allowlist=False),
diff --git a/homeassistant/components/adguard/strings.json b/homeassistant/components/adguard/strings.json
index e593d4199a4..bde73e82b37 100644
--- a/homeassistant/components/adguard/strings.json
+++ b/homeassistant/components/adguard/strings.json
@@ -24,5 +24,53 @@
       "existing_instance_updated": "Updated existing configuration.",
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "dns_queries": {
+        "name": "DNS queries"
+      },
+      "dns_queries_blocked": {
+        "name": "DNS queries blocked"
+      },
+      "dns_queries_blocked_ratio": {
+        "name": "DNS queries blocked ratio"
+      },
+      "parental_control_blocked": {
+        "name": "Parental control blocked"
+      },
+      "safe_browsing_blocked": {
+        "name": "Safe browsing blocked"
+      },
+      "safe_searches_enforced": {
+        "name": "Safe searches enforced"
+      },
+      "average_processing_speed": {
+        "name": "Average processing speed"
+      },
+      "rules_count": {
+        "name": "Rules count"
+      }
+    },
+    "switch": {
+      "protection": {
+        "name": "Protection"
+      },
+      "parental": {
+        "name": "Parental control"
+      },
+      "safe_search": {
+        "name": "Safe search"
+      },
+      "safe_browsing": {
+        "name": "Safe browsing"
+      },
+      "filtering": {
+        "name": "Filtering"
+      },
+      "query_log": {
+        "name": "Query log"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/adguard/switch.py b/homeassistant/components/adguard/switch.py
index a359bf86c2d..1020e8690f1 100644
--- a/homeassistant/components/adguard/switch.py
+++ b/homeassistant/components/adguard/switch.py
@@ -40,7 +40,7 @@ class AdGuardHomeSwitchEntityDescription(
 SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
     AdGuardHomeSwitchEntityDescription(
         key="protection",
-        name="Protection",
+        translation_key="protection",
         icon="mdi:shield-check",
         is_on_fn=lambda adguard: adguard.protection_enabled,
         turn_on_fn=lambda adguard: adguard.enable_protection,
@@ -48,7 +48,7 @@ SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
     ),
     AdGuardHomeSwitchEntityDescription(
         key="parental",
-        name="Parental control",
+        translation_key="parental",
         icon="mdi:shield-check",
         is_on_fn=lambda adguard: adguard.parental.enabled,
         turn_on_fn=lambda adguard: adguard.parental.enable,
@@ -56,7 +56,7 @@ SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
     ),
     AdGuardHomeSwitchEntityDescription(
         key="safesearch",
-        name="Safe search",
+        translation_key="safe_search",
         icon="mdi:shield-check",
         is_on_fn=lambda adguard: adguard.safesearch.enabled,
         turn_on_fn=lambda adguard: adguard.safesearch.enable,
@@ -64,7 +64,7 @@ SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
     ),
     AdGuardHomeSwitchEntityDescription(
         key="safebrowsing",
-        name="Safe browsing",
+        translation_key="safe_browsing",
         icon="mdi:shield-check",
         is_on_fn=lambda adguard: adguard.safebrowsing.enabled,
         turn_on_fn=lambda adguard: adguard.safebrowsing.enable,
@@ -72,7 +72,7 @@ SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
     ),
     AdGuardHomeSwitchEntityDescription(
         key="filtering",
-        name="Filtering",
+        translation_key="filtering",
         icon="mdi:shield-check",
         is_on_fn=lambda adguard: adguard.filtering.enabled,
         turn_on_fn=lambda adguard: adguard.filtering.enable,
@@ -80,7 +80,7 @@ SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
     ),
     AdGuardHomeSwitchEntityDescription(
         key="querylog",
-        name="Query log",
+        translation_key="query_log",
         icon="mdi:shield-check",
         is_on_fn=lambda adguard: adguard.querylog.enabled,
         turn_on_fn=lambda adguard: adguard.querylog.enable,
diff --git a/homeassistant/components/ads/sensor.py b/homeassistant/components/ads/sensor.py
index 76d73f75a8b..17aede2bd2b 100644
--- a/homeassistant/components/ads/sensor.py
+++ b/homeassistant/components/ads/sensor.py
@@ -10,6 +10,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType
 
+from .. import ads
 from . import (
     ADS_TYPEMAP,
     CONF_ADS_FACTOR,
@@ -18,7 +19,6 @@ from . import (
     STATE_KEY_STATE,
     AdsEntity,
 )
-from .. import ads
 
 DEFAULT_NAME = "ADS sensor"
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/advantage_air/climate.py b/homeassistant/components/advantage_air/climate.py
index 6170bd165e9..fa9f609ba10 100644
--- a/homeassistant/components/advantage_air/climate.py
+++ b/homeassistant/components/advantage_air/climate.py
@@ -90,6 +90,7 @@ class AdvantageAirAC(AdvantageAirAcEntity, ClimateEntity):
     _attr_target_temperature_step = PRECISION_WHOLE
     _attr_max_temp = 32
     _attr_min_temp = 16
+    _attr_name = None
 
     _attr_hvac_modes = [
         HVACMode.OFF,
diff --git a/homeassistant/components/advantage_air/diagnostics.py b/homeassistant/components/advantage_air/diagnostics.py
index 27eaef09b43..4c440610838 100644
--- a/homeassistant/components/advantage_air/diagnostics.py
+++ b/homeassistant/components/advantage_air/diagnostics.py
@@ -9,17 +9,30 @@ from homeassistant.core import HomeAssistant
 
 from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
 
-TO_REDACT = ["dealerPhoneNumber", "latitude", "logoPIN", "longitude", "postCode"]
+TO_REDACT = [
+    "dealerPhoneNumber",
+    "latitude",
+    "logoPIN",
+    "longitude",
+    "postCode",
+    "rid",
+    "deviceNames",
+    "deviceIds",
+    "deviceIdsV2",
+    "backupId",
+]
 
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    data = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]["coordinator"].data
+    data = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id].coordinator.data
 
     # Return only the relevant children
     return {
-        "aircons": data["aircons"],
+        "aircons": data.get("aircons"),
+        "myLights": data.get("myLights"),
+        "myThings": data.get("myThings"),
         "system": async_redact_data(data["system"], TO_REDACT),
     }
diff --git a/homeassistant/components/advantage_air/entity.py b/homeassistant/components/advantage_air/entity.py
index bbc8738c4ae..9e4f92e8c98 100644
--- a/homeassistant/components/advantage_air/entity.py
+++ b/homeassistant/components/advantage_air/entity.py
@@ -84,6 +84,8 @@ class AdvantageAirZoneEntity(AdvantageAirAcEntity):
 class AdvantageAirThingEntity(AdvantageAirEntity):
     """Parent class for Advantage Air Things Entities."""
 
+    _attr_name = None
+
     def __init__(self, instance: AdvantageAirData, thing: dict[str, Any]) -> None:
         """Initialize common aspects of an Advantage Air Things entity."""
         super().__init__(instance)
diff --git a/homeassistant/components/advantage_air/light.py b/homeassistant/components/advantage_air/light.py
index 13a77d5cab3..7815354dd92 100644
--- a/homeassistant/components/advantage_air/light.py
+++ b/homeassistant/components/advantage_air/light.py
@@ -41,6 +41,7 @@ class AdvantageAirLight(AdvantageAirEntity, LightEntity):
     """Representation of Advantage Air Light."""
 
     _attr_supported_color_modes = {ColorMode.ONOFF}
+    _attr_name = None
 
     def __init__(self, instance: AdvantageAirData, light: dict[str, Any]) -> None:
         """Initialize an Advantage Air Light."""
diff --git a/homeassistant/components/advantage_air/manifest.json b/homeassistant/components/advantage_air/manifest.json
index ed9d3bff989..a07d14896eb 100644
--- a/homeassistant/components/advantage_air/manifest.json
+++ b/homeassistant/components/advantage_air/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "local_polling",
   "loggers": ["advantage_air"],
   "quality_scale": "platinum",
-  "requirements": ["advantage_air==0.4.4"]
+  "requirements": ["advantage-air==0.4.4"]
 }
diff --git a/homeassistant/components/airly/sensor.py b/homeassistant/components/airly/sensor.py
index 53e15c651a7..cfbe7b98883 100644
--- a/homeassistant/components/airly/sensor.py
+++ b/homeassistant/components/airly/sensor.py
@@ -80,7 +80,6 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
     AirlySensorEntityDescription(
         key=ATTR_API_PM1,
         device_class=SensorDeviceClass.PM1,
-        translation_key="pm1",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -88,7 +87,6 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
     AirlySensorEntityDescription(
         key=ATTR_API_PM25,
         device_class=SensorDeviceClass.PM25,
-        translation_key="pm25",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -100,7 +98,6 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
     AirlySensorEntityDescription(
         key=ATTR_API_PM10,
         device_class=SensorDeviceClass.PM10,
-        translation_key="pm10",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -112,7 +109,6 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
     AirlySensorEntityDescription(
         key=ATTR_API_HUMIDITY,
         device_class=SensorDeviceClass.HUMIDITY,
-        translation_key="humidity",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=1,
@@ -120,7 +116,6 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
     AirlySensorEntityDescription(
         key=ATTR_API_PRESSURE,
         device_class=SensorDeviceClass.PRESSURE,
-        translation_key="pressure",
         native_unit_of_measurement=UnitOfPressure.HPA,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -128,7 +123,6 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
     AirlySensorEntityDescription(
         key=ATTR_API_TEMPERATURE,
         device_class=SensorDeviceClass.TEMPERATURE,
-        translation_key="temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=1,
@@ -147,7 +141,6 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
     AirlySensorEntityDescription(
         key=ATTR_API_NO2,
         device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
-        translation_key="no2",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -159,7 +152,6 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
     AirlySensorEntityDescription(
         key=ATTR_API_SO2,
         device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
-        translation_key="so2",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -171,7 +163,6 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
     AirlySensorEntityDescription(
         key=ATTR_API_O3,
         device_class=SensorDeviceClass.OZONE,
-        translation_key="o3",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
diff --git a/homeassistant/components/airly/strings.json b/homeassistant/components/airly/strings.json
index 50ebdd6d4dd..7ec58ccd8e5 100644
--- a/homeassistant/components/airly/strings.json
+++ b/homeassistant/components/airly/strings.json
@@ -32,35 +32,8 @@
       "caqi": {
         "name": "Common air quality index"
       },
-      "pm1": {
-        "name": "[%key:component::sensor::entity_component::pm1::name%]"
-      },
-      "pm25": {
-        "name": "[%key:component::sensor::entity_component::pm25::name%]"
-      },
-      "pm10": {
-        "name": "[%key:component::sensor::entity_component::pm10::name%]"
-      },
-      "humidity": {
-        "name": "[%key:component::sensor::entity_component::humidity::name%]"
-      },
-      "pressure": {
-        "name": "[%key:component::sensor::entity_component::pressure::name%]"
-      },
-      "temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      },
       "co": {
         "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
-      },
-      "no2": {
-        "name": "[%key:component::sensor::entity_component::nitrogen_dioxide::name%]"
-      },
-      "so2": {
-        "name": "[%key:component::sensor::entity_component::sulphur_dioxide::name%]"
-      },
-      "o3": {
-        "name": "[%key:component::sensor::entity_component::ozone::name%]"
       }
     }
   }
diff --git a/homeassistant/components/airnow/const.py b/homeassistant/components/airnow/const.py
index 67a9289efc5..34b1f4392bc 100644
--- a/homeassistant/components/airnow/const.py
+++ b/homeassistant/components/airnow/const.py
@@ -17,5 +17,3 @@ ATTR_API_STATION_LATITUDE = "Latitude"
 ATTR_API_STATION_LONGITUDE = "Longitude"
 DEFAULT_NAME = "AirNow"
 DOMAIN = "airnow"
-SENSOR_AQI_ATTR_DESCR = "description"
-SENSOR_AQI_ATTR_LEVEL = "level"
diff --git a/homeassistant/components/airnow/sensor.py b/homeassistant/components/airnow/sensor.py
index decec74ee47..f3d29cc65df 100644
--- a/homeassistant/components/airnow/sensor.py
+++ b/homeassistant/components/airnow/sensor.py
@@ -1,7 +1,12 @@
 """Support for the AirNow sensor service."""
 from __future__ import annotations
 
+from collections.abc import Callable
+from dataclasses import dataclass
+from typing import Any
+
 from homeassistant.components.sensor import (
+    SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
     SensorStateClass,
@@ -12,7 +17,10 @@ from homeassistant.const import (
     CONCENTRATION_PARTS_PER_MILLION,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceEntryType
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import AirNowDataUpdateCoordinator
@@ -22,36 +30,60 @@ from .const import (
     ATTR_API_AQI_LEVEL,
     ATTR_API_O3,
     ATTR_API_PM25,
+    DEFAULT_NAME,
     DOMAIN,
-    SENSOR_AQI_ATTR_DESCR,
-    SENSOR_AQI_ATTR_LEVEL,
 )
 
 ATTRIBUTION = "Data provided by AirNow"
 
 PARALLEL_UPDATES = 1
 
-SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
-    SensorEntityDescription(
+ATTR_DESCR = "description"
+ATTR_LEVEL = "level"
+
+
+@dataclass
+class AirNowEntityDescriptionMixin:
+    """Mixin for required keys."""
+
+    value_fn: Callable[[Any], StateType]
+    extra_state_attributes_fn: Callable[[Any], dict[str, str]] | None
+
+
+@dataclass
+class AirNowEntityDescription(SensorEntityDescription, AirNowEntityDescriptionMixin):
+    """Describes Airnow sensor entity."""
+
+
+SENSOR_TYPES: tuple[AirNowEntityDescription, ...] = (
+    AirNowEntityDescription(
         key=ATTR_API_AQI,
         icon="mdi:blur",
-        name=ATTR_API_AQI,
-        native_unit_of_measurement="aqi",
         state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.AQI,
+        value_fn=lambda data: data.get(ATTR_API_AQI),
+        extra_state_attributes_fn=lambda data: {
+            ATTR_DESCR: data[ATTR_API_AQI_DESCRIPTION],
+            ATTR_LEVEL: data[ATTR_API_AQI_LEVEL],
+        },
     ),
-    SensorEntityDescription(
+    AirNowEntityDescription(
         key=ATTR_API_PM25,
         icon="mdi:blur",
-        name=ATTR_API_PM25,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.PM25,
+        value_fn=lambda data: data.get(ATTR_API_PM25),
+        extra_state_attributes_fn=None,
     ),
-    SensorEntityDescription(
+    AirNowEntityDescription(
         key=ATTR_API_O3,
+        translation_key="o3",
         icon="mdi:blur",
-        name=ATTR_API_O3,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
+        value_fn=lambda data: data.get(ATTR_API_O3),
+        extra_state_attributes_fn=None,
     ),
 )
 
@@ -73,38 +105,38 @@ class AirNowSensor(CoordinatorEntity[AirNowDataUpdateCoordinator], SensorEntity)
     """Define an AirNow sensor."""
 
     _attr_attribution = ATTRIBUTION
+    _attr_has_entity_name = True
+
+    entity_description: AirNowEntityDescription
 
     def __init__(
         self,
         coordinator: AirNowDataUpdateCoordinator,
-        description: SensorEntityDescription,
+        description: AirNowEntityDescription,
     ) -> None:
         """Initialize."""
         super().__init__(coordinator)
         self.entity_description = description
-        self._state = None
-        self._attrs: dict[str, str] = {}
-        self._attr_name = f"AirNow {description.name}"
         self._attr_unique_id = (
             f"{coordinator.latitude}-{coordinator.longitude}-{description.key.lower()}"
         )
+        self._attr_device_info = DeviceInfo(
+            entry_type=DeviceEntryType.SERVICE,
+            identifiers={(DOMAIN, self._attr_unique_id)},
+            manufacturer=DEFAULT_NAME,
+            name=DEFAULT_NAME,
+        )
 
     @property
-    def native_value(self):
+    def native_value(self) -> StateType:
         """Return the state."""
-        self._state = self.coordinator.data.get(self.entity_description.key)
-
-        return self._state
+        return self.entity_description.value_fn(self.coordinator.data)
 
     @property
-    def extra_state_attributes(self):
+    def extra_state_attributes(self) -> dict[str, str] | None:
         """Return the state attributes."""
-        if self.entity_description.key == ATTR_API_AQI:
-            self._attrs[SENSOR_AQI_ATTR_DESCR] = self.coordinator.data[
-                ATTR_API_AQI_DESCRIPTION
-            ]
-            self._attrs[SENSOR_AQI_ATTR_LEVEL] = self.coordinator.data[
-                ATTR_API_AQI_LEVEL
-            ]
-
-        return self._attrs
+        if self.entity_description.extra_state_attributes_fn:
+            return self.entity_description.extra_state_attributes_fn(
+                self.coordinator.data
+            )
+        return None
diff --git a/homeassistant/components/airnow/strings.json b/homeassistant/components/airnow/strings.json
index 0e86c4531dc..aed12596176 100644
--- a/homeassistant/components/airnow/strings.json
+++ b/homeassistant/components/airnow/strings.json
@@ -20,5 +20,12 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "o3": {
+        "name": "[%key:component::sensor::entity_component::ozone::name%]"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/airq/sensor.py b/homeassistant/components/airq/sensor.py
index 7f0d51fcaa8..9974307b4cd 100644
--- a/homeassistant/components/airq/sensor.py
+++ b/homeassistant/components/airq/sensor.py
@@ -53,63 +53,62 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
 SENSOR_TYPES: list[AirQEntityDescription] = [
     AirQEntityDescription(
         key="c2h4o",
-        name="Acetaldehyde",
+        translation_key="acetaldehyde",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("c2h4o"),
     ),
     AirQEntityDescription(
         key="nh3_MR100",
-        name="Ammonia",
+        translation_key="ammonia",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("nh3_MR100"),
     ),
     AirQEntityDescription(
         key="ash3",
-        name="Arsine",
+        translation_key="arsine",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("ash3"),
     ),
     AirQEntityDescription(
         key="br2",
-        name="Bromine",
+        translation_key="bromine",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("br2"),
     ),
     AirQEntityDescription(
         key="ch4s",
-        name="CH4S",
+        translation_key="methanethiol",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("ch4s"),
     ),
     AirQEntityDescription(
         key="cl2_M20",
-        name="Chlorine",
+        translation_key="chlorine",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("cl2_M20"),
     ),
     AirQEntityDescription(
         key="clo2",
-        name="ClO2",
+        translation_key="chlorine_dioxide",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("clo2"),
     ),
     AirQEntityDescription(
         key="co",
-        name="CO",
+        translation_key="carbon_monoxide",
         native_unit_of_measurement=CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("co"),
     ),
     AirQEntityDescription(
         key="co2",
-        name="CO2",
         device_class=SensorDeviceClass.CO2,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
@@ -117,14 +116,14 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="cs2",
-        name="CS2",
+        translation_key="carbon_disulfide",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("cs2"),
     ),
     AirQEntityDescription(
         key="dewpt",
-        name="Dew point",
+        translation_key="dew_point",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("dewpt"),
@@ -132,63 +131,63 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="ethanol",
-        name="Ethanol",
+        translation_key="ethanol",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("ethanol"),
     ),
     AirQEntityDescription(
         key="c2h4",
-        name="Ethylene",
+        translation_key="ethylene",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("c2h4"),
     ),
     AirQEntityDescription(
         key="ch2o_M10",
-        name="Formaldehyde",
+        translation_key="formaldehyde",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("ch2o_M10"),
     ),
     AirQEntityDescription(
         key="f2",
-        name="Fluorine",
+        translation_key="fluorine",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("f2"),
     ),
     AirQEntityDescription(
         key="h2s",
-        name="H2S",
+        translation_key="hydrogen_sulfide",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("h2s"),
     ),
     AirQEntityDescription(
         key="hcl",
-        name="HCl",
+        translation_key="hydrochloric_acid",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("hcl"),
     ),
     AirQEntityDescription(
         key="hcn",
-        name="HCN",
+        translation_key="hydrogen_cyanide",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("hcn"),
     ),
     AirQEntityDescription(
         key="hf",
-        name="HF",
+        translation_key="hydrogen_fluoride",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("hf"),
     ),
     AirQEntityDescription(
         key="health",
-        name="Health Index",
+        translation_key="health_index",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         icon="mdi:heart-pulse",
@@ -196,7 +195,6 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="humidity",
-        name="Humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -204,7 +202,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="humidity_abs",
-        name="Absolute humidity",
+        translation_key="absolute_humidity",
         native_unit_of_measurement=CONCENTRATION_GRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("humidity_abs"),
@@ -212,28 +210,27 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="h2_M1000",
-        name="Hydrogen",
+        translation_key="hydrogen",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("h2_M1000"),
     ),
     AirQEntityDescription(
         key="h2o2",
-        name="Hydrogen peroxide",
+        translation_key="hydrogen_peroxide",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("h2o2"),
     ),
     AirQEntityDescription(
         key="ch4_MIPEX",
-        name="Methane",
+        translation_key="methane",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("ch4_MIPEX"),
     ),
     AirQEntityDescription(
         key="n2o",
-        name="N2O",
         device_class=SensorDeviceClass.NITROUS_OXIDE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -241,7 +238,6 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="no_M250",
-        name="NO",
         device_class=SensorDeviceClass.NITROGEN_MONOXIDE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -249,7 +245,6 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="no2",
-        name="NO2",
         device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -257,14 +252,14 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="acid_M100",
-        name="Organic acid",
+        translation_key="organic_acid",
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("acid_M100"),
     ),
     AirQEntityDescription(
         key="oxygen",
-        name="Oxygen",
+        translation_key="oxygen",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("oxygen"),
@@ -272,7 +267,6 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="o3",
-        name="Ozone",
         device_class=SensorDeviceClass.OZONE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -280,7 +274,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="performance",
-        name="Performance Index",
+        translation_key="performance_index",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         icon="mdi:head-check",
@@ -288,14 +282,13 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="ph3",
-        name="PH3",
+        translation_key="hydrogen_phosphide",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("ph3"),
     ),
     AirQEntityDescription(
         key="pm1",
-        name="PM1",
         device_class=SensorDeviceClass.PM1,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -304,7 +297,6 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="pm2_5",
-        name="PM2.5",
         device_class=SensorDeviceClass.PM25,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -313,7 +305,6 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="pm10",
-        name="PM10",
         device_class=SensorDeviceClass.PM10,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -322,7 +313,6 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="pressure",
-        name="Pressure",
         device_class=SensorDeviceClass.PRESSURE,
         native_unit_of_measurement=UnitOfPressure.HPA,
         state_class=SensorStateClass.MEASUREMENT,
@@ -330,7 +320,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="pressure_rel",
-        name="Relative pressure",
+        translation_key="relative_pressure",
         native_unit_of_measurement=UnitOfPressure.HPA,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("pressure_rel"),
@@ -338,28 +328,27 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="c3h8_MIPEX",
-        name="Propane",
+        translation_key="propane",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("c3h8_MIPEX"),
     ),
     AirQEntityDescription(
         key="refigerant",
-        name="Refrigerant",
+        translation_key="refigerant",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("refigerant"),
     ),
     AirQEntityDescription(
         key="sih4",
-        name="SiH4",
+        translation_key="silicon_hydride",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("sih4"),
     ),
     AirQEntityDescription(
         key="so2",
-        name="SO2",
         device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -367,7 +356,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="sound",
-        name="Noise",
+        translation_key="noise",
         native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("sound"),
@@ -375,7 +364,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="sound_max",
-        name="Noise (Maximum)",
+        translation_key="maximum_noise",
         native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("sound_max"),
@@ -383,7 +372,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="radon",
-        name="Radon",
+        translation_key="radon",
         native_unit_of_measurement=ACTIVITY_BECQUEREL_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("radon"),
@@ -391,7 +380,6 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="temperature",
-        name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -399,21 +387,22 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="tvoc",
-        name="VOC",
+        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("tvoc"),
     ),
     AirQEntityDescription(
         key="tvoc_ionsc",
-        name="VOC (Industrial)",
+        translation_key="industrial_volatile_organic_compounds",
+        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("tvoc_ionsc"),
     ),
     AirQEntityDescription(
         key="virus",
-        name="Virus Index",
+        translation_key="virus_index",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         icon="mdi:virus-off",
diff --git a/homeassistant/components/airq/strings.json b/homeassistant/components/airq/strings.json
index 3618d9d517e..8628ede4116 100644
--- a/homeassistant/components/airq/strings.json
+++ b/homeassistant/components/airq/strings.json
@@ -18,5 +18,117 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "acetaldehyde": {
+        "name": "Acetaldehyde"
+      },
+      "ammonia": {
+        "name": "Ammonia"
+      },
+      "arsine": {
+        "name": "Arsine"
+      },
+      "bromine": {
+        "name": "Bromine"
+      },
+      "methanethiol": {
+        "name": "Methanethiol"
+      },
+      "chlorine": {
+        "name": "Chlorine"
+      },
+      "chlorine_dioxide": {
+        "name": "Chlorine dioxide"
+      },
+      "carbon_disulfide": {
+        "name": "Carbon disulfide"
+      },
+      "carbon_monoxide": {
+        "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
+      },
+      "dew_point": {
+        "name": "Dew point"
+      },
+      "ethanol": {
+        "name": "Ethanol"
+      },
+      "ethylene": {
+        "name": "Ethylene"
+      },
+      "formaldehyde": {
+        "name": "Formaldehyde"
+      },
+      "fluorine": {
+        "name": "Fluorine"
+      },
+      "hydrogen_sulfide": {
+        "name": "Hydrogen sulfide"
+      },
+      "hydrochloric_acid": {
+        "name": "Hydrochloric acid"
+      },
+      "hydrogen_cyanide": {
+        "name": "Hydrogen cyanide"
+      },
+      "hydrogen_fluoride": {
+        "name": "Hydrogen fluoride"
+      },
+      "health_index": {
+        "name": "Health Index"
+      },
+      "absolute_humidity": {
+        "name": "Absolute humidity"
+      },
+      "hydrogen": {
+        "name": "Hydrogen"
+      },
+      "hydrogen_peroxide": {
+        "name": "Hydrogen peroxide"
+      },
+      "methane": {
+        "name": "Methane"
+      },
+      "organic_acid": {
+        "name": "Organic acid"
+      },
+      "oxygen": {
+        "name": "Oxygen"
+      },
+      "performance_index": {
+        "name": "Performance Index"
+      },
+      "hydrogen_phosphide": {
+        "name": "Hydrogen Phosphide"
+      },
+      "relative_pressure": {
+        "name": "Relative pressure"
+      },
+      "propane": {
+        "name": "Propane"
+      },
+      "refigerant": {
+        "name": "Refrigerant"
+      },
+      "silicon_hydride": {
+        "name": "Silicon Hydride"
+      },
+      "noise": {
+        "name": "Noise"
+      },
+      "maximum_noise": {
+        "name": "Noise (Maximum)"
+      },
+      "radon": {
+        "name": "Radon"
+      },
+      "industrial_volatile_organic_compounds": {
+        "name": "VOCs (Industrial)"
+      },
+      "virus_index": {
+        "name": "Virus Index"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/airthings/manifest.json b/homeassistant/components/airthings/manifest.json
index 6e30048d844..da7f30679c6 100644
--- a/homeassistant/components/airthings/manifest.json
+++ b/homeassistant/components/airthings/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airthings",
   "iot_class": "cloud_polling",
   "loggers": ["airthings"],
-  "requirements": ["airthings_cloud==0.1.0"]
+  "requirements": ["airthings-cloud==0.1.0"]
 }
diff --git a/homeassistant/components/airthings/sensor.py b/homeassistant/components/airthings/sensor.py
index 5212ff51fe8..9c9859306ca 100644
--- a/homeassistant/components/airthings/sensor.py
+++ b/homeassistant/components/airthings/sensor.py
@@ -35,62 +35,56 @@ SENSORS: dict[str, SensorEntityDescription] = {
     "radonShortTermAvg": SensorEntityDescription(
         key="radonShortTermAvg",
         native_unit_of_measurement="Bq/m³",
-        name="Radon",
+        translation_key="radon",
     ),
     "temp": SensorEntityDescription(
         key="temp",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        name="Temperature",
     ),
     "humidity": SensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
-        name="Humidity",
     ),
     "pressure": SensorEntityDescription(
         key="pressure",
         device_class=SensorDeviceClass.PRESSURE,
         native_unit_of_measurement=UnitOfPressure.MBAR,
-        name="Pressure",
     ),
     "battery": SensorEntityDescription(
         key="battery",
         device_class=SensorDeviceClass.BATTERY,
         native_unit_of_measurement=PERCENTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
-        name="Battery",
     ),
     "co2": SensorEntityDescription(
         key="co2",
         device_class=SensorDeviceClass.CO2,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
-        name="CO2",
     ),
     "voc": SensorEntityDescription(
         key="voc",
+        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
-        name="VOC",
     ),
     "light": SensorEntityDescription(
         key="light",
         native_unit_of_measurement=PERCENTAGE,
-        name="Light",
+        translation_key="light",
     ),
     "virusRisk": SensorEntityDescription(
         key="virusRisk",
-        name="Virus Risk",
+        translation_key="virus_risk",
     ),
     "mold": SensorEntityDescription(
         key="mold",
-        name="Mold",
+        translation_key="mold",
     ),
     "rssi": SensorEntityDescription(
         key="rssi",
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
-        name="RSSI",
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -98,13 +92,11 @@ SENSORS: dict[str, SensorEntityDescription] = {
         key="pm1",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM1,
-        name="PM1",
     ),
     "pm25": SensorEntityDescription(
         key="pm25",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
-        name="PM25",
     ),
 }
 
@@ -134,6 +126,7 @@ class AirthingsHeaterEnergySensor(CoordinatorEntity, SensorEntity):
     """Representation of a Airthings Sensor device."""
 
     _attr_state_class = SensorStateClass.MEASUREMENT
+    _attr_has_entity_name = True
 
     def __init__(
         self,
@@ -146,7 +139,6 @@ class AirthingsHeaterEnergySensor(CoordinatorEntity, SensorEntity):
 
         self.entity_description = entity_description
 
-        self._attr_name = f"{airthings_device.name} {entity_description.name}"
         self._attr_unique_id = f"{airthings_device.device_id}_{entity_description.key}"
         self._id = airthings_device.device_id
         self._attr_device_info = DeviceInfo(
diff --git a/homeassistant/components/airthings/strings.json b/homeassistant/components/airthings/strings.json
index af1200baa58..610891fff10 100644
--- a/homeassistant/components/airthings/strings.json
+++ b/homeassistant/components/airthings/strings.json
@@ -17,5 +17,21 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "radon": {
+        "name": "Radon"
+      },
+      "light": {
+        "name": "Light"
+      },
+      "virus_risk": {
+        "name": "Virus Risk"
+      },
+      "mold": {
+        "name": "Mold"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/airthings_ble/sensor.py b/homeassistant/components/airthings_ble/sensor.py
index b6c8c25491b..98190df6b8d 100644
--- a/homeassistant/components/airthings_ble/sensor.py
+++ b/homeassistant/components/airthings_ble/sensor.py
@@ -39,26 +39,26 @@ _LOGGER = logging.getLogger(__name__)
 SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
     "radon_1day_avg": SensorEntityDescription(
         key="radon_1day_avg",
+        translation_key="radon_1day_avg",
         native_unit_of_measurement=VOLUME_BECQUEREL,
-        name="Radon 1-day average",
         state_class=SensorStateClass.MEASUREMENT,
         icon="mdi:radioactive",
     ),
     "radon_longterm_avg": SensorEntityDescription(
         key="radon_longterm_avg",
+        translation_key="radon_longterm_avg",
         native_unit_of_measurement=VOLUME_BECQUEREL,
-        name="Radon longterm average",
         state_class=SensorStateClass.MEASUREMENT,
         icon="mdi:radioactive",
     ),
     "radon_1day_level": SensorEntityDescription(
         key="radon_1day_level",
-        name="Radon 1-day level",
+        translation_key="radon_1day_level",
         icon="mdi:radioactive",
     ),
     "radon_longterm_level": SensorEntityDescription(
         key="radon_longterm_level",
-        name="Radon longterm level",
+        translation_key="radon_longterm_level",
         icon="mdi:radioactive",
     ),
     "temperature": SensorEntityDescription(
@@ -66,21 +66,18 @@ SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
-        name="Temperature",
     ),
     "humidity": SensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        name="Humidity",
     ),
     "pressure": SensorEntityDescription(
         key="pressure",
         device_class=SensorDeviceClass.PRESSURE,
         native_unit_of_measurement=UnitOfPressure.MBAR,
         state_class=SensorStateClass.MEASUREMENT,
-        name="Pressure",
     ),
     "battery": SensorEntityDescription(
         key="battery",
@@ -88,20 +85,18 @@ SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
-        name="Battery",
     ),
     "co2": SensorEntityDescription(
         key="co2",
         device_class=SensorDeviceClass.CO2,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
-        name="co2",
     ),
     "voc": SensorEntityDescription(
         key="voc",
+        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
-        name="VOC",
         icon="mdi:cloud",
     ),
     "illuminance": SensorEntityDescription(
@@ -109,7 +104,6 @@ SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
         device_class=SensorDeviceClass.ILLUMINANCE,
         native_unit_of_measurement=LIGHT_LUX,
         state_class=SensorStateClass.MEASUREMENT,
-        name="Illuminance",
     ),
 }
 
diff --git a/homeassistant/components/airthings_ble/strings.json b/homeassistant/components/airthings_ble/strings.json
index 1cfc4ccd592..b1159e6f251 100644
--- a/homeassistant/components/airthings_ble/strings.json
+++ b/homeassistant/components/airthings_ble/strings.json
@@ -19,5 +19,21 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "radon_1day_avg": {
+        "name": "Radon 1-day average"
+      },
+      "radon_longterm_avg": {
+        "name": "Radon longterm average"
+      },
+      "radon_1day_level": {
+        "name": "Radon 1-day level"
+      },
+      "radon_longterm_level": {
+        "name": "Radon longterm level"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/airvisual/strings.json b/homeassistant/components/airvisual/strings.json
index 18183eee197..0ba99c0984a 100644
--- a/homeassistant/components/airvisual/strings.json
+++ b/homeassistant/components/airvisual/strings.json
@@ -17,7 +17,7 @@
           "api_key": "[%key:common::config_flow::data::api_key%]",
           "city": "City",
           "country": "Country",
-          "state": "state"
+          "state": "State"
         }
       },
       "reauth_confirm": {
diff --git a/homeassistant/components/airzone/climate.py b/homeassistant/components/airzone/climate.py
index 3c47c333b92..74a564fa2de 100644
--- a/homeassistant/components/airzone/climate.py
+++ b/homeassistant/components/airzone/climate.py
@@ -193,6 +193,8 @@ class AirzoneClimate(AirzoneZoneEntity, ClimateEntity):
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set hvac mode."""
+        slave_raise = False
+
         params = {}
         if hvac_mode == HVACMode.OFF:
             params[API_ON] = 0
@@ -202,12 +204,13 @@ class AirzoneClimate(AirzoneZoneEntity, ClimateEntity):
                 if self.get_airzone_value(AZD_MASTER):
                     params[API_MODE] = mode
                 else:
-                    raise HomeAssistantError(
-                        f"Mode can't be changed on slave zone {self.name}"
-                    )
+                    slave_raise = True
             params[API_ON] = 1
         await self._async_update_hvac_params(params)
 
+        if slave_raise:
+            raise HomeAssistantError(f"Mode can't be changed on slave zone {self.name}")
+
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
         params = {}
diff --git a/homeassistant/components/airzone_cloud/__init__.py b/homeassistant/components/airzone_cloud/__init__.py
index cdc0f30a533..732f159c381 100644
--- a/homeassistant/components/airzone_cloud/__init__.py
+++ b/homeassistant/components/airzone_cloud/__init__.py
@@ -12,7 +12,10 @@ from homeassistant.helpers import aiohttp_client
 from .const import DOMAIN
 from .coordinator import AirzoneUpdateCoordinator
 
-PLATFORMS: list[Platform] = [Platform.SENSOR]
+PLATFORMS: list[Platform] = [
+    Platform.BINARY_SENSOR,
+    Platform.SENSOR,
+]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
diff --git a/homeassistant/components/airzone_cloud/binary_sensor.py b/homeassistant/components/airzone_cloud/binary_sensor.py
new file mode 100644
index 00000000000..052318b6b10
--- /dev/null
+++ b/homeassistant/components/airzone_cloud/binary_sensor.py
@@ -0,0 +1,106 @@
+"""Support for the Airzone Cloud binary sensors."""
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any, Final
+
+from aioairzone_cloud.const import AZD_PROBLEMS, AZD_WARNINGS, AZD_ZONES
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    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 .const import DOMAIN
+from .coordinator import AirzoneUpdateCoordinator
+from .entity import AirzoneEntity, AirzoneZoneEntity
+
+
+@dataclass
+class AirzoneBinarySensorEntityDescription(BinarySensorEntityDescription):
+    """A class that describes Airzone Cloud binary sensor entities."""
+
+    attributes: dict[str, str] | None = None
+
+
+ZONE_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...]] = (
+    AirzoneBinarySensorEntityDescription(
+        attributes={
+            "warnings": AZD_WARNINGS,
+        },
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        key=AZD_PROBLEMS,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Add Airzone Cloud binary sensors from a config_entry."""
+    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+
+    binary_sensors: list[AirzoneBinarySensor] = []
+
+    for zone_id, zone_data in coordinator.data.get(AZD_ZONES, {}).items():
+        for description in ZONE_BINARY_SENSOR_TYPES:
+            if description.key in zone_data:
+                binary_sensors.append(
+                    AirzoneZoneBinarySensor(
+                        coordinator,
+                        description,
+                        zone_id,
+                        zone_data,
+                    )
+                )
+
+    async_add_entities(binary_sensors)
+
+
+class AirzoneBinarySensor(AirzoneEntity, BinarySensorEntity):
+    """Define an Airzone Cloud binary sensor."""
+
+    entity_description: AirzoneBinarySensorEntityDescription
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Update attributes when the coordinator updates."""
+        self._async_update_attrs()
+        super()._handle_coordinator_update()
+
+    @callback
+    def _async_update_attrs(self) -> None:
+        """Update binary sensor attributes."""
+        self._attr_is_on = self.get_airzone_value(self.entity_description.key)
+        if self.entity_description.attributes:
+            self._attr_extra_state_attributes = {
+                key: self.get_airzone_value(val)
+                for key, val in self.entity_description.attributes.items()
+            }
+
+
+class AirzoneZoneBinarySensor(AirzoneZoneEntity, AirzoneBinarySensor):
+    """Define an Airzone Cloud Zone binary sensor."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        description: AirzoneBinarySensorEntityDescription,
+        zone_id: str,
+        zone_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator, zone_id, zone_data)
+
+        self._attr_unique_id = f"{zone_id}_{description.key}"
+        self.entity_description = description
+
+        self._async_update_attrs()
diff --git a/homeassistant/components/airzone_cloud/entity.py b/homeassistant/components/airzone_cloud/entity.py
index c7e59ee1a3f..9b3dfdae06c 100644
--- a/homeassistant/components/airzone_cloud/entity.py
+++ b/homeassistant/components/airzone_cloud/entity.py
@@ -15,7 +15,6 @@ from aioairzone_cloud.const import (
     AZD_ZONES,
 )
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -43,7 +42,6 @@ class AirzoneAidooEntity(AirzoneEntity):
     def __init__(
         self,
         coordinator: AirzoneUpdateCoordinator,
-        entry: ConfigEntry,
         aidoo_id: str,
         aidoo_data: dict[str, Any],
     ) -> None:
@@ -73,7 +71,6 @@ class AirzoneWebServerEntity(AirzoneEntity):
     def __init__(
         self,
         coordinator: AirzoneUpdateCoordinator,
-        entry: ConfigEntry,
         ws_id: str,
         ws_data: dict[str, Any],
     ) -> None:
@@ -86,7 +83,7 @@ class AirzoneWebServerEntity(AirzoneEntity):
             connections={(dr.CONNECTION_NETWORK_MAC, ws_id)},
             identifiers={(DOMAIN, ws_id)},
             manufacturer=MANUFACTURER,
-            name=f"WebServer {ws_id}",
+            name=ws_data[AZD_NAME],
             sw_version=ws_data[AZD_FIRMWARE],
         )
 
@@ -104,7 +101,6 @@ class AirzoneZoneEntity(AirzoneEntity):
     def __init__(
         self,
         coordinator: AirzoneUpdateCoordinator,
-        entry: ConfigEntry,
         zone_id: str,
         zone_data: dict[str, Any],
     ) -> None:
diff --git a/homeassistant/components/airzone_cloud/manifest.json b/homeassistant/components/airzone_cloud/manifest.json
index e64a5d9a7e2..8602dfa14cf 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_polling",
   "loggers": ["aioairzone_cloud"],
-  "requirements": ["aioairzone-cloud==0.1.8"]
+  "requirements": ["aioairzone-cloud==0.2.0"]
 }
diff --git a/homeassistant/components/airzone_cloud/sensor.py b/homeassistant/components/airzone_cloud/sensor.py
index ee162ef5fec..90fbf849389 100644
--- a/homeassistant/components/airzone_cloud/sensor.py
+++ b/homeassistant/components/airzone_cloud/sensor.py
@@ -6,7 +6,6 @@ from typing import Any, Final
 from aioairzone_cloud.const import (
     AZD_AIDOOS,
     AZD_HUMIDITY,
-    AZD_NAME,
     AZD_TEMP,
     AZD_WEBSERVERS,
     AZD_WIFI_RSSI,
@@ -42,7 +41,6 @@ AIDOO_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
     SensorEntityDescription(
         device_class=SensorDeviceClass.TEMPERATURE,
         key=AZD_TEMP,
-        name="Temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -53,9 +51,7 @@ WEBSERVER_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
-        has_entity_name=True,
         key=AZD_WIFI_RSSI,
-        name="RSSI",
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -65,14 +61,12 @@ ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
     SensorEntityDescription(
         device_class=SensorDeviceClass.TEMPERATURE,
         key=AZD_TEMP,
-        name="Temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         device_class=SensorDeviceClass.HUMIDITY,
         key=AZD_HUMIDITY,
-        name="Humidity",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -95,7 +89,6 @@ async def async_setup_entry(
                     AirzoneAidooSensor(
                         coordinator,
                         description,
-                        entry,
                         aidoo_id,
                         aidoo_data,
                     )
@@ -109,7 +102,6 @@ async def async_setup_entry(
                     AirzoneWebServerSensor(
                         coordinator,
                         description,
-                        entry,
                         ws_id,
                         ws_data,
                     )
@@ -123,7 +115,6 @@ async def async_setup_entry(
                     AirzoneZoneSensor(
                         coordinator,
                         description,
-                        entry,
                         zone_id,
                         zone_data,
                     )
@@ -154,14 +145,13 @@ class AirzoneAidooSensor(AirzoneAidooEntity, AirzoneSensor):
         self,
         coordinator: AirzoneUpdateCoordinator,
         description: SensorEntityDescription,
-        entry: ConfigEntry,
         aidoo_id: str,
         aidoo_data: dict[str, Any],
     ) -> None:
         """Initialize."""
-        super().__init__(coordinator, entry, aidoo_id, aidoo_data)
+        super().__init__(coordinator, aidoo_id, aidoo_data)
 
-        self._attr_name = f"{aidoo_data[AZD_NAME]} {description.name}"
+        self._attr_has_entity_name = True
         self._attr_unique_id = f"{aidoo_id}_{description.key}"
         self.entity_description = description
 
@@ -175,13 +165,13 @@ class AirzoneWebServerSensor(AirzoneWebServerEntity, AirzoneSensor):
         self,
         coordinator: AirzoneUpdateCoordinator,
         description: SensorEntityDescription,
-        entry: ConfigEntry,
         ws_id: str,
         ws_data: dict[str, Any],
     ) -> None:
         """Initialize."""
-        super().__init__(coordinator, entry, ws_id, ws_data)
+        super().__init__(coordinator, ws_id, ws_data)
 
+        self._attr_has_entity_name = True
         self._attr_unique_id = f"{ws_id}_{description.key}"
         self.entity_description = description
 
@@ -195,14 +185,13 @@ class AirzoneZoneSensor(AirzoneZoneEntity, AirzoneSensor):
         self,
         coordinator: AirzoneUpdateCoordinator,
         description: SensorEntityDescription,
-        entry: ConfigEntry,
         zone_id: str,
         zone_data: dict[str, Any],
     ) -> None:
         """Initialize."""
-        super().__init__(coordinator, entry, zone_id, zone_data)
+        super().__init__(coordinator, zone_id, zone_data)
 
-        self._attr_name = f"{zone_data[AZD_NAME]} {description.name}"
+        self._attr_has_entity_name = True
         self._attr_unique_id = f"{zone_id}_{description.key}"
         self.entity_description = description
 
diff --git a/homeassistant/components/aladdin_connect/cover.py b/homeassistant/components/aladdin_connect/cover.py
index 32eb34333c9..25d601cf299 100644
--- a/homeassistant/components/aladdin_connect/cover.py
+++ b/homeassistant/components/aladdin_connect/cover.py
@@ -40,26 +40,24 @@ class AladdinDevice(CoverEntity):
 
     _attr_device_class = CoverDeviceClass.GARAGE
     _attr_supported_features = SUPPORTED_FEATURES
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self, acc: AladdinConnectClient, device: DoorDevice, entry: ConfigEntry
     ) -> None:
         """Initialize the Aladdin Connect cover."""
         self._acc = acc
-        self._entry_id = entry.entry_id
         self._device_id = device["device_id"]
         self._number = device["door_number"]
-        self._name = device["name"]
         self._serial = device["serial"]
-        self._model = device["model"]
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, f"{self._device_id}-{self._number}")},
-            name=self._name,
+            name=device["name"],
             manufacturer="Overhead Door",
-            model=self._model,
+            model=device["model"],
         )
-        self._attr_has_entity_name = True
         self._attr_unique_id = f"{self._device_id}-{self._number}"
 
     async def async_added_to_hass(self) -> None:
diff --git a/homeassistant/components/aladdin_connect/sensor.py b/homeassistant/components/aladdin_connect/sensor.py
index 51ae5154302..395bbbb04a8 100644
--- a/homeassistant/components/aladdin_connect/sensor.py
+++ b/homeassistant/components/aladdin_connect/sensor.py
@@ -40,7 +40,6 @@ class AccSensorEntityDescription(
 SENSORS: tuple[AccSensorEntityDescription, ...] = (
     AccSensorEntityDescription(
         key="battery_level",
-        name="Battery level",
         device_class=SensorDeviceClass.BATTERY,
         entity_registry_enabled_default=False,
         native_unit_of_measurement=PERCENTAGE,
@@ -49,7 +48,7 @@ SENSORS: tuple[AccSensorEntityDescription, ...] = (
     ),
     AccSensorEntityDescription(
         key="rssi",
-        name="Wi-Fi RSSI",
+        translation_key="wifi_strength",
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         entity_registry_enabled_default=False,
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
@@ -58,7 +57,7 @@ SENSORS: tuple[AccSensorEntityDescription, ...] = (
     ),
     AccSensorEntityDescription(
         key="ble_strength",
-        name="BLE Strength",
+        translation_key="ble_strength",
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         entity_registry_enabled_default=False,
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
@@ -89,8 +88,8 @@ async def async_setup_entry(
 class AladdinConnectSensor(SensorEntity):
     """A sensor implementation for Aladdin Connect devices."""
 
-    _device: AladdinConnectSensor
     entity_description: AccSensorEntityDescription
+    _attr_has_entity_name = True
 
     def __init__(
         self,
@@ -101,24 +100,20 @@ class AladdinConnectSensor(SensorEntity):
         """Initialize a sensor for an Aladdin Connect device."""
         self._device_id = device["device_id"]
         self._number = device["door_number"]
-        self._name = device["name"]
-        self._model = device["model"]
         self._acc = acc
         self.entity_description = description
         self._attr_unique_id = f"{self._device_id}-{self._number}-{description.key}"
-        self._attr_has_entity_name = True
-        if self._model == "01" and description.key in ("battery_level", "ble_strength"):
-            self._attr_entity_registry_enabled_default = True
-
-    @property
-    def device_info(self) -> DeviceInfo | None:
-        """Device information for Aladdin Connect sensors."""
-        return DeviceInfo(
+        self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, f"{self._device_id}-{self._number}")},
-            name=self._name,
+            name=device["name"],
             manufacturer="Overhead Door",
-            model=self._model,
+            model=device["model"],
         )
+        if device["model"] == "01" and description.key in (
+            "battery_level",
+            "ble_strength",
+        ):
+            self._attr_entity_registry_enabled_default = True
 
     @property
     def native_value(self) -> float | None:
diff --git a/homeassistant/components/aladdin_connect/strings.json b/homeassistant/components/aladdin_connect/strings.json
index ff42ca14bc3..bfe932b039c 100644
--- a/homeassistant/components/aladdin_connect/strings.json
+++ b/homeassistant/components/aladdin_connect/strings.json
@@ -25,5 +25,15 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "wifi_strength": {
+        "name": "Wi-Fi RSSI"
+      },
+      "ble_strength": {
+        "name": "BLE Strength"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/alarm_control_panel/device_action.py b/homeassistant/components/alarm_control_panel/device_action.py
index de4f3df257a..e453be88934 100644
--- a/homeassistant/components/alarm_control_panel/device_action.py
+++ b/homeassistant/components/alarm_control_panel/device_action.py
@@ -5,6 +5,7 @@ from typing import Final
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_CODE,
     ATTR_ENTITY_ID,
@@ -44,15 +45,22 @@ ACTION_TYPES: Final[set[str]] = {
     "trigger",
 }
 
-ACTION_SCHEMA: Final = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA: Final = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Optional(CONF_CODE): cv.string,
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -70,7 +78,7 @@ async def async_get_actions(
         base_action: dict = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         # Add actions for each entity that belongs to this integration
@@ -124,7 +132,9 @@ async def async_get_action_capabilities(
     """List action capabilities."""
     # We need to refer to the state directly because ATTR_CODE_ARM_REQUIRED is not a
     # capability attribute
-    state = hass.states.get(config[CONF_ENTITY_ID])
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[CONF_ENTITY_ID])
+    state = hass.states.get(entity_id) if entity_id else None
     code_required = state.attributes.get(ATTR_CODE_ARM_REQUIRED) if state else False
 
     if config[CONF_TYPE] == "trigger" or (
diff --git a/homeassistant/components/alarm_control_panel/device_condition.py b/homeassistant/components/alarm_control_panel/device_condition.py
index a097aa98535..ee8cb57f568 100644
--- a/homeassistant/components/alarm_control_panel/device_condition.py
+++ b/homeassistant/components/alarm_control_panel/device_condition.py
@@ -58,7 +58,7 @@ CONDITION_TYPES: Final[set[str]] = {
 
 CONDITION_SCHEMA: Final = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
     }
 )
@@ -83,7 +83,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions += [
@@ -126,8 +126,11 @@ def async_condition_from_config(
     elif config[CONF_TYPE] == CONDITION_ARMED_CUSTOM_BYPASS:
         state = STATE_ALARM_ARMED_CUSTOM_BYPASS
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
+
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        return condition.state(hass, config[ATTR_ENTITY_ID], state)
+        return condition.state(hass, entity_id, state)
 
     return test_is_state
diff --git a/homeassistant/components/alarm_control_panel/device_trigger.py b/homeassistant/components/alarm_control_panel/device_trigger.py
index 9106942c5e5..fc3850dce30 100644
--- a/homeassistant/components/alarm_control_panel/device_trigger.py
+++ b/homeassistant/components/alarm_control_panel/device_trigger.py
@@ -46,7 +46,7 @@ TRIGGER_TYPES: Final[set[str]] = BASIC_TRIGGER_TYPES | {
 
 TRIGGER_SCHEMA: Final = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -72,7 +72,7 @@ async def async_get_triggers(
             CONF_PLATFORM: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         triggers += [
diff --git a/homeassistant/components/alpha_vantage/manifest.json b/homeassistant/components/alpha_vantage/manifest.json
index 66de4b6a5f8..c94da6bf487 100644
--- a/homeassistant/components/alpha_vantage/manifest.json
+++ b/homeassistant/components/alpha_vantage/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/alpha_vantage",
   "iot_class": "cloud_polling",
   "loggers": ["alpha_vantage"],
-  "requirements": ["alpha_vantage==2.3.1"]
+  "requirements": ["alpha-vantage==2.3.1"]
 }
diff --git a/homeassistant/components/ambiclimate/manifest.json b/homeassistant/components/ambiclimate/manifest.json
index f2fd0ea5d77..315490b2d62 100644
--- a/homeassistant/components/ambiclimate/manifest.json
+++ b/homeassistant/components/ambiclimate/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ambiclimate",
   "iot_class": "cloud_polling",
   "loggers": ["ambiclimate"],
-  "requirements": ["ambiclimate==0.2.1"]
+  "requirements": ["Ambiclimate==0.2.1"]
 }
diff --git a/homeassistant/components/amcrest/helpers.py b/homeassistant/components/amcrest/helpers.py
index ff1a283769d..306c24a94ac 100644
--- a/homeassistant/components/amcrest/helpers.py
+++ b/homeassistant/components/amcrest/helpers.py
@@ -3,6 +3,8 @@ from __future__ import annotations
 
 import logging
 
+from homeassistant.helpers.typing import UndefinedType
+
 from .const import DOMAIN
 
 
@@ -14,7 +16,7 @@ def service_signal(service: str, *args: str) -> str:
 def log_update_error(
     logger: logging.Logger,
     action: str,
-    name: str | None,
+    name: str | UndefinedType | None,
     entity_type: str,
     error: Exception,
     level: int = logging.ERROR,
diff --git a/homeassistant/components/analytics/analytics.py b/homeassistant/components/analytics/analytics.py
index 9419f00e41e..19e6b5ec7b3 100644
--- a/homeassistant/components/analytics/analytics.py
+++ b/homeassistant/components/analytics/analytics.py
@@ -21,12 +21,22 @@ 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
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+import homeassistant.helpers.entity_registry as er
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.system_info import async_get_system_info
-from homeassistant.loader import IntegrationNotFound, async_get_integrations
+from homeassistant.loader import (
+    Integration,
+    IntegrationNotFound,
+    async_get_integrations,
+)
 from homeassistant.setup import async_get_loaded_integrations
 
 from .const import (
@@ -206,8 +216,25 @@ class Analytics:
         if self.preferences.get(ATTR_USAGE, False) or self.preferences.get(
             ATTR_STATISTICS, False
         ):
+            ent_reg = er.async_get(self.hass)
+
+            try:
+                yaml_configuration = await conf_util.async_hass_config_yaml(self.hass)
+            except HomeAssistantError as err:
+                LOGGER.error(err)
+                return
+
+            configuration_set = set(yaml_configuration)
+            er_platforms = {
+                entity.platform
+                for entity in ent_reg.entities.values()
+                if not entity.disabled
+            }
+
             domains = async_get_loaded_integrations(self.hass)
             configured_integrations = await async_get_integrations(self.hass, domains)
+            enabled_domains = set(configured_integrations)
+
             for integration in configured_integrations.values():
                 if isinstance(integration, IntegrationNotFound):
                     continue
@@ -215,7 +242,11 @@ class Analytics:
                 if isinstance(integration, BaseException):
                     raise integration
 
-                if integration.disabled:
+                if not self._async_should_report_integration(
+                    integration=integration,
+                    yaml_domains=configuration_set,
+                    entity_registry_platforms=er_platforms,
+                ):
                     continue
 
                 if not integration.is_built_in:
@@ -253,12 +284,12 @@ class Analytics:
             if supervisor_info is not None:
                 payload[ATTR_ADDONS] = addons
 
-            if ENERGY_DOMAIN in integrations:
+            if ENERGY_DOMAIN in enabled_domains:
                 payload[ATTR_ENERGY] = {
                     ATTR_CONFIGURED: await energy_is_configured(self.hass)
                 }
 
-            if RECORDER_DOMAIN in integrations:
+            if RECORDER_DOMAIN in enabled_domains:
                 instance = get_recorder_instance(self.hass)
                 engine = instance.database_engine
                 if engine and engine.version is not None:
@@ -306,3 +337,34 @@ class Analytics:
             LOGGER.error(
                 "Error sending analytics to %s: %r", ANALYTICS_ENDPOINT_URL, err
             )
+
+    @callback
+    def _async_should_report_integration(
+        self,
+        integration: Integration,
+        yaml_domains: set[str],
+        entity_registry_platforms: set[str],
+    ) -> bool:
+        """Return a bool to indicate if this integration should be reported."""
+        if integration.disabled:
+            return False
+
+        # Check if the integration is defined in YAML or in the entity registry
+        if (
+            integration.domain in yaml_domains
+            or integration.domain in entity_registry_platforms
+        ):
+            return True
+
+        # Check if the integration provide a config flow
+        if not integration.config_flow:
+            return False
+
+        entries = self.hass.config_entries.async_entries(integration.domain)
+
+        # Filter out ignored and disabled entries
+        return any(
+            entry
+            for entry in entries
+            if entry.source != SOURCE_IGNORE and entry.disabled_by is None
+        )
diff --git a/homeassistant/components/androidtv/media_player.py b/homeassistant/components/androidtv/media_player.py
index 563b8f07b2a..f4fbe4a498f 100644
--- a/homeassistant/components/androidtv/media_player.py
+++ b/homeassistant/components/androidtv/media_player.py
@@ -296,7 +296,6 @@ class ADBDevice(MediaPlayerEntity):
                 self._process_config,
             )
         )
-        return
 
     @property
     def media_image_hash(self) -> str | None:
diff --git a/homeassistant/components/androidtv_remote/entity.py b/homeassistant/components/androidtv_remote/entity.py
index 862f317ee82..5a99805da62 100644
--- a/homeassistant/components/androidtv_remote/entity.py
+++ b/homeassistant/components/androidtv_remote/entity.py
@@ -16,6 +16,7 @@ from .const import DOMAIN
 class AndroidTVRemoteBaseEntity(Entity):
     """Android TV Remote Base Entity."""
 
+    _attr_name = None
     _attr_has_entity_name = True
     _attr_should_poll = False
 
diff --git a/homeassistant/components/anel_pwrctrl/manifest.json b/homeassistant/components/anel_pwrctrl/manifest.json
index f1de40bc89e..48cc3b96ec0 100644
--- a/homeassistant/components/anel_pwrctrl/manifest.json
+++ b/homeassistant/components/anel_pwrctrl/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/anel_pwrctrl",
   "iot_class": "local_polling",
   "loggers": ["anel_pwrctrl"],
-  "requirements": ["anel_pwrctrl-homeassistant==0.0.1.dev2"]
+  "requirements": ["anel-pwrctrl-homeassistant==0.0.1.dev2"]
 }
diff --git a/homeassistant/components/anthemav/media_player.py b/homeassistant/components/anthemav/media_player.py
index 2ab23ff2d37..038e71750dd 100644
--- a/homeassistant/components/anthemav/media_player.py
+++ b/homeassistant/components/anthemav/media_player.py
@@ -80,6 +80,7 @@ class AnthemAVR(MediaPlayerEntity):
             self._attr_name = f"zone {zone_number}"
             self._attr_unique_id = f"{mac_address}_{zone_number}"
         else:
+            self._attr_name = None
             self._attr_unique_id = mac_address
 
         self._attr_device_info = DeviceInfo(
diff --git a/homeassistant/components/apple_tv/manifest.json b/homeassistant/components/apple_tv/manifest.json
index 2d2df955441..4ead41e86e9 100644
--- a/homeassistant/components/apple_tv/manifest.json
+++ b/homeassistant/components/apple_tv/manifest.json
@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/apple_tv",
   "iot_class": "local_push",
   "loggers": ["pyatv", "srptools"],
-  "requirements": ["pyatv==0.12.0"],
+  "requirements": ["pyatv==0.13.2"],
   "zeroconf": [
     "_mediaremotetv._tcp.local.",
     "_companion-link._tcp.local.",
diff --git a/homeassistant/components/apple_tv/media_player.py b/homeassistant/components/apple_tv/media_player.py
index 4196dd1bd9a..a70a30656f2 100644
--- a/homeassistant/components/apple_tv/media_player.py
+++ b/homeassistant/components/apple_tv/media_player.py
@@ -282,7 +282,7 @@ class AppleTvMediaPlayer(AppleTVEntity, MediaPlayerEntity):
         """Send the play_media command to the media player."""
         # If input (file) has a file format supported by pyatv, then stream it with
         # RAOP. Otherwise try to play it with regular AirPlay.
-        if media_type == MediaType.APP:
+        if media_type in {MediaType.APP, MediaType.URL}:
             await self.atv.apps.launch_app(media_id)
             return
 
diff --git a/homeassistant/components/apple_tv/strings.json b/homeassistant/components/apple_tv/strings.json
index 1420c0ffefc..e5948a54a8d 100644
--- a/homeassistant/components/apple_tv/strings.json
+++ b/homeassistant/components/apple_tv/strings.json
@@ -49,6 +49,7 @@
     },
     "abort": {
       "ipv6_not_supported": "IPv6 is not supported.",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "device_did_not_pair": "No attempt to finish pairing process was made from the device.",
diff --git a/homeassistant/components/aquostv/manifest.json b/homeassistant/components/aquostv/manifest.json
index 1bac2bdfb5f..011b8e67a19 100644
--- a/homeassistant/components/aquostv/manifest.json
+++ b/homeassistant/components/aquostv/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/aquostv",
   "iot_class": "local_polling",
   "loggers": ["sharp_aquos_rc"],
-  "requirements": ["sharp_aquos_rc==0.3.2"]
+  "requirements": ["sharp-aquos-rc==0.3.2"]
 }
diff --git a/homeassistant/components/aranet/sensor.py b/homeassistant/components/aranet/sensor.py
index 6ac27b1652b..5c223940915 100644
--- a/homeassistant/components/aranet/sensor.py
+++ b/homeassistant/components/aranet/sensor.py
@@ -1,6 +1,8 @@
 """Support for Aranet sensors."""
 from __future__ import annotations
 
+from dataclasses import dataclass
+
 from aranet4.client import Aranet4Advertisement
 from bleak.backends.device import BLEDevice
 
@@ -23,6 +25,7 @@ from homeassistant.const import (
     ATTR_SW_VERSION,
     CONCENTRATION_PARTS_PER_MILLION,
     PERCENTAGE,
+    EntityCategory,
     UnitOfPressure,
     UnitOfTemperature,
     UnitOfTime,
@@ -33,43 +36,55 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN
 
+
+@dataclass
+class AranetSensorEntityDescription(SensorEntityDescription):
+    """Class to describe an Aranet sensor entity."""
+
+    # PassiveBluetoothDataUpdate does not support UNDEFINED
+    # Restrict the type to satisfy the type checker and catch attempts
+    # to use UNDEFINED in the entity descriptions.
+    name: str | None = None
+
+
 SENSOR_DESCRIPTIONS = {
-    "temperature": SensorEntityDescription(
+    "temperature": AranetSensorEntityDescription(
         key="temperature",
         name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    "humidity": SensorEntityDescription(
+    "humidity": AranetSensorEntityDescription(
         key="humidity",
         name="Humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    "pressure": SensorEntityDescription(
+    "pressure": AranetSensorEntityDescription(
         key="pressure",
         name="Pressure",
         device_class=SensorDeviceClass.PRESSURE,
         native_unit_of_measurement=UnitOfPressure.HPA,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    "co2": SensorEntityDescription(
+    "co2": AranetSensorEntityDescription(
         key="co2",
         name="Carbon Dioxide",
         device_class=SensorDeviceClass.CO2,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    "battery": SensorEntityDescription(
+    "battery": AranetSensorEntityDescription(
         key="battery",
         name="Battery",
         device_class=SensorDeviceClass.BATTERY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
-    "interval": SensorEntityDescription(
+    "interval": AranetSensorEntityDescription(
         key="update_interval",
         name="Update Interval",
         device_class=SensorDeviceClass.DURATION,
@@ -77,6 +92,7 @@ SENSOR_DESCRIPTIONS = {
         state_class=SensorStateClass.MEASUREMENT,
         # The interval setting is not a generally useful entity for most users.
         entity_registry_enabled_default=False,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
 }
 
diff --git a/homeassistant/components/arcam_fmj/device_trigger.py b/homeassistant/components/arcam_fmj/device_trigger.py
index ecaec0e0e7d..ef83217ee26 100644
--- a/homeassistant/components/arcam_fmj/device_trigger.py
+++ b/homeassistant/components/arcam_fmj/device_trigger.py
@@ -3,7 +3,9 @@ from __future__ import annotations
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import DEVICE_TRIGGER_BASE_SCHEMA
+from homeassistant.components.device_automation import (
+    DEVICE_TRIGGER_BASE_SCHEMA,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -22,7 +24,7 @@ from .const import DOMAIN, EVENT_TURN_ON
 TRIGGER_TYPES = {"turn_on"}
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
     }
 )
@@ -43,7 +45,7 @@ async def async_get_triggers(
                     CONF_PLATFORM: "device",
                     CONF_DEVICE_ID: device_id,
                     CONF_DOMAIN: DOMAIN,
-                    CONF_ENTITY_ID: entry.entity_id,
+                    CONF_ENTITY_ID: entry.id,
                     CONF_TYPE: "turn_on",
                 }
             )
@@ -62,7 +64,8 @@ async def async_attach_trigger(
     job = HassJob(action)
 
     if config[CONF_TYPE] == "turn_on":
-        entity_id = config[CONF_ENTITY_ID]
+        registry = er.async_get(hass)
+        entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
 
         @callback
         def _handle_event(event: Event) -> None:
@@ -71,9 +74,10 @@ async def async_attach_trigger(
                     job,
                     {
                         "trigger": {
-                            **trigger_data,  # type: ignore[arg-type]  # https://github.com/python/mypy/issues/9117
+                            **trigger_data,
                             **config,
                             "description": f"{DOMAIN} - {entity_id}",
+                            "entity_id": entity_id,
                         }
                     },
                     event.context,
diff --git a/homeassistant/components/arcam_fmj/manifest.json b/homeassistant/components/arcam_fmj/manifest.json
index 9a76d4843f0..2c9b64b00ce 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.3.0"],
+  "requirements": ["arcam-fmj==1.4.0"],
   "ssdp": [
     {
       "deviceType": "urn:schemas-upnp-org:device:MediaRenderer:1",
diff --git a/homeassistant/components/assist_pipeline/__init__.py b/homeassistant/components/assist_pipeline/__init__.py
index 9e460464cb9..55b192a730a 100644
--- a/homeassistant/components/assist_pipeline/__init__.py
+++ b/homeassistant/components/assist_pipeline/__init__.py
@@ -57,6 +57,7 @@ async def async_pipeline_from_audio_stream(
     pipeline_id: str | None = None,
     conversation_id: str | None = None,
     tts_audio_output: str | None = None,
+    device_id: str | None = None,
 ) -> None:
     """Create an audio pipeline from an audio stream.
 
@@ -64,6 +65,7 @@ async def async_pipeline_from_audio_stream(
     """
     pipeline_input = PipelineInput(
         conversation_id=conversation_id,
+        device_id=device_id,
         stt_metadata=stt_metadata,
         stt_stream=stt_stream,
         run=PipelineRun(
diff --git a/homeassistant/components/assist_pipeline/pipeline.py b/homeassistant/components/assist_pipeline/pipeline.py
index 12764c04f04..891fc639fee 100644
--- a/homeassistant/components/assist_pipeline/pipeline.py
+++ b/homeassistant/components/assist_pipeline/pipeline.py
@@ -499,7 +499,7 @@ class PipelineRun:
         self.intent_agent = agent_info.id
 
     async def recognize_intent(
-        self, intent_input: str, conversation_id: str | None
+        self, intent_input: str, conversation_id: str | None, device_id: str | None
     ) -> str:
         """Run intent recognition portion of pipeline. Returns text to speak."""
         if self.intent_agent is None:
@@ -512,6 +512,8 @@ class PipelineRun:
                     "engine": self.intent_agent,
                     "language": self.pipeline.conversation_language,
                     "intent_input": intent_input,
+                    "conversation_id": conversation_id,
+                    "device_id": device_id,
                 },
             )
         )
@@ -521,6 +523,7 @@ class PipelineRun:
                 hass=self.hass,
                 text=intent_input,
                 conversation_id=conversation_id,
+                device_id=device_id,
                 context=self.context,
                 language=self.pipeline.conversation_language,
                 agent_id=self.intent_agent,
@@ -655,6 +658,8 @@ class PipelineInput:
 
     conversation_id: str | None = None
 
+    device_id: str | None = None
+
     async def execute(self) -> None:
         """Run pipeline."""
         self.run.start()
@@ -678,7 +683,9 @@ class PipelineInput:
                 if current_stage == PipelineStage.INTENT:
                     assert intent_input is not None
                     tts_input = await self.run.recognize_intent(
-                        intent_input, self.conversation_id
+                        intent_input,
+                        self.conversation_id,
+                        self.device_id,
                     )
                     current_stage = PipelineStage.TTS
 
@@ -730,17 +737,30 @@ class PipelineInput:
                 )
 
         start_stage_index = PIPELINE_STAGE_ORDER.index(self.run.start_stage)
+        end_stage_index = PIPELINE_STAGE_ORDER.index(self.run.end_stage)
 
         prepare_tasks = []
 
-        if start_stage_index <= PIPELINE_STAGE_ORDER.index(PipelineStage.STT):
+        if (
+            start_stage_index
+            <= PIPELINE_STAGE_ORDER.index(PipelineStage.STT)
+            <= end_stage_index
+        ):
             # self.stt_metadata can't be None or we'd raise above
             prepare_tasks.append(self.run.prepare_speech_to_text(self.stt_metadata))  # type: ignore[arg-type]
 
-        if start_stage_index <= PIPELINE_STAGE_ORDER.index(PipelineStage.INTENT):
+        if (
+            start_stage_index
+            <= PIPELINE_STAGE_ORDER.index(PipelineStage.INTENT)
+            <= end_stage_index
+        ):
             prepare_tasks.append(self.run.prepare_recognize_intent())
 
-        if start_stage_index <= PIPELINE_STAGE_ORDER.index(PipelineStage.TTS):
+        if (
+            start_stage_index
+            <= PIPELINE_STAGE_ORDER.index(PipelineStage.TTS)
+            <= end_stage_index
+        ):
             prepare_tasks.append(self.run.prepare_text_to_speech())
 
         if prepare_tasks:
@@ -944,6 +964,7 @@ class PipelineData:
 
     pipeline_runs: dict[str, LimitedSizeDict[str, PipelineRunDebug]]
     pipeline_store: PipelineStorageCollection
+    pipeline_devices: set[str] = field(default_factory=set, init=False)
 
 
 @dataclass
diff --git a/homeassistant/components/assist_pipeline/select.py b/homeassistant/components/assist_pipeline/select.py
index 9ac1d6b5888..2ae46fcb9ac 100644
--- a/homeassistant/components/assist_pipeline/select.py
+++ b/homeassistant/components/assist_pipeline/select.py
@@ -10,7 +10,8 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import collection, entity_registry as er, restore_state
 
 from .const import DOMAIN
-from .pipeline import PipelineStorageCollection
+from .pipeline import PipelineData, PipelineStorageCollection
+from .vad import VadSensitivity
 
 OPTION_PREFERRED = "preferred"
 
@@ -38,6 +39,25 @@ def get_chosen_pipeline(
     )
 
 
+@callback
+def get_vad_sensitivity(
+    hass: HomeAssistant, domain: str, unique_id_prefix: str
+) -> VadSensitivity:
+    """Get the chosen vad sensitivity for a domain."""
+    ent_reg = er.async_get(hass)
+    sensitivity_entity_id = ent_reg.async_get_entity_id(
+        Platform.SELECT, domain, f"{unique_id_prefix}-vad_sensitivity"
+    )
+    if sensitivity_entity_id is None:
+        return VadSensitivity.DEFAULT
+
+    state = hass.states.get(sensitivity_entity_id)
+    if state is None:
+        return VadSensitivity.DEFAULT
+
+    return VadSensitivity(state.state)
+
+
 class AssistPipelineSelect(SelectEntity, restore_state.RestoreEntity):
     """Entity to represent a pipeline selector."""
 
@@ -60,15 +80,24 @@ class AssistPipelineSelect(SelectEntity, restore_state.RestoreEntity):
         """When entity is added to Home Assistant."""
         await super().async_added_to_hass()
 
-        pipeline_store: PipelineStorageCollection = self.hass.data[
-            DOMAIN
-        ].pipeline_store
-        pipeline_store.async_add_change_set_listener(self._pipelines_updated)
+        pipeline_data: PipelineData = self.hass.data[DOMAIN]
+        pipeline_store = pipeline_data.pipeline_store
+        self.async_on_remove(
+            pipeline_store.async_add_change_set_listener(self._pipelines_updated)
+        )
 
         state = await self.async_get_last_state()
         if state is not None and state.state in self.options:
             self._attr_current_option = state.state
 
+        if self.registry_entry and (device_id := self.registry_entry.device_id):
+            pipeline_data.pipeline_devices.add(device_id)
+            self.async_on_remove(
+                lambda: pipeline_data.pipeline_devices.discard(
+                    device_id  # type: ignore[arg-type]
+                )
+            )
+
     async def async_select_option(self, option: str) -> None:
         """Select an option."""
         self._attr_current_option = option
@@ -93,3 +122,34 @@ class AssistPipelineSelect(SelectEntity, restore_state.RestoreEntity):
 
         if self._attr_current_option not in options:
             self._attr_current_option = OPTION_PREFERRED
+
+
+class VadSensitivitySelect(SelectEntity, restore_state.RestoreEntity):
+    """Entity to represent VAD sensitivity."""
+
+    entity_description = SelectEntityDescription(
+        key="vad_sensitivity",
+        translation_key="vad_sensitivity",
+        entity_category=EntityCategory.CONFIG,
+    )
+    _attr_should_poll = False
+    _attr_current_option = VadSensitivity.DEFAULT.value
+    _attr_options = [vs.value for vs in VadSensitivity]
+
+    def __init__(self, hass: HomeAssistant, unique_id_prefix: str) -> None:
+        """Initialize a pipeline selector."""
+        self._attr_unique_id = f"{unique_id_prefix}-vad_sensitivity"
+        self.hass = hass
+
+    async def async_added_to_hass(self) -> None:
+        """When entity is added to Home Assistant."""
+        await super().async_added_to_hass()
+
+        state = await self.async_get_last_state()
+        if state is not None and state.state in self.options:
+            self._attr_current_option = state.state
+
+    async def async_select_option(self, option: str) -> None:
+        """Select an option."""
+        self._attr_current_option = option
+        self.async_write_ha_state()
diff --git a/homeassistant/components/assist_pipeline/strings.json b/homeassistant/components/assist_pipeline/strings.json
index d85eb1aaed9..8fa67879fc3 100644
--- a/homeassistant/components/assist_pipeline/strings.json
+++ b/homeassistant/components/assist_pipeline/strings.json
@@ -11,6 +11,14 @@
         "state": {
           "preferred": "Preferred"
         }
+      },
+      "vad_sensitivity": {
+        "name": "Finished speaking detection",
+        "state": {
+          "default": "Default",
+          "aggressive": "Aggressive",
+          "relaxed": "Relaxed"
+        }
       }
     }
   }
diff --git a/homeassistant/components/assist_pipeline/vad.py b/homeassistant/components/assist_pipeline/vad.py
index c5f87f1336a..a737490f22f 100644
--- a/homeassistant/components/assist_pipeline/vad.py
+++ b/homeassistant/components/assist_pipeline/vad.py
@@ -1,11 +1,35 @@
 """Voice activity detection."""
+from __future__ import annotations
+
 from dataclasses import dataclass, field
 
 import webrtcvad
 
+from homeassistant.backports.enum import StrEnum
+
 _SAMPLE_RATE = 16000
 
 
+class VadSensitivity(StrEnum):
+    """How quickly the end of a voice command is detected."""
+
+    DEFAULT = "default"
+    RELAXED = "relaxed"
+    AGGRESSIVE = "aggressive"
+
+    @staticmethod
+    def to_seconds(sensitivity: VadSensitivity | str) -> float:
+        """Return seconds of silence for sensitivity level."""
+        sensitivity = VadSensitivity(sensitivity)
+        if sensitivity == VadSensitivity.RELAXED:
+            return 2.0
+
+        if sensitivity == VadSensitivity.AGGRESSIVE:
+            return 0.5
+
+        return 1.0
+
+
 @dataclass
 class VoiceCommandSegmenter:
     """Segments an audio stream into voice commands using webrtcvad."""
@@ -113,16 +137,15 @@ class VoiceCommandSegmenter:
                 self._reset_seconds_left -= self._seconds_per_chunk
                 if self._reset_seconds_left <= 0:
                     self._speech_seconds_left = self.speech_seconds
+        elif not is_speech:
+            self._reset_seconds_left = self.reset_seconds
+            self._silence_seconds_left -= self._seconds_per_chunk
+            if self._silence_seconds_left <= 0:
+                return False
         else:
-            if not is_speech:
-                self._reset_seconds_left = self.reset_seconds
-                self._silence_seconds_left -= self._seconds_per_chunk
-                if self._silence_seconds_left <= 0:
-                    return False
-            else:
-                # Reset if enough speech
-                self._reset_seconds_left -= self._seconds_per_chunk
-                if self._reset_seconds_left <= 0:
-                    self._silence_seconds_left = self.silence_seconds
+            # Reset if enough speech
+            self._reset_seconds_left -= self._seconds_per_chunk
+            if self._reset_seconds_left <= 0:
+                self._silence_seconds_left = self.silence_seconds
 
         return True
diff --git a/homeassistant/components/assist_pipeline/websocket_api.py b/homeassistant/components/assist_pipeline/websocket_api.py
index 3d8a07dc0b3..ea3aacf43a4 100644
--- a/homeassistant/components/assist_pipeline/websocket_api.py
+++ b/homeassistant/components/assist_pipeline/websocket_api.py
@@ -56,6 +56,7 @@ def async_register_websocket_api(hass: HomeAssistant) -> None:
                 vol.Optional("input"): dict,
                 vol.Optional("pipeline"): str,
                 vol.Optional("conversation_id"): vol.Any(str, None),
+                vol.Optional("device_id"): vol.Any(str, None),
                 vol.Optional("timeout"): vol.Any(float, int),
             },
         ),
@@ -105,6 +106,7 @@ async def websocket_run(
     # Arguments to PipelineInput
     input_args: dict[str, Any] = {
         "conversation_id": msg.get("conversation_id"),
+        "device_id": msg.get("device_id"),
     }
 
     if start_stage == PipelineStage.STT:
@@ -280,7 +282,6 @@ def websocket_get_run(
     )
 
 
-@callback
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "assist_pipeline/language/list",
diff --git a/homeassistant/components/asterisk_mbox/manifest.json b/homeassistant/components/asterisk_mbox/manifest.json
index 8348e40ba6b..840c48aff2a 100644
--- a/homeassistant/components/asterisk_mbox/manifest.json
+++ b/homeassistant/components/asterisk_mbox/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/asterisk_mbox",
   "iot_class": "local_push",
   "loggers": ["asterisk_mbox"],
-  "requirements": ["asterisk_mbox==0.5.0"]
+  "requirements": ["asterisk-mbox==0.5.0"]
 }
diff --git a/homeassistant/components/atag/climate.py b/homeassistant/components/atag/climate.py
index ce52bd4fd65..9b2729f141e 100644
--- a/homeassistant/components/atag/climate.py
+++ b/homeassistant/components/atag/climate.py
@@ -15,6 +15,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.util.enum import try_parse_enum
 
 from . import DOMAIN, AtagEntity
 
@@ -52,14 +53,12 @@ class AtagThermostat(AtagEntity, ClimateEntity):
         self._attr_temperature_unit = coordinator.data.climate.temp_unit
 
     @property
-    def hvac_mode(self) -> str | None:
+    def hvac_mode(self) -> HVACMode | None:
         """Return hvac operation ie. heat, cool mode."""
-        if self.coordinator.data.climate.hvac_mode in HVAC_MODES:
-            return self.coordinator.data.climate.hvac_mode
-        return None
+        return try_parse_enum(HVACMode, self.coordinator.data.climate.hvac_mode)
 
     @property
-    def hvac_action(self) -> str | None:
+    def hvac_action(self) -> HVACAction | None:
         """Return the current running hvac operation."""
         is_active = self.coordinator.data.climate.status
         return HVACAction.HEATING if is_active else HVACAction.IDLE
diff --git a/homeassistant/components/atome/manifest.json b/homeassistant/components/atome/manifest.json
index 236bf6cb082..cafe24e2e13 100644
--- a/homeassistant/components/atome/manifest.json
+++ b/homeassistant/components/atome/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/atome",
   "iot_class": "cloud_polling",
   "loggers": ["pyatome"],
-  "requirements": ["pyatome==0.1.1"]
+  "requirements": ["pyAtome==0.1.1"]
 }
diff --git a/homeassistant/components/august/binary_sensor.py b/homeassistant/components/august/binary_sensor.py
index d380ee11834..c6f406a5094 100644
--- a/homeassistant/components/august/binary_sensor.py
+++ b/homeassistant/components/august/binary_sensor.py
@@ -5,7 +5,6 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 import logging
-from typing import cast
 
 from yalexs.activity import (
     ACTION_DOORBELL_CALL_MISSED,
@@ -104,7 +103,16 @@ def _native_datetime() -> datetime:
 
 
 @dataclass
-class AugustRequiredKeysMixin:
+class AugustBinarySensorEntityDescription(BinarySensorEntityDescription):
+    """Describes August binary_sensor entity."""
+
+    # AugustBinarySensor does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
+
+@dataclass
+class AugustDoorbellRequiredKeysMixin:
     """Mixin for required keys."""
 
     value_fn: Callable[[AugustData, DoorbellDetail], bool]
@@ -112,41 +120,45 @@ class AugustRequiredKeysMixin:
 
 
 @dataclass
-class AugustBinarySensorEntityDescription(
-    BinarySensorEntityDescription, AugustRequiredKeysMixin
+class AugustDoorbellBinarySensorEntityDescription(
+    BinarySensorEntityDescription, AugustDoorbellRequiredKeysMixin
 ):
     """Describes August binary_sensor entity."""
 
+    # AugustDoorbellBinarySensor does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
 
-SENSOR_TYPE_DOOR = BinarySensorEntityDescription(
+
+SENSOR_TYPE_DOOR = AugustBinarySensorEntityDescription(
     key="door_open",
     name="Open",
 )
 
 
-SENSOR_TYPES_DOORBELL: tuple[AugustBinarySensorEntityDescription, ...] = (
-    AugustBinarySensorEntityDescription(
+SENSOR_TYPES_DOORBELL: tuple[AugustDoorbellBinarySensorEntityDescription, ...] = (
+    AugustDoorbellBinarySensorEntityDescription(
         key="doorbell_ding",
         name="Ding",
         device_class=BinarySensorDeviceClass.OCCUPANCY,
         value_fn=_retrieve_ding_state,
         is_time_based=True,
     ),
-    AugustBinarySensorEntityDescription(
+    AugustDoorbellBinarySensorEntityDescription(
         key="doorbell_motion",
         name="Motion",
         device_class=BinarySensorDeviceClass.MOTION,
         value_fn=_retrieve_motion_state,
         is_time_based=True,
     ),
-    AugustBinarySensorEntityDescription(
+    AugustDoorbellBinarySensorEntityDescription(
         key="doorbell_image_capture",
         name="Image Capture",
         icon="mdi:file-image",
         value_fn=_retrieve_image_capture_state,
         is_time_based=True,
     ),
-    AugustBinarySensorEntityDescription(
+    AugustDoorbellBinarySensorEntityDescription(
         key="doorbell_online",
         name="Online",
         device_class=BinarySensorDeviceClass.CONNECTIVITY,
@@ -199,7 +211,10 @@ class AugustDoorBinarySensor(AugustEntityMixin, BinarySensorEntity):
     _attr_device_class = BinarySensorDeviceClass.DOOR
 
     def __init__(
-        self, data: AugustData, device: Lock, description: BinarySensorEntityDescription
+        self,
+        data: AugustData,
+        device: Lock,
+        description: AugustBinarySensorEntityDescription,
     ) -> None:
         """Initialize the sensor."""
         super().__init__(data, device)
@@ -207,9 +222,7 @@ class AugustDoorBinarySensor(AugustEntityMixin, BinarySensorEntity):
         self._data = data
         self._device = device
         self._attr_name = f"{device.device_name} {description.name}"
-        self._attr_unique_id = (
-            f"{self._device_id}_{cast(str, description.name).lower()}"
-        )
+        self._attr_unique_id = f"{self._device_id}_{description.name.lower()}"
 
     @callback
     def _update_from_data(self):
@@ -243,13 +256,13 @@ class AugustDoorBinarySensor(AugustEntityMixin, BinarySensorEntity):
 class AugustDoorbellBinarySensor(AugustEntityMixin, BinarySensorEntity):
     """Representation of an August binary sensor."""
 
-    entity_description: AugustBinarySensorEntityDescription
+    entity_description: AugustDoorbellBinarySensorEntityDescription
 
     def __init__(
         self,
         data: AugustData,
         device: Doorbell,
-        description: AugustBinarySensorEntityDescription,
+        description: AugustDoorbellBinarySensorEntityDescription,
     ) -> None:
         """Initialize the sensor."""
         super().__init__(data, device)
@@ -257,9 +270,7 @@ class AugustDoorbellBinarySensor(AugustEntityMixin, BinarySensorEntity):
         self._check_for_off_update_listener = None
         self._data = data
         self._attr_name = f"{device.device_name} {description.name}"
-        self._attr_unique_id = (
-            f"{self._device_id}_{cast(str, description.name).lower()}"
-        )
+        self._attr_unique_id = f"{self._device_id}_{description.name.lower()}"
 
     @callback
     def _update_from_data(self):
diff --git a/homeassistant/components/aurora/__init__.py b/homeassistant/components/aurora/__init__.py
index bac402fe633..db054910d9a 100644
--- a/homeassistant/components/aurora/__init__.py
+++ b/homeassistant/components/aurora/__init__.py
@@ -1,25 +1,15 @@
 """The aurora component."""
 
-from datetime import timedelta
 import logging
 
-from aiohttp import ClientError
 from auroranoaa import AuroraForecast
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
-from homeassistant.helpers.device_registry import DeviceEntryType
-from homeassistant.helpers.entity import DeviceInfo
-from homeassistant.helpers.update_coordinator import (
-    CoordinatorEntity,
-    DataUpdateCoordinator,
-    UpdateFailed,
-)
 
 from .const import (
-    ATTRIBUTION,
     AURORA_API,
     CONF_THRESHOLD,
     COORDINATOR,
@@ -27,6 +17,7 @@ from .const import (
     DEFAULT_THRESHOLD,
     DOMAIN,
 )
+from .coordinator import AuroraDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -79,71 +70,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         hass.data[DOMAIN].pop(entry.entry_id)
 
     return unload_ok
-
-
-class AuroraDataUpdateCoordinator(DataUpdateCoordinator):
-    """Class to manage fetching data from the NOAA Aurora API."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        name: str,
-        polling_interval: int,
-        api: str,
-        latitude: float,
-        longitude: float,
-        threshold: float,
-    ) -> None:
-        """Initialize the data updater."""
-
-        super().__init__(
-            hass=hass,
-            logger=_LOGGER,
-            name=name,
-            update_interval=timedelta(minutes=polling_interval),
-        )
-
-        self.api = api
-        self.name = name
-        self.latitude = int(latitude)
-        self.longitude = int(longitude)
-        self.threshold = int(threshold)
-
-    async def _async_update_data(self):
-        """Fetch the data from the NOAA Aurora Forecast."""
-
-        try:
-            return await self.api.get_forecast_data(self.longitude, self.latitude)
-        except ClientError as error:
-            raise UpdateFailed(f"Error updating from NOAA: {error}") from error
-
-
-class AuroraEntity(CoordinatorEntity[AuroraDataUpdateCoordinator]):
-    """Implementation of the base Aurora Entity."""
-
-    _attr_attribution = ATTRIBUTION
-
-    def __init__(
-        self,
-        coordinator: AuroraDataUpdateCoordinator,
-        name: str,
-        icon: str,
-    ) -> None:
-        """Initialize the Aurora Entity."""
-
-        super().__init__(coordinator=coordinator)
-
-        self._attr_name = name
-        self._attr_unique_id = f"{coordinator.latitude}_{coordinator.longitude}"
-        self._attr_icon = icon
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Define the device based on name."""
-        return DeviceInfo(
-            entry_type=DeviceEntryType.SERVICE,
-            identifiers={(DOMAIN, str(self.unique_id))},
-            manufacturer="NOAA",
-            model="Aurora Visibility Sensor",
-            name=self.coordinator.name,
-        )
diff --git a/homeassistant/components/aurora/binary_sensor.py b/homeassistant/components/aurora/binary_sensor.py
index ee2fc53691e..a0e09685a0f 100644
--- a/homeassistant/components/aurora/binary_sensor.py
+++ b/homeassistant/components/aurora/binary_sensor.py
@@ -4,8 +4,8 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AuroraEntity
 from .const import COORDINATOR, DOMAIN
+from .entity import AuroraEntity
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/aurora/coordinator.py b/homeassistant/components/aurora/coordinator.py
new file mode 100644
index 00000000000..c126e2a8c68
--- /dev/null
+++ b/homeassistant/components/aurora/coordinator.py
@@ -0,0 +1,52 @@
+"""The aurora component."""
+
+from datetime import timedelta
+import logging
+
+from aiohttp import ClientError
+from auroranoaa import AuroraForecast
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import (
+    DataUpdateCoordinator,
+    UpdateFailed,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AuroraDataUpdateCoordinator(DataUpdateCoordinator):
+    """Class to manage fetching data from the NOAA Aurora API."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        name: str,
+        polling_interval: int,
+        api: AuroraForecast,
+        latitude: float,
+        longitude: float,
+        threshold: float,
+    ) -> None:
+        """Initialize the data updater."""
+
+        super().__init__(
+            hass=hass,
+            logger=_LOGGER,
+            name=name,
+            update_interval=timedelta(minutes=polling_interval),
+        )
+
+        self.api = api
+        self.name = name
+        self.latitude = int(latitude)
+        self.longitude = int(longitude)
+        self.threshold = int(threshold)
+
+    async def _async_update_data(self):
+        """Fetch the data from the NOAA Aurora Forecast."""
+
+        try:
+            return await self.api.get_forecast_data(self.longitude, self.latitude)
+        except ClientError as error:
+            raise UpdateFailed(f"Error updating from NOAA: {error}") from error
diff --git a/homeassistant/components/aurora/entity.py b/homeassistant/components/aurora/entity.py
new file mode 100644
index 00000000000..8948ff9c43c
--- /dev/null
+++ b/homeassistant/components/aurora/entity.py
@@ -0,0 +1,48 @@
+"""The aurora component."""
+
+import logging
+
+from homeassistant.helpers.device_registry import DeviceEntryType
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+)
+
+from .const import (
+    ATTRIBUTION,
+    DOMAIN,
+)
+from .coordinator import AuroraDataUpdateCoordinator
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AuroraEntity(CoordinatorEntity[AuroraDataUpdateCoordinator]):
+    """Implementation of the base Aurora Entity."""
+
+    _attr_attribution = ATTRIBUTION
+
+    def __init__(
+        self,
+        coordinator: AuroraDataUpdateCoordinator,
+        name: str,
+        icon: str,
+    ) -> None:
+        """Initialize the Aurora Entity."""
+
+        super().__init__(coordinator=coordinator)
+
+        self._attr_name = name
+        self._attr_unique_id = f"{coordinator.latitude}_{coordinator.longitude}"
+        self._attr_icon = icon
+
+    @property
+    def device_info(self) -> DeviceInfo:
+        """Define the device based on name."""
+        return DeviceInfo(
+            entry_type=DeviceEntryType.SERVICE,
+            identifiers={(DOMAIN, str(self.unique_id))},
+            manufacturer="NOAA",
+            model="Aurora Visibility Sensor",
+            name=self.coordinator.name,
+        )
diff --git a/homeassistant/components/aurora/sensor.py b/homeassistant/components/aurora/sensor.py
index de5e566e268..a5436e1e219 100644
--- a/homeassistant/components/aurora/sensor.py
+++ b/homeassistant/components/aurora/sensor.py
@@ -5,8 +5,8 @@ from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AuroraEntity
 from .const import COORDINATOR, DOMAIN
+from .entity import AuroraEntity
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/aurora_abb_powerone/aurora_device.py b/homeassistant/components/aurora_abb_powerone/aurora_device.py
index 5a524851bdf..6d3260a45f4 100644
--- a/homeassistant/components/aurora_abb_powerone/aurora_device.py
+++ b/homeassistant/components/aurora_abb_powerone/aurora_device.py
@@ -47,10 +47,10 @@ class AuroraEntity(Entity):
     @property
     def device_info(self) -> DeviceInfo:
         """Return device specific attributes."""
-        return {
-            "identifiers": {(DOMAIN, self._data[ATTR_SERIAL_NUMBER])},
-            "manufacturer": MANUFACTURER,
-            "model": self._data[ATTR_MODEL],
-            "name": self._data.get(ATTR_DEVICE_NAME, DEFAULT_DEVICE_NAME),
-            "sw_version": self._data[ATTR_FIRMWARE],
-        }
+        return DeviceInfo(
+            identifiers={(DOMAIN, self._data[ATTR_SERIAL_NUMBER])},
+            manufacturer=MANUFACTURER,
+            model=self._data[ATTR_MODEL],
+            name=self._data.get(ATTR_DEVICE_NAME, DEFAULT_DEVICE_NAME),
+            sw_version=self._data[ATTR_FIRMWARE],
+        )
diff --git a/homeassistant/components/aurora_abb_powerone/sensor.py b/homeassistant/components/aurora_abb_powerone/sensor.py
index 27a8a65c27f..55f3be5d6db 100644
--- a/homeassistant/components/aurora_abb_powerone/sensor.py
+++ b/homeassistant/components/aurora_abb_powerone/sensor.py
@@ -34,7 +34,7 @@ SENSOR_TYPES = [
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
         state_class=SensorStateClass.MEASUREMENT,
-        name="Power Output",
+        translation_key="power_output",
     ),
     SensorEntityDescription(
         key="temp",
@@ -42,14 +42,13 @@ SENSOR_TYPES = [
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
-        name="Temperature",
     ),
     SensorEntityDescription(
         key="totalenergy",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        name="Total Energy",
+        translation_key="total_energy",
     ),
 ]
 
@@ -75,6 +74,8 @@ async def async_setup_entry(
 class AuroraSensor(AuroraEntity, SensorEntity):
     """Representation of a Sensor on a Aurora ABB PowerOne Solar inverter."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         client: AuroraSerialClient,
diff --git a/homeassistant/components/aurora_abb_powerone/strings.json b/homeassistant/components/aurora_abb_powerone/strings.json
index bed403bd641..50b6e0db502 100644
--- a/homeassistant/components/aurora_abb_powerone/strings.json
+++ b/homeassistant/components/aurora_abb_powerone/strings.json
@@ -18,5 +18,15 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "no_serial_ports": "No com ports found.  Need a valid RS485 device to communicate."
     }
+  },
+  "entity": {
+    "sensor": {
+      "power_output": {
+        "name": "Power Output"
+      },
+      "total_energy": {
+        "name": "Total Energy"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/aussie_broadband/sensor.py b/homeassistant/components/aussie_broadband/sensor.py
index 1ed146b6237..fa407949b40 100644
--- a/homeassistant/components/aussie_broadband/sensor.py
+++ b/homeassistant/components/aussie_broadband/sensor.py
@@ -35,7 +35,7 @@ SENSOR_DESCRIPTIONS: tuple[SensorValueEntityDescription, ...] = (
     # Internet Services sensors
     SensorValueEntityDescription(
         key="usedMb",
-        name="Data used",
+        translation_key="data_used",
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
@@ -43,7 +43,7 @@ SENSOR_DESCRIPTIONS: tuple[SensorValueEntityDescription, ...] = (
     ),
     SensorValueEntityDescription(
         key="downloadedMb",
-        name="Downloaded",
+        translation_key="downloaded",
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
@@ -51,7 +51,7 @@ SENSOR_DESCRIPTIONS: tuple[SensorValueEntityDescription, ...] = (
     ),
     SensorValueEntityDescription(
         key="uploadedMb",
-        name="Uploaded",
+        translation_key="uploaded",
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
@@ -60,21 +60,21 @@ SENSOR_DESCRIPTIONS: tuple[SensorValueEntityDescription, ...] = (
     # Mobile Phone Services sensors
     SensorValueEntityDescription(
         key="national",
-        name="National calls",
+        translation_key="national_calls",
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:phone",
         value=lambda x: x.get("calls"),
     ),
     SensorValueEntityDescription(
         key="mobile",
-        name="Mobile calls",
+        translation_key="mobile_calls",
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:phone",
         value=lambda x: x.get("calls"),
     ),
     SensorValueEntityDescription(
         key="international",
-        name="International calls",
+        translation_key="international_calls",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:phone-plus",
@@ -82,14 +82,14 @@ SENSOR_DESCRIPTIONS: tuple[SensorValueEntityDescription, ...] = (
     ),
     SensorValueEntityDescription(
         key="sms",
-        name="SMS sent",
+        translation_key="sms_sent",
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:message-processing",
         value=lambda x: x.get("calls"),
     ),
     SensorValueEntityDescription(
         key="internet",
-        name="Data used",
+        translation_key="data_used",
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfInformation.KILOBYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
@@ -98,7 +98,7 @@ SENSOR_DESCRIPTIONS: tuple[SensorValueEntityDescription, ...] = (
     ),
     SensorValueEntityDescription(
         key="voicemail",
-        name="Voicemail calls",
+        translation_key="voicemail_calls",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:phone",
@@ -106,7 +106,7 @@ SENSOR_DESCRIPTIONS: tuple[SensorValueEntityDescription, ...] = (
     ),
     SensorValueEntityDescription(
         key="other",
-        name="Other calls",
+        translation_key="other_calls",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:phone",
@@ -115,13 +115,13 @@ SENSOR_DESCRIPTIONS: tuple[SensorValueEntityDescription, ...] = (
     # Generic sensors
     SensorValueEntityDescription(
         key="daysTotal",
-        name="Billing cycle length",
+        translation_key="billing_cycle_length",
         native_unit_of_measurement=UnitOfTime.DAYS,
         icon="mdi:calendar-range",
     ),
     SensorValueEntityDescription(
         key="daysRemaining",
-        name="Billing cycle remaining",
+        translation_key="billing_cycle_remaining",
         native_unit_of_measurement=UnitOfTime.DAYS,
         icon="mdi:calendar-clock",
     ),
diff --git a/homeassistant/components/aussie_broadband/strings.json b/homeassistant/components/aussie_broadband/strings.json
index c2052defa81..90e4f094ee6 100644
--- a/homeassistant/components/aussie_broadband/strings.json
+++ b/homeassistant/components/aussie_broadband/strings.json
@@ -46,5 +46,42 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "data_used": {
+        "name": "Data used"
+      },
+      "downloaded": {
+        "name": "Downloaded"
+      },
+      "uploaded": {
+        "name": "Uploaded"
+      },
+      "national_calls": {
+        "name": "National calls"
+      },
+      "mobile_calls": {
+        "name": "Mobile calls"
+      },
+      "international_calls": {
+        "name": "International calls"
+      },
+      "sms_sent": {
+        "name": "SMS sent"
+      },
+      "voicemail_calls": {
+        "name": "Voicemail calls"
+      },
+      "other_calls": {
+        "name": "Other calls"
+      },
+      "billing_cycle_length": {
+        "name": "Billing cycle length"
+      },
+      "billing_cycle_remaining": {
+        "name": "Billing cycle remaining"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py
index 600cc6013e4..f4db7831235 100644
--- a/homeassistant/components/automation/__init__.py
+++ b/homeassistant/components/automation/__init__.py
@@ -1,6 +1,7 @@
 """Allow to set up simple automation rules via the config file."""
 from __future__ import annotations
 
+from abc import ABC, abstractmethod
 import asyncio
 from collections.abc import Callable, Mapping
 from dataclasses import dataclass
@@ -153,7 +154,7 @@ def _automations_with_x(
     if DOMAIN not in hass.data:
         return []
 
-    component: EntityComponent[AutomationEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseAutomationEntity] = hass.data[DOMAIN]
 
     return [
         automation_entity.entity_id
@@ -169,7 +170,7 @@ def _x_in_automation(
     if DOMAIN not in hass.data:
         return []
 
-    component: EntityComponent[AutomationEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseAutomationEntity] = hass.data[DOMAIN]
 
     if (automation_entity := component.get_entity(entity_id)) is None:
         return []
@@ -219,7 +220,7 @@ def automations_with_blueprint(hass: HomeAssistant, blueprint_path: str) -> list
     if DOMAIN not in hass.data:
         return []
 
-    component: EntityComponent[AutomationEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseAutomationEntity] = hass.data[DOMAIN]
 
     return [
         automation_entity.entity_id
@@ -234,7 +235,7 @@ def blueprint_in_automation(hass: HomeAssistant, entity_id: str) -> str | None:
     if DOMAIN not in hass.data:
         return None
 
-    component: EntityComponent[AutomationEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseAutomationEntity] = hass.data[DOMAIN]
 
     if (automation_entity := component.get_entity(entity_id)) is None:
         return None
@@ -244,7 +245,7 @@ def blueprint_in_automation(hass: HomeAssistant, entity_id: str) -> str | None:
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up all automations."""
-    hass.data[DOMAIN] = component = EntityComponent[AutomationEntity](
+    hass.data[DOMAIN] = component = EntityComponent[BaseAutomationEntity](
         LOGGER, DOMAIN, hass
     )
 
@@ -262,7 +263,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     await async_get_blueprints(hass).async_populate()
 
     async def trigger_service_handler(
-        entity: AutomationEntity, service_call: ServiceCall
+        entity: BaseAutomationEntity, service_call: ServiceCall
     ) -> None:
         """Handle forced automation trigger, e.g. from frontend."""
         await entity.async_trigger(
@@ -310,7 +311,103 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-class AutomationEntity(ToggleEntity, RestoreEntity):
+class BaseAutomationEntity(ToggleEntity, ABC):
+    """Base class for automation entities."""
+
+    raw_config: ConfigType | None
+
+    @property
+    def capability_attributes(self) -> dict[str, Any] | None:
+        """Return capability attributes."""
+        if self.unique_id is not None:
+            return {CONF_ID: self.unique_id}
+        return None
+
+    @property
+    @abstractmethod
+    def referenced_areas(self) -> set[str]:
+        """Return a set of referenced areas."""
+
+    @property
+    @abstractmethod
+    def referenced_blueprint(self) -> str | None:
+        """Return referenced blueprint or None."""
+
+    @property
+    @abstractmethod
+    def referenced_devices(self) -> set[str]:
+        """Return a set of referenced devices."""
+
+    @property
+    @abstractmethod
+    def referenced_entities(self) -> set[str]:
+        """Return a set of referenced entities."""
+
+    @abstractmethod
+    async def async_trigger(
+        self,
+        run_variables: dict[str, Any],
+        context: Context | None = None,
+        skip_condition: bool = False,
+    ) -> None:
+        """Trigger automation."""
+
+
+class UnavailableAutomationEntity(BaseAutomationEntity):
+    """A non-functional automation entity with its state set to unavailable.
+
+    This class is instatiated when an automation fails to validate.
+    """
+
+    _attr_should_poll = False
+    _attr_available = False
+
+    def __init__(
+        self,
+        automation_id: str | None,
+        name: str,
+        raw_config: ConfigType | None,
+    ) -> None:
+        """Initialize an automation entity."""
+        self._name = name
+        self._attr_unique_id = automation_id
+        self.raw_config = raw_config
+
+    @property
+    def name(self) -> str:
+        """Return the name of the entity."""
+        return self._name
+
+    @property
+    def referenced_areas(self) -> set[str]:
+        """Return a set of referenced areas."""
+        return set()
+
+    @property
+    def referenced_blueprint(self) -> str | None:
+        """Return referenced blueprint or None."""
+        return None
+
+    @property
+    def referenced_devices(self) -> set[str]:
+        """Return a set of referenced devices."""
+        return set()
+
+    @property
+    def referenced_entities(self) -> set[str]:
+        """Return a set of referenced entities."""
+        return set()
+
+    async def async_trigger(
+        self,
+        run_variables: dict[str, Any],
+        context: Context | None = None,
+        skip_condition: bool = False,
+    ) -> None:
+        """Trigger automation."""
+
+
+class AutomationEntity(BaseAutomationEntity, RestoreEntity):
     """Entity to show status of entity."""
 
     _attr_should_poll = False
@@ -330,7 +427,7 @@ class AutomationEntity(ToggleEntity, RestoreEntity):
         trace_config: ConfigType,
     ) -> None:
         """Initialize an automation entity."""
-        self._attr_name = name
+        self._name = name
         self._trigger_config = trigger_config
         self._async_detach_triggers: CALLBACK_TYPE | None = None
         self._cond_func = cond_func
@@ -348,6 +445,11 @@ class AutomationEntity(ToggleEntity, RestoreEntity):
         self._trace_config = trace_config
         self._attr_unique_id = automation_id
 
+    @property
+    def name(self) -> str:
+        """Return the name of the entity."""
+        return self._name
+
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return the entity state attributes."""
@@ -358,8 +460,6 @@ class AutomationEntity(ToggleEntity, RestoreEntity):
         }
         if self.action_script.supports_max:
             attrs[ATTR_MAX] = self.action_script.max_runs
-        if self.unique_id is not None:
-            attrs[CONF_ID] = self.unique_id
         return attrs
 
     @property
@@ -681,6 +781,7 @@ class AutomationEntityConfig:
     list_no: int
     raw_blueprint_inputs: ConfigType | None
     raw_config: ConfigType | None
+    validation_failed: bool
 
 
 async def _prepare_automation_config(
@@ -695,9 +796,14 @@ async def _prepare_automation_config(
     for list_no, config_block in enumerate(conf):
         raw_config = cast(AutomationConfig, config_block).raw_config
         raw_blueprint_inputs = cast(AutomationConfig, config_block).raw_blueprint_inputs
+        validation_failed = cast(AutomationConfig, config_block).validation_failed
         automation_configs.append(
             AutomationEntityConfig(
-                config_block, list_no, raw_blueprint_inputs, raw_config
+                config_block,
+                list_no,
+                raw_blueprint_inputs,
+                raw_config,
+                validation_failed,
             )
         )
 
@@ -713,9 +819,9 @@ def _automation_name(automation_config: AutomationEntityConfig) -> str:
 
 async def _create_automation_entities(
     hass: HomeAssistant, automation_configs: list[AutomationEntityConfig]
-) -> list[AutomationEntity]:
+) -> list[BaseAutomationEntity]:
     """Create automation entities from prepared configuration."""
-    entities: list[AutomationEntity] = []
+    entities: list[BaseAutomationEntity] = []
 
     for automation_config in automation_configs:
         config_block = automation_config.config_block
@@ -723,6 +829,16 @@ async def _create_automation_entities(
         automation_id: str | None = config_block.get(CONF_ID)
         name = _automation_name(automation_config)
 
+        if automation_config.validation_failed:
+            entities.append(
+                UnavailableAutomationEntity(
+                    automation_id,
+                    name,
+                    automation_config.raw_config,
+                )
+            )
+            continue
+
         initial_state: bool | None = config_block.get(CONF_INITIAL_STATE)
 
         action_script = Script(
@@ -781,18 +897,18 @@ async def _create_automation_entities(
 async def _async_process_config(
     hass: HomeAssistant,
     config: dict[str, Any],
-    component: EntityComponent[AutomationEntity],
+    component: EntityComponent[BaseAutomationEntity],
 ) -> None:
     """Process config and add automations."""
 
     def automation_matches_config(
-        automation: AutomationEntity, config: AutomationEntityConfig
+        automation: BaseAutomationEntity, config: AutomationEntityConfig
     ) -> bool:
         name = _automation_name(config)
         return automation.name == name and automation.raw_config == config.raw_config
 
     def find_matches(
-        automations: list[AutomationEntity],
+        automations: list[BaseAutomationEntity],
         automation_configs: list[AutomationEntityConfig],
     ) -> tuple[set[int], set[int]]:
         """Find matches between a list of automation entities and a list of configurations.
@@ -838,7 +954,7 @@ async def _async_process_config(
         return automation_matches, config_matches
 
     automation_configs = await _prepare_automation_config(hass, config)
-    automations: list[AutomationEntity] = list(component.entities)
+    automations: list[BaseAutomationEntity] = list(component.entities)
 
     # Find automations and configurations which have matches
     automation_matches, config_matches = find_matches(automations, automation_configs)
@@ -860,8 +976,6 @@ async def _async_process_config(
     entities = await _create_automation_entities(hass, updated_automation_configs)
     await component.async_add_entities(entities)
 
-    return
-
 
 async def _async_process_if(
     hass: HomeAssistant, name: str, config: dict[str, Any]
@@ -965,7 +1079,7 @@ def websocket_config(
     msg: dict[str, Any],
 ) -> None:
     """Get automation config."""
-    component: EntityComponent[AutomationEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseAutomationEntity] = hass.data[DOMAIN]
 
     automation = component.get_entity(msg["entity_id"])
 
diff --git a/homeassistant/components/automation/config.py b/homeassistant/components/automation/config.py
index c127208377f..ed801772e6d 100644
--- a/homeassistant/components/automation/config.py
+++ b/homeassistant/components/automation/config.py
@@ -41,7 +41,15 @@ from .helpers import async_get_blueprints
 
 PACKAGE_MERGE_HINT = "list"
 
-_CONDITION_SCHEMA = vol.All(cv.ensure_list, [cv.CONDITION_SCHEMA])
+_MINIMAL_PLATFORM_SCHEMA = vol.Schema(
+    {
+        CONF_ID: str,
+        CONF_ALIAS: cv.string,
+        vol.Optional(CONF_DESCRIPTION): cv.string,
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+
 
 PLATFORM_SCHEMA = vol.All(
     cv.deprecated(CONF_HIDE_ENTITY),
@@ -55,7 +63,7 @@ PLATFORM_SCHEMA = vol.All(
             vol.Optional(CONF_INITIAL_STATE): cv.boolean,
             vol.Optional(CONF_HIDE_ENTITY): cv.boolean,
             vol.Required(CONF_TRIGGER): cv.TRIGGER_SCHEMA,
-            vol.Optional(CONF_CONDITION): _CONDITION_SCHEMA,
+            vol.Optional(CONF_CONDITION): cv.CONDITIONS_SCHEMA,
             vol.Optional(CONF_VARIABLES): cv.SCRIPT_VARIABLES_SCHEMA,
             vol.Optional(CONF_TRIGGER_VARIABLES): cv.SCRIPT_VARIABLES_SCHEMA,
             vol.Required(CONF_ACTION): cv.SCRIPT_SCHEMA,
@@ -68,6 +76,7 @@ PLATFORM_SCHEMA = vol.All(
 async def _async_validate_config_item(
     hass: HomeAssistant,
     config: ConfigType,
+    raise_on_errors: bool,
     warn_on_errors: bool,
 ) -> AutomationConfig:
     """Validate config item."""
@@ -104,6 +113,15 @@ async def _async_validate_config_item(
         )
         return
 
+    def _minimal_config() -> AutomationConfig:
+        """Try validating id, alias and description."""
+        minimal_config = _MINIMAL_PLATFORM_SCHEMA(config)
+        automation_config = AutomationConfig(minimal_config)
+        automation_config.raw_blueprint_inputs = raw_blueprint_inputs
+        automation_config.raw_config = raw_config
+        automation_config.validation_failed = True
+        return automation_config
+
     if blueprint.is_blueprint_instance_config(config):
         uses_blueprint = True
         blueprints = async_get_blueprints(hass)
@@ -115,7 +133,9 @@ async def _async_validate_config_item(
                     "Failed to generate automation from blueprint: %s",
                     err,
                 )
-            raise
+            if raise_on_errors:
+                raise
+            return _minimal_config()
 
         raw_blueprint_inputs = blueprint_inputs.config_with_inputs
 
@@ -130,7 +150,9 @@ async def _async_validate_config_item(
                     blueprint_inputs.inputs,
                     err,
                 )
-            raise HomeAssistantError from err
+            if raise_on_errors:
+                raise HomeAssistantError(err) from err
+            return _minimal_config()
 
     automation_name = "Unnamed automation"
     if isinstance(config, Mapping):
@@ -143,10 +165,16 @@ async def _async_validate_config_item(
         validated_config = PLATFORM_SCHEMA(config)
     except vol.Invalid as err:
         _log_invalid_automation(err, automation_name, "could not be validated", config)
-        raise
+        if raise_on_errors:
+            raise
+        return _minimal_config()
+
+    automation_config = AutomationConfig(validated_config)
+    automation_config.raw_blueprint_inputs = raw_blueprint_inputs
+    automation_config.raw_config = raw_config
 
     try:
-        validated_config[CONF_TRIGGER] = await async_validate_trigger_config(
+        automation_config[CONF_TRIGGER] = await async_validate_trigger_config(
             hass, validated_config[CONF_TRIGGER]
         )
     except (
@@ -156,11 +184,14 @@ async def _async_validate_config_item(
         _log_invalid_automation(
             err, automation_name, "failed to setup triggers", validated_config
         )
-        raise
+        if raise_on_errors:
+            raise
+        automation_config.validation_failed = True
+        return automation_config
 
     if CONF_CONDITION in validated_config:
         try:
-            validated_config[CONF_CONDITION] = await async_validate_conditions_config(
+            automation_config[CONF_CONDITION] = await async_validate_conditions_config(
                 hass, validated_config[CONF_CONDITION]
             )
         except (
@@ -170,10 +201,13 @@ async def _async_validate_config_item(
             _log_invalid_automation(
                 err, automation_name, "failed to setup conditions", validated_config
             )
-            raise
+            if raise_on_errors:
+                raise
+            automation_config.validation_failed = True
+            return automation_config
 
     try:
-        validated_config[CONF_ACTION] = await script.async_validate_actions_config(
+        automation_config[CONF_ACTION] = await script.async_validate_actions_config(
             hass, validated_config[CONF_ACTION]
         )
     except (
@@ -183,11 +217,11 @@ async def _async_validate_config_item(
         _log_invalid_automation(
             err, automation_name, "failed to setup actions", validated_config
         )
-        raise
+        if raise_on_errors:
+            raise
+        automation_config.validation_failed = True
+        return automation_config
 
-    automation_config = AutomationConfig(validated_config)
-    automation_config.raw_blueprint_inputs = raw_blueprint_inputs
-    automation_config.raw_config = raw_config
     return automation_config
 
 
@@ -196,6 +230,7 @@ class AutomationConfig(dict):
 
     raw_config: dict[str, Any] | None = None
     raw_blueprint_inputs: dict[str, Any] | None = None
+    validation_failed: bool = False
 
 
 async def _try_async_validate_config_item(
@@ -204,7 +239,7 @@ async def _try_async_validate_config_item(
 ) -> AutomationConfig | None:
     """Validate config item."""
     try:
-        return await _async_validate_config_item(hass, config, True)
+        return await _async_validate_config_item(hass, config, False, True)
     except (vol.Invalid, HomeAssistantError):
         return None
 
@@ -215,7 +250,7 @@ async def async_validate_config_item(
     config: dict[str, Any],
 ) -> AutomationConfig | None:
     """Validate config item, called by EditAutomationConfigView."""
-    return await _async_validate_config_item(hass, config, False)
+    return await _async_validate_config_item(hass, config, True, False)
 
 
 async def async_validate_config(hass: HomeAssistant, config: ConfigType) -> ConfigType:
diff --git a/homeassistant/components/awair/__init__.py b/homeassistant/components/awair/__init__.py
index cef2c7d1fd4..dca885ffe0d 100644
--- a/homeassistant/components/awair/__init__.py
+++ b/homeassistant/components/awair/__init__.py
@@ -2,16 +2,22 @@
 from __future__ import annotations
 
 from asyncio import gather
+from dataclasses import dataclass
 from datetime import timedelta
 
 from aiohttp import ClientSession
 from async_timeout import timeout
 from python_awair import Awair, AwairLocal
+from python_awair.air_data import AirData
 from python_awair.devices import AwairBaseDevice, AwairLocalDevice
 from python_awair.exceptions import AuthError, AwairError
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST, Platform
+from homeassistant.const import (
+    CONF_ACCESS_TOKEN,
+    CONF_HOST,
+    Platform,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -23,7 +29,6 @@ from .const import (
     LOGGER,
     UPDATE_INTERVAL_CLOUD,
     UPDATE_INTERVAL_LOCAL,
-    AwairResult,
 )
 
 PLATFORMS = [Platform.SENSOR]
@@ -72,6 +77,14 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
     return unload_ok
 
 
+@dataclass
+class AwairResult:
+    """Wrapper class to hold an awair device and set of air data."""
+
+    device: AwairBaseDevice
+    air_data: AirData
+
+
 class AwairDataUpdateCoordinator(DataUpdateCoordinator[dict[str, AwairResult]]):
     """Define a wrapper class to update Awair data."""
 
diff --git a/homeassistant/components/awair/const.py b/homeassistant/components/awair/const.py
index d483df64298..19341ab6050 100644
--- a/homeassistant/components/awair/const.py
+++ b/homeassistant/components/awair/const.py
@@ -1,28 +1,9 @@
 """Constants for the Awair component."""
 from __future__ import annotations
 
-from dataclasses import dataclass
 from datetime import timedelta
 import logging
 
-from python_awair.air_data import AirData
-from python_awair.devices import AwairBaseDevice
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
-    LIGHT_LUX,
-    PERCENTAGE,
-    UnitOfSoundPressure,
-    UnitOfTemperature,
-)
-
 API_CO2 = "carbon_dioxide"
 API_DUST = "dust"
 API_HUMID = "humidity"
@@ -39,109 +20,7 @@ ATTRIBUTION = "Awair air quality sensor"
 
 DOMAIN = "awair"
 
-DUST_ALIASES = [API_PM25, API_PM10]
-
 LOGGER = logging.getLogger(__package__)
 
 UPDATE_INTERVAL_CLOUD = timedelta(minutes=5)
 UPDATE_INTERVAL_LOCAL = timedelta(seconds=30)
-
-
-@dataclass
-class AwairRequiredKeysMixin:
-    """Mixin for required keys."""
-
-    unique_id_tag: str
-
-
-@dataclass
-class AwairSensorEntityDescription(SensorEntityDescription, AwairRequiredKeysMixin):
-    """Describes Awair sensor entity."""
-
-
-SENSOR_TYPE_SCORE = AwairSensorEntityDescription(
-    key=API_SCORE,
-    icon="mdi:blur",
-    native_unit_of_measurement=PERCENTAGE,
-    name="Score",
-    unique_id_tag="score",  # matches legacy format
-    state_class=SensorStateClass.MEASUREMENT,
-)
-
-SENSOR_TYPES: tuple[AwairSensorEntityDescription, ...] = (
-    AwairSensorEntityDescription(
-        key=API_HUMID,
-        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
-        name="Humidity",
-        unique_id_tag="HUMID",  # matches legacy format
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AwairSensorEntityDescription(
-        key=API_LUX,
-        device_class=SensorDeviceClass.ILLUMINANCE,
-        native_unit_of_measurement=LIGHT_LUX,
-        name="Illuminance",
-        unique_id_tag="illuminance",
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AwairSensorEntityDescription(
-        key=API_SPL_A,
-        device_class=SensorDeviceClass.SOUND_PRESSURE,
-        native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
-        name="Sound level",
-        unique_id_tag="sound_level",
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AwairSensorEntityDescription(
-        key=API_VOC,
-        icon="mdi:molecule",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
-        name="Volatile organic compounds",
-        unique_id_tag="VOC",  # matches legacy format
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AwairSensorEntityDescription(
-        key=API_TEMP,
-        device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        name="Temperature",
-        unique_id_tag="TEMP",  # matches legacy format
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AwairSensorEntityDescription(
-        key=API_CO2,
-        device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
-        name="Carbon dioxide",
-        unique_id_tag="CO2",  # matches legacy format
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-)
-
-SENSOR_TYPES_DUST: tuple[AwairSensorEntityDescription, ...] = (
-    AwairSensorEntityDescription(
-        key=API_PM25,
-        device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        name="PM2.5",
-        unique_id_tag="PM25",  # matches legacy format
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AwairSensorEntityDescription(
-        key=API_PM10,
-        device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        name="PM10",
-        unique_id_tag="PM10",  # matches legacy format
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-)
-
-
-@dataclass
-class AwairResult:
-    """Wrapper class to hold an awair device and set of air data."""
-
-    device: AwairBaseDevice
-    air_data: AirData
diff --git a/homeassistant/components/awair/manifest.json b/homeassistant/components/awair/manifest.json
index 19e3339cef6..25257bc3e1c 100644
--- a/homeassistant/components/awair/manifest.json
+++ b/homeassistant/components/awair/manifest.json
@@ -11,7 +11,7 @@
   "documentation": "https://www.home-assistant.io/integrations/awair",
   "iot_class": "local_polling",
   "loggers": ["python_awair"],
-  "requirements": ["python_awair==0.2.4"],
+  "requirements": ["python-awair==0.2.4"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",
diff --git a/homeassistant/components/awair/sensor.py b/homeassistant/components/awair/sensor.py
index f42a46999fb..ee0febf1455 100644
--- a/homeassistant/components/awair/sensor.py
+++ b/homeassistant/components/awair/sensor.py
@@ -1,14 +1,30 @@
 """Support for Awair sensors."""
 from __future__ import annotations
 
+from dataclasses import dataclass
 from typing import Any, cast
 
 from python_awair.air_data import AirData
 from python_awair.devices import AwairBaseDevice, AwairLocalDevice
 
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_CONNECTIONS, ATTR_SW_VERSION
+from homeassistant.const import (
+    ATTR_CONNECTIONS,
+    ATTR_SW_VERSION,
+    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    CONCENTRATION_PARTS_PER_BILLION,
+    CONCENTRATION_PARTS_PER_MILLION,
+    LIGHT_LUX,
+    PERCENTAGE,
+    UnitOfSoundPressure,
+    UnitOfTemperature,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.entity import DeviceInfo
@@ -17,18 +33,106 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import AwairDataUpdateCoordinator, AwairResult
 from .const import (
+    API_CO2,
     API_DUST,
+    API_HUMID,
+    API_LUX,
+    API_PM10,
     API_PM25,
     API_SCORE,
+    API_SPL_A,
     API_TEMP,
     API_VOC,
     ATTRIBUTION,
     DOMAIN,
-    DUST_ALIASES,
-    SENSOR_TYPE_SCORE,
-    SENSOR_TYPES,
-    SENSOR_TYPES_DUST,
-    AwairSensorEntityDescription,
+)
+
+DUST_ALIASES = [API_PM25, API_PM10]
+
+
+@dataclass
+class AwairRequiredKeysMixin:
+    """Mixin for required keys."""
+
+    unique_id_tag: str
+
+
+@dataclass
+class AwairSensorEntityDescription(SensorEntityDescription, AwairRequiredKeysMixin):
+    """Describes Awair sensor entity."""
+
+
+SENSOR_TYPE_SCORE = AwairSensorEntityDescription(
+    key=API_SCORE,
+    icon="mdi:blur",
+    native_unit_of_measurement=PERCENTAGE,
+    translation_key="score",
+    unique_id_tag="score",  # matches legacy format
+    state_class=SensorStateClass.MEASUREMENT,
+)
+
+SENSOR_TYPES: tuple[AwairSensorEntityDescription, ...] = (
+    AwairSensorEntityDescription(
+        key=API_HUMID,
+        device_class=SensorDeviceClass.HUMIDITY,
+        native_unit_of_measurement=PERCENTAGE,
+        unique_id_tag="HUMID",  # matches legacy format
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AwairSensorEntityDescription(
+        key=API_LUX,
+        device_class=SensorDeviceClass.ILLUMINANCE,
+        native_unit_of_measurement=LIGHT_LUX,
+        unique_id_tag="illuminance",
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AwairSensorEntityDescription(
+        key=API_SPL_A,
+        device_class=SensorDeviceClass.SOUND_PRESSURE,
+        native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
+        translation_key="sound_level",
+        unique_id_tag="sound_level",
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AwairSensorEntityDescription(
+        key=API_VOC,
+        icon="mdi:molecule",
+        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        unique_id_tag="VOC",  # matches legacy format
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AwairSensorEntityDescription(
+        key=API_TEMP,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        unique_id_tag="TEMP",  # matches legacy format
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AwairSensorEntityDescription(
+        key=API_CO2,
+        device_class=SensorDeviceClass.CO2,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        unique_id_tag="CO2",  # matches legacy format
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+)
+
+SENSOR_TYPES_DUST: tuple[AwairSensorEntityDescription, ...] = (
+    AwairSensorEntityDescription(
+        key=API_PM25,
+        device_class=SensorDeviceClass.PM25,
+        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        unique_id_tag="PM25",  # matches legacy format
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AwairSensorEntityDescription(
+        key=API_PM10,
+        device_class=SensorDeviceClass.PM10,
+        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        unique_id_tag="PM10",  # matches legacy format
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
 )
 
 
diff --git a/homeassistant/components/awair/strings.json b/homeassistant/components/awair/strings.json
index 6040bc1d7b0..731cd5db8dd 100644
--- a/homeassistant/components/awair/strings.json
+++ b/homeassistant/components/awair/strings.json
@@ -48,5 +48,15 @@
       "unreachable": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "flow_title": "{model} ({device_id})"
+  },
+  "entity": {
+    "sensor": {
+      "score": {
+        "name": "Score"
+      },
+      "sound_level": {
+        "name": "Sound level"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/baf/binary_sensor.py b/homeassistant/components/baf/binary_sensor.py
index fcfd0f3241d..a68e80c3ac2 100644
--- a/homeassistant/components/baf/binary_sensor.py
+++ b/homeassistant/components/baf/binary_sensor.py
@@ -39,7 +39,6 @@ class BAFBinarySensorDescription(
 OCCUPANCY_SENSORS = (
     BAFBinarySensorDescription(
         key="occupancy",
-        name="Occupancy",
         device_class=BinarySensorDeviceClass.OCCUPANCY,
         value_fn=lambda device: cast(bool | None, device.fan_occupancy_detected),
     ),
@@ -70,7 +69,7 @@ class BAFBinarySensor(BAFEntity, BinarySensorEntity):
     def __init__(self, device: Device, description: BAFBinarySensorDescription) -> None:
         """Initialize the entity."""
         self.entity_description = description
-        super().__init__(device, f"{device.name} {description.name}")
+        super().__init__(device)
         self._attr_unique_id = f"{self._device.mac_address}-{description.key}"
 
     @callback
diff --git a/homeassistant/components/baf/climate.py b/homeassistant/components/baf/climate.py
index 6798639e7a8..531659e901f 100644
--- a/homeassistant/components/baf/climate.py
+++ b/homeassistant/components/baf/climate.py
@@ -27,9 +27,7 @@ async def async_setup_entry(
     """Set up BAF fan auto comfort."""
     data: BAFData = hass.data[DOMAIN][entry.entry_id]
     if data.device.has_fan and data.device.has_auto_comfort:
-        async_add_entities(
-            [BAFAutoComfort(data.device, f"{data.device.name} Auto Comfort")]
-        )
+        async_add_entities([BAFAutoComfort(data.device)])
 
 
 class BAFAutoComfort(BAFEntity, ClimateEntity):
@@ -38,6 +36,7 @@ class BAFAutoComfort(BAFEntity, ClimateEntity):
     _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_hvac_modes = [HVACMode.OFF, HVACMode.FAN_ONLY]
+    _attr_translation_key = "auto_comfort"
 
     @callback
     def _async_update_attrs(self) -> None:
diff --git a/homeassistant/components/baf/entity.py b/homeassistant/components/baf/entity.py
index 22054d0b16d..4aeb287b861 100644
--- a/homeassistant/components/baf/entity.py
+++ b/homeassistant/components/baf/entity.py
@@ -13,12 +13,12 @@ class BAFEntity(Entity):
     """Base class for baf entities."""
 
     _attr_should_poll = False
+    _attr_has_entity_name = True
 
-    def __init__(self, device: Device, name: str) -> None:
+    def __init__(self, device: Device) -> None:
         """Initialize the entity."""
         self._device = device
         self._attr_unique_id = format_mac(self._device.mac_address)
-        self._attr_name = name
         self._attr_device_info = DeviceInfo(
             connections={(dr.CONNECTION_NETWORK_MAC, self._device.mac_address)},
             name=self._device.name,
diff --git a/homeassistant/components/baf/fan.py b/homeassistant/components/baf/fan.py
index a166c346f12..059603fc589 100644
--- a/homeassistant/components/baf/fan.py
+++ b/homeassistant/components/baf/fan.py
@@ -33,7 +33,7 @@ async def async_setup_entry(
     """Set up SenseME fans."""
     data: BAFData = hass.data[DOMAIN][entry.entry_id]
     if data.device.has_fan:
-        async_add_entities([BAFFan(data.device, data.device.name)])
+        async_add_entities([BAFFan(data.device)])
 
 
 class BAFFan(BAFEntity, FanEntity):
@@ -46,6 +46,7 @@ class BAFFan(BAFEntity, FanEntity):
     )
     _attr_preset_modes = [PRESET_MODE_AUTO]
     _attr_speed_count = SPEED_COUNT
+    _attr_name = None
 
     @callback
     def _async_update_attrs(self) -> None:
diff --git a/homeassistant/components/baf/light.py b/homeassistant/components/baf/light.py
index b177d383cd5..9557005e5eb 100644
--- a/homeassistant/components/baf/light.py
+++ b/homeassistant/components/baf/light.py
@@ -63,9 +63,11 @@ class BAFLight(BAFEntity, LightEntity):
 class BAFFanLight(BAFLight):
     """Representation of a Big Ass Fans light on a fan."""
 
+    _attr_name = None
+
     def __init__(self, device: Device) -> None:
         """Init a fan light."""
-        super().__init__(device, device.name)
+        super().__init__(device)
         self._attr_supported_color_modes = {ColorMode.BRIGHTNESS}
         self._attr_color_mode = ColorMode.BRIGHTNESS
 
@@ -75,7 +77,7 @@ class BAFStandaloneLight(BAFLight):
 
     def __init__(self, device: Device) -> None:
         """Init a standalone light."""
-        super().__init__(device, f"{device.name} Light")
+        super().__init__(device)
         self._attr_supported_color_modes = {ColorMode.COLOR_TEMP}
         self._attr_color_mode = ColorMode.COLOR_TEMP
         self._attr_min_mireds = color_temperature_kelvin_to_mired(
diff --git a/homeassistant/components/baf/number.py b/homeassistant/components/baf/number.py
index 020f34fefaf..7fd1c9ed290 100644
--- a/homeassistant/components/baf/number.py
+++ b/homeassistant/components/baf/number.py
@@ -37,7 +37,7 @@ class BAFNumberDescription(NumberEntityDescription, BAFNumberDescriptionMixin):
 AUTO_COMFORT_NUMBER_DESCRIPTIONS = (
     BAFNumberDescription(
         key="comfort_min_speed",
-        name="Auto Comfort Minimum Speed",
+        translation_key="comfort_min_speed",
         native_step=1,
         native_min_value=0,
         native_max_value=SPEED_RANGE[1] - 1,
@@ -47,7 +47,7 @@ AUTO_COMFORT_NUMBER_DESCRIPTIONS = (
     ),
     BAFNumberDescription(
         key="comfort_max_speed",
-        name="Auto Comfort Maximum Speed",
+        translation_key="comfort_max_speed",
         native_step=1,
         native_min_value=1,
         native_max_value=SPEED_RANGE[1],
@@ -57,7 +57,7 @@ AUTO_COMFORT_NUMBER_DESCRIPTIONS = (
     ),
     BAFNumberDescription(
         key="comfort_heat_assist_speed",
-        name="Auto Comfort Heat Assist Speed",
+        translation_key="comfort_heat_assist_speed",
         native_step=1,
         native_min_value=SPEED_RANGE[0],
         native_max_value=SPEED_RANGE[1],
@@ -70,7 +70,7 @@ AUTO_COMFORT_NUMBER_DESCRIPTIONS = (
 FAN_NUMBER_DESCRIPTIONS = (
     BAFNumberDescription(
         key="return_to_auto_timeout",
-        name="Return to Auto Timeout",
+        translation_key="return_to_auto_timeout",
         native_step=1,
         native_min_value=ONE_MIN_SECS,
         native_max_value=HALF_DAY_SECS,
@@ -81,7 +81,7 @@ FAN_NUMBER_DESCRIPTIONS = (
     ),
     BAFNumberDescription(
         key="motion_sense_timeout",
-        name="Motion Sense Timeout",
+        translation_key="motion_sense_timeout",
         native_step=1,
         native_min_value=ONE_MIN_SECS,
         native_max_value=ONE_DAY_SECS,
@@ -95,7 +95,7 @@ FAN_NUMBER_DESCRIPTIONS = (
 LIGHT_NUMBER_DESCRIPTIONS = (
     BAFNumberDescription(
         key="light_return_to_auto_timeout",
-        name="Light Return to Auto Timeout",
+        translation_key="light_return_to_auto_timeout",
         native_step=1,
         native_min_value=ONE_MIN_SECS,
         native_max_value=HALF_DAY_SECS,
@@ -106,7 +106,7 @@ LIGHT_NUMBER_DESCRIPTIONS = (
     ),
     BAFNumberDescription(
         key="light_auto_motion_timeout",
-        name="Light Motion Sense Timeout",
+        translation_key="light_auto_motion_timeout",
         native_step=1,
         native_min_value=ONE_MIN_SECS,
         native_max_value=ONE_DAY_SECS,
@@ -144,7 +144,7 @@ class BAFNumber(BAFEntity, NumberEntity):
     def __init__(self, device: Device, description: BAFNumberDescription) -> None:
         """Initialize the entity."""
         self.entity_description = description
-        super().__init__(device, f"{device.name} {description.name}")
+        super().__init__(device)
         self._attr_unique_id = f"{self._device.mac_address}-{description.key}"
 
     @callback
diff --git a/homeassistant/components/baf/sensor.py b/homeassistant/components/baf/sensor.py
index d8700886e0a..d8111804142 100644
--- a/homeassistant/components/baf/sensor.py
+++ b/homeassistant/components/baf/sensor.py
@@ -46,7 +46,6 @@ class BAFSensorDescription(
 AUTO_COMFORT_SENSORS = (
     BAFSensorDescription(
         key="temperature",
-        name="Temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -57,7 +56,6 @@ AUTO_COMFORT_SENSORS = (
 DEFINED_ONLY_SENSORS = (
     BAFSensorDescription(
         key="humidity",
-        name="Humidity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
@@ -68,7 +66,7 @@ DEFINED_ONLY_SENSORS = (
 FAN_SENSORS = (
     BAFSensorDescription(
         key="current_rpm",
-        name="Current RPM",
+        translation_key="current_rpm",
         native_unit_of_measurement=REVOLUTIONS_PER_MINUTE,
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -76,7 +74,7 @@ FAN_SENSORS = (
     ),
     BAFSensorDescription(
         key="target_rpm",
-        name="Target RPM",
+        translation_key="target_rpm",
         native_unit_of_measurement=REVOLUTIONS_PER_MINUTE,
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -84,14 +82,14 @@ FAN_SENSORS = (
     ),
     BAFSensorDescription(
         key="wifi_ssid",
-        name="WiFi SSID",
+        translation_key="wifi_ssid",
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: cast(int | None, device.wifi_ssid),
     ),
     BAFSensorDescription(
         key="ip_address",
-        name="IP Address",
+        translation_key="ip_address",
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: cast(str | None, device.ip_address),
@@ -128,7 +126,7 @@ class BAFSensor(BAFEntity, SensorEntity):
     def __init__(self, device: Device, description: BAFSensorDescription) -> None:
         """Initialize the entity."""
         self.entity_description = description
-        super().__init__(device, f"{device.name} {description.name}")
+        super().__init__(device)
         self._attr_unique_id = f"{self._device.mac_address}-{description.key}"
 
     @callback
diff --git a/homeassistant/components/baf/strings.json b/homeassistant/components/baf/strings.json
index 59a20ea400c..cb322320675 100644
--- a/homeassistant/components/baf/strings.json
+++ b/homeassistant/components/baf/strings.json
@@ -19,5 +19,81 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
+  },
+  "entity": {
+    "climate": {
+      "auto_comfort": {
+        "name": "Auto comfort"
+      }
+    },
+    "number": {
+      "comfort_min_speed": {
+        "name": "Auto Comfort Minimum Speed"
+      },
+      "comfort_max_speed": {
+        "name": "Auto Comfort Maximum Speed"
+      },
+      "comfort_heat_assist_speed": {
+        "name": "Auto Comfort Heat Assist Speed"
+      },
+      "return_to_auto_timeout": {
+        "name": "Return to Auto Timeout"
+      },
+      "motion_sense_timeout": {
+        "name": "Motion Sense Timeout"
+      },
+      "light_return_to_auto_timeout": {
+        "name": "Light Return to Auto Timeout"
+      },
+      "light_auto_motion_timeout": {
+        "name": "Light Motion Sense Timeout"
+      }
+    },
+    "sensor": {
+      "current_rpm": {
+        "name": "Current RPM"
+      },
+      "target_rpm": {
+        "name": "Target RPM"
+      },
+      "wifi_ssid": {
+        "name": "Wi-Fi SSID"
+      },
+      "ip_address": {
+        "name": "IP Address"
+      }
+    },
+    "switch": {
+      "legacy_ir_remote_enable": {
+        "name": "Legacy IR Remote"
+      },
+      "led_indicators_enable": {
+        "name": "Led Indicators"
+      },
+      "comfort_heat_assist_enable": {
+        "name": "Auto Comfort Heat Assist"
+      },
+      "fan_beep_enable": {
+        "name": "Beep"
+      },
+      "eco_enable": {
+        "name": "Eco Mode"
+      },
+      "motion_sense_enable": {
+        "name": "Motion Sense"
+      },
+      "return_to_auto_enable": {
+        "name": "Return to Auto"
+      },
+      "whoosh_enable": {
+        "name": "Whoosh"
+      },
+      "light_dim_to_warm_enable": {
+        "name": "Dim to Warm"
+      },
+      "light_return_to_auto_enable": {
+        "name": "Light Return to Auto"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/baf/switch.py b/homeassistant/components/baf/switch.py
index d5236f9b861..ed4e635ece3 100644
--- a/homeassistant/components/baf/switch.py
+++ b/homeassistant/components/baf/switch.py
@@ -36,13 +36,13 @@ class BAFSwitchDescription(
 BASE_SWITCHES = [
     BAFSwitchDescription(
         key="legacy_ir_remote_enable",
-        name="Legacy IR Remote",
+        translation_key="legacy_ir_remote_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.legacy_ir_remote_enable),
     ),
     BAFSwitchDescription(
         key="led_indicators_enable",
-        name="Led Indicators",
+        translation_key="led_indicators_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.led_indicators_enable),
     ),
@@ -51,7 +51,7 @@ BASE_SWITCHES = [
 AUTO_COMFORT_SWITCHES = [
     BAFSwitchDescription(
         key="comfort_heat_assist_enable",
-        name="Auto Comfort Heat Assist",
+        translation_key="comfort_heat_assist_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.comfort_heat_assist_enable),
     ),
@@ -60,31 +60,31 @@ AUTO_COMFORT_SWITCHES = [
 FAN_SWITCHES = [
     BAFSwitchDescription(
         key="fan_beep_enable",
-        name="Beep",
+        translation_key="fan_beep_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.fan_beep_enable),
     ),
     BAFSwitchDescription(
         key="eco_enable",
-        name="Eco Mode",
+        translation_key="eco_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.eco_enable),
     ),
     BAFSwitchDescription(
         key="motion_sense_enable",
-        name="Motion Sense",
+        translation_key="motion_sense_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.motion_sense_enable),
     ),
     BAFSwitchDescription(
         key="return_to_auto_enable",
-        name="Return to Auto",
+        translation_key="return_to_auto_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.return_to_auto_enable),
     ),
     BAFSwitchDescription(
         key="whoosh_enable",
-        name="Whoosh",
+        translation_key="whoosh_enable",
         # Not a configuration switch
         value_fn=lambda device: cast(bool | None, device.whoosh_enable),
     ),
@@ -94,13 +94,13 @@ FAN_SWITCHES = [
 LIGHT_SWITCHES = [
     BAFSwitchDescription(
         key="light_dim_to_warm_enable",
-        name="Dim to Warm",
+        translation_key="light_dim_to_warm_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.light_dim_to_warm_enable),
     ),
     BAFSwitchDescription(
         key="light_return_to_auto_enable",
-        name="Light Return to Auto",
+        translation_key="light_return_to_auto_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.light_return_to_auto_enable),
     ),
@@ -134,7 +134,7 @@ class BAFSwitch(BAFEntity, SwitchEntity):
     def __init__(self, device: Device, description: BAFSwitchDescription) -> None:
         """Initialize the entity."""
         self.entity_description = description
-        super().__init__(device, f"{device.name} {description.name}")
+        super().__init__(device)
         self._attr_unique_id = f"{self._device.mac_address}-{description.key}"
 
     @callback
diff --git a/homeassistant/components/balboa/binary_sensor.py b/homeassistant/components/balboa/binary_sensor.py
index 11a0cae0a01..9f363746a8f 100644
--- a/homeassistant/components/balboa/binary_sensor.py
+++ b/homeassistant/components/balboa/binary_sensor.py
@@ -47,6 +47,10 @@ class BalboaBinarySensorEntityDescription(
 ):
     """A class that describes Balboa binary sensor entities."""
 
+    # BalboaBinarySensorEntity does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
 
 FILTER_CYCLE_ICONS = ("mdi:sync", "mdi:sync-off")
 BINARY_SENSOR_DESCRIPTIONS = (
diff --git a/homeassistant/components/balboa/climate.py b/homeassistant/components/balboa/climate.py
index 06e8d265502..0d0fa9bd179 100644
--- a/homeassistant/components/balboa/climate.py
+++ b/homeassistant/components/balboa/climate.py
@@ -78,7 +78,7 @@ class BalboaClimateEntity(BalboaEntity, ClimateEntity):
         return HEAT_HVAC_MODE_MAP.get(self._client.heat_mode.state)
 
     @property
-    def hvac_action(self) -> str:
+    def hvac_action(self) -> HVACAction:
         """Return the current operation mode."""
         return HEAT_STATE_HVAC_ACTION_MAP[self._client.heat_state]
 
diff --git a/homeassistant/components/beewi_smartclim/manifest.json b/homeassistant/components/beewi_smartclim/manifest.json
index f238c76d366..3555f9181bb 100644
--- a/homeassistant/components/beewi_smartclim/manifest.json
+++ b/homeassistant/components/beewi_smartclim/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/beewi_smartclim",
   "iot_class": "local_polling",
   "loggers": ["beewi_smartclim"],
-  "requirements": ["beewi_smartclim==0.0.10"]
+  "requirements": ["beewi-smartclim==0.0.10"]
 }
diff --git a/homeassistant/components/binary_sensor/__init__.py b/homeassistant/components/binary_sensor/__init__.py
index d99f569ed59..1c2d6d779fb 100644
--- a/homeassistant/components/binary_sensor/__init__.py
+++ b/homeassistant/components/binary_sensor/__init__.py
@@ -190,6 +190,13 @@ class BinarySensorEntity(Entity):
     _attr_is_on: bool | None = None
     _attr_state: None = None
 
+    def _default_to_device_class_name(self) -> bool:
+        """Return True if an unnamed entity should be named by its device class.
+
+        For binary sensors this is True if the entity has a device class.
+        """
+        return self.device_class is not None
+
     @property
     def device_class(self) -> BinarySensorDeviceClass | None:
         """Return the class of this entity."""
diff --git a/homeassistant/components/binary_sensor/device_condition.py b/homeassistant/components/binary_sensor/device_condition.py
index 4da9bd45670..81d2ebf26a2 100644
--- a/homeassistant/components/binary_sensor/device_condition.py
+++ b/homeassistant/components/binary_sensor/device_condition.py
@@ -256,7 +256,7 @@ ENTITY_CONDITIONS = {
 
 CONDITION_SCHEMA = cv.DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(IS_OFF + IS_ON),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -287,7 +287,7 @@ async def async_get_conditions(
                 **template,
                 "condition": "device",
                 "device_id": device_id,
-                "entity_id": entry.entity_id,
+                "entity_id": entry.id,
                 "domain": DOMAIN,
             }
             for template in templates
diff --git a/homeassistant/components/binary_sensor/device_trigger.py b/homeassistant/components/binary_sensor/device_trigger.py
index b2fd371a260..de6dbdbe075 100644
--- a/homeassistant/components/binary_sensor/device_trigger.py
+++ b/homeassistant/components/binary_sensor/device_trigger.py
@@ -112,8 +112,8 @@ ENTITY_TRIGGERS = {
         {CONF_TYPE: CONF_NO_LIGHT},
     ],
     BinarySensorDeviceClass.LOCK: [
-        {CONF_TYPE: CONF_LOCKED},
         {CONF_TYPE: CONF_NOT_LOCKED},
+        {CONF_TYPE: CONF_LOCKED},
     ],
     BinarySensorDeviceClass.MOISTURE: [
         {CONF_TYPE: CONF_MOIST},
@@ -195,7 +195,7 @@ TURNED_OFF = [trigger[1][CONF_TYPE] for trigger in ENTITY_TRIGGERS.values()]
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TURNED_OFF + TURNED_ON),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -254,7 +254,7 @@ async def async_get_triggers(
                 **automation,
                 "platform": "device",
                 "device_id": device_id,
-                "entity_id": entry.entity_id,
+                "entity_id": entry.id,
                 "domain": DOMAIN,
             }
             for automation in templates
diff --git a/homeassistant/components/binary_sensor/strings.json b/homeassistant/components/binary_sensor/strings.json
index ca349e19328..b9c9b19a93c 100644
--- a/homeassistant/components/binary_sensor/strings.json
+++ b/homeassistant/components/binary_sensor/strings.json
@@ -302,7 +302,7 @@
     }
   },
   "device_class": {
-    "co": "carbon_monoxide",
+    "co": "carbon monoxide",
     "cold": "cold",
     "gas": "gas",
     "heat": "heat",
diff --git a/homeassistant/components/blebox/manifest.json b/homeassistant/components/blebox/manifest.json
index 8cb7ddb5c1e..b639e28d698 100644
--- a/homeassistant/components/blebox/manifest.json
+++ b/homeassistant/components/blebox/manifest.json
@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/blebox",
   "iot_class": "local_polling",
   "loggers": ["blebox_uniapi"],
-  "requirements": ["blebox_uniapi==2.1.4"],
+  "requirements": ["blebox-uniapi==2.1.4"],
   "zeroconf": ["_bbxsrv._tcp.local."]
 }
diff --git a/homeassistant/components/blink/__init__.py b/homeassistant/components/blink/__init__.py
index 668a7f99c02..b94a77fbf18 100644
--- a/homeassistant/components/blink/__init__.py
+++ b/homeassistant/components/blink/__init__.py
@@ -8,7 +8,13 @@ import voluptuous as vol
 
 from homeassistant.components import persistent_notification
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntry
-from homeassistant.const import CONF_FILENAME, CONF_NAME, CONF_PIN, CONF_SCAN_INTERVAL
+from homeassistant.const import (
+    CONF_FILE_PATH,
+    CONF_FILENAME,
+    CONF_NAME,
+    CONF_PIN,
+    CONF_SCAN_INTERVAL,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv
@@ -18,6 +24,7 @@ from .const import (
     DOMAIN,
     PLATFORMS,
     SERVICE_REFRESH,
+    SERVICE_SAVE_RECENT_CLIPS,
     SERVICE_SAVE_VIDEO,
     SERVICE_SEND_PIN,
 )
@@ -28,6 +35,9 @@ SERVICE_SAVE_VIDEO_SCHEMA = vol.Schema(
     {vol.Required(CONF_NAME): cv.string, vol.Required(CONF_FILENAME): cv.string}
 )
 SERVICE_SEND_PIN_SCHEMA = vol.Schema({vol.Optional(CONF_PIN): cv.string})
+SERVICE_SAVE_RECENT_CLIPS_SCHEMA = vol.Schema(
+    {vol.Required(CONF_NAME): cv.string, vol.Required(CONF_FILE_PATH): cv.string}
+)
 
 
 def _blink_startup_wrapper(hass: HomeAssistant, entry: ConfigEntry) -> Blink:
@@ -100,6 +110,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         """Call save video service handler."""
         await async_handle_save_video_service(hass, entry, call)
 
+    async def async_save_recent_clips(call):
+        """Call save recent clips service handler."""
+        await async_handle_save_recent_clips_service(hass, entry, call)
+
     def send_pin(call):
         """Call blink to send new pin."""
         pin = call.data[CONF_PIN]
@@ -112,6 +126,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     hass.services.async_register(
         DOMAIN, SERVICE_SAVE_VIDEO, async_save_video, schema=SERVICE_SAVE_VIDEO_SCHEMA
     )
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_SAVE_RECENT_CLIPS,
+        async_save_recent_clips,
+        schema=SERVICE_SAVE_RECENT_CLIPS_SCHEMA,
+    )
     hass.services.async_register(
         DOMAIN, SERVICE_SEND_PIN, send_pin, schema=SERVICE_SEND_PIN_SCHEMA
     )
@@ -164,13 +184,33 @@ async def async_handle_save_video_service(hass, entry, call):
         _LOGGER.error("Can't write %s, no access to path!", video_path)
         return
 
-    def _write_video(camera_name, video_path):
+    def _write_video(name, file_path):
         """Call video write."""
         all_cameras = hass.data[DOMAIN][entry.entry_id].cameras
-        if camera_name in all_cameras:
-            all_cameras[camera_name].video_to_file(video_path)
+        if name in all_cameras:
+            all_cameras[name].video_to_file(file_path)
 
     try:
         await hass.async_add_executor_job(_write_video, camera_name, video_path)
     except OSError as err:
         _LOGGER.error("Can't write image to file: %s", err)
+
+
+async def async_handle_save_recent_clips_service(hass, entry, call):
+    """Save multiple recent clips to output directory."""
+    camera_name = call.data[CONF_NAME]
+    clips_dir = call.data[CONF_FILE_PATH]
+    if not hass.config.is_allowed_path(clips_dir):
+        _LOGGER.error("Can't write to directory %s, no access to path!", clips_dir)
+        return
+
+    def _save_recent_clips(name, output_dir):
+        """Call save recent clips."""
+        all_cameras = hass.data[DOMAIN][entry.entry_id].cameras
+        if name in all_cameras:
+            all_cameras[name].save_recent_clips(output_dir=output_dir)
+
+    try:
+        await hass.async_add_executor_job(_save_recent_clips, camera_name, clips_dir)
+    except OSError as err:
+        _LOGGER.error("Can't write recent clips to directory: %s", err)
diff --git a/homeassistant/components/blink/alarm_control_panel.py b/homeassistant/components/blink/alarm_control_panel.py
index 22a142ff44c..5d0ea67f31d 100644
--- a/homeassistant/components/blink/alarm_control_panel.py
+++ b/homeassistant/components/blink/alarm_control_panel.py
@@ -41,6 +41,7 @@ class BlinkSyncModule(AlarmControlPanelEntity):
 
     _attr_icon = ICON
     _attr_supported_features = AlarmControlPanelEntityFeature.ARM_AWAY
+    _attr_name = None
 
     def __init__(self, data, name, sync):
         """Initialize the alarm control panel."""
@@ -48,15 +49,23 @@ class BlinkSyncModule(AlarmControlPanelEntity):
         self.sync = sync
         self._name = name
         self._attr_unique_id = sync.serial
-        self._attr_name = f"{DOMAIN} {name}"
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, sync.serial)}, name=name, manufacturer=DEFAULT_BRAND
+            identifiers={(DOMAIN, sync.serial)},
+            name=f"{DOMAIN} {name}",
+            manufacturer=DEFAULT_BRAND,
         )
 
     def update(self) -> None:
         """Update the state of the device."""
-        _LOGGER.debug("Updating Blink Alarm Control Panel %s", self._name)
-        self.data.refresh()
+        if self.data.check_if_ok_to_update():
+            _LOGGER.debug(
+                "Initiating a blink.refresh() from BlinkSyncModule('%s') (%s)",
+                self._name,
+                self.data,
+            )
+            self.data.refresh()
+            _LOGGER.info("Updating State of Blink Alarm Control Panel '%s'", self._name)
+
         self._attr_state = (
             STATE_ALARM_ARMED_AWAY if self.sync.arm else STATE_ALARM_DISARMED
         )
diff --git a/homeassistant/components/blink/binary_sensor.py b/homeassistant/components/blink/binary_sensor.py
index 9454daa85ec..c7daf0ec1e1 100644
--- a/homeassistant/components/blink/binary_sensor.py
+++ b/homeassistant/components/blink/binary_sensor.py
@@ -1,6 +1,8 @@
 """Support for Blink system camera control."""
 from __future__ import annotations
 
+import logging
+
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
@@ -20,20 +22,20 @@ from .const import (
     TYPE_MOTION_DETECTED,
 )
 
+_LOGGER = logging.getLogger(__name__)
+
 BINARY_SENSORS_TYPES: tuple[BinarySensorEntityDescription, ...] = (
     BinarySensorEntityDescription(
         key=TYPE_BATTERY,
-        name="Battery",
         device_class=BinarySensorDeviceClass.BATTERY,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     BinarySensorEntityDescription(
         key=TYPE_CAMERA_ARMED,
-        name="Camera Armed",
+        translation_key="camera_armed",
     ),
     BinarySensorEntityDescription(
         key=TYPE_MOTION_DETECTED,
-        name="Motion Detected",
         device_class=BinarySensorDeviceClass.MOTION,
     ),
 )
@@ -74,8 +76,13 @@ class BlinkBinarySensor(BinarySensorEntity):
 
     def update(self) -> None:
         """Update sensor state."""
-        self.data.refresh()
         state = self._camera.attributes[self.entity_description.key]
+        _LOGGER.debug(
+            "'%s' %s = %s",
+            self._camera.attributes["name"],
+            self.entity_description.key,
+            state,
+        )
         if self.entity_description.key == TYPE_BATTERY:
             state = state != "ok"
         self._attr_is_on = state
diff --git a/homeassistant/components/blink/camera.py b/homeassistant/components/blink/camera.py
index e500eb79e42..e74555f8db9 100644
--- a/homeassistant/components/blink/camera.py
+++ b/homeassistant/components/blink/camera.py
@@ -38,11 +38,12 @@ async def async_setup_entry(
 class BlinkCamera(Camera):
     """An implementation of a Blink Camera."""
 
+    _attr_name = None
+
     def __init__(self, data, name, camera):
         """Initialize a camera."""
         super().__init__()
         self.data = data
-        self._attr_name = f"{DOMAIN} {name}"
         self._camera = camera
         self._attr_unique_id = f"{camera.serial}-camera"
         self._attr_device_info = DeviceInfo(
diff --git a/homeassistant/components/blink/const.py b/homeassistant/components/blink/const.py
index 8986782031f..d58920562f4 100644
--- a/homeassistant/components/blink/const.py
+++ b/homeassistant/components/blink/const.py
@@ -23,6 +23,7 @@ TYPE_WIFI_STRENGTH = "wifi_strength"
 SERVICE_REFRESH = "blink_update"
 SERVICE_TRIGGER = "trigger_camera"
 SERVICE_SAVE_VIDEO = "save_video"
+SERVICE_SAVE_RECENT_CLIPS = "save_recent_clips"
 SERVICE_SEND_PIN = "send_pin"
 
 PLATFORMS = [
diff --git a/homeassistant/components/blink/sensor.py b/homeassistant/components/blink/sensor.py
index c051fef98f4..c996a90e54d 100644
--- a/homeassistant/components/blink/sensor.py
+++ b/homeassistant/components/blink/sensor.py
@@ -25,14 +25,13 @@ _LOGGER = logging.getLogger(__name__)
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key=TYPE_TEMPERATURE,
-        name="Temperature",
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
         device_class=SensorDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     SensorEntityDescription(
         key=TYPE_WIFI_STRENGTH,
-        name="Wifi Signal",
+        translation_key="wifi_rssi",
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -57,10 +56,11 @@ async def async_setup_entry(
 class BlinkSensor(SensorEntity):
     """A Blink camera sensor."""
 
+    _attr_has_entity_name = True
+
     def __init__(self, data, camera, description: SensorEntityDescription) -> None:
         """Initialize sensors from Blink camera."""
         self.entity_description = description
-        self._attr_name = f"{DOMAIN} {camera} {description.name}"
         self.data = data
         self._camera = data.cameras[camera]
         self._attr_unique_id = f"{self._camera.serial}-{description.key}"
@@ -71,16 +71,21 @@ class BlinkSensor(SensorEntity):
         )
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, self._camera.serial)},
-            name=camera,
+            name=f"{DOMAIN} {camera}",
             manufacturer=DEFAULT_BRAND,
             model=self._camera.camera_type,
         )
 
     def update(self) -> None:
         """Retrieve sensor data from the camera."""
-        self.data.refresh()
         try:
             self._attr_native_value = self._camera.attributes[self._sensor_key]
+            _LOGGER.debug(
+                "'%s' %s = %s",
+                self._camera.attributes["name"],
+                self._sensor_key,
+                self._attr_native_value,
+            )
         except KeyError:
             self._attr_native_value = None
             _LOGGER.error(
diff --git a/homeassistant/components/blink/services.yaml b/homeassistant/components/blink/services.yaml
index 89af4799c85..3d51ba2f7bb 100644
--- a/homeassistant/components/blink/services.yaml
+++ b/homeassistant/components/blink/services.yaml
@@ -25,12 +25,31 @@ save_video:
         text:
     filename:
       name: File name
-      description: Filename to writable path (directory may need to be included in whitelist_dirs in config)
+      description: Filename to writable path (directory may need to be included in allowlist_external_dirs in config)
       required: true
       example: "/tmp/video.mp4"
       selector:
         text:
 
+save_recent_clips:
+  name: Save recent clips
+  description: 'Save all recent video clips to local directory with file pattern "%Y%m%d_%H%M%S_{name}.mp4"'
+  fields:
+    name:
+      name: Name
+      description: Name of camera to grab recent clips from.
+      required: true
+      example: "Living Room"
+      selector:
+        text:
+    file_path:
+      name: Output directory
+      description: Directory name of writable path (directory may need to be included in allowlist_external_dirs in config)
+      required: true
+      example: "/tmp"
+      selector:
+        text:
+
 send_pin:
   name: Send pin
   description: Send a new PIN to blink for 2FA.
diff --git a/homeassistant/components/blink/strings.json b/homeassistant/components/blink/strings.json
index ae04f37714b..61c9a21af37 100644
--- a/homeassistant/components/blink/strings.json
+++ b/homeassistant/components/blink/strings.json
@@ -34,5 +34,17 @@
         "description": "Configure Blink integration"
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "wifi_rssi": {
+        "name": "Wi-Fi RSSI"
+      }
+    },
+    "binary_sensor": {
+      "camera_armed": {
+        "name": "Camera armed"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/blinksticklight/manifest.json b/homeassistant/components/blinksticklight/manifest.json
index 70e5c2a4672..e3a6638f2a9 100644
--- a/homeassistant/components/blinksticklight/manifest.json
+++ b/homeassistant/components/blinksticklight/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/blinksticklight",
   "iot_class": "local_polling",
   "loggers": ["blinkstick"],
-  "requirements": ["blinkstick==1.2.0"]
+  "requirements": ["BlinkStick==1.2.0"]
 }
diff --git a/homeassistant/components/blueprint/importer.py b/homeassistant/components/blueprint/importer.py
index d857992a13c..4517d134e69 100644
--- a/homeassistant/components/blueprint/importer.py
+++ b/homeassistant/components/blueprint/importer.py
@@ -1,6 +1,8 @@
 """Import logic for blueprint."""
+
 from __future__ import annotations
 
+from contextlib import suppress
 from dataclasses import dataclass
 import html
 import re
@@ -28,6 +30,10 @@ GITHUB_FILE_PATTERN = re.compile(
     r"^https://github.com/(?P<repository>.+)/blob/(?P<path>.+)$"
 )
 
+WEBSITE_PATTERN = re.compile(
+    r"^https://(?P<subdomain>[a-z0-9-]+)\.home-assistant\.io/(?P<path>.+).yaml$"
+)
+
 COMMUNITY_TOPIC_SCHEMA = vol.Schema(
     {
         "slug": str,
@@ -219,18 +225,37 @@ async def fetch_blueprint_from_github_gist_url(
     )
 
 
+async def fetch_blueprint_from_website_url(
+    hass: HomeAssistant, url: str
+) -> ImportedBlueprint:
+    """Get a blueprint from our website."""
+    if (WEBSITE_PATTERN.match(url)) is None:
+        raise UnsupportedUrl("Not a Home Assistant website URL")
+
+    session = aiohttp_client.async_get_clientsession(hass)
+
+    resp = await session.get(url, raise_for_status=True)
+    raw_yaml = await resp.text()
+    data = yaml.parse_yaml(raw_yaml)
+    assert isinstance(data, dict)
+    blueprint = Blueprint(data)
+
+    parsed_import_url = yarl.URL(url)
+    suggested_filename = f"homeassistant/{parsed_import_url.parts[-1][:-5]}"
+    return ImportedBlueprint(suggested_filename, raw_yaml, blueprint)
+
+
 async def fetch_blueprint_from_url(hass: HomeAssistant, url: str) -> ImportedBlueprint:
     """Get a blueprint from a url."""
     for func in (
         fetch_blueprint_from_community_post,
         fetch_blueprint_from_github_url,
         fetch_blueprint_from_github_gist_url,
+        fetch_blueprint_from_website_url,
     ):
-        try:
+        with suppress(UnsupportedUrl):
             imported_bp = await func(hass, url)
             imported_bp.blueprint.update_metadata(source_url=url)
             return imported_bp
-        except UnsupportedUrl:
-            pass
 
-    raise HomeAssistantError("Unsupported url")
+    raise HomeAssistantError("Unsupported URL")
diff --git a/homeassistant/components/bluetooth/__init__.py b/homeassistant/components/bluetooth/__init__.py
index 8d3bc0ae5e2..bf4dbf81f01 100644
--- a/homeassistant/components/bluetooth/__init__.py
+++ b/homeassistant/components/bluetooth/__init__.py
@@ -76,7 +76,7 @@ from .models import (
     BluetoothScanningMode,
     HaBluetoothConnector,
 )
-from .scanner import HaScanner, ScannerStartError
+from .scanner import MONOTONIC_TIME, HaScanner, ScannerStartError
 from .storage import BluetoothStorage
 
 if TYPE_CHECKING:
@@ -108,6 +108,7 @@ __all__ = [
     "HaBluetoothConnector",
     "SOURCE_LOCAL",
     "FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS",
+    "MONOTONIC_TIME",
 ]
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/bluetooth/base_scanner.py b/homeassistant/components/bluetooth/base_scanner.py
index 8f7750fe322..e8de285138e 100644
--- a/homeassistant/components/bluetooth/base_scanner.py
+++ b/homeassistant/components/bluetooth/base_scanner.py
@@ -299,10 +299,10 @@ class BaseHaRemoteScanner(BaseHaScanner):
         manufacturer_data: dict[int, bytes],
         tx_power: int | None,
         details: dict[Any, Any],
+        advertisement_monotonic_time: float,
     ) -> None:
         """Call the registered callback."""
-        now = MONOTONIC_TIME()
-        self._last_detection = now
+        self._last_detection = advertisement_monotonic_time
         if prev_discovery := self._discovered_device_advertisement_datas.get(address):
             # Merge the new data with the old data
             # to function the same as BlueZ which
@@ -365,7 +365,7 @@ class BaseHaRemoteScanner(BaseHaScanner):
             device,
             advertisement_data,
         )
-        self._discovered_device_timestamps[address] = now
+        self._discovered_device_timestamps[address] = advertisement_monotonic_time
         self._new_info_callback(
             BluetoothServiceInfoBleak(
                 name=local_name or address,
@@ -378,7 +378,7 @@ class BaseHaRemoteScanner(BaseHaScanner):
                 device=device,
                 advertisement=advertisement_data,
                 connectable=self.connectable,
-                time=now,
+                time=advertisement_monotonic_time,
             )
         )
 
diff --git a/homeassistant/components/bluetooth/manager.py b/homeassistant/components/bluetooth/manager.py
index 3210822e795..f1221290c74 100644
--- a/homeassistant/components/bluetooth/manager.py
+++ b/homeassistant/components/bluetooth/manager.py
@@ -246,9 +246,12 @@ class BluetoothManager:
         self, address: str, connectable: bool
     ) -> list[BluetoothScannerDevice]:
         """Get BluetoothScannerDevice by address."""
-        scanners = self._get_scanners_by_type(True)
         if not connectable:
-            scanners.extend(self._get_scanners_by_type(False))
+            scanners: Iterable[BaseHaScanner] = itertools.chain(
+                self._connectable_scanners, self._non_connectable_scanners
+            )
+        else:
+            scanners = self._connectable_scanners
         return [
             BluetoothScannerDevice(scanner, *device_adv)
             for scanner in scanners
@@ -267,21 +270,19 @@ class BluetoothManager:
         """
         yield from itertools.chain.from_iterable(
             scanner.discovered_devices_and_advertisement_data
-            for scanner in self._get_scanners_by_type(True)
+            for scanner in self._connectable_scanners
         )
         if not connectable:
             yield from itertools.chain.from_iterable(
                 scanner.discovered_devices_and_advertisement_data
-                for scanner in self._get_scanners_by_type(False)
+                for scanner in self._non_connectable_scanners
             )
 
     @hass_callback
     def async_discovered_devices(self, connectable: bool) -> list[BLEDevice]:
         """Return all of combined best path to discovered from all the scanners."""
-        return [
-            history.device
-            for history in self._get_history_by_type(connectable).values()
-        ]
+        histories = self._connectable_history if connectable else self._all_history
+        return [history.device for history in histories.values()]
 
     @hass_callback
     def async_setup_unavailable_tracking(self) -> None:
@@ -303,7 +304,10 @@ class BluetoothManager:
         intervals = tracker.intervals
 
         for connectable in (True, False):
-            unavailable_callbacks = self._get_unavailable_callbacks_by_type(connectable)
+            if connectable:
+                unavailable_callbacks = self._connectable_unavailable_callbacks
+            else:
+                unavailable_callbacks = self._unavailable_callbacks
             history = connectable_history if connectable else all_history
             disappeared = set(history).difference(
                 self._async_all_discovered_addresses(connectable)
@@ -583,7 +587,10 @@ class BluetoothManager:
         connectable: bool,
     ) -> Callable[[], None]:
         """Register a callback."""
-        unavailable_callbacks = self._get_unavailable_callbacks_by_type(connectable)
+        if connectable:
+            unavailable_callbacks = self._connectable_unavailable_callbacks
+        else:
+            unavailable_callbacks = self._unavailable_callbacks
         unavailable_callbacks.setdefault(address, []).append(callback)
 
         @hass_callback
@@ -620,13 +627,13 @@ class BluetoothManager:
         # If we have history for the subscriber, we can trigger the callback
         # immediately with the last packet so the subscriber can see the
         # device.
-        all_history = self._get_history_by_type(connectable)
+        history = self._connectable_history if connectable else self._all_history
         service_infos: Iterable[BluetoothServiceInfoBleak] = []
         if address := callback_matcher.get(ADDRESS):
-            if service_info := all_history.get(address):
+            if service_info := history.get(address):
                 service_infos = [service_info]
         else:
-            service_infos = all_history.values()
+            service_infos = history.values()
 
         for service_info in service_infos:
             if ble_device_matches(callback_matcher, service_info):
@@ -642,29 +649,32 @@ class BluetoothManager:
         self, address: str, connectable: bool
     ) -> BLEDevice | None:
         """Return the BLEDevice if present."""
-        all_history = self._get_history_by_type(connectable)
-        if history := all_history.get(address):
+        histories = self._connectable_history if connectable else self._all_history
+        if history := histories.get(address):
             return history.device
         return None
 
     @hass_callback
     def async_address_present(self, address: str, connectable: bool) -> bool:
         """Return if the address is present."""
-        return address in self._get_history_by_type(connectable)
+        histories = self._connectable_history if connectable else self._all_history
+        return address in histories
 
     @hass_callback
     def async_discovered_service_info(
         self, connectable: bool
     ) -> Iterable[BluetoothServiceInfoBleak]:
         """Return all the discovered services info."""
-        return self._get_history_by_type(connectable).values()
+        histories = self._connectable_history if connectable else self._all_history
+        return histories.values()
 
     @hass_callback
     def async_last_service_info(
         self, address: str, connectable: bool
     ) -> BluetoothServiceInfoBleak | None:
         """Return the last service info for an address."""
-        return self._get_history_by_type(connectable).get(address)
+        histories = self._connectable_history if connectable else self._all_history
+        return histories.get(address)
 
     def _async_trigger_matching_discovery(
         self, service_info: BluetoothServiceInfoBleak
@@ -688,26 +698,6 @@ class BluetoothManager:
         if service_info := self._all_history.get(address):
             self._async_trigger_matching_discovery(service_info)
 
-    def _get_scanners_by_type(self, connectable: bool) -> list[BaseHaScanner]:
-        """Return the scanners by type."""
-        if connectable:
-            return self._connectable_scanners
-        return self._non_connectable_scanners
-
-    def _get_unavailable_callbacks_by_type(
-        self, connectable: bool
-    ) -> dict[str, list[Callable[[BluetoothServiceInfoBleak], None]]]:
-        """Return the unavailable callbacks by type."""
-        if connectable:
-            return self._connectable_unavailable_callbacks
-        return self._unavailable_callbacks
-
-    def _get_history_by_type(
-        self, connectable: bool
-    ) -> dict[str, BluetoothServiceInfoBleak]:
-        """Return the history by type."""
-        return self._connectable_history if connectable else self._all_history
-
     def async_register_scanner(
         self,
         scanner: BaseHaScanner,
@@ -716,7 +706,10 @@ class BluetoothManager:
     ) -> CALLBACK_TYPE:
         """Register a new scanner."""
         _LOGGER.debug("Registering scanner %s", scanner.name)
-        scanners = self._get_scanners_by_type(connectable)
+        if connectable:
+            scanners = self._connectable_scanners
+        else:
+            scanners = self._non_connectable_scanners
 
         def _unregister_scanner() -> None:
             _LOGGER.debug("Unregistering scanner %s", scanner.name)
diff --git a/homeassistant/components/bluetooth/manifest.json b/homeassistant/components/bluetooth/manifest.json
index 8d936b7286f..dbe8ac3f1ab 100644
--- a/homeassistant/components/bluetooth/manifest.json
+++ b/homeassistant/components/bluetooth/manifest.json
@@ -18,7 +18,7 @@
     "bleak-retry-connector==3.0.2",
     "bluetooth-adapters==0.15.3",
     "bluetooth-auto-recovery==1.2.0",
-    "bluetooth-data-tools==0.4.0",
+    "bluetooth-data-tools==1.3.0",
     "dbus-fast==1.86.0"
   ]
 }
diff --git a/homeassistant/components/bluetooth_tracker/manifest.json b/homeassistant/components/bluetooth_tracker/manifest.json
index b1411a41f87..0a0356e6669 100644
--- a/homeassistant/components/bluetooth_tracker/manifest.json
+++ b/homeassistant/components/bluetooth_tracker/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/bluetooth_tracker",
   "iot_class": "local_polling",
   "loggers": ["bluetooth", "bt_proximity"],
-  "requirements": ["bt_proximity==0.2.1", "pybluez==0.22"]
+  "requirements": ["bt-proximity==0.2.1", "PyBluez==0.22"]
 }
diff --git a/homeassistant/components/bmw_connected_drive/binary_sensor.py b/homeassistant/components/bmw_connected_drive/binary_sensor.py
index 640f4e3653b..c3be7ae189b 100644
--- a/homeassistant/components/bmw_connected_drive/binary_sensor.py
+++ b/homeassistant/components/bmw_connected_drive/binary_sensor.py
@@ -37,6 +37,7 @@ ALLOWED_CONDITION_BASED_SERVICE_KEYS = {
     "TIRE_WEAR_REAR",
     "VEHICLE_CHECK",
     "VEHICLE_TUV",
+    "WASHING_FLUID",
 }
 LOGGED_CONDITION_BASED_SERVICE_WARNINGS: set[str] = set()
 
@@ -122,7 +123,7 @@ class BMWBinarySensorEntityDescription(
 SENSOR_TYPES: tuple[BMWBinarySensorEntityDescription, ...] = (
     BMWBinarySensorEntityDescription(
         key="lids",
-        name="Lids",
+        translation_key="lids",
         device_class=BinarySensorDeviceClass.OPENING,
         icon="mdi:car-door-lock",
         # device class opening: On means open, Off means closed
@@ -133,7 +134,7 @@ SENSOR_TYPES: tuple[BMWBinarySensorEntityDescription, ...] = (
     ),
     BMWBinarySensorEntityDescription(
         key="windows",
-        name="Windows",
+        translation_key="windows",
         device_class=BinarySensorDeviceClass.OPENING,
         icon="mdi:car-door",
         # device class opening: On means open, Off means closed
@@ -144,7 +145,7 @@ SENSOR_TYPES: tuple[BMWBinarySensorEntityDescription, ...] = (
     ),
     BMWBinarySensorEntityDescription(
         key="door_lock_state",
-        name="Door lock state",
+        translation_key="door_lock_state",
         device_class=BinarySensorDeviceClass.LOCK,
         icon="mdi:car-key",
         # device class lock: On means unlocked, Off means locked
@@ -157,7 +158,7 @@ SENSOR_TYPES: tuple[BMWBinarySensorEntityDescription, ...] = (
     ),
     BMWBinarySensorEntityDescription(
         key="condition_based_services",
-        name="Condition based services",
+        translation_key="condition_based_services",
         device_class=BinarySensorDeviceClass.PROBLEM,
         icon="mdi:wrench",
         # device class problem: On means problem detected, Off means no problem
@@ -166,7 +167,7 @@ SENSOR_TYPES: tuple[BMWBinarySensorEntityDescription, ...] = (
     ),
     BMWBinarySensorEntityDescription(
         key="check_control_messages",
-        name="Check control messages",
+        translation_key="check_control_messages",
         device_class=BinarySensorDeviceClass.PROBLEM,
         icon="mdi:car-tire-alert",
         # device class problem: On means problem detected, Off means no problem
@@ -176,7 +177,7 @@ SENSOR_TYPES: tuple[BMWBinarySensorEntityDescription, ...] = (
     # electric
     BMWBinarySensorEntityDescription(
         key="charging_status",
-        name="Charging status",
+        translation_key="charging_status",
         device_class=BinarySensorDeviceClass.BATTERY_CHARGING,
         icon="mdi:ev-station",
         # device class power: On means power detected, Off means no power
@@ -184,14 +185,14 @@ SENSOR_TYPES: tuple[BMWBinarySensorEntityDescription, ...] = (
     ),
     BMWBinarySensorEntityDescription(
         key="connection_status",
-        name="Connection status",
+        translation_key="connection_status",
         device_class=BinarySensorDeviceClass.PLUG,
         icon="mdi:car-electric",
         value_fn=lambda v: v.fuel_and_battery.is_charger_connected,
     ),
     BMWBinarySensorEntityDescription(
         key="is_pre_entry_climatization_enabled",
-        name="Pre entry climatization",
+        translation_key="is_pre_entry_climatization_enabled",
         icon="mdi:car-seat-heater",
         value_fn=lambda v: v.charging_profile.is_pre_entry_climatization_enabled
         if v.charging_profile
diff --git a/homeassistant/components/bmw_connected_drive/button.py b/homeassistant/components/bmw_connected_drive/button.py
index 5285820b32d..6edb1a3f2ac 100644
--- a/homeassistant/components/bmw_connected_drive/button.py
+++ b/homeassistant/components/bmw_connected_drive/button.py
@@ -6,12 +6,14 @@ from dataclasses import dataclass
 import logging
 from typing import TYPE_CHECKING, Any
 
+from bimmer_connected.models import MyBMWAPIError
 from bimmer_connected.vehicle import MyBMWVehicle
 from bimmer_connected.vehicle.remote_services import RemoteServiceStatus
 
 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 . import BMWBaseEntity
@@ -32,37 +34,45 @@ class BMWButtonEntityDescription(ButtonEntityDescription):
         [MyBMWVehicle], Coroutine[Any, Any, RemoteServiceStatus]
     ] | None = None
     account_function: Callable[[BMWDataUpdateCoordinator], Coroutine] | None = None
+    is_available: Callable[[MyBMWVehicle], bool] = lambda _: True
 
 
 BUTTON_TYPES: tuple[BMWButtonEntityDescription, ...] = (
     BMWButtonEntityDescription(
         key="light_flash",
+        translation_key="light_flash",
         icon="mdi:car-light-alert",
-        name="Flash lights",
         remote_function=lambda vehicle: vehicle.remote_services.trigger_remote_light_flash(),
     ),
     BMWButtonEntityDescription(
         key="sound_horn",
+        translation_key="sound_horn",
         icon="mdi:bullhorn",
-        name="Sound horn",
         remote_function=lambda vehicle: vehicle.remote_services.trigger_remote_horn(),
     ),
     BMWButtonEntityDescription(
         key="activate_air_conditioning",
+        translation_key="activate_air_conditioning",
         icon="mdi:hvac",
-        name="Activate air conditioning",
         remote_function=lambda vehicle: vehicle.remote_services.trigger_remote_air_conditioning(),
     ),
+    BMWButtonEntityDescription(
+        key="deactivate_air_conditioning",
+        icon="mdi:hvac-off",
+        name="Deactivate air conditioning",
+        remote_function=lambda vehicle: vehicle.remote_services.trigger_remote_air_conditioning_stop(),
+        is_available=lambda vehicle: vehicle.is_remote_climate_stop_enabled,
+    ),
     BMWButtonEntityDescription(
         key="find_vehicle",
+        translation_key="find_vehicle",
         icon="mdi:crosshairs-question",
-        name="Find vehicle",
         remote_function=lambda vehicle: vehicle.remote_services.trigger_remote_vehicle_finder(),
     ),
     BMWButtonEntityDescription(
         key="refresh",
+        translation_key="refresh",
         icon="mdi:refresh",
-        name="Refresh from cloud",
         account_function=lambda coordinator: coordinator.async_request_refresh(),
         enabled_when_read_only=True,
     ),
@@ -84,7 +94,7 @@ async def async_setup_entry(
             [
                 BMWButton(coordinator, vehicle, description)
                 for description in BUTTON_TYPES
-                if not coordinator.read_only
+                if (not coordinator.read_only and description.is_available(vehicle))
                 or (coordinator.read_only and description.enabled_when_read_only)
             ]
         )
@@ -111,7 +121,10 @@ class BMWButton(BMWBaseEntity, ButtonEntity):
     async def async_press(self) -> None:
         """Press the button."""
         if self.entity_description.remote_function:
-            await self.entity_description.remote_function(self.vehicle)
+            try:
+                await self.entity_description.remote_function(self.vehicle)
+            except MyBMWAPIError as ex:
+                raise HomeAssistantError(ex) from ex
         elif self.entity_description.account_function:
             _LOGGER.warning(
                 "The 'Refresh from cloud' button is deprecated. Use the"
@@ -120,6 +133,9 @@ class BMWButton(BMWBaseEntity, ButtonEntity):
                 " https://www.home-assistant.io/integrations/bmw_connected_drive/#update-the-state--refresh-from-api"
                 " for details"
             )
-            await self.entity_description.account_function(self.coordinator)
+            try:
+                await self.entity_description.account_function(self.coordinator)
+            except MyBMWAPIError as ex:
+                raise HomeAssistantError(ex) from ex
 
         self.coordinator.async_update_listeners()
diff --git a/homeassistant/components/bmw_connected_drive/const.py b/homeassistant/components/bmw_connected_drive/const.py
index 37225fc052f..96ef152307d 100644
--- a/homeassistant/components/bmw_connected_drive/const.py
+++ b/homeassistant/components/bmw_connected_drive/const.py
@@ -21,3 +21,9 @@ UNIT_MAP = {
     "LITERS": UnitOfVolume.LITERS,
     "GALLONS": UnitOfVolume.GALLONS,
 }
+
+SCAN_INTERVALS = {
+    "china": 300,
+    "north_america": 600,
+    "rest_of_world": 300,
+}
diff --git a/homeassistant/components/bmw_connected_drive/coordinator.py b/homeassistant/components/bmw_connected_drive/coordinator.py
index f6354422312..4a586aab373 100644
--- a/homeassistant/components/bmw_connected_drive/coordinator.py
+++ b/homeassistant/components/bmw_connected_drive/coordinator.py
@@ -15,10 +15,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_GCID, CONF_READ_ONLY, CONF_REFRESH_TOKEN, DOMAIN
+from .const import CONF_GCID, CONF_READ_ONLY, CONF_REFRESH_TOKEN, DOMAIN, SCAN_INTERVALS
 
-DEFAULT_SCAN_INTERVAL_SECONDS = 300
-SCAN_INTERVAL = timedelta(seconds=DEFAULT_SCAN_INTERVAL_SECONDS)
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -50,7 +48,7 @@ class BMWDataUpdateCoordinator(DataUpdateCoordinator[None]):
             hass,
             _LOGGER,
             name=f"{DOMAIN}-{entry.data['username']}",
-            update_interval=SCAN_INTERVAL,
+            update_interval=timedelta(seconds=SCAN_INTERVALS[entry.data[CONF_REGION]]),
         )
 
     async def _async_update_data(self) -> None:
diff --git a/homeassistant/components/bmw_connected_drive/lock.py b/homeassistant/components/bmw_connected_drive/lock.py
index d20ccd1fbb4..6608206a0ee 100644
--- a/homeassistant/components/bmw_connected_drive/lock.py
+++ b/homeassistant/components/bmw_connected_drive/lock.py
@@ -4,12 +4,14 @@ from __future__ import annotations
 import logging
 from typing import Any
 
+from bimmer_connected.models import MyBMWAPIError
 from bimmer_connected.vehicle import MyBMWVehicle
 from bimmer_connected.vehicle.doors_windows import LockState
 
 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 . import BMWBaseEntity
@@ -44,7 +46,7 @@ async def async_setup_entry(
 class BMWLock(BMWBaseEntity, LockEntity):
     """Representation of a MyBMW vehicle lock."""
 
-    _attr_name = "Lock"
+    _attr_translation_key = "lock"
 
     def __init__(
         self,
@@ -66,7 +68,12 @@ class BMWLock(BMWBaseEntity, LockEntity):
             # update callback response
             self._attr_is_locked = True
             self.async_write_ha_state()
-        await self.vehicle.remote_services.trigger_remote_door_lock()
+        try:
+            await self.vehicle.remote_services.trigger_remote_door_lock()
+        except MyBMWAPIError as ex:
+            self._attr_is_locked = False
+            self.async_write_ha_state()
+            raise HomeAssistantError(ex) from ex
 
         self.coordinator.async_update_listeners()
 
@@ -79,7 +86,12 @@ class BMWLock(BMWBaseEntity, LockEntity):
             # update callback response
             self._attr_is_locked = False
             self.async_write_ha_state()
-        await self.vehicle.remote_services.trigger_remote_door_unlock()
+        try:
+            await self.vehicle.remote_services.trigger_remote_door_unlock()
+        except MyBMWAPIError as ex:
+            self._attr_is_locked = True
+            self.async_write_ha_state()
+            raise HomeAssistantError(ex) from ex
 
         self.coordinator.async_update_listeners()
 
diff --git a/homeassistant/components/bmw_connected_drive/manifest.json b/homeassistant/components/bmw_connected_drive/manifest.json
index d30198bdc12..82426fbce08 100644
--- a/homeassistant/components/bmw_connected_drive/manifest.json
+++ b/homeassistant/components/bmw_connected_drive/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/bmw_connected_drive",
   "iot_class": "cloud_polling",
   "loggers": ["bimmer_connected"],
-  "requirements": ["bimmer-connected==0.13.7"]
+  "requirements": ["bimmer-connected==0.13.8"]
 }
diff --git a/homeassistant/components/bmw_connected_drive/notify.py b/homeassistant/components/bmw_connected_drive/notify.py
index 036d5147c4f..4a9f7679dc4 100644
--- a/homeassistant/components/bmw_connected_drive/notify.py
+++ b/homeassistant/components/bmw_connected_drive/notify.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 import logging
 from typing import Any, cast
 
+from bimmer_connected.models import MyBMWAPIError
 from bimmer_connected.vehicle import MyBMWVehicle
 
 from homeassistant.components.notify import (
@@ -19,6 +20,7 @@ from homeassistant.const import (
     CONF_ENTITY_ID,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import DOMAIN
@@ -87,7 +89,11 @@ class BMWNotificationService(BaseNotificationService):
                         if k in ATTR_LOCATION_ATTRIBUTES
                     }
                 )
-
-                await vehicle.remote_services.trigger_send_poi(location_dict)
+                try:
+                    await vehicle.remote_services.trigger_send_poi(location_dict)
+                except TypeError as ex:
+                    raise ValueError(str(ex)) from ex
+                except MyBMWAPIError as ex:
+                    raise HomeAssistantError(ex) from ex
             else:
                 raise ValueError(f"'data.{ATTR_LOCATION}' is required.")
diff --git a/homeassistant/components/bmw_connected_drive/number.py b/homeassistant/components/bmw_connected_drive/number.py
index c8f72b272c1..f37f7627140 100644
--- a/homeassistant/components/bmw_connected_drive/number.py
+++ b/homeassistant/components/bmw_connected_drive/number.py
@@ -45,7 +45,7 @@ class BMWNumberEntityDescription(NumberEntityDescription, BMWRequiredKeysMixin):
 NUMBER_TYPES: list[BMWNumberEntityDescription] = [
     BMWNumberEntityDescription(
         key="target_soc",
-        name="Target SoC",
+        translation_key="target_soc",
         device_class=NumberDeviceClass.BATTERY,
         is_available=lambda v: v.is_remote_set_target_soc_enabled,
         native_max_value=100.0,
diff --git a/homeassistant/components/bmw_connected_drive/select.py b/homeassistant/components/bmw_connected_drive/select.py
index 0b20ed90873..3467322a4af 100644
--- a/homeassistant/components/bmw_connected_drive/select.py
+++ b/homeassistant/components/bmw_connected_drive/select.py
@@ -4,6 +4,7 @@ from dataclasses import dataclass
 import logging
 from typing import Any
 
+from bimmer_connected.models import MyBMWAPIError
 from bimmer_connected.vehicle import MyBMWVehicle
 from bimmer_connected.vehicle.charging_profile import ChargingMode
 
@@ -11,6 +12,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfElectricCurrent
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import BMWBaseEntity
@@ -39,7 +41,7 @@ class BMWSelectEntityDescription(SelectEntityDescription, BMWRequiredKeysMixin):
 SELECT_TYPES: dict[str, BMWSelectEntityDescription] = {
     "ac_limit": BMWSelectEntityDescription(
         key="ac_limit",
-        name="AC Charging Limit",
+        translation_key="ac_limit",
         is_available=lambda v: v.is_remote_set_ac_limit_enabled,
         dynamic_options=lambda v: [
             str(lim) for lim in v.charging_profile.ac_available_limits  # type: ignore[union-attr]
@@ -53,7 +55,7 @@ SELECT_TYPES: dict[str, BMWSelectEntityDescription] = {
     ),
     "charging_mode": BMWSelectEntityDescription(
         key="charging_mode",
-        name="Charging Mode",
+        translation_key="charging_mode",
         is_available=lambda v: v.is_charging_plan_supported,
         options=[c.value for c in ChargingMode if c != ChargingMode.UNKNOWN],
         current_option=lambda v: str(v.charging_profile.charging_mode.value),  # type: ignore[union-attr]
@@ -123,6 +125,9 @@ class BMWSelect(BMWBaseEntity, SelectEntity):
             self.vehicle.vin,
             option,
         )
-        await self.entity_description.remote_service(self.vehicle, option)
+        try:
+            await self.entity_description.remote_service(self.vehicle, option)
+        except MyBMWAPIError as ex:
+            raise HomeAssistantError(ex) from ex
 
         self.coordinator.async_update_listeners()
diff --git a/homeassistant/components/bmw_connected_drive/sensor.py b/homeassistant/components/bmw_connected_drive/sensor.py
index 314ff47c14c..8f5b4fb8608 100644
--- a/homeassistant/components/bmw_connected_drive/sensor.py
+++ b/homeassistant/components/bmw_connected_drive/sensor.py
@@ -55,7 +55,7 @@ SENSOR_TYPES: dict[str, BMWSensorEntityDescription] = {
     # --- Generic ---
     "ac_current_limit": BMWSensorEntityDescription(
         key="ac_current_limit",
-        name="AC current limit",
+        translation_key="ac_current_limit",
         key_class="charging_profile",
         unit_type=UnitOfElectricCurrent.AMPERE,
         icon="mdi:current-ac",
@@ -63,34 +63,34 @@ SENSOR_TYPES: dict[str, BMWSensorEntityDescription] = {
     ),
     "charging_start_time": BMWSensorEntityDescription(
         key="charging_start_time",
-        name="Charging start time",
+        translation_key="charging_start_time",
         key_class="fuel_and_battery",
         device_class=SensorDeviceClass.TIMESTAMP,
         entity_registry_enabled_default=False,
     ),
     "charging_end_time": BMWSensorEntityDescription(
         key="charging_end_time",
-        name="Charging end time",
+        translation_key="charging_end_time",
         key_class="fuel_and_battery",
         device_class=SensorDeviceClass.TIMESTAMP,
     ),
     "charging_status": BMWSensorEntityDescription(
         key="charging_status",
-        name="Charging status",
+        translation_key="charging_status",
         key_class="fuel_and_battery",
         icon="mdi:ev-station",
         value=lambda x, y: x.value,
     ),
     "charging_target": BMWSensorEntityDescription(
         key="charging_target",
-        name="Charging target",
+        translation_key="charging_target",
         key_class="fuel_and_battery",
         icon="mdi:battery-charging-high",
         unit_type=PERCENTAGE,
     ),
     "remaining_battery_percent": BMWSensorEntityDescription(
         key="remaining_battery_percent",
-        name="Remaining battery percent",
+        translation_key="remaining_battery_percent",
         key_class="fuel_and_battery",
         unit_type=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
@@ -98,14 +98,14 @@ SENSOR_TYPES: dict[str, BMWSensorEntityDescription] = {
     # --- Specific ---
     "mileage": BMWSensorEntityDescription(
         key="mileage",
-        name="Mileage",
+        translation_key="mileage",
         icon="mdi:speedometer",
         unit_type=LENGTH,
         value=lambda x, hass: convert_and_round(x, hass.config.units.length, 2),
     ),
     "remaining_range_total": BMWSensorEntityDescription(
         key="remaining_range_total",
-        name="Remaining range total",
+        translation_key="remaining_range_total",
         key_class="fuel_and_battery",
         icon="mdi:map-marker-distance",
         unit_type=LENGTH,
@@ -113,7 +113,7 @@ SENSOR_TYPES: dict[str, BMWSensorEntityDescription] = {
     ),
     "remaining_range_electric": BMWSensorEntityDescription(
         key="remaining_range_electric",
-        name="Remaining range electric",
+        translation_key="remaining_range_electric",
         key_class="fuel_and_battery",
         icon="mdi:map-marker-distance",
         unit_type=LENGTH,
@@ -121,7 +121,7 @@ SENSOR_TYPES: dict[str, BMWSensorEntityDescription] = {
     ),
     "remaining_range_fuel": BMWSensorEntityDescription(
         key="remaining_range_fuel",
-        name="Remaining range fuel",
+        translation_key="remaining_range_fuel",
         key_class="fuel_and_battery",
         icon="mdi:map-marker-distance",
         unit_type=LENGTH,
@@ -129,7 +129,7 @@ SENSOR_TYPES: dict[str, BMWSensorEntityDescription] = {
     ),
     "remaining_fuel": BMWSensorEntityDescription(
         key="remaining_fuel",
-        name="Remaining fuel",
+        translation_key="remaining_fuel",
         key_class="fuel_and_battery",
         icon="mdi:gas-station",
         unit_type=VOLUME,
@@ -137,7 +137,7 @@ SENSOR_TYPES: dict[str, BMWSensorEntityDescription] = {
     ),
     "remaining_fuel_percent": BMWSensorEntityDescription(
         key="remaining_fuel_percent",
-        name="Remaining fuel percent",
+        translation_key="remaining_fuel_percent",
         key_class="fuel_and_battery",
         icon="mdi:gas-station",
         unit_type=PERCENTAGE,
diff --git a/homeassistant/components/bmw_connected_drive/strings.json b/homeassistant/components/bmw_connected_drive/strings.json
index 506175becd9..af73417b1a9 100644
--- a/homeassistant/components/bmw_connected_drive/strings.json
+++ b/homeassistant/components/bmw_connected_drive/strings.json
@@ -26,5 +26,114 @@
         }
       }
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "lids": {
+        "name": "Lids"
+      },
+      "windows": {
+        "name": "Windows"
+      },
+      "door_lock_state": {
+        "name": "Door lock state"
+      },
+      "condition_based_services": {
+        "name": "Condition based services"
+      },
+      "check_control_messages": {
+        "name": "Check control messages"
+      },
+      "charging_status": {
+        "name": "Charging status"
+      },
+      "connection_status": {
+        "name": "Connection status"
+      },
+      "is_pre_entry_climatization_enabled": {
+        "name": "Pre entry climatization"
+      }
+    },
+    "button": {
+      "light_flash": {
+        "name": "Flash lights"
+      },
+      "sound_horn": {
+        "name": "Sound horn"
+      },
+      "activate_air_conditioning": {
+        "name": "Activate air conditioning"
+      },
+      "find_vehicle": {
+        "name": "Find vehicle"
+      },
+      "refresh": {
+        "name": "Refresh from cloud"
+      }
+    },
+    "lock": {
+      "lock": {
+        "name": "[%key:component::lock::title%]"
+      }
+    },
+    "number": {
+      "target_soc": {
+        "name": "Target SoC"
+      }
+    },
+    "select": {
+      "ac_limit": {
+        "name": "AC Charging Limit"
+      },
+      "charging_mode": {
+        "name": "Charging Mode"
+      }
+    },
+    "sensor": {
+      "ac_current_limit": {
+        "name": "AC current limit"
+      },
+      "charging_start_time": {
+        "name": "Charging start time"
+      },
+      "charging_end_time": {
+        "name": "Charging end time"
+      },
+      "charging_status": {
+        "name": "Charging status"
+      },
+      "charging_target": {
+        "name": "Charging target"
+      },
+      "remaining_battery_percent": {
+        "name": "Remaining battery percent"
+      },
+      "mileage": {
+        "name": "Mileage"
+      },
+      "remaining_range_total": {
+        "name": "Remaining range total"
+      },
+      "remaining_range_electric": {
+        "name": "Remaining range electric"
+      },
+      "remaining_range_fuel": {
+        "name": "Remaining range fuel"
+      },
+      "remaining_fuel": {
+        "name": "Remaining fuel"
+      },
+      "remaining_fuel_percent": {
+        "name": "Remaining fuel percent"
+      }
+    },
+    "switch": {
+      "climate": {
+        "name": "Climate"
+      },
+      "charging": {
+        "name": "Charging"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/bmw_connected_drive/switch.py b/homeassistant/components/bmw_connected_drive/switch.py
index 41243ca9323..298338dc9fa 100644
--- a/homeassistant/components/bmw_connected_drive/switch.py
+++ b/homeassistant/components/bmw_connected_drive/switch.py
@@ -51,7 +51,7 @@ CHARGING_STATE_ON = {
 NUMBER_TYPES: list[BMWSwitchEntityDescription] = [
     BMWSwitchEntityDescription(
         key="climate",
-        name="Climate",
+        translation_key="climate",
         is_available=lambda v: v.is_remote_climate_stop_enabled,
         value_fn=lambda v: v.climate.is_climate_on,
         remote_service_on=lambda v: v.remote_services.trigger_remote_air_conditioning(),
@@ -60,7 +60,7 @@ NUMBER_TYPES: list[BMWSwitchEntityDescription] = [
     ),
     BMWSwitchEntityDescription(
         key="charging",
-        name="Charging",
+        translation_key="charging",
         is_available=lambda v: v.is_remote_charge_stop_enabled,
         value_fn=lambda v: v.fuel_and_battery.charging_status in CHARGING_STATE_ON,
         remote_service_on=lambda v: v.remote_services.trigger_charge_start(),
diff --git a/homeassistant/components/bond/button.py b/homeassistant/components/bond/button.py
index 32b76c6fcae..1109cf0d311 100644
--- a/homeassistant/components/bond/button.py
+++ b/homeassistant/components/bond/button.py
@@ -35,6 +35,10 @@ class BondButtonEntityDescription(
 ):
     """Class to describe a Bond Button entity."""
 
+    # BondEntity does not support UNDEFINED,
+    # restrict the type to str | None
+    name: str | None = None
+
 
 STOP_BUTTON = BondButtonEntityDescription(
     key=Action.STOP,
diff --git a/homeassistant/components/bosch_shc/manifest.json b/homeassistant/components/bosch_shc/manifest.json
index 90558936592..9fd1055dd60 100644
--- a/homeassistant/components/bosch_shc/manifest.json
+++ b/homeassistant/components/bosch_shc/manifest.json
@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/bosch_shc",
   "iot_class": "local_push",
   "loggers": ["boschshcpy"],
-  "requirements": ["boschshcpy==0.2.35"],
+  "requirements": ["boschshcpy==0.2.57"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",
diff --git a/homeassistant/components/bosch_shc/sensor.py b/homeassistant/components/bosch_shc/sensor.py
index b310799323a..73307d9ea0a 100644
--- a/homeassistant/components/bosch_shc/sensor.py
+++ b/homeassistant/components/bosch_shc/sensor.py
@@ -117,7 +117,7 @@ async def async_setup_entry(
         )
 
     for sensor in (
-        session.device_helper.smart_plugs + session.device_helper.light_switches
+        session.device_helper.smart_plugs + session.device_helper.light_switches_bsm
     ):
         entities.append(
             PowerSensor(
diff --git a/homeassistant/components/bosch_shc/switch.py b/homeassistant/components/bosch_shc/switch.py
index 6fe06213d75..3b3b6e2ffd4 100644
--- a/homeassistant/components/bosch_shc/switch.py
+++ b/homeassistant/components/bosch_shc/switch.py
@@ -111,7 +111,7 @@ async def async_setup_entry(
             )
         )
 
-    for switch in session.device_helper.light_switches:
+    for switch in session.device_helper.light_switches_bsm:
         entities.append(
             SHCSwitch(
                 device=switch,
diff --git a/homeassistant/components/braviatv/media_player.py b/homeassistant/components/braviatv/media_player.py
index ff5691f9aed..cfa388fcce7 100644
--- a/homeassistant/components/braviatv/media_player.py
+++ b/homeassistant/components/braviatv/media_player.py
@@ -40,6 +40,7 @@ async def async_setup_entry(
 class BraviaTVMediaPlayer(BraviaTVEntity, MediaPlayerEntity):
     """Representation of a Bravia TV Media Player."""
 
+    _attr_name = None
     _attr_assumed_state = True
     _attr_device_class = MediaPlayerDeviceClass.TV
     _attr_supported_features = (
diff --git a/homeassistant/components/braviatv/remote.py b/homeassistant/components/braviatv/remote.py
index f45b2d74004..f9e3f464dcb 100644
--- a/homeassistant/components/braviatv/remote.py
+++ b/homeassistant/components/braviatv/remote.py
@@ -30,6 +30,8 @@ async def async_setup_entry(
 class BraviaTVRemote(BraviaTVEntity, RemoteEntity):
     """Representation of a Bravia TV Remote."""
 
+    _attr_name = None
+
     @property
     def is_on(self) -> bool:
         """Return true if device is on."""
diff --git a/homeassistant/components/broadlink/__init__.py b/homeassistant/components/broadlink/__init__.py
index 3b1312a64c5..e6a769fd2c4 100644
--- a/homeassistant/components/broadlink/__init__.py
+++ b/homeassistant/components/broadlink/__init__.py
@@ -5,12 +5,15 @@ from dataclasses import dataclass, field
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
 from .device import BroadlinkDevice
 from .heartbeat import BroadlinkHeartbeat
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 @dataclass
 class BroadlinkData:
diff --git a/homeassistant/components/broadlink/remote.py b/homeassistant/components/broadlink/remote.py
index c116a1bb635..c0fb80971ca 100644
--- a/homeassistant/components/broadlink/remote.py
+++ b/homeassistant/components/broadlink/remote.py
@@ -107,6 +107,7 @@ class BroadlinkRemote(BroadlinkEntity, RemoteEntity, RestoreEntity):
     """Representation of a Broadlink remote."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, device, codes, flags):
         """Initialize the remote."""
diff --git a/homeassistant/components/broadlink/sensor.py b/homeassistant/components/broadlink/sensor.py
index 50c58d41667..747418e1e79 100644
--- a/homeassistant/components/broadlink/sensor.py
+++ b/homeassistant/components/broadlink/sensor.py
@@ -25,18 +25,16 @@ from .entity import BroadlinkEntity
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="temperature",
-        translation_key="temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="air_quality",
-        translation_key="air_quality",
+        device_class=SensorDeviceClass.AQI,
     ),
     SensorEntityDescription(
         key="humidity",
-        translation_key="humidity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
@@ -51,21 +49,18 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     ),
     SensorEntityDescription(
         key="power",
-        translation_key="power",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="volt",
-        translation_key="voltage",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="current",
-        translation_key="current",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
diff --git a/homeassistant/components/broadlink/strings.json b/homeassistant/components/broadlink/strings.json
index adff2303c74..87567bcb7b1 100644
--- a/homeassistant/components/broadlink/strings.json
+++ b/homeassistant/components/broadlink/strings.json
@@ -46,30 +46,12 @@
   },
   "entity": {
     "sensor": {
-      "temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      },
-      "air_quality": {
-        "name": "[%key:component::sensor::entity_component::aqi::name%]"
-      },
-      "humidity": {
-        "name": "[%key:component::sensor::entity_component::humidity::name%]"
-      },
       "light": {
         "name": "[%key:component::sensor::entity_component::illuminance::name%]"
       },
       "noise": {
         "name": "Noise"
       },
-      "power": {
-        "name": "[%key:component::sensor::entity_component::power::name%]"
-      },
-      "voltage": {
-        "name": "[%key:component::sensor::entity_component::voltage::name%]"
-      },
-      "current": {
-        "name": "[%key:component::sensor::entity_component::current::name%]"
-      },
       "overload": {
         "name": "Overload"
       },
diff --git a/homeassistant/components/broadlink/switch.py b/homeassistant/components/broadlink/switch.py
index 009536a9adb..b8744865898 100644
--- a/homeassistant/components/broadlink/switch.py
+++ b/homeassistant/components/broadlink/switch.py
@@ -221,6 +221,7 @@ class BroadlinkSP2Switch(BroadlinkSP1Switch):
 
     _attr_assumed_state = False
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, device, *args, **kwargs):
         """Initialize the switch."""
diff --git a/homeassistant/components/brottsplatskartan/sensor.py b/homeassistant/components/brottsplatskartan/sensor.py
index ca6173d2ef5..5512bcd1176 100644
--- a/homeassistant/components/brottsplatskartan/sensor.py
+++ b/homeassistant/components/brottsplatskartan/sensor.py
@@ -47,7 +47,7 @@ async def async_setup_platform(
         hass,
         DOMAIN,
         "deprecated_yaml",
-        breaks_in_ha_version="2023.7.0",
+        breaks_in_ha_version="2023.11.0",
         is_fixable=False,
         severity=IssueSeverity.WARNING,
         translation_key="deprecated_yaml",
@@ -83,6 +83,7 @@ class BrottsplatskartanSensor(SensorEntity):
 
     _attr_attribution = ATTRIBUTION
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, bpk: BrottsplatsKartan, name: str, entry_id: str) -> None:
         """Initialize the Brottsplatskartan sensor."""
diff --git a/homeassistant/components/bsblan/climate.py b/homeassistant/components/bsblan/climate.py
index cbc6dd00471..dc403611da2 100644
--- a/homeassistant/components/bsblan/climate.py
+++ b/homeassistant/components/bsblan/climate.py
@@ -23,6 +23,7 @@ from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
 )
+from homeassistant.util.enum import try_parse_enum
 
 from . import HomeAssistantBSBLANData
 from .const import ATTR_TARGET_TEMPERATURE, DOMAIN, LOGGER
@@ -70,6 +71,7 @@ class BSBLANClimate(
     """Defines a BSBLAN climate device."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     # Determine preset modes
     _attr_supported_features = (
         ClimateEntityFeature.TARGET_TEMPERATURE | ClimateEntityFeature.PRESET_MODE
@@ -112,12 +114,11 @@ class BSBLANClimate(
         return float(self.coordinator.data.target_temperature.value)
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode | None:
         """Return hvac operation ie. heat, cool mode."""
         if self.coordinator.data.hvac_mode.value == PRESET_ECO:
             return HVACMode.AUTO
-
-        return self.coordinator.data.hvac_mode.value
+        return try_parse_enum(HVACMode, self.coordinator.data.hvac_mode.value)
 
     @property
     def preset_mode(self) -> str | None:
diff --git a/homeassistant/components/bt_smarthub/manifest.json b/homeassistant/components/bt_smarthub/manifest.json
index 90f5d92a0a2..8f2dc631e80 100644
--- a/homeassistant/components/bt_smarthub/manifest.json
+++ b/homeassistant/components/bt_smarthub/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/bt_smarthub",
   "iot_class": "local_polling",
   "loggers": ["btsmarthub_devicelist"],
-  "requirements": ["btsmarthub_devicelist==0.2.3"]
+  "requirements": ["btsmarthub-devicelist==0.2.3"]
 }
diff --git a/homeassistant/components/button/__init__.py b/homeassistant/components/button/__init__.py
index 99fe02f7a9d..0e2790a2e85 100644
--- a/homeassistant/components/button/__init__.py
+++ b/homeassistant/components/button/__init__.py
@@ -35,6 +35,7 @@ _LOGGER = logging.getLogger(__name__)
 class ButtonDeviceClass(StrEnum):
     """Device class for buttons."""
 
+    IDENTIFY = "identify"
     RESTART = "restart"
     UPDATE = "update"
 
@@ -88,6 +89,13 @@ class ButtonEntity(RestoreEntity):
     _attr_state: None = None
     __last_pressed: datetime | None = None
 
+    def _default_to_device_class_name(self) -> bool:
+        """Return True if an unnamed entity should be named by its device class.
+
+        For buttons this is True if the entity has a device class.
+        """
+        return self.device_class is not None
+
     @property
     def device_class(self) -> ButtonDeviceClass | None:
         """Return the class of this entity."""
diff --git a/homeassistant/components/button/device_action.py b/homeassistant/components/button/device_action.py
index 8398b4990cd..338b11e765b 100644
--- a/homeassistant/components/button/device_action.py
+++ b/homeassistant/components/button/device_action.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -19,14 +20,21 @@ from .const import DOMAIN, SERVICE_PRESS
 
 ACTION_TYPES = {"press"}
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -36,7 +44,7 @@ async def async_get_actions(
         {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
             CONF_TYPE: "press",
         }
         for entry in er.async_entries_for_device(registry, device_id)
diff --git a/homeassistant/components/button/device_trigger.py b/homeassistant/components/button/device_trigger.py
index fbf054996c3..1b206337f33 100644
--- a/homeassistant/components/button/device_trigger.py
+++ b/homeassistant/components/button/device_trigger.py
@@ -26,7 +26,7 @@ TRIGGER_TYPES = {"pressed"}
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
     }
 )
@@ -42,7 +42,7 @@ async def async_get_triggers(
             CONF_PLATFORM: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
             CONF_TYPE: "pressed",
         }
         for entry in er.async_entries_for_device(registry, device_id)
diff --git a/homeassistant/components/button/strings.json b/homeassistant/components/button/strings.json
index efad77f5c6d..006959d1b4c 100644
--- a/homeassistant/components/button/strings.json
+++ b/homeassistant/components/button/strings.json
@@ -12,6 +12,9 @@
     "_": {
       "name": "[%key:component::button::title%]"
     },
+    "identify": {
+      "name": "Identify"
+    },
     "restart": {
       "name": "Restart"
     },
diff --git a/homeassistant/components/calendar/__init__.py b/homeassistant/components/calendar/__init__.py
index 2cb807169ea..d56b2b0ddfa 100644
--- a/homeassistant/components/calendar/__init__.py
+++ b/homeassistant/components/calendar/__init__.py
@@ -8,7 +8,7 @@ from http import HTTPStatus
 from itertools import groupby
 import logging
 import re
-from typing import Any, cast, final
+from typing import Any, Final, cast, final
 
 from aiohttp import web
 from dateutil.rrule import rrulestr
@@ -19,7 +19,12 @@ from homeassistant.components.websocket_api import ERR_NOT_FOUND, ERR_NOT_SUPPOR
 from homeassistant.components.websocket_api.connection import ActiveConnection
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import (
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+)
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.config_validation import (  # noqa: F401
@@ -32,10 +37,12 @@ from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.template import DATE_STR_FORMAT
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import dt as dt_util
+from homeassistant.util.json import JsonValueType
 
 from .const import (
     CONF_EVENT,
     EVENT_DESCRIPTION,
+    EVENT_DURATION,
     EVENT_END,
     EVENT_END_DATE,
     EVENT_END_DATETIME,
@@ -53,6 +60,7 @@ from .const import (
     EVENT_TIME_FIELDS,
     EVENT_TYPES,
     EVENT_UID,
+    LIST_EVENT_FIELDS,
     CalendarEntityFeature,
 )
 
@@ -250,6 +258,21 @@ CALENDAR_EVENT_SCHEMA = vol.Schema(
     extra=vol.ALLOW_EXTRA,
 )
 
+SERVICE_LIST_EVENTS: Final = "list_events"
+SERVICE_LIST_EVENTS_SCHEMA: Final = vol.All(
+    cv.has_at_least_one_key(EVENT_END_DATETIME, EVENT_DURATION),
+    cv.has_at_most_one_key(EVENT_END_DATETIME, EVENT_DURATION),
+    cv.make_entity_service_schema(
+        {
+            vol.Optional(EVENT_START_DATETIME): cv.datetime,
+            vol.Optional(EVENT_END_DATETIME): cv.datetime,
+            vol.Optional(EVENT_DURATION): vol.All(
+                cv.time_period, cv.positive_timedelta
+            ),
+        }
+    ),
+)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Track states and offer events for calendars."""
@@ -274,7 +297,12 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         async_create_event,
         required_features=[CalendarEntityFeature.CREATE_EVENT],
     )
-
+    component.async_register_entity_service(
+        SERVICE_LIST_EVENTS,
+        SERVICE_LIST_EVENTS_SCHEMA,
+        async_list_events_service,
+        supports_response=SupportsResponse.ONLY,
+    )
     await component.async_setup(config)
     return True
 
@@ -388,6 +416,17 @@ def _api_event_dict_factory(obj: Iterable[tuple[str, Any]]) -> dict[str, Any]:
     return result
 
 
+def _list_events_dict_factory(
+    obj: Iterable[tuple[str, Any]]
+) -> dict[str, JsonValueType]:
+    """Convert CalendarEvent dataclass items to dictionary of attributes."""
+    return {
+        name: value
+        for name, value in _event_dict_factory(obj).items()
+        if name in LIST_EVENT_FIELDS and value is not None
+    }
+
+
 def _get_datetime_local(
     dt_or_d: datetime.datetime | datetime.date,
 ) -> datetime.datetime:
@@ -743,3 +782,23 @@ async def async_create_event(entity: CalendarEntity, call: ServiceCall) -> None:
         EVENT_END: end,
     }
     await entity.async_create_event(**params)
+
+
+async def async_list_events_service(
+    calendar: CalendarEntity, service_call: ServiceCall
+) -> ServiceResponse:
+    """List events on a calendar during a time drange."""
+    start = service_call.data.get(EVENT_START_DATETIME, dt_util.now())
+    if EVENT_DURATION in service_call.data:
+        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)
+    )
+    return {
+        "events": [
+            dataclasses.asdict(event, dict_factory=_list_events_dict_factory)
+            for event in calendar_event_list
+        ]
+    }
diff --git a/homeassistant/components/calendar/const.py b/homeassistant/components/calendar/const.py
index 3fbab6742a9..e667510325b 100644
--- a/homeassistant/components/calendar/const.py
+++ b/homeassistant/components/calendar/const.py
@@ -40,3 +40,13 @@ EVENT_TIME_FIELDS = {
     EVENT_IN,
 }
 EVENT_TYPES = "event_types"
+EVENT_DURATION = "duration"
+
+# Fields for the list events service
+LIST_EVENT_FIELDS = {
+    "start",
+    "end",
+    EVENT_SUMMARY,
+    EVENT_DESCRIPTION,
+    EVENT_LOCATION,
+}
diff --git a/homeassistant/components/calendar/services.yaml b/homeassistant/components/calendar/services.yaml
index 5d1a3ccf0f4..af69882bba5 100644
--- a/homeassistant/components/calendar/services.yaml
+++ b/homeassistant/components/calendar/services.yaml
@@ -52,3 +52,27 @@ create_event:
       example: "Conference Room - F123, Bldg. 002"
       selector:
         text:
+list_events:
+  name: List event
+  description: List events on a calendar within a time range.
+  target:
+    entity:
+      domain: calendar
+  fields:
+    start_date_time:
+      name: Start time
+      description: Return active events after this time (exclusive). When not set, defaults to now.
+      example: "2022-03-22 20:00:00"
+      selector:
+        datetime:
+    end_date_time:
+      name: End time
+      description: Return active events before this time (exclusive). Cannot be used with 'duration'.
+      example: "2022-03-22 22:00:00"
+      selector:
+        datetime:
+    duration:
+      name: Duration
+      description: Return active events from start_date_time until the specified duration.
+      selector:
+        duration:
diff --git a/homeassistant/components/cast/manifest.json b/homeassistant/components/cast/manifest.json
index 48921303ce0..7cf318f12a6 100644
--- a/homeassistant/components/cast/manifest.json
+++ b/homeassistant/components/cast/manifest.json
@@ -14,6 +14,6 @@
   "documentation": "https://www.home-assistant.io/integrations/cast",
   "iot_class": "local_polling",
   "loggers": ["casttube", "pychromecast"],
-  "requirements": ["pychromecast==13.0.7"],
+  "requirements": ["PyChromecast==13.0.7"],
   "zeroconf": ["_googlecast._tcp.local."]
 }
diff --git a/homeassistant/components/cast/media_player.py b/homeassistant/components/cast/media_player.py
index 3031eb8365b..d32ff07c261 100644
--- a/homeassistant/components/cast/media_player.py
+++ b/homeassistant/components/cast/media_player.py
@@ -267,6 +267,7 @@ class CastMediaPlayerEntity(CastDevice, MediaPlayerEntity):
     """Representation of a Cast device on the network."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
     _attr_media_image_remotely_accessible = True
     _mz_only = False
@@ -361,15 +362,7 @@ class CastMediaPlayerEntity(CastDevice, MediaPlayerEntity):
         ):
             external_url = None
             internal_url = None
-            tts_base_url = None
             url_description = ""
-            if "tts" in self.hass.config.components:
-                # pylint: disable-next=[import-outside-toplevel]
-                from homeassistant.components import tts
-
-                with suppress(KeyError):  # base_url not configured
-                    tts_base_url = tts.get_base_url(self.hass)
-
             with suppress(NoURLAvailableError):  # external_url not configured
                 external_url = get_url(self.hass, allow_internal=False)
 
@@ -377,8 +370,6 @@ class CastMediaPlayerEntity(CastDevice, MediaPlayerEntity):
                 internal_url = get_url(self.hass, allow_external=False)
 
             if media_status.content_id:
-                if tts_base_url and media_status.content_id.startswith(tts_base_url):
-                    url_description = f" from tts.base_url ({tts_base_url})"
                 if external_url and media_status.content_id.startswith(external_url):
                     url_description = f" from external_url ({external_url})"
                 if internal_url and media_status.content_id.startswith(internal_url):
diff --git a/homeassistant/components/cert_expiry/__init__.py b/homeassistant/components/cert_expiry/__init__.py
index 5f6152b7bc7..4fc89bc918b 100644
--- a/homeassistant/components/cert_expiry/__init__.py
+++ b/homeassistant/components/cert_expiry/__init__.py
@@ -8,10 +8,10 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_PORT,
-    EVENT_HOMEASSISTANT_STARTED,
     Platform,
 )
-from homeassistant.core import CoreState, HomeAssistant
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.start import async_at_started
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DEFAULT_PORT, DOMAIN
@@ -38,19 +38,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     if entry.unique_id is None:
         hass.config_entries.async_update_entry(entry, unique_id=f"{host}:{port}")
 
-    async def async_finish_startup(_):
+    async def _async_finish_startup(_):
         await coordinator.async_refresh()
         await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
-    if hass.state == CoreState.running:
-        await async_finish_startup(None)
-    else:
-        entry.async_on_unload(
-            hass.bus.async_listen_once(
-                EVENT_HOMEASSISTANT_STARTED, async_finish_startup
-            )
-        )
-
+    async_at_started(hass, _async_finish_startup)
     return True
 
 
diff --git a/homeassistant/components/cert_expiry/helper.py b/homeassistant/components/cert_expiry/helper.py
index 582c6118f57..0817025c703 100644
--- a/homeassistant/components/cert_expiry/helper.py
+++ b/homeassistant/components/cert_expiry/helper.py
@@ -1,4 +1,5 @@
 """Helper functions for the Cert Expiry platform."""
+from functools import cache
 import socket
 import ssl
 
@@ -14,12 +15,18 @@ from .errors import (
 )
 
 
+@cache
+def _get_default_ssl_context():
+    """Return the default SSL context."""
+    return ssl.create_default_context()
+
+
 def get_cert(
     host: str,
     port: int,
 ):
     """Get the certificate for the host and port combination."""
-    ctx = ssl.create_default_context()
+    ctx = _get_default_ssl_context()
     address = (host, port)
     with socket.create_connection(address, timeout=TIMEOUT) as sock, ctx.wrap_socket(
         sock, server_hostname=address[0]
diff --git a/homeassistant/components/climate/__init__.py b/homeassistant/components/climate/__init__.py
index ed0f8f2a4aa..e62cb1143b5 100644
--- a/homeassistant/components/climate/__init__.py
+++ b/homeassistant/components/climate/__init__.py
@@ -214,9 +214,9 @@ class ClimateEntity(Entity):
     _attr_current_temperature: float | None = None
     _attr_fan_mode: str | None
     _attr_fan_modes: list[str] | None
-    _attr_hvac_action: HVACAction | str | None = None
-    _attr_hvac_mode: HVACMode | str | None
-    _attr_hvac_modes: list[HVACMode] | list[str]
+    _attr_hvac_action: HVACAction | None = None
+    _attr_hvac_mode: HVACMode | None
+    _attr_hvac_modes: list[HVACMode]
     _attr_is_aux_heat: bool | None
     _attr_max_humidity: int = DEFAULT_MAX_HUMIDITY
     _attr_max_temp: float
@@ -361,17 +361,17 @@ class ClimateEntity(Entity):
         return self._attr_target_humidity
 
     @property
-    def hvac_mode(self) -> HVACMode | str | None:
+    def hvac_mode(self) -> HVACMode | None:
         """Return hvac operation ie. heat, cool mode."""
         return self._attr_hvac_mode
 
     @property
-    def hvac_modes(self) -> list[HVACMode] | list[str]:
+    def hvac_modes(self) -> list[HVACMode]:
         """Return the list of available hvac operation modes."""
         return self._attr_hvac_modes
 
     @property
-    def hvac_action(self) -> HVACAction | str | None:
+    def hvac_action(self) -> HVACAction | None:
         """Return the current running hvac operation if supported."""
         return self._attr_hvac_action
 
@@ -534,6 +534,14 @@ class ClimateEntity(Entity):
             await self.hass.async_add_executor_job(self.turn_on)
             return
 
+        # If there are only two HVAC modes, and one of those modes is OFF,
+        # then we can just turn on the other mode.
+        if len(self.hvac_modes) == 2 and HVACMode.OFF in self.hvac_modes:
+            for mode in self.hvac_modes:
+                if mode != HVACMode.OFF:
+                    await self.async_set_hvac_mode(mode)
+                    return
+
         # Fake turn on
         for mode in (HVACMode.HEAT_COOL, HVACMode.HEAT, HVACMode.COOL):
             if mode not in self.hvac_modes:
diff --git a/homeassistant/components/climate/const.py b/homeassistant/components/climate/const.py
index 9ee561b9c1b..41d4646aeae 100644
--- a/homeassistant/components/climate/const.py
+++ b/homeassistant/components/climate/const.py
@@ -96,6 +96,7 @@ class HVACAction(StrEnum):
     HEATING = "heating"
     IDLE = "idle"
     OFF = "off"
+    PREHEATING = "preheating"
 
 
 # These CURRENT_HVAC_* constants are deprecated as of Home Assistant 2022.5.
diff --git a/homeassistant/components/climate/device_action.py b/homeassistant/components/climate/device_action.py
index 0119ad65801..6714e0bf35a 100644
--- a/homeassistant/components/climate/device_action.py
+++ b/homeassistant/components/climate/device_action.py
@@ -3,6 +3,10 @@ from __future__ import annotations
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+    async_validate_entity_schema,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -24,7 +28,7 @@ ACTION_TYPES = {"set_hvac_mode", "set_preset_mode"}
 SET_HVAC_MODE_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): "set_hvac_mode",
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(const.ATTR_HVAC_MODE): vol.In(const.HVAC_MODES),
     }
 )
@@ -32,12 +36,19 @@ SET_HVAC_MODE_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
 SET_PRESET_MODE_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): "set_preset_mode",
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(const.ATTR_PRESET_MODE): str,
     }
 )
 
-ACTION_SCHEMA = vol.Any(SET_HVAC_MODE_SCHEMA, SET_PRESET_MODE_SCHEMA)
+_ACTION_SCHEMA = vol.Any(SET_HVAC_MODE_SCHEMA, SET_PRESET_MODE_SCHEMA)
+
+
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
 
 
 async def async_get_actions(
@@ -57,7 +68,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         actions.append({**base_action, CONF_TYPE: "set_hvac_mode"})
@@ -93,23 +104,24 @@ async def async_get_action_capabilities(
 ) -> dict[str, vol.Schema]:
     """List action capabilities."""
     action_type = config[CONF_TYPE]
+    entity_id_or_uuid = config[CONF_ENTITY_ID]
 
     fields = {}
 
     if action_type == "set_hvac_mode":
         try:
+            entry = async_get_entity_registry_entry_or_raise(hass, entity_id_or_uuid)
             hvac_modes = (
-                get_capability(hass, config[ATTR_ENTITY_ID], const.ATTR_HVAC_MODES)
-                or []
+                get_capability(hass, entry.entity_id, const.ATTR_HVAC_MODES) or []
             )
         except HomeAssistantError:
             hvac_modes = []
         fields[vol.Required(const.ATTR_HVAC_MODE)] = vol.In(hvac_modes)
     elif action_type == "set_preset_mode":
         try:
+            entry = async_get_entity_registry_entry_or_raise(hass, entity_id_or_uuid)
             preset_modes = (
-                get_capability(hass, config[ATTR_ENTITY_ID], const.ATTR_PRESET_MODES)
-                or []
+                get_capability(hass, entry.entity_id, const.ATTR_PRESET_MODES) or []
             )
         except HomeAssistantError:
             preset_modes = []
diff --git a/homeassistant/components/climate/device_condition.py b/homeassistant/components/climate/device_condition.py
index 97dc27cfa09..d9f1b240a9a 100644
--- a/homeassistant/components/climate/device_condition.py
+++ b/homeassistant/components/climate/device_condition.py
@@ -3,6 +3,9 @@ from __future__ import annotations
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_CONDITION,
@@ -28,7 +31,7 @@ CONDITION_TYPES = {"is_hvac_mode", "is_preset_mode"}
 
 HVAC_MODE_CONDITION = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): "is_hvac_mode",
         vol.Required(const.ATTR_HVAC_MODE): vol.In(const.HVAC_MODES),
     }
@@ -36,7 +39,7 @@ HVAC_MODE_CONDITION = DEVICE_CONDITION_BASE_SCHEMA.extend(
 
 PRESET_MODE_CONDITION = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): "is_preset_mode",
         vol.Required(const.ATTR_PRESET_MODE): str,
     }
@@ -63,7 +66,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions.append({**base_condition, CONF_TYPE: "is_hvac_mode"})
@@ -80,9 +83,12 @@ def async_condition_from_config(
 ) -> condition.ConditionCheckerType:
     """Create a function to test a device condition."""
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
+
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        if (state := hass.states.get(config[ATTR_ENTITY_ID])) is None:
+        if not entity_id or (state := hass.states.get(entity_id)) is None:
             return False
 
         if config[CONF_TYPE] == "is_hvac_mode":
@@ -106,9 +112,11 @@ async def async_get_condition_capabilities(
 
     if condition_type == "is_hvac_mode":
         try:
+            entry = async_get_entity_registry_entry_or_raise(
+                hass, config[CONF_ENTITY_ID]
+            )
             hvac_modes = (
-                get_capability(hass, config[ATTR_ENTITY_ID], const.ATTR_HVAC_MODES)
-                or []
+                get_capability(hass, entry.entity_id, const.ATTR_HVAC_MODES) or []
             )
         except HomeAssistantError:
             hvac_modes = []
@@ -116,9 +124,11 @@ async def async_get_condition_capabilities(
 
     elif condition_type == "is_preset_mode":
         try:
+            entry = async_get_entity_registry_entry_or_raise(
+                hass, config[CONF_ENTITY_ID]
+            )
             preset_modes = (
-                get_capability(hass, config[ATTR_ENTITY_ID], const.ATTR_PRESET_MODES)
-                or []
+                get_capability(hass, entry.entity_id, const.ATTR_PRESET_MODES) or []
             )
         except HomeAssistantError:
             preset_modes = []
diff --git a/homeassistant/components/climate/device_trigger.py b/homeassistant/components/climate/device_trigger.py
index 005e744b53f..0afd2485517 100644
--- a/homeassistant/components/climate/device_trigger.py
+++ b/homeassistant/components/climate/device_trigger.py
@@ -34,7 +34,7 @@ TRIGGER_TYPES = {
 
 HVAC_MODE_TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): "hvac_mode_changed",
         vol.Required(state_trigger.CONF_TO): vol.In(const.HVAC_MODES),
     }
@@ -43,7 +43,7 @@ HVAC_MODE_TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
 CURRENT_TRIGGER_SCHEMA = vol.All(
     DEVICE_TRIGGER_BASE_SCHEMA.extend(
         {
-            vol.Required(CONF_ENTITY_ID): cv.entity_id,
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_TYPE): vol.In(
                 ["current_temperature_changed", "current_humidity_changed"]
             ),
@@ -77,7 +77,7 @@ async def async_get_triggers(
             CONF_PLATFORM: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         triggers.append(
@@ -142,7 +142,7 @@ async def async_attach_trigger(
         numeric_state_config[
             numeric_state_trigger.CONF_VALUE_TEMPLATE
         ] = "{{ state.attributes.current_temperature }}"
-    else:
+    else:  # trigger_type == "current_humidity_changed"
         numeric_state_config[
             numeric_state_trigger.CONF_VALUE_TEMPLATE
         ] = "{{ state.attributes.current_humidity }}"
diff --git a/homeassistant/components/climate/strings.json b/homeassistant/components/climate/strings.json
index 00696b0738c..73ac4d6fbc4 100644
--- a/homeassistant/components/climate/strings.json
+++ b/homeassistant/components/climate/strings.json
@@ -54,6 +54,7 @@
           "name": "Current action",
           "state": {
             "off": "Off",
+            "preheating": "Preheating",
             "heating": "Heating",
             "cooling": "Cooling",
             "drying": "Drying",
diff --git a/homeassistant/components/cloud/__init__.py b/homeassistant/components/cloud/__init__.py
index 620e650315a..40e5f264caf 100644
--- a/homeassistant/components/cloud/__init__.py
+++ b/homeassistant/components/cloud/__init__.py
@@ -234,7 +234,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     websession = async_get_clientsession(hass)
     client = CloudClient(hass, prefs, websession, alexa_conf, google_conf)
     cloud = hass.data[DOMAIN] = Cloud(client, **kwargs)
-    cloud.iot.register_on_connect(client.on_cloud_connected)
 
     async def _shutdown(event: Event) -> None:
         """Shutdown event."""
diff --git a/homeassistant/components/cloud/client.py b/homeassistant/components/cloud/client.py
index dff3bdcdbdd..236635a0bb8 100644
--- a/homeassistant/components/cloud/client.py
+++ b/homeassistant/components/cloud/client.py
@@ -17,6 +17,7 @@ from homeassistant.components.alexa import (
     smart_home as alexa_smart_home,
 )
 from homeassistant.components.google_assistant import smart_home as ga
+from homeassistant.const import __version__ as HA_VERSION
 from homeassistant.core import Context, HassJob, HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_call_later
@@ -135,7 +136,7 @@ class CloudClient(Interface):
 
         return self._google_config
 
-    async def on_cloud_connected(self) -> None:
+    async def cloud_connected(self) -> None:
         """When cloud is connected."""
         is_new_user = await self.prefs.async_set_username(self.cloud.username)
 
@@ -182,6 +183,9 @@ class CloudClient(Interface):
         if tasks:
             await asyncio.gather(*(task(None) for task in tasks))
 
+    async def cloud_disconnected(self) -> None:
+        """When cloud disconnected."""
+
     async def cloud_started(self) -> None:
         """When cloud is started."""
 
@@ -209,6 +213,19 @@ class CloudClient(Interface):
         """Process cloud remote message to client."""
         await self._prefs.async_update(remote_enabled=connect)
 
+    async def async_cloud_connection_info(
+        self, payload: dict[str, Any]
+    ) -> dict[str, Any]:
+        """Process cloud connection info message to client."""
+        return {
+            "remote": {
+                "connected": self.cloud.remote.is_connected,
+                "enabled": self._prefs.remote_enabled,
+                "instance_domain": self.cloud.remote.instance_domain,
+            },
+            "version": HA_VERSION,
+        }
+
     async def async_alexa_message(self, payload: dict[Any, Any]) -> dict[Any, Any]:
         """Process cloud alexa message to client."""
         cloud_user = await self._prefs.get_cloud_user()
diff --git a/homeassistant/components/cloud/manifest.json b/homeassistant/components/cloud/manifest.json
index d352b7226f0..d8fd2148b4d 100644
--- a/homeassistant/components/cloud/manifest.json
+++ b/homeassistant/components/cloud/manifest.json
@@ -8,5 +8,5 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["hass_nabucasa"],
-  "requirements": ["hass-nabucasa==0.67.1"]
+  "requirements": ["hass-nabucasa==0.69.0"]
 }
diff --git a/homeassistant/components/cloud/prefs.py b/homeassistant/components/cloud/prefs.py
index 46ddafd48e7..8b6f773e5d9 100644
--- a/homeassistant/components/cloud/prefs.py
+++ b/homeassistant/components/cloud/prefs.py
@@ -47,7 +47,7 @@ GOOGLE_SETTINGS_VERSION = 3
 
 
 class CloudPreferencesStore(Store):
-    """Store entity registry data."""
+    """Store cloud preferences."""
 
     async def _async_migrate_func(
         self, old_major_version: int, old_minor_version: int, old_data: dict[str, Any]
diff --git a/homeassistant/components/co2signal/manifest.json b/homeassistant/components/co2signal/manifest.json
index 801718b88a7..b4dc01d03aa 100644
--- a/homeassistant/components/co2signal/manifest.json
+++ b/homeassistant/components/co2signal/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/co2signal",
   "iot_class": "cloud_polling",
   "loggers": ["CO2Signal"],
-  "requirements": ["co2signal==0.4.2"]
+  "requirements": ["CO2Signal==0.4.2"]
 }
diff --git a/homeassistant/components/color_extractor/__init__.py b/homeassistant/components/color_extractor/__init__.py
index aa2d9cfbfdb..d0a6b53964b 100644
--- a/homeassistant/components/color_extractor/__init__.py
+++ b/homeassistant/components/color_extractor/__init__.py
@@ -3,10 +3,10 @@ import asyncio
 import io
 import logging
 
-from PIL import UnidentifiedImageError
 import aiohttp
 import async_timeout
 from colorthief import ColorThief
+from PIL import UnidentifiedImageError
 import voluptuous as vol
 
 from homeassistant.components.light import (
diff --git a/homeassistant/components/command_line/binary_sensor.py b/homeassistant/components/command_line/binary_sensor.py
index e7007b24592..f2097178a95 100644
--- a/homeassistant/components/command_line/binary_sensor.py
+++ b/homeassistant/components/command_line/binary_sensor.py
@@ -29,6 +29,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.template import Template
+from homeassistant.helpers.template_entity import ManualTriggerEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
@@ -69,7 +70,7 @@ async def async_setup_platform(
             hass,
             DOMAIN,
             "deprecated_yaml_binary_sensor",
-            breaks_in_ha_version="2023.8.0",
+            breaks_in_ha_version="2023.12.0",
             is_fixable=False,
             severity=IssueSeverity.WARNING,
             translation_key="deprecated_platform_yaml",
@@ -95,23 +96,27 @@ async def async_setup_platform(
         value_template.hass = hass
     data = CommandSensorData(hass, command, command_timeout)
 
+    trigger_entity_config = {
+        CONF_UNIQUE_ID: unique_id,
+        CONF_NAME: Template(name, hass),
+        CONF_DEVICE_CLASS: device_class,
+    }
+
     async_add_entities(
         [
             CommandBinarySensor(
                 data,
-                name,
-                device_class,
+                trigger_entity_config,
                 payload_on,
                 payload_off,
                 value_template,
-                unique_id,
                 scan_interval,
             )
         ],
     )
 
 
-class CommandBinarySensor(BinarySensorEntity):
+class CommandBinarySensor(ManualTriggerEntity, BinarySensorEntity):
     """Representation of a command line binary sensor."""
 
     _attr_should_poll = False
@@ -119,23 +124,19 @@ class CommandBinarySensor(BinarySensorEntity):
     def __init__(
         self,
         data: CommandSensorData,
-        name: str,
-        device_class: BinarySensorDeviceClass | None,
+        config: ConfigType,
         payload_on: str,
         payload_off: str,
         value_template: Template | None,
-        unique_id: str | None,
         scan_interval: timedelta,
     ) -> None:
         """Initialize the Command line binary sensor."""
+        super().__init__(self.hass, config)
         self.data = data
-        self._attr_name = name
-        self._attr_device_class = device_class
         self._attr_is_on = None
         self._payload_on = payload_on
         self._payload_off = payload_off
         self._value_template = value_template
-        self._attr_unique_id = unique_id
         self._scan_interval = scan_interval
         self._process_updates: asyncio.Lock | None = None
 
@@ -183,6 +184,7 @@ class CommandBinarySensor(BinarySensorEntity):
         elif value == self._payload_off:
             self._attr_is_on = False
 
+        self._process_manual_data(value)
         self.async_write_ha_state()
 
     async def async_update(self) -> None:
diff --git a/homeassistant/components/command_line/cover.py b/homeassistant/components/command_line/cover.py
index 041fa122f37..553af2f0c86 100644
--- a/homeassistant/components/command_line/cover.py
+++ b/homeassistant/components/command_line/cover.py
@@ -30,6 +30,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.template import Template
+from homeassistant.helpers.template_entity import ManualTriggerEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util, slugify
 
@@ -72,7 +73,7 @@ async def async_setup_platform(
             hass,
             DOMAIN,
             "deprecated_yaml_cover",
-            breaks_in_ha_version="2023.8.0",
+            breaks_in_ha_version="2023.12.0",
             is_fixable=False,
             severity=IssueSeverity.WARNING,
             translation_key="deprecated_platform_yaml",
@@ -90,16 +91,20 @@ async def async_setup_platform(
         ):  # Backward compatibility. Can be removed after deprecation
             device_config[CONF_NAME] = name
 
+        trigger_entity_config = {
+            CONF_UNIQUE_ID: device_config.get(CONF_UNIQUE_ID),
+            CONF_NAME: Template(device_config.get(CONF_NAME, device_name), hass),
+        }
+
         covers.append(
             CommandCover(
-                device_config.get(CONF_NAME, device_name),
+                trigger_entity_config,
                 device_config[CONF_COMMAND_OPEN],
                 device_config[CONF_COMMAND_CLOSE],
                 device_config[CONF_COMMAND_STOP],
                 device_config.get(CONF_COMMAND_STATE),
                 value_template,
                 device_config[CONF_COMMAND_TIMEOUT],
-                device_config.get(CONF_UNIQUE_ID),
                 device_config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL),
             )
         )
@@ -111,25 +116,24 @@ async def async_setup_platform(
     async_add_entities(covers)
 
 
-class CommandCover(CoverEntity):
+class CommandCover(ManualTriggerEntity, CoverEntity):
     """Representation a command line cover."""
 
     _attr_should_poll = False
 
     def __init__(
         self,
-        name: str,
+        config: ConfigType,
         command_open: str,
         command_close: str,
         command_stop: str,
         command_state: str | None,
         value_template: Template | None,
         timeout: int,
-        unique_id: str | None,
         scan_interval: timedelta,
     ) -> None:
         """Initialize the cover."""
-        self._attr_name = name
+        super().__init__(self.hass, config)
         self._state: int | None = None
         self._command_open = command_open
         self._command_close = command_close
@@ -137,7 +141,6 @@ class CommandCover(CoverEntity):
         self._command_state = command_state
         self._value_template = value_template
         self._timeout = timeout
-        self._attr_unique_id = unique_id
         self._scan_interval = scan_interval
         self._process_updates: asyncio.Lock | None = None
 
@@ -218,7 +221,8 @@ class CommandCover(CoverEntity):
             self._state = None
             if payload:
                 self._state = int(payload)
-            await self.async_update_ha_state(True)
+            self._process_manual_data(payload)
+            self.async_write_ha_state()
 
     async def async_update(self) -> None:
         """Update the entity.
diff --git a/homeassistant/components/command_line/notify.py b/homeassistant/components/command_line/notify.py
index 2922b8caae3..d00926eb0ee 100644
--- a/homeassistant/components/command_line/notify.py
+++ b/homeassistant/components/command_line/notify.py
@@ -43,7 +43,7 @@ def get_service(
             hass,
             DOMAIN,
             "deprecated_yaml_notify",
-            breaks_in_ha_version="2023.8.0",
+            breaks_in_ha_version="2023.12.0",
             is_fixable=False,
             severity=IssueSeverity.WARNING,
             translation_key="deprecated_platform_yaml",
@@ -72,7 +72,7 @@ class CommandLineNotificationService(BaseNotificationService):
             universal_newlines=True,
             stdin=subprocess.PIPE,
             close_fds=False,  # required for posix_spawn
-            shell=True,  # nosec # shell by design
+            shell=True,  # noqa: S602 # shell by design
         ) as proc:
             try:
                 proc.communicate(input=message, timeout=self._timeout)
diff --git a/homeassistant/components/command_line/sensor.py b/homeassistant/components/command_line/sensor.py
index 8137173d613..1b865827e69 100644
--- a/homeassistant/components/command_line/sensor.py
+++ b/homeassistant/components/command_line/sensor.py
@@ -5,6 +5,7 @@ import asyncio
 from collections.abc import Mapping
 from datetime import timedelta
 import json
+from typing import Any, cast
 
 import voluptuous as vol
 
@@ -15,6 +16,7 @@ from homeassistant.components.sensor import (
     PLATFORM_SCHEMA,
     STATE_CLASSES_SCHEMA,
     SensorEntity,
+    SensorStateClass,
 )
 from homeassistant.const import (
     CONF_COMMAND,
@@ -32,6 +34,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.template import Template
+from homeassistant.helpers.template_entity import ManualTriggerEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
@@ -71,7 +74,7 @@ async def async_setup_platform(
             hass,
             DOMAIN,
             "deprecated_yaml_sensor",
-            breaks_in_ha_version="2023.8.0",
+            breaks_in_ha_version="2023.12.0",
             is_fixable=False,
             severity=IssueSeverity.WARNING,
             translation_key="deprecated_platform_yaml",
@@ -90,24 +93,31 @@ async def async_setup_platform(
         value_template.hass = hass
     json_attributes: list[str] | None = sensor_config.get(CONF_JSON_ATTRIBUTES)
     scan_interval: timedelta = sensor_config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL)
+    state_class: SensorStateClass | None = sensor_config.get(CONF_STATE_CLASS)
     data = CommandSensorData(hass, command, command_timeout)
 
+    trigger_entity_config = {
+        CONF_UNIQUE_ID: unique_id,
+        CONF_NAME: Template(name, hass),
+        CONF_DEVICE_CLASS: sensor_config.get(CONF_DEVICE_CLASS),
+    }
+
     async_add_entities(
         [
             CommandSensor(
                 data,
-                name,
+                trigger_entity_config,
                 unit,
+                state_class,
                 value_template,
                 json_attributes,
-                unique_id,
                 scan_interval,
             )
         ]
     )
 
 
-class CommandSensor(SensorEntity):
+class CommandSensor(ManualTriggerEntity, SensorEntity):
     """Representation of a sensor that is using shell commands."""
 
     _attr_should_poll = False
@@ -115,25 +125,30 @@ class CommandSensor(SensorEntity):
     def __init__(
         self,
         data: CommandSensorData,
-        name: str,
+        config: ConfigType,
         unit_of_measurement: str | None,
+        state_class: SensorStateClass | None,
         value_template: Template | None,
         json_attributes: list[str] | None,
-        unique_id: str | None,
         scan_interval: timedelta,
     ) -> None:
         """Initialize the sensor."""
-        self._attr_name = name
+        super().__init__(self.hass, config)
         self.data = data
         self._attr_extra_state_attributes = {}
         self._json_attributes = json_attributes
         self._attr_native_value = None
         self._value_template = value_template
         self._attr_native_unit_of_measurement = unit_of_measurement
-        self._attr_unique_id = unique_id
+        self._attr_state_class = state_class
         self._scan_interval = scan_interval
         self._process_updates: asyncio.Lock | None = None
 
+    @property
+    def extra_state_attributes(self) -> dict[str, Any]:
+        """Return extra state attributes."""
+        return cast(dict, self._attr_extra_state_attributes)
+
     async def async_added_to_hass(self) -> None:
         """Call when entity about to be added to hass."""
         await super().async_added_to_hass()
@@ -187,6 +202,7 @@ class CommandSensor(SensorEntity):
                 LOGGER.warning("Empty reply found when expecting JSON data")
             if self._value_template is None:
                 self._attr_native_value = None
+                self._process_manual_data(value)
                 return
 
         if self._value_template is not None:
@@ -198,7 +214,7 @@ class CommandSensor(SensorEntity):
             )
         else:
             self._attr_native_value = value
-
+        self._process_manual_data(value)
         self.async_write_ha_state()
 
     async def async_update(self) -> None:
diff --git a/homeassistant/components/command_line/switch.py b/homeassistant/components/command_line/switch.py
index 4a33d8072d7..8fbafd7a4d1 100644
--- a/homeassistant/components/command_line/switch.py
+++ b/homeassistant/components/command_line/switch.py
@@ -74,7 +74,7 @@ async def async_setup_platform(
             hass,
             DOMAIN,
             "deprecated_yaml_switch",
-            breaks_in_ha_version="2023.8.0",
+            breaks_in_ha_version="2023.12.0",
             is_fixable=False,
             severity=IssueSeverity.WARNING,
             translation_key="deprecated_platform_yaml",
@@ -238,7 +238,7 @@ class CommandSwitch(ManualTriggerEntity, SwitchEntity):
             if payload or value:
                 self._attr_is_on = (value or payload).lower() == "true"
             self._process_manual_data(payload)
-            await self.async_update_ha_state(True)
+            self.async_write_ha_state()
 
     async def async_update(self) -> None:
         """Update the entity.
diff --git a/homeassistant/components/command_line/utils.py b/homeassistant/components/command_line/utils.py
index 2d42732190e..66faa3a0bf8 100644
--- a/homeassistant/components/command_line/utils.py
+++ b/homeassistant/components/command_line/utils.py
@@ -19,7 +19,7 @@ def call_shell_with_timeout(
         _LOGGER.debug("Running command: %s", command)
         subprocess.check_output(
             command,
-            shell=True,  # nosec # shell by design
+            shell=True,  # noqa: S602 # shell by design
             timeout=timeout,
             close_fds=False,  # required for posix_spawn
         )
@@ -45,7 +45,7 @@ def check_output_or_log(command: str, timeout: int) -> str | None:
     try:
         return_value = subprocess.check_output(
             command,
-            shell=True,  # nosec # shell by design
+            shell=True,  # noqa: S602 # shell by design
             timeout=timeout,
             close_fds=False,  # required for posix_spawn
         )
diff --git a/homeassistant/components/compensation/__init__.py b/homeassistant/components/compensation/__init__.py
index e36737c7d35..01003020108 100644
--- a/homeassistant/components/compensation/__init__.py
+++ b/homeassistant/components/compensation/__init__.py
@@ -1,5 +1,6 @@
 """The Compensation integration."""
 import logging
+from operator import itemgetter
 
 import numpy as np
 import voluptuous as vol
@@ -7,6 +8,8 @@ import voluptuous as vol
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.const import (
     CONF_ATTRIBUTE,
+    CONF_MAXIMUM,
+    CONF_MINIMUM,
     CONF_SOURCE,
     CONF_UNIQUE_ID,
     CONF_UNIT_OF_MEASUREMENT,
@@ -20,8 +23,10 @@ from .const import (
     CONF_COMPENSATION,
     CONF_DATAPOINTS,
     CONF_DEGREE,
+    CONF_LOWER_LIMIT,
     CONF_POLYNOMIAL,
     CONF_PRECISION,
+    CONF_UPPER_LIMIT,
     DATA_COMPENSATION,
     DEFAULT_DEGREE,
     DEFAULT_PRECISION,
@@ -50,6 +55,8 @@ COMPENSATION_SCHEMA = vol.Schema(
         ],
         vol.Optional(CONF_UNIQUE_ID): cv.string,
         vol.Optional(CONF_ATTRIBUTE): cv.string,
+        vol.Optional(CONF_UPPER_LIMIT, default=False): cv.boolean,
+        vol.Optional(CONF_LOWER_LIMIT, default=False): cv.boolean,
         vol.Optional(CONF_PRECISION, default=DEFAULT_PRECISION): cv.positive_int,
         vol.Optional(CONF_DEGREE, default=DEFAULT_DEGREE): vol.All(
             vol.Coerce(int),
@@ -78,8 +85,11 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
         degree = conf[CONF_DEGREE]
 
+        initial_coefficients: list[tuple[float, float]] = conf[CONF_DATAPOINTS]
+        sorted_coefficients = sorted(initial_coefficients, key=itemgetter(0))
+
         # get x values and y values from the x,y point pairs
-        x_values, y_values = zip(*conf[CONF_DATAPOINTS])
+        x_values, y_values = zip(*initial_coefficients)
 
         # try to get valid coefficients for a polynomial
         coefficients = None
@@ -99,6 +109,16 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             }
             data[CONF_POLYNOMIAL] = np.poly1d(coefficients)
 
+            if data[CONF_LOWER_LIMIT]:
+                data[CONF_MINIMUM] = sorted_coefficients[0]
+            else:
+                data[CONF_MINIMUM] = None
+
+            if data[CONF_UPPER_LIMIT]:
+                data[CONF_MAXIMUM] = sorted_coefficients[-1]
+            else:
+                data[CONF_MAXIMUM] = None
+
             hass.data[DATA_COMPENSATION][compensation] = data
 
             hass.async_create_task(
diff --git a/homeassistant/components/compensation/const.py b/homeassistant/components/compensation/const.py
index f116725883e..d49a6982166 100644
--- a/homeassistant/components/compensation/const.py
+++ b/homeassistant/components/compensation/const.py
@@ -4,6 +4,8 @@ DOMAIN = "compensation"
 SENSOR = "compensation"
 
 CONF_COMPENSATION = "compensation"
+CONF_LOWER_LIMIT = "lower_limit"
+CONF_UPPER_LIMIT = "upper_limit"
 CONF_DATAPOINTS = "data_points"
 CONF_DEGREE = "degree"
 CONF_PRECISION = "precision"
diff --git a/homeassistant/components/compensation/sensor.py b/homeassistant/components/compensation/sensor.py
index 16226974120..4d6ff95b810 100644
--- a/homeassistant/components/compensation/sensor.py
+++ b/homeassistant/components/compensation/sensor.py
@@ -10,6 +10,8 @@ from homeassistant.components.sensor import SensorEntity
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     CONF_ATTRIBUTE,
+    CONF_MAXIMUM,
+    CONF_MINIMUM,
     CONF_SOURCE,
     CONF_UNIQUE_ID,
     CONF_UNIT_OF_MEASUREMENT,
@@ -64,6 +66,8 @@ async def async_setup_platform(
                 conf[CONF_PRECISION],
                 conf[CONF_POLYNOMIAL],
                 conf.get(CONF_UNIT_OF_MEASUREMENT),
+                conf[CONF_MINIMUM],
+                conf[CONF_MAXIMUM],
             )
         ]
     )
@@ -83,6 +87,8 @@ class CompensationSensor(SensorEntity):
         precision: int,
         polynomial: np.poly1d,
         unit_of_measurement: str | None,
+        minimum: tuple[float, float] | None,
+        maximum: tuple[float, float] | None,
     ) -> None:
         """Initialize the Compensation sensor."""
         self._source_entity_id = source
@@ -93,6 +99,8 @@ class CompensationSensor(SensorEntity):
         self._coefficients = polynomial.coefficients.tolist()
         self._attr_unique_id = unique_id
         self._attr_name = name
+        self._minimum = minimum
+        self._maximum = maximum
 
     async def async_added_to_hass(self) -> None:
         """Handle added to Hass."""
@@ -132,7 +140,14 @@ class CompensationSensor(SensorEntity):
         else:
             value = None if new_state.state == STATE_UNKNOWN else new_state.state
         try:
-            self._attr_native_value = round(self._poly(float(value)), self._precision)
+            x_value = float(value)
+            if self._minimum is not None and x_value <= self._minimum[0]:
+                y_value = self._minimum[1]
+            elif self._maximum is not None and x_value >= self._maximum[0]:
+                y_value = self._maximum[1]
+            else:
+                y_value = self._poly(x_value)
+            self._attr_native_value = round(y_value, self._precision)
 
         except (ValueError, TypeError):
             self._attr_native_value = None
diff --git a/homeassistant/components/control4/light.py b/homeassistant/components/control4/light.py
index fde9b00aba2..a2d1308be98 100644
--- a/homeassistant/components/control4/light.py
+++ b/homeassistant/components/control4/light.py
@@ -30,7 +30,7 @@ _LOGGER = logging.getLogger(__name__)
 
 CONTROL4_CATEGORY = "lights"
 CONTROL4_NON_DIMMER_VAR = "LIGHT_STATE"
-CONTROL4_DIMMER_VAR = "LIGHT_LEVEL"
+CONTROL4_DIMMER_VARS = ["LIGHT_LEVEL", "Brightness Percent"]
 
 
 async def async_setup_entry(
@@ -57,7 +57,7 @@ async def async_setup_entry(
         """Fetch data from Control4 director for dimmer lights."""
         try:
             return await update_variables_for_config_entry(
-                hass, entry, {CONTROL4_DIMMER_VAR}
+                hass, entry, {*CONTROL4_DIMMER_VARS}
             )
         except C4Exception as err:
             raise UpdateFailed(f"Error communicating with API: {err}") from err
@@ -190,14 +190,19 @@ class Control4Light(Control4Entity, LightEntity):
     def is_on(self):
         """Return whether this light is on or off."""
         if self._is_dimmer:
-            return self.coordinator.data[self._idx][CONTROL4_DIMMER_VAR] > 0
+            for var in CONTROL4_DIMMER_VARS:
+                if var in self.coordinator.data[self._idx]:
+                    return self.coordinator.data[self._idx][var] > 0
+            raise RuntimeError("Dimmer Variable Not Found")
         return self.coordinator.data[self._idx][CONTROL4_NON_DIMMER_VAR] > 0
 
     @property
     def brightness(self):
         """Return the brightness of this light between 0..255."""
         if self._is_dimmer:
-            return round(self.coordinator.data[self._idx][CONTROL4_DIMMER_VAR] * 2.55)
+            for var in CONTROL4_DIMMER_VARS:
+                if var in self.coordinator.data[self._idx]:
+                    return round(self.coordinator.data[self._idx][var] * 2.55)
         return None
 
     @property
diff --git a/homeassistant/components/conversation/__init__.py b/homeassistant/components/conversation/__init__.py
index f156acfd568..5b82b5dae72 100644
--- a/homeassistant/components/conversation/__init__.py
+++ b/homeassistant/components/conversation/__init__.py
@@ -8,6 +8,7 @@ import logging
 import re
 from typing import Any, Literal
 
+from hassil.recognize import RecognizeResult
 import voluptuous as vol
 
 from homeassistant import core
@@ -16,6 +17,7 @@ from homeassistant.components.http.data_validator import RequestDataValidator
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import MATCH_ALL
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, intent, singleton
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
@@ -154,12 +156,12 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     if config_intents := config.get(DOMAIN, {}).get("intents"):
         hass.data[DATA_CONFIG] = config_intents
 
-    async def handle_process(service: core.ServiceCall) -> None:
+    async def handle_process(service: core.ServiceCall) -> core.ServiceResponse:
         """Parse text into commands."""
         text = service.data[ATTR_TEXT]
         _LOGGER.debug("Processing: <%s>", text)
         try:
-            await async_converse(
+            result = await async_converse(
                 hass=hass,
                 text=text,
                 conversation_id=None,
@@ -168,7 +170,12 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 agent_id=service.data.get(ATTR_AGENT_ID),
             )
         except intent.IntentHandleError as err:
-            _LOGGER.error("Error processing %s: %s", text, err)
+            raise HomeAssistantError(f"Error processing {text}: {err}") from err
+
+        if service.return_response:
+            return result.as_dict()
+
+        return None
 
     async def handle_reload(service: core.ServiceCall) -> None:
         """Reload intents."""
@@ -176,7 +183,11 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         await agent.async_reload(language=service.data.get(ATTR_LANGUAGE))
 
     hass.services.async_register(
-        DOMAIN, SERVICE_PROCESS, handle_process, schema=SERVICE_PROCESS_SCHEMA
+        DOMAIN,
+        SERVICE_PROCESS,
+        handle_process,
+        schema=SERVICE_PROCESS_SCHEMA,
+        supports_response=core.SupportsResponse.OPTIONAL,
     )
     hass.services.async_register(
         DOMAIN, SERVICE_RELOAD, handle_reload, schema=SERVICE_RELOAD_SCHEMA
@@ -186,6 +197,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     websocket_api.async_register_command(hass, websocket_prepare)
     websocket_api.async_register_command(hass, websocket_get_agent_info)
     websocket_api.async_register_command(hass, websocket_list_agents)
+    websocket_api.async_register_command(hass, websocket_hass_agent_debug)
 
     return True
 
@@ -297,6 +309,107 @@ async def websocket_list_agents(
     connection.send_message(websocket_api.result_message(msg["id"], {"agents": agents}))
 
 
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "conversation/agent/homeassistant/debug",
+        vol.Required("sentences"): [str],
+        vol.Optional("language"): str,
+        vol.Optional("device_id"): vol.Any(str, None),
+    }
+)
+@websocket_api.async_response
+async def websocket_hass_agent_debug(
+    hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict
+) -> None:
+    """Return intents that would be matched by the default agent for a list of sentences."""
+    agent = await _get_agent_manager(hass).async_get_agent(HOME_ASSISTANT_AGENT)
+    assert isinstance(agent, DefaultAgent)
+    results = [
+        await agent.async_recognize(
+            ConversationInput(
+                text=sentence,
+                context=connection.context(msg),
+                conversation_id=None,
+                device_id=msg.get("device_id"),
+                language=msg.get("language", hass.config.language),
+            )
+        )
+        for sentence in msg["sentences"]
+    ]
+
+    # Return results for each sentence in the same order as the input.
+    connection.send_result(
+        msg["id"],
+        {
+            "results": [
+                {
+                    "intent": {
+                        "name": result.intent.name,
+                    },
+                    "entities": {
+                        entity_key: {
+                            "name": entity.name,
+                            "value": entity.value,
+                            "text": entity.text,
+                        }
+                        for entity_key, entity in result.entities.items()
+                    },
+                    "targets": {
+                        state.entity_id: {"matched": is_matched}
+                        for state, is_matched in _get_debug_targets(hass, result)
+                    },
+                }
+                if result is not None
+                else None
+                for result in results
+            ]
+        },
+    )
+
+
+def _get_debug_targets(
+    hass: HomeAssistant,
+    result: RecognizeResult,
+) -> Iterable[tuple[core.State, bool]]:
+    """Yield state/is_matched pairs for a hassil recognition."""
+    entities = result.entities
+
+    name: str | None = None
+    area_name: str | None = None
+    domains: set[str] | None = None
+    device_classes: set[str] | None = None
+    state_names: set[str] | None = None
+
+    if "name" in entities:
+        name = str(entities["name"].value)
+
+    if "area" in entities:
+        area_name = str(entities["area"].value)
+
+    if "domain" in entities:
+        domains = set(cv.ensure_list(entities["domain"].value))
+
+    if "device_class" in entities:
+        device_classes = set(cv.ensure_list(entities["device_class"].value))
+
+    if "state" in entities:
+        # HassGetState only
+        state_names = set(cv.ensure_list(entities["state"].value))
+
+    states = intent.async_match_states(
+        hass,
+        name=name,
+        area_name=area_name,
+        domains=domains,
+        device_classes=device_classes,
+    )
+
+    for state in states:
+        # For queries, a target is "matched" based on its state
+        is_matched = (state_names is None) or (state.state in state_names)
+        yield state, is_matched
+
+
 class ConversationProcessView(http.HomeAssistantView):
     """View to process text."""
 
@@ -362,6 +475,7 @@ async def async_converse(
     context: core.Context,
     language: str | None = None,
     agent_id: str | None = None,
+    device_id: str | None = None,
 ) -> ConversationResult:
     """Process text and get intent."""
     agent = await _get_agent_manager(hass).async_get_agent(agent_id)
@@ -375,6 +489,7 @@ async def async_converse(
             text=text,
             context=context,
             conversation_id=conversation_id,
+            device_id=device_id,
             language=language,
         )
     )
@@ -462,12 +577,8 @@ class AgentManager:
     def async_set_agent(self, agent_id: str, agent: AbstractConversationAgent) -> None:
         """Set the agent."""
         self._agents[agent_id] = agent
-        if self.default_agent == HOME_ASSISTANT_AGENT:
-            self.default_agent = agent_id
 
     @core.callback
     def async_unset_agent(self, agent_id: str) -> None:
         """Unset the agent."""
-        if self.default_agent == agent_id:
-            self.default_agent = HOME_ASSISTANT_AGENT
         self._agents.pop(agent_id, None)
diff --git a/homeassistant/components/conversation/agent.py b/homeassistant/components/conversation/agent.py
index 162338a6ff0..99b9c9392d8 100644
--- a/homeassistant/components/conversation/agent.py
+++ b/homeassistant/components/conversation/agent.py
@@ -16,6 +16,7 @@ class ConversationInput:
     text: str
     context: Context
     conversation_id: str | None
+    device_id: str | None
     language: str
 
 
diff --git a/homeassistant/components/conversation/default_agent.py b/homeassistant/components/conversation/default_agent.py
index 44b13522412..336d6287f18 100644
--- a/homeassistant/components/conversation/default_agent.py
+++ b/homeassistant/components/conversation/default_agent.py
@@ -3,8 +3,9 @@ from __future__ import annotations
 
 import asyncio
 from collections import defaultdict
-from collections.abc import Iterable
+from collections.abc import Awaitable, Callable, Iterable
 from dataclasses import dataclass
+import functools
 import logging
 from pathlib import Path
 import re
@@ -42,6 +43,9 @@ _DEFAULT_ERROR_TEXT = "Sorry, I couldn't understand that"
 _ENTITY_REGISTRY_UPDATE_FIELDS = ["aliases", "name", "original_name"]
 
 REGEX_TYPE = type(re.compile(""))
+TRIGGER_CALLBACK_TYPE = Callable[  # pylint: disable=invalid-name
+    [str], Awaitable[str | None]
+]
 
 
 def json_load(fp: IO[str]) -> JsonObjectType:
@@ -60,6 +64,14 @@ class LanguageIntents:
     loaded_components: set[str]
 
 
+@dataclass(slots=True)
+class TriggerData:
+    """List of sentences and the callback for a trigger."""
+
+    sentences: list[str]
+    callback: TRIGGER_CALLBACK_TYPE
+
+
 def _get_language_variations(language: str) -> Iterable[str]:
     """Generate language codes with and without region."""
     yield language
@@ -110,6 +122,10 @@ class DefaultAgent(AbstractConversationAgent):
         self._config_intents: dict[str, Any] = {}
         self._slot_lists: dict[str, SlotList] | None = None
 
+        # Sentences that will trigger a callback (skipping intent recognition)
+        self._trigger_sentences: list[TriggerData] = []
+        self._trigger_intents: Intents | None = None
+
     @property
     def supported_languages(self) -> list[str]:
         """Return a list of supported languages."""
@@ -143,11 +159,12 @@ class DefaultAgent(AbstractConversationAgent):
             self.hass, DOMAIN, self._async_exposed_entities_updated
         )
 
-    async def async_process(self, user_input: ConversationInput) -> ConversationResult:
-        """Process a sentence."""
+    async def async_recognize(
+        self, user_input: ConversationInput
+    ) -> RecognizeResult | None:
+        """Recognize intent from user input."""
         language = user_input.language or self.hass.config.language
         lang_intents = self._lang_intents.get(language)
-        conversation_id = None  # Not supported
 
         # Reload intents if missing or new components
         if lang_intents is None or (
@@ -159,21 +176,29 @@ class DefaultAgent(AbstractConversationAgent):
         if lang_intents is None:
             # No intents loaded
             _LOGGER.warning("No intents were loaded for language: %s", language)
-            return _make_error_result(
-                language,
-                intent.IntentResponseErrorCode.NO_INTENT_MATCH,
-                _DEFAULT_ERROR_TEXT,
-                conversation_id,
-            )
+            return None
 
         slot_lists = self._make_slot_lists()
-
         result = await self.hass.async_add_executor_job(
             self._recognize,
             user_input,
             lang_intents,
             slot_lists,
         )
+
+        return result
+
+    async def async_process(self, user_input: ConversationInput) -> ConversationResult:
+        """Process a sentence."""
+        if trigger_result := await self._match_triggers(user_input.text):
+            return trigger_result
+
+        language = user_input.language or self.hass.config.language
+        conversation_id = None  # Not supported
+
+        result = await self.async_recognize(user_input)
+        lang_intents = self._lang_intents.get(language)
+
         if result is None:
             _LOGGER.debug("No intent was matched for '%s'", user_input.text)
             return _make_error_result(
@@ -183,6 +208,10 @@ class DefaultAgent(AbstractConversationAgent):
                 conversation_id,
             )
 
+        # Will never happen because result will be None when no intents are
+        # loaded in async_recognize.
+        assert lang_intents is not None
+
         try:
             intent_response = await intent.async_handle(
                 self.hass,
@@ -585,13 +614,109 @@ class DefaultAgent(AbstractConversationAgent):
         return self._slot_lists
 
     def _get_error_text(
-        self, response_type: ResponseType, lang_intents: LanguageIntents
+        self, response_type: ResponseType, lang_intents: LanguageIntents | None
     ) -> str:
         """Get response error text by type."""
+        if lang_intents is None:
+            return _DEFAULT_ERROR_TEXT
+
         response_key = response_type.value
         response_str = lang_intents.error_responses.get(response_key)
         return response_str or _DEFAULT_ERROR_TEXT
 
+    def register_trigger(
+        self,
+        sentences: list[str],
+        callback: TRIGGER_CALLBACK_TYPE,
+    ) -> core.CALLBACK_TYPE:
+        """Register a list of sentences that will trigger a callback when recognized."""
+        trigger_data = TriggerData(sentences=sentences, callback=callback)
+        self._trigger_sentences.append(trigger_data)
+
+        # Force rebuild on next use
+        self._trigger_intents = None
+
+        unregister = functools.partial(self._unregister_trigger, trigger_data)
+        return unregister
+
+    def _rebuild_trigger_intents(self) -> None:
+        """Rebuild the HassIL intents object from the current trigger sentences."""
+        intents_dict = {
+            "language": self.hass.config.language,
+            "intents": {
+                # Use trigger data index as a virtual intent name for HassIL.
+                # This works because the intents are rebuilt on every
+                # register/unregister.
+                str(trigger_id): {"data": [{"sentences": trigger_data.sentences}]}
+                for trigger_id, trigger_data in enumerate(self._trigger_sentences)
+            },
+        }
+
+        self._trigger_intents = Intents.from_dict(intents_dict)
+        _LOGGER.debug("Rebuilt trigger intents: %s", intents_dict)
+
+    def _unregister_trigger(self, trigger_data: TriggerData) -> None:
+        """Unregister a set of trigger sentences."""
+        self._trigger_sentences.remove(trigger_data)
+
+        # Force rebuild on next use
+        self._trigger_intents = None
+
+    async def _match_triggers(self, sentence: str) -> ConversationResult | None:
+        """Try to match sentence against registered trigger sentences.
+
+        Calls the registered callbacks if there's a match and returns a positive
+        conversation result.
+        """
+        if not self._trigger_sentences:
+            # No triggers registered
+            return None
+
+        if self._trigger_intents is None:
+            # Need to rebuild intents before matching
+            self._rebuild_trigger_intents()
+
+        assert self._trigger_intents is not None
+
+        matched_triggers: set[int] = set()
+        for result in recognize_all(sentence, self._trigger_intents):
+            trigger_id = int(result.intent.name)
+            if trigger_id in matched_triggers:
+                # Already matched a sentence from this trigger
+                break
+
+            matched_triggers.add(trigger_id)
+
+        if not matched_triggers:
+            # Sentence did not match any trigger sentences
+            return None
+
+        _LOGGER.debug(
+            "'%s' matched %s trigger(s): %s",
+            sentence,
+            len(matched_triggers),
+            matched_triggers,
+        )
+
+        # Gather callback responses in parallel
+        trigger_responses = await asyncio.gather(
+            *(
+                self._trigger_sentences[trigger_id].callback(sentence)
+                for trigger_id in matched_triggers
+            )
+        )
+
+        # Use last non-empty result as speech response
+        speech: str | None = None
+        for trigger_response in trigger_responses:
+            speech = speech or trigger_response
+
+        response = intent.IntentResponse(language=self.hass.config.language)
+        response.response_type = intent.IntentResponseType.ACTION_DONE
+        response.async_set_speech(speech or "")
+
+        return ConversationResult(response=response)
+
 
 def _make_error_result(
     language: str,
diff --git a/homeassistant/components/conversation/manifest.json b/homeassistant/components/conversation/manifest.json
index 01276d56081..aa2d0c32d16 100644
--- a/homeassistant/components/conversation/manifest.json
+++ b/homeassistant/components/conversation/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "system",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["hassil==1.0.6", "home-assistant-intents==2023.6.5"]
+  "requirements": ["hassil==1.0.6", "home-assistant-intents==2023.6.28"]
 }
diff --git a/homeassistant/components/conversation/services.yaml b/homeassistant/components/conversation/services.yaml
index 6b031ff7142..1a28044dcb5 100644
--- a/homeassistant/components/conversation/services.yaml
+++ b/homeassistant/components/conversation/services.yaml
@@ -7,6 +7,7 @@ process:
       name: Text
       description: Transcribed text
       example: Turn all lights on
+      required: true
       selector:
         text:
     language:
@@ -20,4 +21,4 @@ process:
       description: Assist engine to process your request
       example: homeassistant
       selector:
-        text:
+        conversation_agent:
diff --git a/homeassistant/components/conversation/trigger.py b/homeassistant/components/conversation/trigger.py
new file mode 100644
index 00000000000..b64b74c5fa6
--- /dev/null
+++ b/homeassistant/components/conversation/trigger.py
@@ -0,0 +1,72 @@
+"""Offer sentence based automation rules."""
+from __future__ import annotations
+
+from typing import Any
+
+from hassil.recognize import PUNCTUATION
+import voluptuous as vol
+
+from homeassistant.const import CONF_COMMAND, CONF_PLATFORM
+from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
+from homeassistant.helpers.typing import ConfigType
+
+from . import HOME_ASSISTANT_AGENT, _get_agent_manager
+from .const import DOMAIN
+from .default_agent import DefaultAgent
+
+
+def has_no_punctuation(value: list[str]) -> list[str]:
+    """Validate result does not contain punctuation."""
+    for sentence in value:
+        if PUNCTUATION.search(sentence):
+            raise vol.Invalid("sentence should not contain punctuation")
+
+    return value
+
+
+TRIGGER_SCHEMA = cv.TRIGGER_BASE_SCHEMA.extend(
+    {
+        vol.Required(CONF_PLATFORM): DOMAIN,
+        vol.Required(CONF_COMMAND): vol.All(
+            cv.ensure_list, [cv.string], has_no_punctuation
+        ),
+    }
+)
+
+
+async def async_attach_trigger(
+    hass: HomeAssistant,
+    config: ConfigType,
+    action: TriggerActionType,
+    trigger_info: TriggerInfo,
+) -> CALLBACK_TYPE:
+    """Listen for events based on configuration."""
+    trigger_data = trigger_info["trigger_data"]
+    sentences = config.get(CONF_COMMAND, [])
+
+    job = HassJob(action)
+
+    @callback
+    async def call_action(sentence: str) -> str | None:
+        """Call action with right context."""
+        trigger_input: dict[str, Any] = {  # Satisfy type checker
+            **trigger_data,
+            "platform": DOMAIN,
+            "sentence": sentence,
+        }
+
+        # Wait for the automation to complete
+        if future := hass.async_run_hass_job(
+            job,
+            {"trigger": trigger_input},
+        ):
+            await future
+
+        return "Done"
+
+    default_agent = await _get_agent_manager(hass).async_get_agent(HOME_ASSISTANT_AGENT)
+    assert isinstance(default_agent, DefaultAgent)
+
+    return default_agent.register_trigger(sentences, call_action)
diff --git a/homeassistant/components/coolmaster/binary_sensor.py b/homeassistant/components/coolmaster/binary_sensor.py
index 884cf98b742..29fd5797124 100644
--- a/homeassistant/components/coolmaster/binary_sensor.py
+++ b/homeassistant/components/coolmaster/binary_sensor.py
@@ -32,12 +32,11 @@ async def async_setup_entry(
 class CoolmasterCleanFilter(CoolmasterEntity, BinarySensorEntity):
     """Representation of a unit's filter state (true means need to be cleaned)."""
 
-    _attr_has_entity_name = True
     entity_description = BinarySensorEntityDescription(
         key="clean_filter",
+        translation_key="clean_filter",
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
-        name="Clean filter",
         icon="mdi:air-filter",
     )
 
diff --git a/homeassistant/components/coolmaster/button.py b/homeassistant/components/coolmaster/button.py
index a32a9833dd9..e4dfb371a0b 100644
--- a/homeassistant/components/coolmaster/button.py
+++ b/homeassistant/components/coolmaster/button.py
@@ -28,11 +28,10 @@ async def async_setup_entry(
 class CoolmasterResetFilter(CoolmasterEntity, ButtonEntity):
     """Reset the clean filter timer (once filter was cleaned)."""
 
-    _attr_has_entity_name = True
     entity_description = ButtonEntityDescription(
         key="reset_filter",
+        translation_key="reset_filter",
         entity_category=EntityCategory.CONFIG,
-        name="Reset filter",
         icon="mdi:air-filter",
     )
 
diff --git a/homeassistant/components/coolmaster/climate.py b/homeassistant/components/coolmaster/climate.py
index d27f776c655..6ae6613bcca 100644
--- a/homeassistant/components/coolmaster/climate.py
+++ b/homeassistant/components/coolmaster/climate.py
@@ -53,6 +53,8 @@ async def async_setup_entry(
 class CoolmasterClimate(CoolmasterEntity, ClimateEntity):
     """Representation of a coolmaster climate device."""
 
+    _attr_name = None
+
     def __init__(self, coordinator, unit_id, info, supported_modes):
         """Initialize the climate device."""
         super().__init__(coordinator, unit_id, info)
@@ -63,11 +65,6 @@ class CoolmasterClimate(CoolmasterEntity, ClimateEntity):
         """Return unique ID for this device."""
         return self._unit_id
 
-    @property
-    def name(self):
-        """Return the name of the climate device."""
-        return self.unique_id
-
     @property
     def supported_features(self) -> ClimateEntityFeature:
         """Return the list of supported features."""
diff --git a/homeassistant/components/coolmaster/entity.py b/homeassistant/components/coolmaster/entity.py
index 65f21b77534..1607e220a55 100644
--- a/homeassistant/components/coolmaster/entity.py
+++ b/homeassistant/components/coolmaster/entity.py
@@ -12,6 +12,8 @@ from .const import DOMAIN
 class CoolmasterEntity(CoordinatorEntity[CoolmasterDataUpdateCoordinator]):
     """Representation of a Coolmaster entity."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: CoolmasterDataUpdateCoordinator,
diff --git a/homeassistant/components/coolmaster/sensor.py b/homeassistant/components/coolmaster/sensor.py
index 59b0e71abb2..5c6774e8c92 100644
--- a/homeassistant/components/coolmaster/sensor.py
+++ b/homeassistant/components/coolmaster/sensor.py
@@ -28,11 +28,10 @@ async def async_setup_entry(
 class CoolmasterCleanFilter(CoolmasterEntity, SensorEntity):
     """Representation of a unit's error code."""
 
-    _attr_has_entity_name = True
     entity_description = SensorEntityDescription(
         key="error_code",
+        translation_key="error_code",
         entity_category=EntityCategory.DIAGNOSTIC,
-        name="Error code",
         icon="mdi:alert",
     )
 
diff --git a/homeassistant/components/coolmaster/strings.json b/homeassistant/components/coolmaster/strings.json
index 6bba26b6bc9..7baa6444c1d 100644
--- a/homeassistant/components/coolmaster/strings.json
+++ b/homeassistant/components/coolmaster/strings.json
@@ -19,5 +19,22 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "no_units": "Could not find any HVAC units in CoolMasterNet host."
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "clean_filter": {
+        "name": "Clean filter"
+      }
+    },
+    "button": {
+      "reset_filter": {
+        "name": "Reset filter"
+      }
+    },
+    "sensor": {
+      "error_code": {
+        "name": "Error code"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/counter/__init__.py b/homeassistant/components/counter/__init__.py
index d2834b8991b..6f3d48fc1bb 100644
--- a/homeassistant/components/counter/__init__.py
+++ b/homeassistant/components/counter/__init__.py
@@ -292,7 +292,7 @@ class Counter(collection.CollectionEntity, RestoreEntity):
             self.hass,
             DOMAIN,
             "deprecated_configure_service",
-            breaks_in_ha_version="2023.8.0",
+            breaks_in_ha_version="2023.12.0",
             is_fixable=True,
             is_persistent=True,
             severity=IssueSeverity.WARNING,
diff --git a/homeassistant/components/cover/device_action.py b/homeassistant/components/cover/device_action.py
index dd22821d5e4..e34a623be93 100644
--- a/homeassistant/components/cover/device_action.py
+++ b/homeassistant/components/cover/device_action.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -42,21 +43,28 @@ POSITION_ACTION_TYPES = {"set_position", "set_tilt_position"}
 CMD_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(CMD_ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
     }
 )
 
 POSITION_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(POSITION_ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Optional("position", default=0): vol.All(
             vol.Coerce(int), vol.Range(min=0, max=100)
         ),
     }
 )
 
-ACTION_SCHEMA = vol.Any(CMD_ACTION_SCHEMA, POSITION_ACTION_SCHEMA)
+_ACTION_SCHEMA = vol.Any(CMD_ACTION_SCHEMA, POSITION_ACTION_SCHEMA)
+
+
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
 
 
 async def async_get_actions(
@@ -77,7 +85,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         if supported_features & SUPPORT_SET_POSITION:
diff --git a/homeassistant/components/cover/device_condition.py b/homeassistant/components/cover/device_condition.py
index 6144bdb6dbf..2aa0a1dd2fb 100644
--- a/homeassistant/components/cover/device_condition.py
+++ b/homeassistant/components/cover/device_condition.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 import voluptuous as vol
 
 from homeassistant.const import (
-    ATTR_ENTITY_ID,
     CONF_ABOVE,
     CONF_BELOW,
     CONF_CONDITION,
@@ -43,7 +42,7 @@ STATE_CONDITION_TYPES = {"is_open", "is_closed", "is_opening", "is_closing"}
 POSITION_CONDITION_SCHEMA = vol.All(
     DEVICE_CONDITION_BASE_SCHEMA.extend(
         {
-            vol.Required(CONF_ENTITY_ID): cv.entity_id,
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_TYPE): vol.In(POSITION_CONDITION_TYPES),
             vol.Optional(CONF_ABOVE): vol.All(
                 vol.Coerce(int), vol.Range(min=0, max=100)
@@ -58,7 +57,7 @@ POSITION_CONDITION_SCHEMA = vol.All(
 
 STATE_CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(STATE_CONDITION_TYPES),
     }
 )
@@ -86,7 +85,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         if supports_open_close:
@@ -127,6 +126,9 @@ def async_condition_from_config(
     hass: HomeAssistant, config: ConfigType
 ) -> condition.ConditionCheckerType:
     """Create a function to test a device condition."""
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[CONF_ENTITY_ID])
+
     if config[CONF_TYPE] in STATE_CONDITION_TYPES:
         if config[CONF_TYPE] == "is_open":
             state = STATE_OPEN
@@ -139,7 +141,7 @@ def async_condition_from_config(
 
         def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
             """Test if an entity is a certain state."""
-            return condition.state(hass, config[ATTR_ENTITY_ID], state)
+            return condition.state(hass, entity_id, state)
 
         return test_is_state
 
@@ -156,7 +158,7 @@ def async_condition_from_config(
     ) -> bool:
         """Return whether the criteria are met."""
         return condition.async_numeric_state(
-            hass, config[ATTR_ENTITY_ID], max_pos, min_pos, attribute=position_attr
+            hass, entity_id, max_pos, min_pos, attribute=position_attr
         )
 
     return check_numeric_state
diff --git a/homeassistant/components/cover/device_trigger.py b/homeassistant/components/cover/device_trigger.py
index aad225c8039..2fb456d726d 100644
--- a/homeassistant/components/cover/device_trigger.py
+++ b/homeassistant/components/cover/device_trigger.py
@@ -43,7 +43,7 @@ STATE_TRIGGER_TYPES = {"opened", "closed", "opening", "closing"}
 POSITION_TRIGGER_SCHEMA = vol.All(
     DEVICE_TRIGGER_BASE_SCHEMA.extend(
         {
-            vol.Required(CONF_ENTITY_ID): cv.entity_id,
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_TYPE): vol.In(POSITION_TRIGGER_TYPES),
             vol.Optional(CONF_ABOVE): vol.All(
                 vol.Coerce(int), vol.Range(min=0, max=100)
@@ -58,7 +58,7 @@ POSITION_TRIGGER_SCHEMA = vol.All(
 
 STATE_TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(STATE_TRIGGER_TYPES),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -87,7 +87,7 @@ async def async_get_triggers(
             CONF_PLATFORM: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         if supports_open_close:
diff --git a/homeassistant/components/cpuspeed/sensor.py b/homeassistant/components/cpuspeed/sensor.py
index c71de53ebbe..7eb3cfab753 100644
--- a/homeassistant/components/cpuspeed/sensor.py
+++ b/homeassistant/components/cpuspeed/sensor.py
@@ -35,6 +35,7 @@ class CPUSpeedSensor(SensorEntity):
     _attr_device_class = SensorDeviceClass.FREQUENCY
     _attr_icon = "mdi:pulse"
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_native_unit_of_measurement = UnitOfFrequency.GIGAHERTZ
 
     def __init__(self, entry: ConfigEntry) -> None:
diff --git a/homeassistant/components/cups/sensor.py b/homeassistant/components/cups/sensor.py
index c642eb9112e..dd5366dee6a 100644
--- a/homeassistant/components/cups/sensor.py
+++ b/homeassistant/components/cups/sensor.py
@@ -115,10 +115,15 @@ class CupsSensor(SensorEntity):
     def __init__(self, data: CupsData, printer_name: str) -> None:
         """Initialize the CUPS sensor."""
         self.data = data
-        self._attr_name = printer_name
+        self._name = printer_name
         self._printer: dict[str, Any] | None = None
         self._attr_available = False
 
+    @property
+    def name(self) -> str:
+        """Return the name of the entity."""
+        return self._name
+
     @property
     def native_value(self):
         """Return the state of the sensor."""
@@ -149,7 +154,6 @@ class CupsSensor(SensorEntity):
     def update(self) -> None:
         """Get the latest data and updates the states."""
         self.data.update()
-        assert self.name is not None
         assert self.data.printers is not None
         self._printer = self.data.printers.get(self.name)
         self._attr_available = self.data.available
diff --git a/homeassistant/components/daikin/climate.py b/homeassistant/components/daikin/climate.py
index bd0e846ea4d..5ede11c60b6 100644
--- a/homeassistant/components/daikin/climate.py
+++ b/homeassistant/components/daikin/climate.py
@@ -276,17 +276,16 @@ class DaikinClimate(ClimateEntity):
             await self._api.device.set_advanced_mode(
                 HA_PRESET_TO_DAIKIN[PRESET_ECO], ATTR_STATE_ON
             )
-        else:
-            if self.preset_mode == PRESET_AWAY:
-                await self._api.device.set_holiday(ATTR_STATE_OFF)
-            elif self.preset_mode == PRESET_BOOST:
-                await self._api.device.set_advanced_mode(
-                    HA_PRESET_TO_DAIKIN[PRESET_BOOST], ATTR_STATE_OFF
-                )
-            elif self.preset_mode == PRESET_ECO:
-                await self._api.device.set_advanced_mode(
-                    HA_PRESET_TO_DAIKIN[PRESET_ECO], ATTR_STATE_OFF
-                )
+        elif self.preset_mode == PRESET_AWAY:
+            await self._api.device.set_holiday(ATTR_STATE_OFF)
+        elif self.preset_mode == PRESET_BOOST:
+            await self._api.device.set_advanced_mode(
+                HA_PRESET_TO_DAIKIN[PRESET_BOOST], ATTR_STATE_OFF
+            )
+        elif self.preset_mode == PRESET_ECO:
+            await self._api.device.set_advanced_mode(
+                HA_PRESET_TO_DAIKIN[PRESET_ECO], ATTR_STATE_OFF
+            )
 
     @property
     def preset_modes(self):
diff --git a/homeassistant/components/deconz/manifest.json b/homeassistant/components/deconz/manifest.json
index 8139d77df85..6245558a1c5 100644
--- a/homeassistant/components/deconz/manifest.json
+++ b/homeassistant/components/deconz/manifest.json
@@ -8,7 +8,7 @@
   "iot_class": "local_push",
   "loggers": ["pydeconz"],
   "quality_scale": "platinum",
-  "requirements": ["pydeconz==112"],
+  "requirements": ["pydeconz==113"],
   "ssdp": [
     {
       "manufacturer": "Royal Philips Electronics",
diff --git a/homeassistant/components/deconz/sensor.py b/homeassistant/components/deconz/sensor.py
index e5d5de41008..4e00ac0a415 100644
--- a/homeassistant/components/deconz/sensor.py
+++ b/homeassistant/components/deconz/sensor.py
@@ -16,6 +16,7 @@ from pydeconz.models.sensor.daylight import DAYLIGHT_STATUS, Daylight
 from pydeconz.models.sensor.generic_status import GenericStatus
 from pydeconz.models.sensor.humidity import Humidity
 from pydeconz.models.sensor.light_level import LightLevel
+from pydeconz.models.sensor.moisture import Moisture
 from pydeconz.models.sensor.power import Power
 from pydeconz.models.sensor.pressure import Pressure
 from pydeconz.models.sensor.switch import Switch
@@ -81,6 +82,7 @@ T = TypeVar(
     GenericStatus,
     Humidity,
     LightLevel,
+    Moisture,
     Power,
     Pressure,
     Temperature,
@@ -206,6 +208,17 @@ ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=LIGHT_LUX,
     ),
+    DeconzSensorDescription[Moisture](
+        key="moisture",
+        supported_fn=lambda device: device.moisture is not None,
+        update_key="moisture",
+        value_fn=lambda device: device.scaled_moisture,
+        instance_check=Moisture,
+        device_class=SensorDeviceClass.MOISTURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=PERCENTAGE,
+        suggested_display_precision=1,
+    ),
     DeconzSensorDescription[Power](
         key="power",
         supported_fn=lambda device: device.power is not None,
diff --git a/homeassistant/components/decora_wifi/manifest.json b/homeassistant/components/decora_wifi/manifest.json
index 592942ee99b..0bead527e78 100644
--- a/homeassistant/components/decora_wifi/manifest.json
+++ b/homeassistant/components/decora_wifi/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/decora_wifi",
   "iot_class": "cloud_polling",
   "loggers": ["decora_wifi"],
-  "requirements": ["decora_wifi==1.4"]
+  "requirements": ["decora-wifi==1.4"]
 }
diff --git a/homeassistant/components/delijn/manifest.json b/homeassistant/components/delijn/manifest.json
index 81307c47bba..d25dab4234e 100644
--- a/homeassistant/components/delijn/manifest.json
+++ b/homeassistant/components/delijn/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/delijn",
   "iot_class": "cloud_polling",
   "loggers": ["pydelijn"],
-  "requirements": ["pydelijn==1.0.0"]
+  "requirements": ["pydelijn==1.1.0"]
 }
diff --git a/homeassistant/components/deluge/sensor.py b/homeassistant/components/deluge/sensor.py
index eed194640dd..9242e3e2d5e 100644
--- a/homeassistant/components/deluge/sensor.py
+++ b/homeassistant/components/deluge/sensor.py
@@ -28,11 +28,11 @@ def get_state(data: dict[str, float], key: str) -> str | float:
     download = data[DATA_KEYS[1]] - data[DATA_KEYS[3]]
     if key == CURRENT_STATUS:
         if upload > 0 and download > 0:
-            return "Up/Down"
+            return "seeding_and_downloading"
         if upload > 0 and download == 0:
-            return "Seeding"
+            return "seeding"
         if upload == 0 and download > 0:
-            return "Downloading"
+            return "downloading"
         return STATE_IDLE
     kb_spd = float(upload if key == UPLOAD_SPEED else download) / 1024
     return round(kb_spd, 2 if kb_spd < 0.1 else 1)
@@ -48,12 +48,14 @@ class DelugeSensorEntityDescription(SensorEntityDescription):
 SENSOR_TYPES: tuple[DelugeSensorEntityDescription, ...] = (
     DelugeSensorEntityDescription(
         key=CURRENT_STATUS,
-        name="Status",
+        translation_key="status",
         value=lambda data: get_state(data, CURRENT_STATUS),
+        device_class=SensorDeviceClass.ENUM,
+        options=["seeding_and_downloading", "seeding", "downloading", "idle"],
     ),
     DelugeSensorEntityDescription(
         key=DOWNLOAD_SPEED,
-        name="Down speed",
+        translation_key="download_speed",
         device_class=SensorDeviceClass.DATA_RATE,
         native_unit_of_measurement=UnitOfDataRate.KILOBYTES_PER_SECOND,
         state_class=SensorStateClass.MEASUREMENT,
@@ -61,7 +63,7 @@ SENSOR_TYPES: tuple[DelugeSensorEntityDescription, ...] = (
     ),
     DelugeSensorEntityDescription(
         key=UPLOAD_SPEED,
-        name="Up speed",
+        translation_key="upload_speed",
         device_class=SensorDeviceClass.DATA_RATE,
         native_unit_of_measurement=UnitOfDataRate.KILOBYTES_PER_SECOND,
         state_class=SensorStateClass.MEASUREMENT,
diff --git a/homeassistant/components/deluge/strings.json b/homeassistant/components/deluge/strings.json
index f11e1a2bd3e..e0266d004e2 100644
--- a/homeassistant/components/deluge/strings.json
+++ b/homeassistant/components/deluge/strings.json
@@ -19,5 +19,24 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "status": {
+        "name": "Status",
+        "state": {
+          "seeding_and_downloading": "Up/Down",
+          "seeding": "Seeding",
+          "downloading": "Downloading",
+          "idle": "[%key:common::state::idle%]"
+        }
+      },
+      "download_speed": {
+        "name": "Download speed"
+      },
+      "upload_speed": {
+        "name": "Upload speed"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/deluge/switch.py b/homeassistant/components/deluge/switch.py
index f9e89543d26..483b02844d6 100644
--- a/homeassistant/components/deluge/switch.py
+++ b/homeassistant/components/deluge/switch.py
@@ -24,6 +24,8 @@ async def async_setup_entry(
 class DelugeSwitch(DelugeEntity, SwitchEntity):
     """Representation of a Deluge switch."""
 
+    _attr_name = None
+
     def __init__(self, coordinator: DelugeDataUpdateCoordinator) -> None:
         """Initialize the Deluge switch."""
         super().__init__(coordinator)
diff --git a/homeassistant/components/demo/__init__.py b/homeassistant/components/demo/__init__.py
index a84d7bf4f0b..246c952e219 100644
--- a/homeassistant/components/demo/__init__.py
+++ b/homeassistant/components/demo/__init__.py
@@ -50,7 +50,6 @@ COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM = [
 
 COMPONENTS_WITH_DEMO_PLATFORM = [
     Platform.TTS,
-    Platform.STT,
     Platform.MAILBOX,
     Platform.NOTIFY,
     Platform.IMAGE_PROCESSING,
@@ -63,9 +62,6 @@ CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the demo environment."""
-    if DOMAIN not in config:
-        return True
-
     if not hass.config_entries.async_entries(DOMAIN):
         hass.async_create_task(
             hass.config_entries.flow.async_init(
@@ -73,6 +69,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             )
         )
 
+    if DOMAIN not in config:
+        return True
+
     # Set up demo platforms
     for platform in COMPONENTS_WITH_DEMO_PLATFORM:
         hass.async_create_task(async_load_platform(hass, platform, DOMAIN, {}, config))
diff --git a/homeassistant/components/demo/binary_sensor.py b/homeassistant/components/demo/binary_sensor.py
index ee718e85cc0..236d4bbb1b0 100644
--- a/homeassistant/components/demo/binary_sensor.py
+++ b/homeassistant/components/demo/binary_sensor.py
@@ -9,18 +9,16 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo binary sensor platform."""
+    """Set up the demo binary sensor platform."""
     async_add_entities(
         [
             DemoBinarySensor(
@@ -36,42 +34,30 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoBinarySensor(BinarySensorEntity):
     """representation of a Demo binary sensor."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         state: bool,
         device_class: BinarySensorDeviceClass,
     ) -> None:
         """Initialize the demo sensor."""
         self._unique_id = unique_id
-        self._attr_name = name
         self._state = state
         self._attr_device_class = device_class
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device info."""
-        return DeviceInfo(
+        self._attr_device_info = DeviceInfo(
             identifiers={
                 # Serial numbers are unique identifiers within a specific domain
                 (DOMAIN, self.unique_id)
             },
-            name=self.name,
+            name=device_name,
         )
 
     @property
diff --git a/homeassistant/components/demo/button.py b/homeassistant/components/demo/button.py
index 626403009ce..f7a653e1779 100644
--- a/homeassistant/components/demo/button.py
+++ b/homeassistant/components/demo/button.py
@@ -4,59 +4,48 @@ from __future__ import annotations
 from homeassistant.components import persistent_notification
 from homeassistant.components.button import ButtonEntity
 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.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the demo Button entity."""
-    async_add_entities(
-        [
-            DemoButton(
-                unique_id="push",
-                name="Push",
-                icon="mdi:gesture-tap-button",
-            ),
-        ]
-    )
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
+    """Set up the demo button platform."""
+    async_add_entities(
+        [
+            DemoButton(
+                unique_id="push",
+                device_name="Push",
+                icon="mdi:gesture-tap-button",
+            ),
+        ]
+    )
 
 
 class DemoButton(ButtonEntity):
     """Representation of a demo button entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         icon: str,
     ) -> None:
         """Initialize the Demo button entity."""
         self._attr_unique_id = unique_id
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_icon = icon
         self._attr_device_info = {
             "identifiers": {(DOMAIN, unique_id)},
-            "name": name,
+            "name": device_name,
         }
 
     async def async_press(self) -> None:
diff --git a/homeassistant/components/demo/calendar.py b/homeassistant/components/demo/calendar.py
index ae546361d8f..73b45a55640 100644
--- a/homeassistant/components/demo/calendar.py
+++ b/homeassistant/components/demo/calendar.py
@@ -27,10 +27,10 @@ def setup_platform(
 
 def calendar_data_future() -> CalendarEvent:
     """Representation of a Demo Calendar for a future event."""
-    one_hour_from_now = dt_util.now() + datetime.timedelta(minutes=30)
+    half_hour_from_now = dt_util.now() + datetime.timedelta(minutes=30)
     return CalendarEvent(
-        start=one_hour_from_now,
-        end=one_hour_from_now + datetime.timedelta(minutes=60),
+        start=half_hour_from_now,
+        end=half_hour_from_now + datetime.timedelta(minutes=60),
         summary="Future Event",
         description="Future Description",
         location="Future Location",
@@ -67,4 +67,9 @@ class DemoCalendar(CalendarEntity):
         end_date: datetime.datetime,
     ) -> list[CalendarEvent]:
         """Return calendar events within a datetime range."""
+        assert start_date < end_date
+        if self._event.start_datetime_local >= end_date:
+            return []
+        if self._event.end_datetime_local < start_date:
+            return []
         return [self._event]
diff --git a/homeassistant/components/demo/camera.py b/homeassistant/components/demo/camera.py
index b55fb4ba0e9..722693280a0 100644
--- a/homeassistant/components/demo/camera.py
+++ b/homeassistant/components/demo/camera.py
@@ -7,22 +7,6 @@ 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.typing import ConfigType, DiscoveryInfoType
-
-
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the Demo camera platform."""
-    async_add_entities(
-        [
-            DemoCamera("Demo camera", "image/jpg"),
-            DemoCamera("Demo camera png", "image/png"),
-        ]
-    )
 
 
 async def async_setup_entry(
@@ -31,7 +15,12 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
+    async_add_entities(
+        [
+            DemoCamera("Demo camera", "image/jpg"),
+            DemoCamera("Demo camera png", "image/png"),
+        ]
+    )
 
 
 class DemoCamera(Camera):
diff --git a/homeassistant/components/demo/climate.py b/homeassistant/components/demo/climate.py
index 7c0a4a5c9c8..340a4b306cb 100644
--- a/homeassistant/components/demo/climate.py
+++ b/homeassistant/components/demo/climate.py
@@ -14,27 +14,24 @@ 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 import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 SUPPORT_FLAGS = ClimateEntityFeature(0)
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo climate devices."""
+    """Set up the demo climate platform."""
     async_add_entities(
         [
             DemoClimate(
                 unique_id="climate_1",
-                name="HeatPump",
+                device_name="HeatPump",
                 target_temperature=68,
                 unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
                 preset=None,
@@ -52,7 +49,7 @@ async def async_setup_platform(
             ),
             DemoClimate(
                 unique_id="climate_2",
-                name="Hvac",
+                device_name="Hvac",
                 target_temperature=21,
                 unit_of_measurement=UnitOfTemperature.CELSIUS,
                 preset=None,
@@ -70,7 +67,7 @@ async def async_setup_platform(
             ),
             DemoClimate(
                 unique_id="climate_3",
-                name="Ecobee",
+                device_name="Ecobee",
                 target_temperature=None,
                 unit_of_measurement=UnitOfTemperature.CELSIUS,
                 preset="home",
@@ -91,25 +88,18 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo climate devices config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoClimate(ClimateEntity):
     """Representation of a demo climate device."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
     _attr_translation_key = "ubercool"
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         target_temperature: float | None,
         unit_of_measurement: str,
         preset: str | None,
@@ -128,7 +118,6 @@ class DemoClimate(ClimateEntity):
     ) -> None:
         """Initialize the climate device."""
         self._unique_id = unique_id
-        self._attr_name = name
         self._attr_supported_features = SUPPORT_FLAGS
         if target_temperature is not None:
             self._attr_supported_features |= ClimateEntityFeature.TARGET_TEMPERATURE
@@ -163,17 +152,10 @@ class DemoClimate(ClimateEntity):
         self._swing_modes = ["auto", "1", "2", "3", "off"]
         self._target_temperature_high = target_temp_high
         self._target_temperature_low = target_temp_low
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device info."""
-        return DeviceInfo(
-            identifiers={
-                # Serial numbers are unique identifiers within a specific domain
-                (DOMAIN, self.unique_id)
-            },
-            name=self.name,
-        )
+        self._attr_device_info = {
+            "identifiers": {(DOMAIN, unique_id)},
+            "name": device_name,
+        }
 
     @property
     def unique_id(self) -> str:
diff --git a/homeassistant/components/demo/cover.py b/homeassistant/components/demo/cover.py
index 6f443329661..42e30aa8336 100644
--- a/homeassistant/components/demo/cover.py
+++ b/homeassistant/components/demo/cover.py
@@ -16,18 +16,16 @@ from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_utc_time_change
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo covers."""
+    """Set up the demo cover platform."""
     async_add_entities(
         [
             DemoCover(hass, "cover_1", "Kitchen Window"),
@@ -56,25 +54,18 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoCover(CoverEntity):
     """Representation of a demo cover."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         hass: HomeAssistant,
         unique_id: str,
-        name: str,
+        device_name: str,
         position: int | None = None,
         tilt_position: int | None = None,
         device_class: CoverDeviceClass | None = None,
@@ -83,7 +74,6 @@ class DemoCover(CoverEntity):
         """Initialize the cover."""
         self.hass = hass
         self._unique_id = unique_id
-        self._attr_name = name
         self._position = position
         self._attr_device_class = device_class
         self._attr_supported_features = supported_features
@@ -101,15 +91,12 @@ class DemoCover(CoverEntity):
         else:
             self._closed = position <= 0
 
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device info."""
-        return DeviceInfo(
+        self._attr_device_info = DeviceInfo(
             identifiers={
                 # Serial numbers are unique identifiers within a specific domain
                 (DOMAIN, self.unique_id)
             },
-            name=self.name,
+            name=device_name,
         )
 
     @property
diff --git a/homeassistant/components/demo/date.py b/homeassistant/components/demo/date.py
index eb96bc49038..4129d0d392a 100644
--- a/homeassistant/components/demo/date.py
+++ b/homeassistant/components/demo/date.py
@@ -5,22 +5,19 @@ from datetime import date
 
 from homeassistant.components.date import DateEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo date entity."""
+    """Set up the demo date platform."""
     async_add_entities(
         [
             DemoDate(
@@ -34,24 +31,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoDate(DateEntity):
     """Representation of a Demo date entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         state: date,
         icon: str,
         assumed_state: bool,
@@ -59,12 +49,11 @@ class DemoDate(DateEntity):
         """Initialize the Demo date entity."""
         self._attr_assumed_state = assumed_state
         self._attr_icon = icon
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_native_value = state
         self._attr_unique_id = unique_id
 
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, unique_id)}, name=self.name
+            identifiers={(DOMAIN, unique_id)}, name=device_name
         )
 
     async def async_set_value(self, value: date) -> None:
diff --git a/homeassistant/components/demo/datetime.py b/homeassistant/components/demo/datetime.py
index 88027f58b92..b769f9baba3 100644
--- a/homeassistant/components/demo/datetime.py
+++ b/homeassistant/components/demo/datetime.py
@@ -5,22 +5,19 @@ from datetime import datetime, timezone
 
 from homeassistant.components.datetime import DateTimeEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo date/time entity."""
+    """Set up the demo datetime platform."""
     async_add_entities(
         [
             DemoDateTime(
@@ -34,24 +31,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoDateTime(DateTimeEntity):
     """Representation of a Demo date/time entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         state: datetime,
         icon: str,
         assumed_state: bool,
@@ -59,7 +49,6 @@ class DemoDateTime(DateTimeEntity):
         """Initialize the Demo date/time entity."""
         self._attr_assumed_state = assumed_state
         self._attr_icon = icon
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_native_value = state
         self._attr_unique_id = unique_id
 
@@ -68,7 +57,7 @@ class DemoDateTime(DateTimeEntity):
                 # Serial numbers are unique identifiers within a specific domain
                 (DOMAIN, unique_id)
             },
-            name=self.name,
+            name=device_name,
         )
 
     async def async_set_value(self, value: datetime) -> None:
diff --git a/homeassistant/components/demo/humidifier.py b/homeassistant/components/demo/humidifier.py
index 772726ac1d5..2e16a04e171 100644
--- a/homeassistant/components/demo/humidifier.py
+++ b/homeassistant/components/demo/humidifier.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 from typing import Any
 
 from homeassistant.components.humidifier import (
+    HumidifierAction,
     HumidifierDeviceClass,
     HumidifierEntity,
     HumidifierEntityFeature,
@@ -29,12 +30,16 @@ async def async_setup_platform(
                 name="Humidifier",
                 mode=None,
                 target_humidity=68,
+                current_humidity=45,
+                action=HumidifierAction.HUMIDIFYING,
                 device_class=HumidifierDeviceClass.HUMIDIFIER,
             ),
             DemoHumidifier(
                 name="Dehumidifier",
                 mode=None,
                 target_humidity=54,
+                current_humidity=59,
+                action=HumidifierAction.DRYING,
                 device_class=HumidifierDeviceClass.DEHUMIDIFIER,
             ),
             DemoHumidifier(
@@ -66,17 +71,21 @@ class DemoHumidifier(HumidifierEntity):
         name: str,
         mode: str | None,
         target_humidity: int,
+        current_humidity: int | None = None,
         available_modes: list[str] | None = None,
         is_on: bool = True,
+        action: HumidifierAction | None = None,
         device_class: HumidifierDeviceClass | None = None,
     ) -> None:
         """Initialize the humidifier device."""
         self._attr_name = name
         self._attr_is_on = is_on
+        self._attr_action = action
         self._attr_supported_features = SUPPORT_FLAGS
         if mode is not None:
             self._attr_supported_features |= HumidifierEntityFeature.MODES
         self._attr_target_humidity = target_humidity
+        self._attr_current_humidity = current_humidity
         self._attr_mode = mode
         self._attr_available_modes = available_modes
         self._attr_device_class = device_class
diff --git a/homeassistant/components/demo/light.py b/homeassistant/components/demo/light.py
index 2e5291b8a13..fbc35965dc4 100644
--- a/homeassistant/components/demo/light.py
+++ b/homeassistant/components/demo/light.py
@@ -20,7 +20,6 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
@@ -34,11 +33,10 @@ SUPPORT_DEMO = {ColorMode.HS, ColorMode.COLOR_TEMP}
 SUPPORT_DEMO_HS_WHITE = {ColorMode.HS, ColorMode.WHITE}
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the demo light platform."""
     async_add_entities(
@@ -47,28 +45,28 @@ async def async_setup_platform(
                 available=True,
                 effect_list=LIGHT_EFFECT_LIST,
                 effect=LIGHT_EFFECT_LIST[0],
-                name="Bed Light",
+                device_name="Bed Light",
                 state=False,
                 unique_id="light_1",
             ),
             DemoLight(
                 available=True,
                 ct=LIGHT_TEMPS[1],
-                name="Ceiling Lights",
+                device_name="Ceiling Lights",
                 state=True,
                 unique_id="light_2",
             ),
             DemoLight(
                 available=True,
                 hs_color=LIGHT_COLORS[1],
-                name="Kitchen Lights",
+                device_name="Kitchen Lights",
                 state=True,
                 unique_id="light_3",
             ),
             DemoLight(
                 available=True,
                 ct=LIGHT_TEMPS[1],
-                name="Office RGBW Lights",
+                device_name="Office RGBW Lights",
                 rgbw_color=(255, 0, 0, 255),
                 state=True,
                 supported_color_modes={ColorMode.RGBW},
@@ -76,7 +74,7 @@ async def async_setup_platform(
             ),
             DemoLight(
                 available=True,
-                name="Living Room RGBWW Lights",
+                device_name="Living Room RGBWW Lights",
                 rgbww_color=(255, 0, 0, 255, 0),
                 state=True,
                 supported_color_modes={ColorMode.RGBWW},
@@ -84,7 +82,7 @@ async def async_setup_platform(
             ),
             DemoLight(
                 available=True,
-                name="Entrance Color + White Lights",
+                device_name="Entrance Color + White Lights",
                 hs_color=LIGHT_COLORS[1],
                 state=True,
                 supported_color_modes=SUPPORT_DEMO_HS_WHITE,
@@ -94,24 +92,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoLight(LightEntity):
     """Representation of a demo light."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         state: bool,
         available: bool = False,
         brightness: int = 180,
@@ -130,7 +121,6 @@ class DemoLight(LightEntity):
         self._effect = effect
         self._effect_list = effect_list
         self._hs_color = hs_color
-        self._attr_name = name
         self._rgbw_color = rgbw_color
         self._rgbww_color = rgbww_color
         self._state = state
@@ -148,16 +138,12 @@ class DemoLight(LightEntity):
         self._color_modes = supported_color_modes
         if self._effect_list is not None:
             self._attr_supported_features |= LightEntityFeature.EFFECT
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device info."""
-        return DeviceInfo(
+        self._attr_device_info = DeviceInfo(
             identifiers={
                 # Serial numbers are unique identifiers within a specific domain
                 (DOMAIN, self.unique_id)
             },
-            name=self.name,
+            name=device_name,
         )
 
     @property
diff --git a/homeassistant/components/demo/mailbox.py b/homeassistant/components/demo/mailbox.py
index 9627383443e..8aa3e1ef384 100644
--- a/homeassistant/components/demo/mailbox.py
+++ b/homeassistant/components/demo/mailbox.py
@@ -78,7 +78,7 @@ class DemoMailbox(Mailbox):
         """Return a list of the current messages."""
         return sorted(
             self._messages.values(),
-            key=lambda item: item["info"]["origtime"],  # type: ignore[no-any-return]
+            key=lambda item: item["info"]["origtime"],
             reverse=True,
         )
 
diff --git a/homeassistant/components/demo/number.py b/homeassistant/components/demo/number.py
index 25ed7347bda..719b1078b8c 100644
--- a/homeassistant/components/demo/number.py
+++ b/homeassistant/components/demo/number.py
@@ -3,22 +3,20 @@ from __future__ import annotations
 
 from homeassistant.components.number import NumberDeviceClass, NumberEntity, NumberMode
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME, UnitOfTemperature
+from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the demo Number entity."""
+    """Set up the demo number platform."""
     async_add_entities(
         [
             DemoNumber(
@@ -77,24 +75,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoNumber(NumberEntity):
     """Representation of a demo Number entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         state: float,
         icon: str,
         assumed_state: bool,
@@ -111,7 +102,6 @@ class DemoNumber(NumberEntity):
         self._attr_device_class = device_class
         self._attr_icon = icon
         self._attr_mode = mode
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_native_unit_of_measurement = unit_of_measurement
         self._attr_native_value = state
         self._attr_unique_id = unique_id
@@ -128,7 +118,7 @@ class DemoNumber(NumberEntity):
                 # Serial numbers are unique identifiers within a specific domain
                 (DOMAIN, unique_id)
             },
-            name=self.name,
+            name=device_name,
         )
 
     async def async_set_native_value(self, value: float) -> None:
diff --git a/homeassistant/components/demo/select.py b/homeassistant/components/demo/select.py
index e30d65c9f0e..6349b10040c 100644
--- a/homeassistant/components/demo/select.py
+++ b/homeassistant/components/demo/select.py
@@ -3,27 +3,24 @@ from __future__ import annotations
 
 from homeassistant.components.select import SelectEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the demo Select entity."""
+    """Set up the demo select platform."""
     async_add_entities(
         [
             DemoSelect(
                 unique_id="speed",
-                name="Speed",
+                device_name="Speed",
                 icon="mdi:speedometer",
                 current_option="ridiculous_speed",
                 options=[
@@ -37,24 +34,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoSelect(SelectEntity):
     """Representation of a demo select entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         icon: str,
         current_option: str | None,
         options: list[str],
@@ -62,14 +52,13 @@ class DemoSelect(SelectEntity):
     ) -> None:
         """Initialize the Demo select entity."""
         self._attr_unique_id = unique_id
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_current_option = current_option
         self._attr_icon = icon
         self._attr_options = options
         self._attr_translation_key = translation_key
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            name=name,
+            name=device_name,
         )
 
     async def async_select_option(self, option: str) -> None:
diff --git a/homeassistant/components/demo/sensor.py b/homeassistant/components/demo/sensor.py
index 84758f0c294..26689582fae 100644
--- a/homeassistant/components/demo/sensor.py
+++ b/homeassistant/components/demo/sensor.py
@@ -25,18 +25,17 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType
+from homeassistant.helpers.typing import StateType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo sensors."""
+    """Set up the demo sensor platform."""
     async_add_entities(
         [
             DemoSensor(
@@ -126,7 +125,7 @@ async def async_setup_platform(
             ),
             DemoSensor(
                 unique_id="sensor_10",
-                name=None,
+                device_name="Thermostat",
                 state="eco",
                 device_class=SensorDeviceClass.ENUM,
                 state_class=None,
@@ -139,24 +138,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoSensor(SensorEntity):
     """Representation of a Demo sensor."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str | None,
+        device_name: str | None,
         state: StateType,
         device_class: SensorDeviceClass,
         state_class: SensorStateClass | None,
@@ -167,10 +159,6 @@ class DemoSensor(SensorEntity):
     ) -> None:
         """Initialize the sensor."""
         self._attr_device_class = device_class
-        if name is not None:
-            self._attr_name = name
-        else:
-            self._attr_has_entity_name = True
         self._attr_native_unit_of_measurement = unit_of_measurement
         self._attr_native_value = state
         self._attr_state_class = state_class
@@ -180,7 +168,7 @@ class DemoSensor(SensorEntity):
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            name=name,
+            name=device_name,
         )
 
         if battery:
@@ -196,7 +184,7 @@ class DemoSumSensor(RestoreSensor):
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         five_minute_increase: float,
         device_class: SensorDeviceClass,
         state_class: SensorStateClass | None,
@@ -207,7 +195,6 @@ class DemoSumSensor(RestoreSensor):
         """Initialize the sensor."""
         self.entity_id = f"{SENSOR_DOMAIN}.{suggested_entity_id}"
         self._attr_device_class = device_class
-        self._attr_name = name
         self._attr_native_unit_of_measurement = unit_of_measurement
         self._attr_native_value = 0
         self._attr_state_class = state_class
@@ -216,7 +203,7 @@ class DemoSumSensor(RestoreSensor):
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            name=name,
+            name=device_name,
         )
 
         if battery:
diff --git a/homeassistant/components/demo/stt.py b/homeassistant/components/demo/stt.py
index 6458bf47397..8cbc287b71d 100644
--- a/homeassistant/components/demo/stt.py
+++ b/homeassistant/components/demo/stt.py
@@ -9,7 +9,6 @@ from homeassistant.components.stt import (
     AudioCodecs,
     AudioFormats,
     AudioSampleRates,
-    Provider,
     SpeechMetadata,
     SpeechResult,
     SpeechResultState,
@@ -18,20 +17,10 @@ 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.typing import ConfigType, DiscoveryInfoType
 
 SUPPORT_LANGUAGES = ["en", "de"]
 
 
-async def async_get_engine(
-    hass: HomeAssistant,
-    config: ConfigType,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> Provider:
-    """Set up Demo speech component."""
-    return DemoProvider()
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
@@ -86,48 +75,3 @@ class DemoProviderEntity(SpeechToTextEntity):
             pass
 
         return SpeechResult("Turn the Kitchen Lights on", SpeechResultState.SUCCESS)
-
-
-class DemoProvider(Provider):
-    """Demo speech API provider."""
-
-    @property
-    def supported_languages(self) -> list[str]:
-        """Return a list of supported languages."""
-        return SUPPORT_LANGUAGES
-
-    @property
-    def supported_formats(self) -> list[AudioFormats]:
-        """Return a list of supported formats."""
-        return [AudioFormats.WAV]
-
-    @property
-    def supported_codecs(self) -> list[AudioCodecs]:
-        """Return a list of supported codecs."""
-        return [AudioCodecs.PCM]
-
-    @property
-    def supported_bit_rates(self) -> list[AudioBitRates]:
-        """Return a list of supported bit rates."""
-        return [AudioBitRates.BITRATE_16]
-
-    @property
-    def supported_sample_rates(self) -> list[AudioSampleRates]:
-        """Return a list of supported sample rates."""
-        return [AudioSampleRates.SAMPLERATE_16000, AudioSampleRates.SAMPLERATE_44100]
-
-    @property
-    def supported_channels(self) -> list[AudioChannels]:
-        """Return a list of supported channels."""
-        return [AudioChannels.CHANNEL_STEREO]
-
-    async def async_process_audio_stream(
-        self, metadata: SpeechMetadata, stream: AsyncIterable[bytes]
-    ) -> SpeechResult:
-        """Process an audio stream to STT service."""
-
-        # Read available data
-        async for _ in stream:
-            pass
-
-        return SpeechResult("Turn the Kitchen Lights on", SpeechResultState.SUCCESS)
diff --git a/homeassistant/components/demo/switch.py b/homeassistant/components/demo/switch.py
index 2ad400ff3f7..49e06839be5 100644
--- a/homeassistant/components/demo/switch.py
+++ b/homeassistant/components/demo/switch.py
@@ -5,22 +5,19 @@ from typing import Any
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the demo switches."""
+    """Set up the demo switch platform."""
     async_add_entities(
         [
             DemoSwitch("switch1", "Decorative Lights", True, None, True),
@@ -36,24 +33,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoSwitch(SwitchEntity):
     """Representation of a demo switch."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         state: bool,
         icon: str | None,
         assumed: bool,
@@ -64,11 +54,10 @@ class DemoSwitch(SwitchEntity):
         self._attr_device_class = device_class
         self._attr_icon = icon
         self._attr_is_on = state
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_unique_id = unique_id
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            name=self.name,
+            name=device_name,
         )
 
     def turn_on(self, **kwargs: Any) -> None:
diff --git a/homeassistant/components/demo/text.py b/homeassistant/components/demo/text.py
index efce1af5c37..7c243b73ea5 100644
--- a/homeassistant/components/demo/text.py
+++ b/homeassistant/components/demo/text.py
@@ -3,40 +3,37 @@ from __future__ import annotations
 
 from homeassistant.components.text import TextEntity, TextMode
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the demo Text entity."""
+    """Set up the Demo text platform."""
     async_add_entities(
         [
             DemoText(
                 unique_id="text",
-                name="Text",
+                device_name="Text",
                 icon=None,
                 native_value="Hello world",
             ),
             DemoText(
                 unique_id="password",
-                name="Password",
+                device_name="Password",
                 icon="mdi:text",
                 native_value="Hello world",
                 mode=TextMode.PASSWORD,
             ),
             DemoText(
                 unique_id="text_1_to_5_char",
-                name="Text with 1 to 5 characters",
+                device_name="Text with 1 to 5 characters",
                 icon="mdi:text",
                 native_value="Hello",
                 native_min=1,
@@ -44,7 +41,7 @@ async def async_setup_platform(
             ),
             DemoText(
                 unique_id="text_lowercase",
-                name="Text with only lower case characters",
+                device_name="Text with only lower case characters",
                 icon="mdi:text",
                 native_value="world",
                 pattern=r"[a-z]+",
@@ -53,24 +50,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoText(TextEntity):
     """Representation of a demo text entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         icon: str | None,
         native_value: str | None,
         mode: TextMode = TextMode.TEXT,
@@ -80,7 +70,6 @@ class DemoText(TextEntity):
     ) -> None:
         """Initialize the Demo text entity."""
         self._attr_unique_id = unique_id
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_native_value = native_value
         self._attr_icon = icon
         self._attr_mode = mode
@@ -92,7 +81,7 @@ class DemoText(TextEntity):
             self._attr_pattern = pattern
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            name=name,
+            name=device_name,
         )
 
     async def async_set_value(self, value: str) -> None:
diff --git a/homeassistant/components/demo/time.py b/homeassistant/components/demo/time.py
index aafd425a024..0384c0822f4 100644
--- a/homeassistant/components/demo/time.py
+++ b/homeassistant/components/demo/time.py
@@ -5,43 +5,33 @@ from datetime import time
 
 from homeassistant.components.time import TimeEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the Demo time entity."""
-    async_add_entities([DemoTime("time", "Time", time(12, 0, 0), "mdi:clock", False)])
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
+    """Set up the demo time platform."""
+    async_add_entities([DemoTime("time", "Time", time(12, 0, 0), "mdi:clock", False)])
 
 
 class DemoTime(TimeEntity):
     """Representation of a Demo time entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         state: time,
         icon: str,
         assumed_state: bool,
@@ -49,12 +39,11 @@ class DemoTime(TimeEntity):
         """Initialize the Demo time entity."""
         self._attr_assumed_state = assumed_state
         self._attr_icon = icon
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_native_value = state
         self._attr_unique_id = unique_id
 
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, unique_id)}, name=self.name
+            identifiers={(DOMAIN, unique_id)}, name=device_name
         )
 
     async def async_set_value(self, value: time) -> None:
diff --git a/homeassistant/components/demo/update.py b/homeassistant/components/demo/update.py
index 15e67ffa0a8..6373c485037 100644
--- a/homeassistant/components/demo/update.py
+++ b/homeassistant/components/demo/update.py
@@ -10,29 +10,26 @@ from homeassistant.components.update import (
     UpdateEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 FAKE_INSTALL_SLEEP_TIME = 0.5
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up demo update entities."""
+    """Set up demo update platform."""
     async_add_entities(
         [
             DemoUpdate(
                 unique_id="update_no_install",
-                name="Demo Update No Install",
+                device_name="Demo Update No Install",
                 title="Awesomesoft Inc.",
                 installed_version="1.0.0",
                 latest_version="1.0.1",
@@ -42,14 +39,14 @@ async def async_setup_platform(
             ),
             DemoUpdate(
                 unique_id="update_2_date",
-                name="Demo No Update",
+                device_name="Demo No Update",
                 title="AdGuard Home",
                 installed_version="1.0.0",
                 latest_version="1.0.0",
             ),
             DemoUpdate(
                 unique_id="update_addon",
-                name="Demo add-on",
+                device_name="Demo add-on",
                 title="AdGuard Home",
                 installed_version="1.0.0",
                 latest_version="1.0.1",
@@ -58,7 +55,7 @@ async def async_setup_platform(
             ),
             DemoUpdate(
                 unique_id="update_light_bulb",
-                name="Demo Living Room Bulb Update",
+                device_name="Demo Living Room Bulb Update",
                 title="Philips Lamps Firmware",
                 installed_version="1.93.3",
                 latest_version="1.94.2",
@@ -68,7 +65,7 @@ async def async_setup_platform(
             ),
             DemoUpdate(
                 unique_id="update_support_progress",
-                name="Demo Update with Progress",
+                device_name="Demo Update with Progress",
                 title="Philips Lamps Firmware",
                 installed_version="1.93.3",
                 latest_version="1.94.2",
@@ -82,15 +79,6 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 async def _fake_install() -> None:
     """Fake install an update."""
     await asyncio.sleep(FAKE_INSTALL_SLEEP_TIME)
@@ -99,13 +87,15 @@ async def _fake_install() -> None:
 class DemoUpdate(UpdateEntity):
     """Representation of a demo update entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         *,
         unique_id: str,
-        name: str,
+        device_name: str,
         title: str | None,
         installed_version: str | None,
         latest_version: str | None,
@@ -120,14 +110,13 @@ class DemoUpdate(UpdateEntity):
         self._attr_installed_version = installed_version
         self._attr_device_class = device_class
         self._attr_latest_version = latest_version
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_release_summary = release_summary
         self._attr_release_url = release_url
         self._attr_title = title
         self._attr_unique_id = unique_id
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            name=name,
+            name=device_name,
         )
         if support_install:
             self._attr_supported_features |= (
diff --git a/homeassistant/components/derivative/sensor.py b/homeassistant/components/derivative/sensor.py
index e1cc278137c..af04da27406 100644
--- a/homeassistant/components/derivative/sensor.py
+++ b/homeassistant/components/derivative/sensor.py
@@ -19,7 +19,12 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import Event, HomeAssistant, State, callback
-from homeassistant.helpers import config_validation as cv, entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -86,6 +91,28 @@ async def async_setup_entry(
         registry, config_entry.options[CONF_SOURCE]
     )
 
+    source_entity = registry.async_get(source_entity_id)
+    dev_reg = dr.async_get(hass)
+    # Resolve source entity device
+    if (
+        (source_entity is not None)
+        and (source_entity.device_id is not None)
+        and (
+            (
+                device := dev_reg.async_get(
+                    device_id=source_entity.device_id,
+                )
+            )
+            is not None
+        )
+    ):
+        device_info = DeviceInfo(
+            identifiers=device.identifiers,
+            connections=device.connections,
+        )
+    else:
+        device_info = None
+
     unit_prefix = config_entry.options[CONF_UNIT_PREFIX]
     if unit_prefix == "none":
         unit_prefix = None
@@ -99,6 +126,7 @@ async def async_setup_entry(
         unit_of_measurement=None,
         unit_prefix=unit_prefix,
         unit_time=config_entry.options[CONF_UNIT_TIME],
+        device_info=device_info,
     )
 
     async_add_entities([derivative_sensor])
@@ -142,9 +170,11 @@ class DerivativeSensor(RestoreSensor, SensorEntity):
         unit_prefix: str | None,
         unit_time: UnitOfTime,
         unique_id: str | None,
+        device_info: DeviceInfo | None = None,
     ) -> None:
         """Initialize the derivative sensor."""
         self._attr_unique_id = unique_id
+        self._attr_device_info = device_info
         self._sensor_source_id = source_entity
         self._round_digits = round_digits
         self._state: float | int | Decimal = 0
diff --git a/homeassistant/components/device_automation/__init__.py b/homeassistant/components/device_automation/__init__.py
index 71acc6dfa79..af2fd61081c 100644
--- a/homeassistant/components/device_automation/__init__.py
+++ b/homeassistant/components/device_automation/__init__.py
@@ -19,6 +19,7 @@ from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
     CONF_DOMAIN,
+    CONF_ENTITY_ID,
     CONF_PLATFORM,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -40,7 +41,7 @@ from .const import (  # noqa: F401
     CONF_TURNED_OFF,
     CONF_TURNED_ON,
 )
-from .exceptions import DeviceNotFound, InvalidDeviceAutomationConfig
+from .exceptions import DeviceNotFound, EntityNotFound, InvalidDeviceAutomationConfig
 
 if TYPE_CHECKING:
     from .action import DeviceAutomationActionProtocol
@@ -313,7 +314,7 @@ async def _async_get_device_automation_capabilities(
 
     try:
         capabilities = await getattr(platform, function_name)(hass, automation)
-    except InvalidDeviceAutomationConfig:
+    except (EntityNotFound, InvalidDeviceAutomationConfig):
         return {}
 
     capabilities = capabilities.copy()
@@ -328,6 +329,33 @@ async def _async_get_device_automation_capabilities(
     return capabilities  # type: ignore[no-any-return]
 
 
+@callback
+def async_get_entity_registry_entry_or_raise(
+    hass: HomeAssistant, entity_registry_id: str
+) -> er.RegistryEntry:
+    """Get an entity registry entry from entry ID or raise."""
+    entity_registry = er.async_get(hass)
+    entry = entity_registry.async_get(entity_registry_id)
+    if entry is None:
+        raise EntityNotFound
+    return entry
+
+
+@callback
+def async_validate_entity_schema(
+    hass: HomeAssistant, config: ConfigType, schema: vol.Schema
+) -> ConfigType:
+    """Validate schema and resolve entity registry entry id to entity_id."""
+    config = schema(config)
+
+    registry = er.async_get(hass)
+    config[CONF_ENTITY_ID] = er.async_resolve_entity_id(
+        registry, config[CONF_ENTITY_ID]
+    )
+
+    return config
+
+
 def handle_device_errors(
     func: Callable[[HomeAssistant, ActiveConnection, dict[str, Any]], Awaitable[None]]
 ) -> Callable[
diff --git a/homeassistant/components/device_automation/entity.py b/homeassistant/components/device_automation/entity.py
index f38daf2dae6..87ff5a2cb52 100644
--- a/homeassistant/components/device_automation/entity.py
+++ b/homeassistant/components/device_automation/entity.py
@@ -23,7 +23,7 @@ ENTITY_TRIGGERS = [
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In([CONF_CHANGED_STATES]),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -73,7 +73,7 @@ async def _async_get_automations(
             {
                 **template,
                 "device_id": device_id,
-                "entity_id": entry.entity_id,
+                "entity_id": entry.id,
                 "domain": domain,
             }
             for template in automation_templates
diff --git a/homeassistant/components/device_automation/exceptions.py b/homeassistant/components/device_automation/exceptions.py
index ad92696cb94..0b2f2c01be7 100644
--- a/homeassistant/components/device_automation/exceptions.py
+++ b/homeassistant/components/device_automation/exceptions.py
@@ -8,3 +8,7 @@ class InvalidDeviceAutomationConfig(HomeAssistantError):
 
 class DeviceNotFound(HomeAssistantError):
     """When referenced device not found."""
+
+
+class EntityNotFound(HomeAssistantError):
+    """When referenced entity not found."""
diff --git a/homeassistant/components/device_automation/helpers.py b/homeassistant/components/device_automation/helpers.py
index 5f844c36aa5..038ded07e8a 100644
--- a/homeassistant/components/device_automation/helpers.py
+++ b/homeassistant/components/device_automation/helpers.py
@@ -5,7 +5,7 @@ from typing import cast
 
 import voluptuous as vol
 
-from homeassistant.const import CONF_DEVICE_ID, CONF_DOMAIN
+from homeassistant.const import CONF_DEVICE_ID, CONF_DOMAIN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.typing import ConfigType
@@ -25,6 +25,24 @@ STATIC_VALIDATOR = {
     DeviceAutomationType.TRIGGER: "TRIGGER_SCHEMA",
 }
 
+ENTITY_PLATFORMS = {
+    Platform.ALARM_CONTROL_PANEL.value,
+    Platform.BUTTON.value,
+    Platform.CLIMATE.value,
+    Platform.COVER.value,
+    Platform.FAN.value,
+    Platform.HUMIDIFIER.value,
+    Platform.LIGHT.value,
+    Platform.LOCK.value,
+    Platform.NUMBER.value,
+    Platform.REMOTE.value,
+    Platform.SELECT.value,
+    Platform.SWITCH.value,
+    Platform.TEXT.value,
+    Platform.VACUUM.value,
+    Platform.WATER_HEATER.value,
+}
+
 
 async def async_validate_device_automation_config(
     hass: HomeAssistant,
@@ -43,6 +61,16 @@ async def async_validate_device_automation_config(
             ConfigType, getattr(platform, STATIC_VALIDATOR[automation_type])(config)
         )
 
+    # Bypass checks for entity platforms
+    if (
+        automation_type == DeviceAutomationType.ACTION
+        and validated_config[CONF_DOMAIN] in ENTITY_PLATFORMS
+    ):
+        return cast(
+            ConfigType,
+            await getattr(platform, DYNAMIC_VALIDATOR[automation_type])(hass, config),
+        )
+
     # Only call the dynamic validator if the referenced device exists and the relevant
     # config entry is loaded
     registry = dr.async_get(hass)
diff --git a/homeassistant/components/device_automation/toggle_entity.py b/homeassistant/components/device_automation/toggle_entity.py
index e5061cb691e..189fc750e50 100644
--- a/homeassistant/components/device_automation/toggle_entity.py
+++ b/homeassistant/components/device_automation/toggle_entity.py
@@ -78,14 +78,14 @@ DEVICE_ACTION_TYPES = [CONF_TOGGLE, CONF_TURN_OFF, CONF_TURN_ON]
 
 ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(DEVICE_ACTION_TYPES),
     }
 )
 
 CONDITION_SCHEMA = cv.DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In([CONF_IS_OFF, CONF_IS_ON]),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -93,7 +93,7 @@ CONDITION_SCHEMA = cv.DEVICE_CONDITION_BASE_SCHEMA.extend(
 
 _TOGGLE_TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In([CONF_TURNED_OFF, CONF_TURNED_ON]),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -196,7 +196,7 @@ async def _async_get_automations(
             {
                 **template,
                 "device_id": device_id,
-                "entity_id": entry.entity_id,
+                "entity_id": entry.id,
                 "domain": domain,
             }
             for template in automation_templates
diff --git a/homeassistant/components/device_tracker/config_entry.py b/homeassistant/components/device_tracker/config_entry.py
index c4450ab60a7..286929c5345 100644
--- a/homeassistant/components/device_tracker/config_entry.py
+++ b/homeassistant/components/device_tracker/config_entry.py
@@ -373,7 +373,6 @@ class ScannerEntity(BaseTrackerEntity):
         # Entities without a unique ID don't have a device
         if (
             not self.registry_entry
-            or not self.platform
             or not self.platform.config_entry
             or not self.mac_address
             or (device_entry := self.find_device_entry()) is None
diff --git a/homeassistant/components/device_tracker/device_condition.py b/homeassistant/components/device_tracker/device_condition.py
index 96ee70baca8..b5bf850b4fa 100644
--- a/homeassistant/components/device_tracker/device_condition.py
+++ b/homeassistant/components/device_tracker/device_condition.py
@@ -27,7 +27,7 @@ CONDITION_TYPES = {"is_home", "is_not_home"}
 
 CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
     }
 )
@@ -50,7 +50,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions += [{**base_condition, CONF_TYPE: cond} for cond in CONDITION_TYPES]
@@ -63,12 +63,14 @@ def async_condition_from_config(
     hass: HomeAssistant, config: ConfigType
 ) -> condition.ConditionCheckerType:
     """Create a function to test a device condition."""
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
     reverse = config[CONF_TYPE] == "is_not_home"
 
     @callback
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        result = condition.state(hass, config[ATTR_ENTITY_ID], STATE_HOME)
+        result = condition.state(hass, entity_id, STATE_HOME)
         if reverse:
             result = not result
         return result
diff --git a/homeassistant/components/device_tracker/device_trigger.py b/homeassistant/components/device_tracker/device_trigger.py
index 150b5872275..a96f9affb1d 100644
--- a/homeassistant/components/device_tracker/device_trigger.py
+++ b/homeassistant/components/device_tracker/device_trigger.py
@@ -27,7 +27,7 @@ TRIGGER_TYPES: Final[set[str]] = {"enters", "leaves"}
 
 TRIGGER_SCHEMA: Final = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Required(CONF_ZONE): cv.entity_domain(DOMAIN_ZONE),
     }
@@ -51,7 +51,7 @@ async def async_get_triggers(
                 CONF_PLATFORM: "device",
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: "enters",
             }
         )
@@ -60,7 +60,7 @@ async def async_get_triggers(
                 CONF_PLATFORM: "device",
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: "leaves",
             }
         )
diff --git a/homeassistant/components/device_tracker/legacy.py b/homeassistant/components/device_tracker/legacy.py
index e27ff57f03f..b428018cd9e 100644
--- a/homeassistant/components/device_tracker/legacy.py
+++ b/homeassistant/components/device_tracker/legacy.py
@@ -726,6 +726,10 @@ class DeviceTracker:
 class Device(RestoreEntity):
     """Base class for a tracked device."""
 
+    # This entity is legacy and does not have a platform.
+    # We can't fix this easily without breaking changes.
+    _no_platform_reported = True
+
     host_name: str | None = None
     location_name: str | None = None
     gps: GPSType | None = None
diff --git a/homeassistant/components/devolo_home_control/devolo_multi_level_switch.py b/homeassistant/components/devolo_home_control/devolo_multi_level_switch.py
index eafd1e63b1f..d2608ed43c7 100644
--- a/homeassistant/components/devolo_home_control/devolo_multi_level_switch.py
+++ b/homeassistant/components/devolo_home_control/devolo_multi_level_switch.py
@@ -8,6 +8,8 @@ from .devolo_device import DevoloDeviceEntity
 class DevoloMultiLevelSwitchDeviceEntity(DevoloDeviceEntity):
     """Representation of a multi level switch device within devolo Home Control. Something like a dimmer or a thermostat."""
 
+    _attr_name = None
+
     def __init__(
         self, homecontrol: HomeControl, device_instance: Zwave, element_uid: str
     ) -> None:
diff --git a/homeassistant/components/devolo_home_control/light.py b/homeassistant/components/devolo_home_control/light.py
index 4ccd5a00ab2..93a66e345ec 100644
--- a/homeassistant/components/devolo_home_control/light.py
+++ b/homeassistant/components/devolo_home_control/light.py
@@ -71,13 +71,12 @@ class DevoloLightDeviceEntity(DevoloMultiLevelSwitchDeviceEntity, LightEntity):
             self._multi_level_switch_property.set(
                 round(kwargs[ATTR_BRIGHTNESS] / 255 * 100)
             )
+        elif self._binary_switch_property is not None:
+            # Turn on the light device to the latest known value. The value is known by the device itself.
+            self._binary_switch_property.set(True)
         else:
-            if self._binary_switch_property is not None:
-                # Turn on the light device to the latest known value. The value is known by the device itself.
-                self._binary_switch_property.set(True)
-            else:
-                # If there is no binary switch attached to the device, turn it on to 100 %.
-                self._multi_level_switch_property.set(100)
+            # If there is no binary switch attached to the device, turn it on to 100 %.
+            self._multi_level_switch_property.set(100)
 
     def turn_off(self, **kwargs: Any) -> None:
         """Turn device off."""
diff --git a/homeassistant/components/devolo_home_control/switch.py b/homeassistant/components/devolo_home_control/switch.py
index 24b1d3545de..9b96e58da60 100644
--- a/homeassistant/components/devolo_home_control/switch.py
+++ b/homeassistant/components/devolo_home_control/switch.py
@@ -41,6 +41,8 @@ async def async_setup_entry(
 class DevoloSwitch(DevoloDeviceEntity, SwitchEntity):
     """Representation of a switch."""
 
+    _attr_name = None
+
     def __init__(
         self, homecontrol: HomeControl, device_instance: Zwave, element_uid: str
     ) -> None:
diff --git a/homeassistant/components/dexcom/sensor.py b/homeassistant/components/dexcom/sensor.py
index bf53022b43b..b9958dc7309 100644
--- a/homeassistant/components/dexcom/sensor.py
+++ b/homeassistant/components/dexcom/sensor.py
@@ -20,53 +20,35 @@ async def async_setup_entry(
     coordinator = hass.data[DOMAIN][config_entry.entry_id][COORDINATOR]
     username = config_entry.data[CONF_USERNAME]
     unit_of_measurement = config_entry.options[CONF_UNIT_OF_MEASUREMENT]
-    sensors: list[SensorEntity] = []
-    sensors.append(DexcomGlucoseTrendSensor(coordinator, username))
-    sensors.append(DexcomGlucoseValueSensor(coordinator, username, unit_of_measurement))
-    async_add_entities(sensors, False)
+    async_add_entities(
+        [
+            DexcomGlucoseTrendSensor(coordinator, username),
+            DexcomGlucoseValueSensor(coordinator, username, unit_of_measurement),
+        ],
+        False,
+    )
 
 
 class DexcomGlucoseValueSensor(CoordinatorEntity, SensorEntity):
     """Representation of a Dexcom glucose value sensor."""
 
+    _attr_icon = GLUCOSE_VALUE_ICON
+
     def __init__(self, coordinator, username, unit_of_measurement):
         """Initialize the sensor."""
         super().__init__(coordinator)
-        self._state = None
-        self._unit_of_measurement = unit_of_measurement
-        self._attribute_unit_of_measurement = (
-            "mg_dl" if unit_of_measurement == MG_DL else "mmol_l"
-        )
-        self._name = f"{DOMAIN}_{username}_glucose_value"
-        self._unique_id = f"{username}-value"
-
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._name
-
-    @property
-    def icon(self):
-        """Return the icon for the frontend."""
-        return GLUCOSE_VALUE_ICON
-
-    @property
-    def native_unit_of_measurement(self):
-        """Return the unit of measurement of the device."""
-        return self._unit_of_measurement
+        self._attr_native_unit_of_measurement = unit_of_measurement
+        self._key = "mg_dl" if unit_of_measurement == MG_DL else "mmol_l"
+        self._attr_name = f"{DOMAIN}_{username}_glucose_value"
+        self._attr_unique_id = f"{username}-value"
 
     @property
     def native_value(self):
         """Return the state of the sensor."""
         if self.coordinator.data:
-            return getattr(self.coordinator.data, self._attribute_unit_of_measurement)
+            return getattr(self.coordinator.data, self._key)
         return None
 
-    @property
-    def unique_id(self):
-        """Device unique id."""
-        return self._unique_id
-
 
 class DexcomGlucoseTrendSensor(CoordinatorEntity, SensorEntity):
     """Representation of a Dexcom glucose trend sensor."""
@@ -74,14 +56,8 @@ class DexcomGlucoseTrendSensor(CoordinatorEntity, SensorEntity):
     def __init__(self, coordinator, username):
         """Initialize the sensor."""
         super().__init__(coordinator)
-        self._state = None
-        self._name = f"{DOMAIN}_{username}_glucose_trend"
-        self._unique_id = f"{username}-trend"
-
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._name
+        self._attr_name = f"{DOMAIN}_{username}_glucose_trend"
+        self._attr_unique_id = f"{username}-trend"
 
     @property
     def icon(self):
@@ -96,8 +72,3 @@ class DexcomGlucoseTrendSensor(CoordinatorEntity, SensorEntity):
         if self.coordinator.data:
             return self.coordinator.data.trend_description
         return None
-
-    @property
-    def unique_id(self):
-        """Device unique id."""
-        return self._unique_id
diff --git a/homeassistant/components/directv/entity.py b/homeassistant/components/directv/entity.py
index 08b24a50a75..9d1fd68b742 100644
--- a/homeassistant/components/directv/entity.py
+++ b/homeassistant/components/directv/entity.py
@@ -1,6 +1,8 @@
 """Base DirecTV Entity."""
 from __future__ import annotations
 
+from typing import cast
+
 from directv import DIRECTV
 
 from homeassistant.helpers.entity import DeviceInfo, Entity
@@ -24,7 +26,10 @@ class DIRECTVEntity(Entity):
         return DeviceInfo(
             identifiers={(DOMAIN, self._device_id)},
             manufacturer=self.dtv.device.info.brand,
-            name=self.name,
+            # Instead of setting the device name to the entity name, directv
+            # should be updated to set has_entity_name = True, and set the entity
+            # name to None
+            name=cast(str | None, self.name),
             sw_version=self.dtv.device.info.version,
             via_device=(DOMAIN, self.dtv.device.info.receiver_id),
         )
diff --git a/homeassistant/components/discogs/manifest.json b/homeassistant/components/discogs/manifest.json
index 2b405341841..fceb214aded 100644
--- a/homeassistant/components/discogs/manifest.json
+++ b/homeassistant/components/discogs/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/discogs",
   "iot_class": "cloud_polling",
   "loggers": ["discogs_client"],
-  "requirements": ["discogs_client==2.3.0"]
+  "requirements": ["discogs-client==2.3.0"]
 }
diff --git a/homeassistant/components/discord/__init__.py b/homeassistant/components/discord/__init__.py
index a52c079ac8e..329709e88d2 100644
--- a/homeassistant/components/discord/__init__.py
+++ b/homeassistant/components/discord/__init__.py
@@ -6,13 +6,15 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_TOKEN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import discovery
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DATA_HASS_CONFIG, DOMAIN
 
 PLATFORMS = [Platform.NOTIFY]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Discord component."""
diff --git a/homeassistant/components/discovergy/__init__.py b/homeassistant/components/discovergy/__init__.py
new file mode 100644
index 00000000000..54f6fca83d4
--- /dev/null
+++ b/homeassistant/components/discovergy/__init__.py
@@ -0,0 +1,93 @@
+"""The Discovergy integration."""
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+import pydiscovergy
+from pydiscovergy.authentication import BasicAuth
+import pydiscovergy.error as discovergyError
+from pydiscovergy.models import Meter
+
+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 .const import APP_NAME, DOMAIN
+from .coordinator import DiscovergyUpdateCoordinator
+
+PLATFORMS = [Platform.SENSOR]
+
+
+@dataclass
+class DiscovergyData:
+    """Discovergy data class to share meters and api client."""
+
+    api_client: pydiscovergy.Discovergy
+    meters: list[Meter]
+    coordinators: dict[str, DiscovergyUpdateCoordinator]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Discovergy from a config entry."""
+    hass.data.setdefault(DOMAIN, {})
+
+    # init discovergy data class
+    discovergy_data = DiscovergyData(
+        api_client=pydiscovergy.Discovergy(
+            email=entry.data[CONF_EMAIL],
+            password=entry.data[CONF_PASSWORD],
+            app_name=APP_NAME,
+            httpx_client=get_async_client(hass),
+            authentication=BasicAuth(),
+        ),
+        meters=[],
+        coordinators={},
+    )
+
+    try:
+        # try to get meters from api to check if credentials are still valid and for later use
+        # if no exception is raised everything is fine to go
+        discovergy_data.meters = await discovergy_data.api_client.get_meters()
+    except discovergyError.InvalidLogin as err:
+        raise ConfigEntryAuthFailed("Invalid email or password") from err
+    except Exception as err:  # pylint: disable=broad-except
+        raise ConfigEntryNotReady(
+            "Unexpected error while while getting meters"
+        ) from err
+
+    # Init coordinators for meters
+    for meter in discovergy_data.meters:
+        # Create coordinator for meter, set config entry and fetch initial data,
+        # so we have data when entities are added
+        coordinator = DiscovergyUpdateCoordinator(
+            hass=hass,
+            config_entry=entry,
+            meter=meter,
+            discovergy_client=discovergy_data.api_client,
+        )
+        await coordinator.async_config_entry_first_refresh()
+
+        discovergy_data.coordinators[meter.get_meter_id()] = coordinator
+
+    hass.data[DOMAIN][entry.entry_id] = discovergy_data
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    entry.async_on_unload(entry.add_update_listener(async_reload_entry))
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> 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
+
+
+async def async_reload_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Handle an options update."""
+    await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/discovergy/config_flow.py b/homeassistant/components/discovergy/config_flow.py
new file mode 100644
index 00000000000..d6b81ed8837
--- /dev/null
+++ b/homeassistant/components/discovergy/config_flow.py
@@ -0,0 +1,122 @@
+"""Config flow for Discovergy integration."""
+from __future__ import annotations
+
+from collections.abc import Mapping
+import logging
+from typing import Any
+
+import pydiscovergy
+from pydiscovergy.authentication import BasicAuth
+import pydiscovergy.error as discovergyError
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers.httpx_client import get_async_client
+
+from .const import APP_NAME, DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def make_schema(email: str = "", password: str = "") -> vol.Schema:
+    """Create schema for config flow."""
+    return vol.Schema(
+        {
+            vol.Required(
+                CONF_EMAIL,
+                default=email,
+            ): str,
+            vol.Required(
+                CONF_PASSWORD,
+                default=password,
+            ): str,
+        }
+    )
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Discovergy."""
+
+    VERSION = 1
+
+    existing_entry: ConfigEntry | None = None
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id="user",
+                data_schema=make_schema(),
+            )
+
+        return await self._validate_and_save(user_input)
+
+    async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> FlowResult:
+        """Handle the initial step."""
+        self.existing_entry = await self.async_set_unique_id(self.context["unique_id"])
+
+        if entry_data is None:
+            return self.async_show_form(
+                step_id="reauth",
+                data_schema=make_schema(
+                    self.existing_entry.data[CONF_EMAIL] or "",
+                    self.existing_entry.data[CONF_PASSWORD] or "",
+                ),
+            )
+
+        return await self._validate_and_save(entry_data, step_id="reauth")
+
+    async def _validate_and_save(
+        self, user_input: Mapping[str, Any] | None = None, step_id: str = "user"
+    ) -> FlowResult:
+        """Validate user input and create config entry."""
+        errors = {}
+
+        if user_input:
+            try:
+                await pydiscovergy.Discovergy(
+                    email=user_input[CONF_EMAIL],
+                    password=user_input[CONF_PASSWORD],
+                    app_name=APP_NAME,
+                    httpx_client=get_async_client(self.hass),
+                    authentication=BasicAuth(),
+                ).get_meters()
+            except discovergyError.HTTPError:
+                errors["base"] = "cannot_connect"
+            except discovergyError.InvalidLogin:
+                errors["base"] = "invalid_auth"
+            except Exception:  # pylint: disable=broad-except
+                _LOGGER.exception("Unexpected error occurred while getting meters")
+                errors["base"] = "unknown"
+            else:
+                if self.existing_entry:
+                    self.hass.config_entries.async_update_entry(
+                        self.existing_entry,
+                        data={
+                            CONF_EMAIL: user_input[CONF_EMAIL],
+                            CONF_PASSWORD: user_input[CONF_PASSWORD],
+                        },
+                    )
+                    await self.hass.config_entries.async_reload(
+                        self.existing_entry.entry_id
+                    )
+                    return self.async_abort(reason="reauth_successful")
+
+                # set unique id to title which is the account email
+                await self.async_set_unique_id(user_input[CONF_EMAIL].lower())
+                self._abort_if_unique_id_configured()
+
+                return self.async_create_entry(
+                    title=user_input[CONF_EMAIL], data=user_input
+                )
+
+        return self.async_show_form(
+            step_id=step_id,
+            data_schema=make_schema(),
+            errors=errors,
+        )
diff --git a/homeassistant/components/discovergy/const.py b/homeassistant/components/discovergy/const.py
new file mode 100644
index 00000000000..866e9f11def
--- /dev/null
+++ b/homeassistant/components/discovergy/const.py
@@ -0,0 +1,6 @@
+"""Constants for the Discovergy integration."""
+from __future__ import annotations
+
+DOMAIN = "discovergy"
+MANUFACTURER = "Discovergy"
+APP_NAME = "homeassistant"
diff --git a/homeassistant/components/discovergy/coordinator.py b/homeassistant/components/discovergy/coordinator.py
new file mode 100644
index 00000000000..e3b6e91e03f
--- /dev/null
+++ b/homeassistant/components/discovergy/coordinator.py
@@ -0,0 +1,60 @@
+"""DataUpdateCoordinator for the Discovergy integration."""
+from __future__ import annotations
+
+from datetime import timedelta
+import logging
+
+from pydiscovergy import Discovergy
+from pydiscovergy.error import AccessTokenExpired, HTTPError
+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
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class DiscovergyUpdateCoordinator(DataUpdateCoordinator[Reading]):
+    """The Discovergy update coordinator."""
+
+    config_entry: ConfigEntry
+    discovergy_client: Discovergy
+    meter: Meter
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        meter: Meter,
+        discovergy_client: Discovergy,
+    ) -> None:
+        """Initialize the Discovergy coordinator."""
+        self.config_entry = config_entry
+        self.meter = meter
+        self.discovergy_client = discovergy_client
+
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=DOMAIN,
+            update_interval=timedelta(seconds=30),
+        )
+
+    async def _async_update_data(self) -> Reading:
+        """Get last reading for meter."""
+        try:
+            return await self.discovergy_client.get_last_reading(
+                self.meter.get_meter_id()
+            )
+        except AccessTokenExpired as err:
+            raise ConfigEntryAuthFailed(
+                f"Auth expired while fetching last reading for meter {self.meter.get_meter_id()}"
+            ) from err
+        except HTTPError as err:
+            raise UpdateFailed(
+                f"Error while fetching last reading for meter {self.meter.get_meter_id()}"
+            ) from err
diff --git a/homeassistant/components/discovergy/diagnostics.py b/homeassistant/components/discovergy/diagnostics.py
new file mode 100644
index 00000000000..02d5585c1dc
--- /dev/null
+++ b/homeassistant/components/discovergy/diagnostics.py
@@ -0,0 +1,49 @@
+"""Diagnostics support for discovergy."""
+from __future__ import annotations
+
+from typing import Any
+
+from pydiscovergy.models import Meter
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, CONF_UNIQUE_ID
+from homeassistant.core import HomeAssistant
+
+from . import DiscovergyData
+from .const import DOMAIN
+
+TO_REDACT_CONFIG_ENTRY = {CONF_EMAIL, CONF_PASSWORD, CONF_UNIQUE_ID, "title"}
+
+TO_REDACT_METER = {
+    "serial_number",
+    "full_serial_number",
+    "location",
+    "fullSerialNumber",
+    "printedFullSerialNumber",
+    "administrationNumber",
+}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: ConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    flattened_meter: list[dict] = []
+    last_readings: dict[str, dict] = {}
+    data: DiscovergyData = hass.data[DOMAIN][entry.entry_id]
+    meters: list[Meter] = data.meters  # always returns a list
+
+    for meter in meters:
+        # make a dict of meter data and redact some data
+        flattened_meter.append(async_redact_data(meter.__dict__, TO_REDACT_METER))
+
+        # get last reading for meter and make a dict of it
+        coordinator = data.coordinators[meter.get_meter_id()]
+        last_readings[meter.get_meter_id()] = coordinator.data.__dict__
+
+    return {
+        "entry": async_redact_data(entry.as_dict(), TO_REDACT_CONFIG_ENTRY),
+        "meters": flattened_meter,
+        "readings": last_readings,
+    }
diff --git a/homeassistant/components/discovergy/manifest.json b/homeassistant/components/discovergy/manifest.json
new file mode 100644
index 00000000000..c929386e8e8
--- /dev/null
+++ b/homeassistant/components/discovergy/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "discovergy",
+  "name": "Discovergy",
+  "codeowners": ["@jpbede"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/discovergy",
+  "integration_type": "hub",
+  "iot_class": "cloud_polling",
+  "requirements": ["pydiscovergy==1.2.1"]
+}
diff --git a/homeassistant/components/discovergy/sensor.py b/homeassistant/components/discovergy/sensor.py
new file mode 100644
index 00000000000..35955a6b189
--- /dev/null
+++ b/homeassistant/components/discovergy/sensor.py
@@ -0,0 +1,213 @@
+"""Discovergy sensor entity."""
+from dataclasses import dataclass, field
+
+from pydiscovergy.models import Meter
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    ATTR_IDENTIFIERS,
+    ATTR_MANUFACTURER,
+    ATTR_MODEL,
+    ATTR_NAME,
+    UnitOfElectricPotential,
+    UnitOfEnergy,
+    UnitOfPower,
+    UnitOfVolume,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from . import DiscovergyData, DiscovergyUpdateCoordinator
+from .const import DOMAIN, MANUFACTURER
+
+PARALLEL_UPDATES = 1
+
+
+@dataclass
+class DiscovergyMixin:
+    """Mixin for alternative keys."""
+
+    alternative_keys: list[str] = field(default_factory=lambda: [])
+    scale: int = field(default_factory=lambda: 1000)
+
+
+@dataclass
+class DiscovergySensorEntityDescription(DiscovergyMixin, SensorEntityDescription):
+    """Define Sensor entity description class."""
+
+
+GAS_SENSORS: tuple[DiscovergySensorEntityDescription, ...] = (
+    DiscovergySensorEntityDescription(
+        key="volume",
+        translation_key="total_gas_consumption",
+        suggested_display_precision=4,
+        native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
+        device_class=SensorDeviceClass.GAS,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+)
+
+ELECTRICITY_SENSORS: tuple[DiscovergySensorEntityDescription, ...] = (
+    # power sensors
+    DiscovergySensorEntityDescription(
+        key="power",
+        translation_key="total_power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        suggested_display_precision=3,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    DiscovergySensorEntityDescription(
+        key="power1",
+        translation_key="phase_1_power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        suggested_display_precision=3,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+        alternative_keys=["phase1Power"],
+    ),
+    DiscovergySensorEntityDescription(
+        key="power2",
+        translation_key="phase_2_power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        suggested_display_precision=3,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+        alternative_keys=["phase2Power"],
+    ),
+    DiscovergySensorEntityDescription(
+        key="power3",
+        translation_key="phase_3_power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        suggested_display_precision=3,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+        alternative_keys=["phase3Power"],
+    ),
+    # voltage sensors
+    DiscovergySensorEntityDescription(
+        key="phase1Voltage",
+        translation_key="phase_1_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        suggested_display_precision=1,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+    ),
+    DiscovergySensorEntityDescription(
+        key="phase2Voltage",
+        translation_key="phase_2_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        suggested_display_precision=1,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+    ),
+    DiscovergySensorEntityDescription(
+        key="phase3Voltage",
+        translation_key="phase_3_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        suggested_display_precision=1,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+    ),
+    # energy sensors
+    DiscovergySensorEntityDescription(
+        key="energy",
+        translation_key="total_consumption",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=4,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        scale=10000000000,
+    ),
+    DiscovergySensorEntityDescription(
+        key="energyOut",
+        translation_key="total_production",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=4,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        scale=10000000000,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the Discovergy sensors."""
+    data: DiscovergyData = hass.data[DOMAIN][entry.entry_id]
+    meters: list[Meter] = data.meters  # always returns a list
+
+    entities: list[DiscovergySensor] = []
+    for meter in meters:
+        meter_id = meter.get_meter_id()
+
+        sensors = None
+        if meter.measurement_type == "ELECTRICITY":
+            sensors = ELECTRICITY_SENSORS
+        elif meter.measurement_type == "GAS":
+            sensors = GAS_SENSORS
+
+        if sensors is not None:
+            for description in sensors:
+                # check if this meter has this data, then add this sensor
+                for key in {description.key, *description.alternative_keys}:
+                    coordinator: DiscovergyUpdateCoordinator = data.coordinators[
+                        meter_id
+                    ]
+                    if key in coordinator.data.values:
+                        entities.append(
+                            DiscovergySensor(key, description, meter, coordinator)
+                        )
+
+    async_add_entities(entities, False)
+
+
+class DiscovergySensor(CoordinatorEntity[DiscovergyUpdateCoordinator], SensorEntity):
+    """Represents a discovergy smart meter sensor."""
+
+    entity_description: DiscovergySensorEntityDescription
+    data_key: str
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        data_key: str,
+        description: DiscovergySensorEntityDescription,
+        meter: Meter,
+        coordinator: DiscovergyUpdateCoordinator,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(coordinator)
+
+        self.data_key = data_key
+
+        self.entity_description = description
+        self._attr_unique_id = f"{meter.full_serial_number}-{data_key}"
+        self._attr_device_info = {
+            ATTR_IDENTIFIERS: {(DOMAIN, meter.get_meter_id())},
+            ATTR_NAME: f"{meter.measurement_type.capitalize()} {meter.location.street} {meter.location.street_number}",
+            ATTR_MODEL: f"{meter.type} {meter.full_serial_number}",
+            ATTR_MANUFACTURER: MANUFACTURER,
+        }
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the sensor state."""
+        return float(
+            self.coordinator.data.values[self.data_key] / self.entity_description.scale
+        )
diff --git a/homeassistant/components/discovergy/strings.json b/homeassistant/components/discovergy/strings.json
new file mode 100644
index 00000000000..e8dbbab2021
--- /dev/null
+++ b/homeassistant/components/discovergy/strings.json
@@ -0,0 +1,66 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "email": "[%key:common::config_flow::data::email%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      },
+      "reauth": {
+        "data": {
+          "email": "[%key:common::config_flow::data::email%]",
+          "password": "[%key:common::config_flow::data::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_account%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+    }
+  },
+  "system_health": {
+    "info": {
+      "api_endpoint_reachable": "Discovergy API endpoint reachable"
+    }
+  },
+  "entity": {
+    "sensor": {
+      "total_gas_consumption": {
+        "name": "Total gas consumption"
+      },
+      "total_power": {
+        "name": "Total power"
+      },
+      "total_consumption": {
+        "name": "Total consumption"
+      },
+      "total_production": {
+        "name": "Total production"
+      },
+      "phase_1_voltage": {
+        "name": "Phase 1 voltage"
+      },
+      "phase_2_voltage": {
+        "name": "Phase 2 voltage"
+      },
+      "phase_3_voltage": {
+        "name": "Phase 3 voltage"
+      },
+      "phase_1_power": {
+        "name": "Phase 1 power"
+      },
+      "phase_2_power": {
+        "name": "Phase 2 power"
+      },
+      "phase_3_power": {
+        "name": "Phase 3 power"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/discovergy/system_health.py b/homeassistant/components/discovergy/system_health.py
new file mode 100644
index 00000000000..2baeb0e5f6e
--- /dev/null
+++ b/homeassistant/components/discovergy/system_health.py
@@ -0,0 +1,22 @@
+"""Provide info to system health."""
+from pydiscovergy.const import API_BASE
+
+from homeassistant.components import system_health
+from homeassistant.core import HomeAssistant, callback
+
+
+@callback
+def async_register(
+    hass: HomeAssistant, register: system_health.SystemHealthRegistration
+) -> None:
+    """Register system health callbacks."""
+    register.async_register_info(system_health_info)
+
+
+async def system_health_info(hass):
+    """Get info for the info page."""
+    return {
+        "api_endpoint_reachable": system_health.async_check_can_reach_url(
+            hass, API_BASE
+        )
+    }
diff --git a/homeassistant/components/dlib_face_detect/manifest.json b/homeassistant/components/dlib_face_detect/manifest.json
index 33811d5821c..e395a84f206 100644
--- a/homeassistant/components/dlib_face_detect/manifest.json
+++ b/homeassistant/components/dlib_face_detect/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/dlib_face_detect",
   "iot_class": "local_push",
   "loggers": ["face_recognition"],
-  "requirements": ["face_recognition==1.2.3"]
+  "requirements": ["face-recognition==1.2.3"]
 }
diff --git a/homeassistant/components/dlib_face_identify/manifest.json b/homeassistant/components/dlib_face_identify/manifest.json
index 34cc7344cd9..60c0ef3c766 100644
--- a/homeassistant/components/dlib_face_identify/manifest.json
+++ b/homeassistant/components/dlib_face_identify/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/dlib_face_identify",
   "iot_class": "local_push",
   "loggers": ["face_recognition"],
-  "requirements": ["face_recognition==1.2.3"]
+  "requirements": ["face-recognition==1.2.3"]
 }
diff --git a/homeassistant/components/dlna_dms/dms.py b/homeassistant/components/dlna_dms/dms.py
index 2fd1a85ebae..8fc55830c63 100644
--- a/homeassistant/components/dlna_dms/dms.py
+++ b/homeassistant/components/dlna_dms/dms.py
@@ -16,6 +16,7 @@ from async_upnp_client.profiles.dlna import ContentDirectoryErrorCode, DmsDevice
 from didl_lite import didl_lite
 
 from homeassistant.backports.enum import StrEnum
+from homeassistant.backports.functools import cached_property
 from homeassistant.components import ssdp
 from homeassistant.components.media_player import BrowseError, MediaClass
 from homeassistant.components.media_source.error import Unresolvable
@@ -619,7 +620,7 @@ class DmsDeviceSource:
         """Make an identifier for BrowseMediaSource."""
         return f"{self.source_id}/{action}{object_id}"
 
-    @functools.cached_property
+    @cached_property
     def _sort_criteria(self) -> list[str]:
         """Return criteria to be used for sorting results.
 
diff --git a/homeassistant/components/doods/image_processing.py b/homeassistant/components/doods/image_processing.py
index 8240bb117ea..c94fff1124e 100644
--- a/homeassistant/components/doods/image_processing.py
+++ b/homeassistant/components/doods/image_processing.py
@@ -350,14 +350,13 @@ class Doods(ImageProcessingEntity):
                     or boxes[3] > self._area[3]
                 ):
                     continue
-            else:
-                if (
-                    boxes[0] > self._area[2]
-                    or boxes[1] > self._area[3]
-                    or boxes[2] < self._area[0]
-                    or boxes[3] < self._area[1]
-                ):
-                    continue
+            elif (
+                boxes[0] > self._area[2]
+                or boxes[1] > self._area[3]
+                or boxes[2] < self._area[0]
+                or boxes[3] < self._area[1]
+            ):
+                continue
 
             # Exclude matches outside label specific area definition
             if self._label_areas.get(label):
@@ -369,14 +368,13 @@ class Doods(ImageProcessingEntity):
                         or boxes[3] > self._label_areas[label][3]
                     ):
                         continue
-                else:
-                    if (
-                        boxes[0] > self._label_areas[label][2]
-                        or boxes[1] > self._label_areas[label][3]
-                        or boxes[2] < self._label_areas[label][0]
-                        or boxes[3] < self._label_areas[label][1]
-                    ):
-                        continue
+                elif (
+                    boxes[0] > self._label_areas[label][2]
+                    or boxes[1] > self._label_areas[label][3]
+                    or boxes[2] < self._label_areas[label][0]
+                    or boxes[3] < self._label_areas[label][1]
+                ):
+                    continue
 
             if label not in matches:
                 matches[label] = []
diff --git a/homeassistant/components/doods/manifest.json b/homeassistant/components/doods/manifest.json
index 79c114e2f38..52c89f3f34b 100644
--- a/homeassistant/components/doods/manifest.json
+++ b/homeassistant/components/doods/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/doods",
   "iot_class": "local_polling",
   "loggers": ["pydoods"],
-  "requirements": ["pydoods==1.0.2", "pillow==9.5.0"]
+  "requirements": ["pydoods==1.0.2", "Pillow==9.5.0"]
 }
diff --git a/homeassistant/components/doorbird/manifest.json b/homeassistant/components/doorbird/manifest.json
index d6eba115bb8..2bb981ab06f 100644
--- a/homeassistant/components/doorbird/manifest.json
+++ b/homeassistant/components/doorbird/manifest.json
@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/doorbird",
   "iot_class": "local_push",
   "loggers": ["doorbirdpy"],
-  "requirements": ["doorbirdpy==2.1.0"],
+  "requirements": ["DoorBirdPy==2.1.0"],
   "zeroconf": [
     {
       "type": "_axis-video._tcp.local.",
diff --git a/homeassistant/components/dormakaba_dkey/binary_sensor.py b/homeassistant/components/dormakaba_dkey/binary_sensor.py
index e21e35da1e5..6cfbdd50b34 100644
--- a/homeassistant/components/dormakaba_dkey/binary_sensor.py
+++ b/homeassistant/components/dormakaba_dkey/binary_sensor.py
@@ -39,13 +39,12 @@ class DormakabaDkeyBinarySensorDescription(
 BINARY_SENSOR_DESCRIPTIONS = (
     DormakabaDkeyBinarySensorDescription(
         key="door_position",
-        name="Door",
         device_class=BinarySensorDeviceClass.DOOR,
         is_on=lambda state: state.door_position == DoorPosition.OPEN,
     ),
     DormakabaDkeyBinarySensorDescription(
         key="security_locked",
-        name="Deadbolt",
+        translation_key="deadbolt",
         device_class=BinarySensorDeviceClass.LOCK,
         is_on=lambda state: state.unlock_status
         not in (UnlockStatus.SECURITY_LOCKED, UnlockStatus.UNLOCKED_SECURITY_LOCKED),
diff --git a/homeassistant/components/dormakaba_dkey/sensor.py b/homeassistant/components/dormakaba_dkey/sensor.py
index 8234b41c43a..39915563b03 100644
--- a/homeassistant/components/dormakaba_dkey/sensor.py
+++ b/homeassistant/components/dormakaba_dkey/sensor.py
@@ -22,7 +22,6 @@ from .models import DormakabaDkeyData
 BINARY_SENSOR_DESCRIPTIONS = (
     SensorEntityDescription(
         key="battery_level",
-        name="Battery",
         device_class=SensorDeviceClass.BATTERY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
diff --git a/homeassistant/components/dormakaba_dkey/strings.json b/homeassistant/components/dormakaba_dkey/strings.json
index efe9d3acb52..15bcf3f9ddc 100644
--- a/homeassistant/components/dormakaba_dkey/strings.json
+++ b/homeassistant/components/dormakaba_dkey/strings.json
@@ -33,5 +33,12 @@
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "deadbolt": {
+        "name": "Deadbolt"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/dremel_3d_printer/__init__.py b/homeassistant/components/dremel_3d_printer/__init__.py
new file mode 100644
index 00000000000..5f9f10dc9c1
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/__init__.py
@@ -0,0 +1,48 @@
+"""The Dremel 3D Printer (3D20, 3D40, 3D45) integration."""
+from __future__ import annotations
+
+from dremel3dpy import Dremel3DPrinter
+from requests.exceptions import ConnectTimeout, HTTPError
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+
+from .const import CAMERA_MODEL, DOMAIN
+from .coordinator import Dremel3DPrinterDataUpdateCoordinator
+
+PLATFORMS = [Platform.BINARY_SENSOR, Platform.BUTTON, Platform.CAMERA, Platform.SENSOR]
+
+
+async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+    """Set up Dremel 3D Printer from a config entry."""
+    try:
+        api = await hass.async_add_executor_job(
+            Dremel3DPrinter, config_entry.data[CONF_HOST]
+        )
+
+    except (ConnectTimeout, HTTPError) as ex:
+        raise ConfigEntryNotReady(
+            f"Unable to connect to Dremel 3D Printer: {ex}"
+        ) from ex
+
+    coordinator = Dremel3DPrinterDataUpdateCoordinator(hass, api)
+    await coordinator.async_config_entry_first_refresh()
+    hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = coordinator
+    platforms = list(PLATFORMS)
+    if api.get_model() != CAMERA_MODEL:
+        platforms.remove(Platform.CAMERA)
+    await hass.config_entries.async_forward_entry_setups(config_entry, platforms)
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload Dremel config entry."""
+    platforms = list(PLATFORMS)
+    api: Dremel3DPrinter = hass.data[DOMAIN][entry.entry_id].api
+    if api.get_model() != CAMERA_MODEL:
+        platforms.remove(Platform.CAMERA)
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, platforms):
+        hass.data[DOMAIN].pop(entry.entry_id)
+    return unload_ok
diff --git a/homeassistant/components/dremel_3d_printer/binary_sensor.py b/homeassistant/components/dremel_3d_printer/binary_sensor.py
new file mode 100644
index 00000000000..3a92bfe5510
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/binary_sensor.py
@@ -0,0 +1,72 @@
+"""Support for monitoring Dremel 3D Printer binary sensors."""
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from dremel3dpy import Dremel3DPrinter
+
+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 .const import DOMAIN
+from .entity import Dremel3DPrinterEntity
+
+
+@dataclass
+class Dremel3DPrinterBinarySensorEntityMixin:
+    """Mixin for Dremel 3D Printer binary sensor."""
+
+    value_fn: Callable[[Dremel3DPrinter], bool]
+
+
+@dataclass
+class Dremel3DPrinterBinarySensorEntityDescription(
+    BinarySensorEntityDescription, Dremel3DPrinterBinarySensorEntityMixin
+):
+    """Describes a Dremel 3D Printer binary sensor."""
+
+
+BINARY_SENSOR_TYPES: tuple[Dremel3DPrinterBinarySensorEntityDescription, ...] = (
+    Dremel3DPrinterBinarySensorEntityDescription(
+        key="door",
+        device_class=BinarySensorDeviceClass.DOOR,
+        value_fn=lambda api: api.is_door_open(),
+    ),
+    Dremel3DPrinterBinarySensorEntityDescription(
+        key="running",
+        device_class=BinarySensorDeviceClass.RUNNING,
+        value_fn=lambda api: api.is_running(),
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the available Dremel binary sensors."""
+    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+
+    async_add_entities(
+        Dremel3DPrinterBinarySensor(coordinator, description)
+        for description in BINARY_SENSOR_TYPES
+    )
+
+
+class Dremel3DPrinterBinarySensor(Dremel3DPrinterEntity, BinarySensorEntity):
+    """Representation of a Dremel 3D Printer door binary sensor."""
+
+    entity_description: Dremel3DPrinterBinarySensorEntityDescription
+
+    @property
+    def is_on(self) -> bool:
+        """Return True if door is open."""
+        return self.entity_description.value_fn(self._api)
diff --git a/homeassistant/components/dremel_3d_printer/button.py b/homeassistant/components/dremel_3d_printer/button.py
new file mode 100644
index 00000000000..2d328b30cea
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/button.py
@@ -0,0 +1,78 @@
+"""Support for Dremel 3D Printer buttons."""
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from dremel3dpy import Dremel3DPrinter
+
+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 .const import DOMAIN
+from .entity import Dremel3DPrinterEntity
+
+
+@dataclass
+class Dremel3DPrinterButtonEntityMixin:
+    """Mixin for required keys."""
+
+    press_fn: Callable[[Dremel3DPrinter], None]
+
+
+@dataclass
+class Dremel3DPrinterButtonEntityDescription(
+    ButtonEntityDescription, Dremel3DPrinterButtonEntityMixin
+):
+    """Describes a Dremel 3D Printer button entity."""
+
+
+BUTTON_TYPES: tuple[Dremel3DPrinterButtonEntityDescription, ...] = (
+    Dremel3DPrinterButtonEntityDescription(
+        key="cancel_job",
+        translation_key="cancel_job",
+        press_fn=lambda api: api.stop_print(),
+    ),
+    Dremel3DPrinterButtonEntityDescription(
+        key="pause_job",
+        translation_key="pause_job",
+        press_fn=lambda api: api.pause_print(),
+    ),
+    Dremel3DPrinterButtonEntityDescription(
+        key="resume_job",
+        translation_key="resume_job",
+        press_fn=lambda api: api.resume_print(),
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up Dremel 3D Printer control buttons."""
+    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+    async_add_entities(
+        Dremel3DPrinterButtonEntity(coordinator, description)
+        for description in BUTTON_TYPES
+    )
+
+
+class Dremel3DPrinterButtonEntity(Dremel3DPrinterEntity, ButtonEntity):
+    """Represent a Dremel 3D Printer button."""
+
+    entity_description: Dremel3DPrinterButtonEntityDescription
+
+    def press(self) -> None:
+        """Handle the button press."""
+        # api does not care about the current state
+        try:
+            self.entity_description.press_fn(self._api)
+        except RuntimeError as ex:
+            raise HomeAssistantError(
+                "An error occurred while submitting command"
+            ) from ex
diff --git a/homeassistant/components/dremel_3d_printer/camera.py b/homeassistant/components/dremel_3d_printer/camera.py
new file mode 100644
index 00000000000..7468400ec35
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/camera.py
@@ -0,0 +1,44 @@
+"""Support for Dremel 3D45 Camera."""
+from __future__ import annotations
+
+from homeassistant.components.camera import CameraEntityDescription
+from homeassistant.components.mjpeg import MjpegCamera
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from . import Dremel3DPrinterDataUpdateCoordinator
+from .const import DOMAIN
+from .entity import Dremel3DPrinterEntity
+
+CAMERA_TYPE = CameraEntityDescription(
+    key="camera",
+    name="Camera",
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up a MJPEG IP Camera for the 3D45 Model. The 3D20 and 3D40 models don't have built in cameras."""
+    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+    async_add_entities([Dremel3D45Camera(coordinator, CAMERA_TYPE)])
+
+
+class Dremel3D45Camera(Dremel3DPrinterEntity, MjpegCamera):
+    """Dremel 3D45 Camera."""
+
+    def __init__(
+        self,
+        coordinator: Dremel3DPrinterDataUpdateCoordinator,
+        description: CameraEntityDescription,
+    ) -> None:
+        """Initialize a new Dremel 3D Printer integration camera for the 3D45 model."""
+        super().__init__(coordinator, description)
+        MjpegCamera.__init__(
+            self,
+            mjpeg_url=coordinator.api.get_stream_url(),
+            still_image_url=coordinator.api.get_snapshot_url(),
+        )
diff --git a/homeassistant/components/dremel_3d_printer/config_flow.py b/homeassistant/components/dremel_3d_printer/config_flow.py
new file mode 100644
index 00000000000..6fa4d2e0a5b
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/config_flow.py
@@ -0,0 +1,58 @@
+"""Config flow for Dremel 3D Printer (3D20, 3D40, 3D45)."""
+from __future__ import annotations
+
+from json.decoder import JSONDecodeError
+from typing import Any
+
+from dremel3dpy import Dremel3DPrinter
+from requests.exceptions import ConnectTimeout, HTTPError
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_HOST
+from homeassistant.data_entry_flow import FlowResult
+import homeassistant.helpers.config_validation as cv
+
+from .const import DOMAIN, LOGGER
+
+
+def _schema_with_defaults(host: str = "") -> vol.Schema:
+    return vol.Schema({vol.Required(CONF_HOST, default=host): cv.string})
+
+
+class Dremel3DPrinterConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Dremel 3D Printer."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        errors = {}
+
+        if user_input is None:
+            return self.async_show_form(
+                step_id="user",
+                data_schema=_schema_with_defaults(),
+            )
+        host = user_input[CONF_HOST]
+
+        try:
+            api = await self.hass.async_add_executor_job(Dremel3DPrinter, host)
+        except (ConnectTimeout, HTTPError, JSONDecodeError):
+            errors = {"base": "cannot_connect"}
+        except Exception:  # pylint: disable=broad-except
+            LOGGER.exception("An unknown error has occurred")
+            errors = {"base": "unknown"}
+
+        if errors:
+            return self.async_show_form(
+                step_id="user",
+                errors=errors,
+                data_schema=_schema_with_defaults(host=host),
+            )
+
+        await self.async_set_unique_id(api.get_serial_number())
+        self._abort_if_unique_id_configured()
+        return self.async_create_entry(title=api.get_title(), data={CONF_HOST: host})
diff --git a/homeassistant/components/dremel_3d_printer/const.py b/homeassistant/components/dremel_3d_printer/const.py
new file mode 100644
index 00000000000..cccdeb937cb
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/const.py
@@ -0,0 +1,13 @@
+"""Constants for the Dremel 3D Printer (3D20, 3D40, 3D45) integration."""
+from __future__ import annotations
+
+import logging
+
+LOGGER = logging.getLogger(__package__)
+
+CAMERA_MODEL = "3D45"
+
+DOMAIN = "dremel_3d_printer"
+
+ATTR_EXTRUDER = "extruder"
+ATTR_PLATFORM = "platform"
diff --git a/homeassistant/components/dremel_3d_printer/coordinator.py b/homeassistant/components/dremel_3d_printer/coordinator.py
new file mode 100644
index 00000000000..81e0053fd77
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/coordinator.py
@@ -0,0 +1,36 @@
+"""Data update coordinator for the Dremel 3D Printer integration."""
+
+from datetime import timedelta
+
+from dremel3dpy import Dremel3DPrinter
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN, LOGGER
+
+
+class Dremel3DPrinterDataUpdateCoordinator(DataUpdateCoordinator[None]):
+    """Class to manage fetching Dremel 3D Printer data."""
+
+    config_entry: ConfigEntry
+
+    def __init__(self, hass: HomeAssistant, api: Dremel3DPrinter) -> None:
+        """Initialize Dremel 3D Printer data update coordinator."""
+        super().__init__(
+            hass=hass,
+            logger=LOGGER,
+            name=DOMAIN,
+            update_interval=timedelta(seconds=10),
+        )
+        self.api = api
+
+    async def _async_update_data(self) -> None:
+        """Update data via APIs."""
+        try:
+            await self.hass.async_add_executor_job(self.api.refresh)
+        except RuntimeError as ex:
+            raise UpdateFailed(
+                f"Unable to refresh printer information: Printer offline: {ex}"
+            ) from ex
diff --git a/homeassistant/components/dremel_3d_printer/entity.py b/homeassistant/components/dremel_3d_printer/entity.py
new file mode 100644
index 00000000000..392869a138b
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/entity.py
@@ -0,0 +1,41 @@
+"""Entity representing a Dremel 3D Printer."""
+
+from dremel3dpy import Dremel3DPrinter
+
+from homeassistant.helpers.entity import DeviceInfo, EntityDescription
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import Dremel3DPrinterDataUpdateCoordinator
+
+
+class Dremel3DPrinterEntity(CoordinatorEntity[Dremel3DPrinterDataUpdateCoordinator]):
+    """Defines a Dremel 3D Printer device entity."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: Dremel3DPrinterDataUpdateCoordinator,
+        description: EntityDescription,
+    ) -> None:
+        """Initialize the base device entity."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.config_entry.unique_id}_{description.key}"
+
+    @property
+    def device_info(self) -> DeviceInfo:
+        """Return device information about this Dremel printer."""
+        return DeviceInfo(
+            identifiers={(DOMAIN, self._api.get_serial_number())},
+            manufacturer=self._api.get_manufacturer(),
+            model=self._api.get_model(),
+            name=self._api.get_title(),
+            sw_version=self._api.get_firmware_version(),
+        )
+
+    @property
+    def _api(self) -> Dremel3DPrinter:
+        """Return to api from coordinator."""
+        return self.coordinator.api
diff --git a/homeassistant/components/dremel_3d_printer/manifest.json b/homeassistant/components/dremel_3d_printer/manifest.json
new file mode 100644
index 00000000000..12d4e4003c4
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "dremel_3d_printer",
+  "name": "Dremel 3D Printer",
+  "codeowners": ["@tkdrob"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/dremel_3d_printer",
+  "integration_type": "device",
+  "iot_class": "local_polling",
+  "requirements": ["dremel3dpy==2.1.1"]
+}
diff --git a/homeassistant/components/dremel_3d_printer/sensor.py b/homeassistant/components/dremel_3d_printer/sensor.py
new file mode 100644
index 00000000000..660e7a90487
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/sensor.py
@@ -0,0 +1,279 @@
+"""Support for monitoring Dremel 3D Printer sensors."""
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+from datetime import datetime, timedelta
+
+from dremel3dpy import Dremel3DPrinter
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    PERCENTAGE,
+    EntityCategory,
+    UnitOfInformation,
+    UnitOfTemperature,
+    UnitOfTime,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
+from homeassistant.util.dt import utcnow
+from homeassistant.util.variance import ignore_variance
+
+from .const import ATTR_EXTRUDER, ATTR_PLATFORM, DOMAIN
+from .entity import Dremel3DPrinterEntity
+
+
+@dataclass
+class Dremel3DPrinterSensorEntityMixin:
+    """Mixin for Dremel 3D Printer sensor."""
+
+    value_fn: Callable[[Dremel3DPrinter, str], StateType | datetime]
+
+
+@dataclass
+class Dremel3DPrinterSensorEntityDescription(
+    SensorEntityDescription, Dremel3DPrinterSensorEntityMixin
+):
+    """Describes a Dremel 3D Printer sensor."""
+
+    available_fn: Callable[[Dremel3DPrinter, str], bool] = lambda api, _: True
+
+
+SENSOR_TYPES: tuple[Dremel3DPrinterSensorEntityDescription, ...] = (
+    Dremel3DPrinterSensorEntityDescription(
+        key="job_phase",
+        translation_key="job_phase",
+        icon="mdi:printer-3d",
+        value_fn=lambda api, _: api.get_printing_status(),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="remaining_time",
+        translation_key="completion_time",
+        device_class=SensorDeviceClass.TIMESTAMP,
+        available_fn=lambda api, key: api.get_job_status()[key] > 0,
+        value_fn=ignore_variance(
+            lambda api, key: utcnow() + timedelta(seconds=api.get_job_status()[key]),
+            timedelta(minutes=2),
+        ),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="progress",
+        translation_key="progress",
+        icon="mdi:printer-3d-nozzle",
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_printing_progress(),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="chamber",
+        translation_key="chamber",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_temperature_type(key),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="platform_temperature",
+        translation_key="platform_temperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_temperature_type(ATTR_PLATFORM),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="target_platform_temperature",
+        translation_key="target_platform_temperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_temperature_attributes(ATTR_PLATFORM)[
+            "target_temp"
+        ],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="max_platform_temperature",
+        translation_key="max_platform_temperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_temperature_attributes(ATTR_PLATFORM)[
+            "max_temp"
+        ],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key=ATTR_EXTRUDER,
+        translation_key="extruder",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_temperature_type(key),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="target_extruder_temperature",
+        translation_key="target_extruder_temperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_temperature_attributes(ATTR_EXTRUDER)[
+            "target_temp"
+        ],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="max_extruder_temperature",
+        translation_key="max_extruder_temperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_temperature_attributes(ATTR_EXTRUDER)[
+            "max_temp"
+        ],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="network_build",
+        translation_key="network_build",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_job_status()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="filament",
+        translation_key="filament",
+        icon="mdi:printer-3d-nozzle",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_job_status()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="elapsed_time",
+        translation_key="elapsed_time",
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        device_class=SensorDeviceClass.DURATION,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        available_fn=lambda api, _: api.get_printing_status() == "building",
+        value_fn=lambda api, key: api.get_job_status()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="estimated_total_time",
+        translation_key="estimated_total_time",
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        device_class=SensorDeviceClass.DURATION,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        available_fn=lambda api, key: api.get_job_status()[key] > 0,
+        value_fn=lambda api, key: api.get_job_status()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="job_status",
+        translation_key="job_status",
+        icon="mdi:printer-3d",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_job_status()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="job_name",
+        translation_key="job_name",
+        icon="mdi:file",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_job_name(),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="api_version",
+        translation_key="api_version",
+        icon="mdi:api",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_printer_info()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="host",
+        translation_key="host",
+        icon="mdi:ip-network",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_printer_info()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="connection_type",
+        translation_key="connection_type",
+        icon="mdi:network",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_printer_info()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="available_storage",
+        translation_key="available_storage",
+        native_unit_of_measurement=UnitOfInformation.MEGABYTES,
+        device_class=SensorDeviceClass.DATA_SIZE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_printer_info()[key] * 100,
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="hours_used",
+        translation_key="hours_used",
+        icon="mdi:clock",
+        native_unit_of_measurement=UnitOfTime.HOURS,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_printer_info()[key],
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the available Dremel 3D Printer sensors."""
+    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+
+    async_add_entities(
+        Dremel3DPrinterSensor(coordinator, description) for description in SENSOR_TYPES
+    )
+
+
+class Dremel3DPrinterSensor(Dremel3DPrinterEntity, SensorEntity):
+    """Representation of a Dremel 3D Printer sensor."""
+
+    entity_description: Dremel3DPrinterSensorEntityDescription
+
+    @property
+    def available(self) -> bool:
+        """Return True if the entity is available."""
+        return super().available and self.entity_description.available_fn(
+            self._api, self.entity_description.key
+        )
+
+    @property
+    def native_value(self) -> StateType | datetime:
+        """Return the sensor state."""
+        return self.entity_description.value_fn(self._api, self.entity_description.key)
diff --git a/homeassistant/components/dremel_3d_printer/strings.json b/homeassistant/components/dremel_3d_printer/strings.json
new file mode 100644
index 00000000000..0016b8f2bca
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/strings.json
@@ -0,0 +1,96 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        }
+      }
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    }
+  },
+  "entity": {
+    "button": {
+      "cancel_job": {
+        "name": "Cancel job"
+      },
+      "pause_job": {
+        "name": "Pause job"
+      },
+      "resume_job": {
+        "name": "Resume job"
+      }
+    },
+    "sensor": {
+      "job_phase": {
+        "name": "Job phase"
+      },
+      "completion_time": {
+        "name": "Completion time"
+      },
+      "progress": {
+        "name": "Progress"
+      },
+      "chamber": {
+        "name": "Chamber"
+      },
+      "platform_temperature": {
+        "name": "Platform temperature"
+      },
+      "target_platform_temperature": {
+        "name": "Target platform temperature"
+      },
+      "max_platform_temperature": {
+        "name": "Max platform temperature"
+      },
+      "extruder": {
+        "name": "Extruder"
+      },
+      "target_extruder_temperature": {
+        "name": "Target extruder temperature"
+      },
+      "max_extruder_temperature": {
+        "name": "Max extruder temperature"
+      },
+      "network_build": {
+        "name": "Network build"
+      },
+      "filament": {
+        "name": "Filament"
+      },
+      "elapsed_time": {
+        "name": "Elapsed time"
+      },
+      "estimated_total_time": {
+        "name": "Estimated total time"
+      },
+      "job_status": {
+        "name": "Job status"
+      },
+      "job_name": {
+        "name": "Job name"
+      },
+      "api_version": {
+        "name": "API version"
+      },
+      "host": {
+        "name": "[%key:common::config_flow::data::host%]"
+      },
+      "connection_type": {
+        "name": "Connection type"
+      },
+      "available_storage": {
+        "name": "Available storage"
+      },
+      "hours_used": {
+        "name": "Hours used"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/dsmr/manifest.json b/homeassistant/components/dsmr/manifest.json
index 2ba7ce55835..3fc81d2f8e7 100644
--- a/homeassistant/components/dsmr/manifest.json
+++ b/homeassistant/components/dsmr/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["dsmr_parser"],
-  "requirements": ["dsmr_parser==0.33"]
+  "requirements": ["dsmr-parser==0.33"]
 }
diff --git a/homeassistant/components/dsmr/sensor.py b/homeassistant/components/dsmr/sensor.py
index 524f5c4ffc2..e6d1d035e3b 100644
--- a/homeassistant/components/dsmr/sensor.py
+++ b/homeassistant/components/dsmr/sensor.py
@@ -459,9 +459,9 @@ async def async_setup_entry(
                     @callback
                     def close_transport(_event: EventType) -> None:
                         """Close the transport on HA shutdown."""
-                        if not transport:
+                        if not transport:  # noqa: B023
                             return
-                        transport.close()
+                        transport.close()  # noqa: B023
 
                     stop_listener = hass.bus.async_listen_once(
                         EVENT_HOMEASSISTANT_STOP, close_transport
diff --git a/homeassistant/components/dwd_weather_warnings/sensor.py b/homeassistant/components/dwd_weather_warnings/sensor.py
index 3e8ed2afbdc..f44d736b426 100644
--- a/homeassistant/components/dwd_weather_warnings/sensor.py
+++ b/homeassistant/components/dwd_weather_warnings/sensor.py
@@ -91,7 +91,7 @@ async def async_setup_platform(
         hass,
         DOMAIN,
         "deprecated_yaml",
-        breaks_in_ha_version="2023.8.0",
+        breaks_in_ha_version="2023.12.0",
         is_fixable=False,
         severity=IssueSeverity.WARNING,
         translation_key="deprecated_yaml",
diff --git a/homeassistant/components/dynalite/manifest.json b/homeassistant/components/dynalite/manifest.json
index a3dd890cc11..8fd138dc49b 100644
--- a/homeassistant/components/dynalite/manifest.json
+++ b/homeassistant/components/dynalite/manifest.json
@@ -8,5 +8,5 @@
   "documentation": "https://www.home-assistant.io/integrations/dynalite",
   "iot_class": "local_push",
   "loggers": ["dynalite_devices_lib"],
-  "requirements": ["dynalite_devices==0.1.47", "dynalite_panel==0.0.4"]
+  "requirements": ["dynalite-devices==0.1.47", "dynalite-panel==0.0.4"]
 }
diff --git a/homeassistant/components/eafm/sensor.py b/homeassistant/components/eafm/sensor.py
index 2650aa35489..ce3ee2bfbec 100644
--- a/homeassistant/components/eafm/sensor.py
+++ b/homeassistant/components/eafm/sensor.py
@@ -100,6 +100,7 @@ class Measurement(CoordinatorEntity, SensorEntity):
         """Initialise the gauge with a data instance and station."""
         super().__init__(coordinator)
         self.key = key
+        self._attr_unique_id = key
 
     @property
     def station_name(self):
@@ -126,11 +127,6 @@ class Measurement(CoordinatorEntity, SensorEntity):
         """Return the name of the gauge."""
         return f"{self.station_name} {self.parameter_name} {self.qualifier}"
 
-    @property
-    def unique_id(self):
-        """Return the unique id of the gauge."""
-        return self.key
-
     @property
     def device_info(self):
         """Return the device info."""
diff --git a/homeassistant/components/easyenergy/sensor.py b/homeassistant/components/easyenergy/sensor.py
index 9cf5944dfaa..a64851f6696 100644
--- a/homeassistant/components/easyenergy/sensor.py
+++ b/homeassistant/components/easyenergy/sensor.py
@@ -48,7 +48,7 @@ class EasyEnergySensorEntityDescription(
 SENSORS: tuple[EasyEnergySensorEntityDescription, ...] = (
     EasyEnergySensorEntityDescription(
         key="current_hour_price",
-        name="Current hour",
+        translation_key="current_hour_price",
         service_type="today_gas",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfVolume.CUBIC_METERS}",
@@ -56,14 +56,14 @@ SENSORS: tuple[EasyEnergySensorEntityDescription, ...] = (
     ),
     EasyEnergySensorEntityDescription(
         key="next_hour_price",
-        name="Next hour",
+        translation_key="next_hour_price",
         service_type="today_gas",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfVolume.CUBIC_METERS}",
         value_fn=lambda data: get_gas_price(data, 1),
     ),
     EasyEnergySensorEntityDescription(
         key="current_hour_price",
-        name="Current hour",
+        translation_key="current_hour_price",
         service_type="today_energy_usage",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
@@ -71,7 +71,7 @@ SENSORS: tuple[EasyEnergySensorEntityDescription, ...] = (
     ),
     EasyEnergySensorEntityDescription(
         key="next_hour_price",
-        name="Next hour",
+        translation_key="next_hour_price",
         service_type="today_energy_usage",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.price_at_time(
@@ -80,42 +80,42 @@ SENSORS: tuple[EasyEnergySensorEntityDescription, ...] = (
     ),
     EasyEnergySensorEntityDescription(
         key="average_price",
-        name="Average - today",
+        translation_key="average_price",
         service_type="today_energy_usage",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.average_usage_price,
     ),
     EasyEnergySensorEntityDescription(
         key="max_price",
-        name="Highest price - today",
+        translation_key="max_price",
         service_type="today_energy_usage",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.extreme_usage_prices[1],
     ),
     EasyEnergySensorEntityDescription(
         key="min_price",
-        name="Lowest price - today",
+        translation_key="min_price",
         service_type="today_energy_usage",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.extreme_usage_prices[0],
     ),
     EasyEnergySensorEntityDescription(
         key="highest_price_time",
-        name="Time of highest price - today",
+        translation_key="highest_price_time",
         service_type="today_energy_usage",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.energy_today.highest_usage_price_time,
     ),
     EasyEnergySensorEntityDescription(
         key="lowest_price_time",
-        name="Time of lowest price - today",
+        translation_key="lowest_price_time",
         service_type="today_energy_usage",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.energy_today.lowest_usage_price_time,
     ),
     EasyEnergySensorEntityDescription(
         key="percentage_of_max",
-        name="Current percentage of highest price - today",
+        translation_key="percentage_of_max",
         service_type="today_energy_usage",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:percent",
@@ -123,7 +123,7 @@ SENSORS: tuple[EasyEnergySensorEntityDescription, ...] = (
     ),
     EasyEnergySensorEntityDescription(
         key="current_hour_price",
-        name="Current hour",
+        translation_key="current_hour_price",
         service_type="today_energy_return",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
@@ -131,7 +131,7 @@ SENSORS: tuple[EasyEnergySensorEntityDescription, ...] = (
     ),
     EasyEnergySensorEntityDescription(
         key="next_hour_price",
-        name="Next hour",
+        translation_key="next_hour_price",
         service_type="today_energy_return",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.price_at_time(
@@ -140,42 +140,42 @@ SENSORS: tuple[EasyEnergySensorEntityDescription, ...] = (
     ),
     EasyEnergySensorEntityDescription(
         key="average_price",
-        name="Average - today",
+        translation_key="average_price",
         service_type="today_energy_return",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.average_return_price,
     ),
     EasyEnergySensorEntityDescription(
         key="max_price",
-        name="Highest price - today",
+        translation_key="max_price",
         service_type="today_energy_return",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.extreme_return_prices[1],
     ),
     EasyEnergySensorEntityDescription(
         key="min_price",
-        name="Lowest price - today",
+        translation_key="min_price",
         service_type="today_energy_return",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.extreme_return_prices[0],
     ),
     EasyEnergySensorEntityDescription(
         key="highest_price_time",
-        name="Time of highest price - today",
+        translation_key="highest_price_time",
         service_type="today_energy_return",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.energy_today.highest_return_price_time,
     ),
     EasyEnergySensorEntityDescription(
         key="lowest_price_time",
-        name="Time of lowest price - today",
+        translation_key="lowest_price_time",
         service_type="today_energy_return",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.energy_today.lowest_return_price_time,
     ),
     EasyEnergySensorEntityDescription(
         key="percentage_of_max",
-        name="Current percentage of highest price - today",
+        translation_key="percentage_of_max",
         service_type="today_energy_return",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:percent",
@@ -183,7 +183,7 @@ SENSORS: tuple[EasyEnergySensorEntityDescription, ...] = (
     ),
     EasyEnergySensorEntityDescription(
         key="hours_priced_equal_or_lower",
-        name="Hours priced equal or lower than current - today",
+        translation_key="hours_priced_equal_or_lower",
         service_type="today_energy_usage",
         native_unit_of_measurement=UnitOfTime.HOURS,
         icon="mdi:clock",
@@ -191,7 +191,7 @@ SENSORS: tuple[EasyEnergySensorEntityDescription, ...] = (
     ),
     EasyEnergySensorEntityDescription(
         key="hours_priced_equal_or_higher",
-        name="Hours priced equal or higher than current - today",
+        translation_key="hours_priced_equal_or_higher",
         service_type="today_energy_return",
         native_unit_of_measurement=UnitOfTime.HOURS,
         icon="mdi:clock",
@@ -231,7 +231,7 @@ async def async_setup_entry(
 class EasyEnergySensorEntity(
     CoordinatorEntity[EasyEnergyDataUpdateCoordinator], SensorEntity
 ):
-    """Defines a easyEnergy sensor."""
+    """Defines an easyEnergy sensor."""
 
     _attr_has_entity_name = True
     _attr_attribution = "Data provided by easyEnergy"
diff --git a/homeassistant/components/easyenergy/strings.json b/homeassistant/components/easyenergy/strings.json
index ed89e0068d4..93fb264b01d 100644
--- a/homeassistant/components/easyenergy/strings.json
+++ b/homeassistant/components/easyenergy/strings.json
@@ -8,5 +8,39 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "current_hour_price": {
+        "name": "Current hour"
+      },
+      "next_hour_price": {
+        "name": "Next hour"
+      },
+      "average_price": {
+        "name": "Average - today"
+      },
+      "max_price": {
+        "name": "Highest price - today"
+      },
+      "min_price": {
+        "name": "Lowest price - today"
+      },
+      "highest_price_time": {
+        "name": "Time of highest price - today"
+      },
+      "lowest_price_time": {
+        "name": "Time of lowest price - today"
+      },
+      "percentage_of_max": {
+        "name": "Current percentage of highest price - today"
+      },
+      "hours_priced_equal_or_lower": {
+        "name": "Hours priced equal or lower than current - today"
+      },
+      "hours_priced_equal_or_higher": {
+        "name": "Hours priced equal or higher than current - today"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/ecobee/binary_sensor.py b/homeassistant/components/ecobee/binary_sensor.py
index 2266d70e0ad..e65dc221a9f 100644
--- a/homeassistant/components/ecobee/binary_sensor.py
+++ b/homeassistant/components/ecobee/binary_sensor.py
@@ -35,19 +35,16 @@ async def async_setup_entry(
 class EcobeeBinarySensor(BinarySensorEntity):
     """Representation of an Ecobee sensor."""
 
+    _attr_device_class = BinarySensorDeviceClass.OCCUPANCY
+    _attr_has_entity_name = True
+
     def __init__(self, data, sensor_name, sensor_index):
         """Initialize the Ecobee sensor."""
         self.data = data
-        self._name = f"{sensor_name} Occupancy"
-        self.sensor_name = sensor_name
+        self.sensor_name = sensor_name.rstrip()
         self.index = sensor_index
         self._state = None
 
-    @property
-    def name(self):
-        """Return the name of the Ecobee sensor."""
-        return self._name.rstrip()
-
     @property
     def unique_id(self):
         """Return a unique identifier for this sensor."""
@@ -101,11 +98,6 @@ class EcobeeBinarySensor(BinarySensorEntity):
         """Return the status of the sensor."""
         return self._state == "true"
 
-    @property
-    def device_class(self):
-        """Return the class of this sensor, from DEVICE_CLASSES."""
-        return BinarySensorDeviceClass.OCCUPANCY
-
     async def async_update(self) -> None:
         """Get the latest state of the sensor."""
         await self.data.update()
diff --git a/homeassistant/components/ecobee/climate.py b/homeassistant/components/ecobee/climate.py
index 7925832953b..8c0b77b913d 100644
--- a/homeassistant/components/ecobee/climate.py
+++ b/homeassistant/components/ecobee/climate.py
@@ -310,6 +310,8 @@ class Thermostat(ClimateEntity):
 
     _attr_precision = PRECISION_TENTHS
     _attr_temperature_unit = UnitOfTemperature.FAHRENHEIT
+    _attr_name = None
+    _attr_has_entity_name = True
 
     def __init__(
         self, data: EcobeeData, thermostat_index: int, thermostat: dict
@@ -318,7 +320,7 @@ class Thermostat(ClimateEntity):
         self.data = data
         self.thermostat_index = thermostat_index
         self.thermostat = thermostat
-        self._name = self.thermostat["name"]
+        self._attr_unique_id = self.thermostat["identifier"]
         self.vacation = None
         self._last_active_hvac_mode = HVACMode.HEAT_COOL
 
@@ -364,16 +366,6 @@ class Thermostat(ClimateEntity):
             supported = supported | ClimateEntityFeature.AUX_HEAT
         return supported
 
-    @property
-    def name(self):
-        """Return the name of the Ecobee Thermostat."""
-        return self.thermostat["name"]
-
-    @property
-    def unique_id(self):
-        """Return a unique identifier for this ecobee thermostat."""
-        return self.thermostat["identifier"]
-
     @property
     def device_info(self) -> DeviceInfo:
         """Return device information for this ecobee thermostat."""
@@ -388,7 +380,7 @@ class Thermostat(ClimateEntity):
             identifiers={(DOMAIN, self.thermostat["identifier"])},
             manufacturer=MANUFACTURER,
             model=model,
-            name=self.name,
+            name=self.thermostat["name"],
         )
 
     @property
diff --git a/homeassistant/components/ecobee/humidifier.py b/homeassistant/components/ecobee/humidifier.py
index f4c4dad6527..fb5533adf07 100644
--- a/homeassistant/components/ecobee/humidifier.py
+++ b/homeassistant/components/ecobee/humidifier.py
@@ -44,27 +44,19 @@ class EcobeeHumidifier(HumidifierEntity):
     """A humidifier class for an ecobee thermostat with humidifier attached."""
 
     _attr_supported_features = HumidifierEntityFeature.MODES
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, data, thermostat_index):
         """Initialize ecobee humidifier platform."""
         self.data = data
         self.thermostat_index = thermostat_index
         self.thermostat = self.data.ecobee.get_thermostat(self.thermostat_index)
-        self._name = self.thermostat["name"]
+        self._attr_unique_id = self.thermostat["identifier"]
         self._last_humidifier_on_mode = MODE_MANUAL
 
         self.update_without_throttle = False
 
-    @property
-    def name(self):
-        """Return the name of the humidifier."""
-        return self._name
-
-    @property
-    def unique_id(self):
-        """Return unique_id for humidifier."""
-        return f"{self.thermostat['identifier']}"
-
     @property
     def device_info(self) -> DeviceInfo:
         """Return device information for the ecobee humidifier."""
@@ -79,7 +71,7 @@ class EcobeeHumidifier(HumidifierEntity):
             identifiers={(DOMAIN, self.thermostat["identifier"])},
             manufacturer=MANUFACTURER,
             model=model,
-            name=self.name,
+            name=self.thermostat["name"],
         )
 
     @property
diff --git a/homeassistant/components/ecobee/number.py b/homeassistant/components/ecobee/number.py
index 15ad17b0e39..67c975010ab 100644
--- a/homeassistant/components/ecobee/number.py
+++ b/homeassistant/components/ecobee/number.py
@@ -36,7 +36,7 @@ class EcobeeNumberEntityDescription(
 VENTILATOR_NUMBERS = (
     EcobeeNumberEntityDescription(
         key="home",
-        name="home",
+        translation_key="ventilator_min_type_home",
         ecobee_setting_key="ventilatorMinOnTimeHome",
         set_fn=lambda data, id, min_time: data.ecobee.set_ventilator_min_on_time_home(
             id, min_time
@@ -44,7 +44,7 @@ VENTILATOR_NUMBERS = (
     ),
     EcobeeNumberEntityDescription(
         key="away",
-        name="away",
+        translation_key="ventilator_min_type_away",
         ecobee_setting_key="ventilatorMinOnTimeAway",
         set_fn=lambda data, id, min_time: data.ecobee.set_ventilator_min_on_time_away(
             id, min_time
@@ -92,7 +92,6 @@ class EcobeeVentilatorMinTime(EcobeeBaseEntity, NumberEntity):
         """Initialize ecobee ventilator platform."""
         super().__init__(data, thermostat_index)
         self.entity_description = description
-        self._attr_name = f"Ventilator min time {description.name}"
         self._attr_unique_id = f"{self.base_unique_id}_ventilator_{description.key}"
 
     async def async_update(self) -> None:
diff --git a/homeassistant/components/ecobee/sensor.py b/homeassistant/components/ecobee/sensor.py
index 90d4ba4202e..3996ec6fd35 100644
--- a/homeassistant/components/ecobee/sensor.py
+++ b/homeassistant/components/ecobee/sensor.py
@@ -42,7 +42,6 @@ class EcobeeSensorEntityDescription(
 SENSOR_TYPES: tuple[EcobeeSensorEntityDescription, ...] = (
     EcobeeSensorEntityDescription(
         key="temperature",
-        name="Temperature",
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -50,7 +49,6 @@ SENSOR_TYPES: tuple[EcobeeSensorEntityDescription, ...] = (
     ),
     EcobeeSensorEntityDescription(
         key="humidity",
-        name="Humidity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
@@ -58,7 +56,6 @@ SENSOR_TYPES: tuple[EcobeeSensorEntityDescription, ...] = (
     ),
     EcobeeSensorEntityDescription(
         key="co2PPM",
-        name="CO2",
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
@@ -66,7 +63,6 @@ SENSOR_TYPES: tuple[EcobeeSensorEntityDescription, ...] = (
     ),
     EcobeeSensorEntityDescription(
         key="vocPPM",
-        name="VOC",
         device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -74,7 +70,6 @@ SENSOR_TYPES: tuple[EcobeeSensorEntityDescription, ...] = (
     ),
     EcobeeSensorEntityDescription(
         key="airQuality",
-        name="Air Quality Index",
         device_class=SensorDeviceClass.AQI,
         state_class=SensorStateClass.MEASUREMENT,
         runtime_key="actualAQScore",
@@ -104,6 +99,8 @@ async def async_setup_entry(
 class EcobeeSensor(SensorEntity):
     """Representation of an Ecobee sensor."""
 
+    _attr_has_entity_name = True
+
     entity_description: EcobeeSensorEntityDescription
 
     def __init__(
@@ -119,7 +116,6 @@ class EcobeeSensor(SensorEntity):
         self.sensor_name = sensor_name
         self.index = sensor_index
         self._state = None
-        self._attr_name = f"{sensor_name} {description.name}"
 
     @property
     def unique_id(self):
diff --git a/homeassistant/components/ecobee/strings.json b/homeassistant/components/ecobee/strings.json
index 19f379de7d9..647ea55e311 100644
--- a/homeassistant/components/ecobee/strings.json
+++ b/homeassistant/components/ecobee/strings.json
@@ -2,14 +2,12 @@
   "config": {
     "step": {
       "user": {
-        "title": "ecobee API key",
         "description": "Please enter the API key obtained from ecobee.com.",
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]"
         }
       },
       "authorize": {
-        "title": "Authorize app on ecobee.com",
         "description": "Please authorize this app at https://www.ecobee.com/consumerportal/index.html with PIN code:\n\n{pin}\n\nThen, press Submit."
       }
     },
@@ -20,5 +18,15 @@
     "abort": {
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
+  },
+  "entity": {
+    "number": {
+      "ventilator_min_type_home": {
+        "name": "Ventilator min time home"
+      },
+      "ventilator_min_type_away": {
+        "name": "Ventilator min time away"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/ecobee/weather.py b/homeassistant/components/ecobee/weather.py
index 5610cdb2a9c..d38bc82c6f2 100644
--- a/homeassistant/components/ecobee/weather.py
+++ b/homeassistant/components/ecobee/weather.py
@@ -57,6 +57,8 @@ class EcobeeWeather(WeatherEntity):
     _attr_native_temperature_unit = UnitOfTemperature.FAHRENHEIT
     _attr_native_visibility_unit = UnitOfLength.METERS
     _attr_native_wind_speed_unit = UnitOfSpeed.METERS_PER_SECOND
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, data, name, index):
         """Initialize the Ecobee weather platform."""
@@ -64,6 +66,7 @@ class EcobeeWeather(WeatherEntity):
         self._name = name
         self._index = index
         self.weather = None
+        self._attr_unique_id = data.ecobee.get_thermostat(self._index)["identifier"]
 
     def get_forecast(self, index, param):
         """Retrieve forecast parameter."""
@@ -73,16 +76,6 @@ class EcobeeWeather(WeatherEntity):
         except (IndexError, KeyError) as err:
             raise ValueError from err
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._name
-
-    @property
-    def unique_id(self):
-        """Return a unique identifier for the weather platform."""
-        return self.data.ecobee.get_thermostat(self._index)["identifier"]
-
     @property
     def device_info(self) -> DeviceInfo:
         """Return device information for the ecobee weather platform."""
@@ -98,7 +91,7 @@ class EcobeeWeather(WeatherEntity):
             identifiers={(DOMAIN, thermostat["identifier"])},
             manufacturer=MANUFACTURER,
             model=model,
-            name=self.name,
+            name=self._name,
         )
 
     @property
diff --git a/homeassistant/components/econet/__init__.py b/homeassistant/components/econet/__init__.py
index 6fa54fc70fb..afba9ba6837 100644
--- a/homeassistant/components/econet/__init__.py
+++ b/homeassistant/components/econet/__init__.py
@@ -19,7 +19,6 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.dispatcher import async_dispatcher_connect, dispatcher_send
 from homeassistant.helpers.entity import DeviceInfo, Entity
 from homeassistant.helpers.event import async_track_time_interval
-from homeassistant.helpers.typing import ConfigType
 
 from .const import API_CLIENT, DOMAIN, EQUIPMENT
 
@@ -36,14 +35,6 @@ PUSH_UPDATE = "econet.push_update"
 INTERVAL = timedelta(minutes=60)
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the EcoNet component."""
-    hass.data[DOMAIN] = {}
-    hass.data[DOMAIN][API_CLIENT] = {}
-    hass.data[DOMAIN][EQUIPMENT] = {}
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Set up EcoNet as config entry."""
 
@@ -65,6 +56,7 @@ 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
 
diff --git a/homeassistant/components/econet/climate.py b/homeassistant/components/econet/climate.py
index cf950a3c38c..7233d135f2e 100644
--- a/homeassistant/components/econet/climate.py
+++ b/homeassistant/components/econet/climate.py
@@ -151,7 +151,7 @@ class EcoNetThermostat(EcoNetEntity, ClimateEntity):
         return self.op_list
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool, mode.
 
         Needs to be one of HVAC_MODE_*.
diff --git a/homeassistant/components/ecowitt/sensor.py b/homeassistant/components/ecowitt/sensor.py
index 5bbe22b6972..8d5411e9e2e 100644
--- a/homeassistant/components/ecowitt/sensor.py
+++ b/homeassistant/components/ecowitt/sensor.py
@@ -125,7 +125,7 @@ ECOWITT_SENSORS_MAPPING: Final = {
     EcoWittSensorTypes.LIGHTNING_COUNT: SensorEntityDescription(
         key="LIGHTNING_COUNT",
         native_unit_of_measurement="strikes",
-        state_class=SensorStateClass.TOTAL,
+        state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     EcoWittSensorTypes.TEMPERATURE_C: SensorEntityDescription(
         key="TEMPERATURE_C",
@@ -143,13 +143,13 @@ ECOWITT_SENSORS_MAPPING: Final = {
         key="RAIN_COUNT_MM",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
-        state_class=SensorStateClass.TOTAL,
+        state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     EcoWittSensorTypes.RAIN_COUNT_INCHES: SensorEntityDescription(
         key="RAIN_COUNT_INCHES",
         native_unit_of_measurement=UnitOfPrecipitationDepth.INCHES,
         device_class=SensorDeviceClass.PRECIPITATION,
-        state_class=SensorStateClass.TOTAL,
+        state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     EcoWittSensorTypes.RAIN_RATE_MM: SensorEntityDescription(
         key="RAIN_RATE_MM",
@@ -230,6 +230,13 @@ async def async_setup_entry(
             name=sensor.name,
         )
 
+        # Hourly rain doesn't reset to fixed hours, it must be measurement state classes
+        if sensor.key in ("hrain_piezomm", "hrain_piezo"):
+            description = dataclasses.replace(
+                description,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+
         async_add_entities([EcowittSensorEntity(sensor, description)])
 
     ecowitt.new_sensor_cb.append(_new_sensor)
diff --git a/homeassistant/components/eddystone_temperature/manifest.json b/homeassistant/components/eddystone_temperature/manifest.json
index dba5d35ab1a..b15a88d099f 100644
--- a/homeassistant/components/eddystone_temperature/manifest.json
+++ b/homeassistant/components/eddystone_temperature/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/eddystone_temperature",
   "iot_class": "local_polling",
   "loggers": ["beacontools"],
-  "requirements": ["beacontools[scan]==2.1.0", "construct==2.10.56"]
+  "requirements": ["beacontools[scan]==2.1.0"]
 }
diff --git a/homeassistant/components/edl21/sensor.py b/homeassistant/components/edl21/sensor.py
index c2436c15057..3ce42198fbd 100644
--- a/homeassistant/components/edl21/sensor.py
+++ b/homeassistant/components/edl21/sensor.py
@@ -16,7 +16,6 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    CONF_NAME,
     DEGREE,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
@@ -51,41 +50,47 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # E=0 Ownership ID
     SensorEntityDescription(
         key="1-0:0.0.0*255",
-        name="Ownership ID",
+        translation_key="ownership_id",
         icon="mdi:flash",
         entity_registry_enabled_default=False,
     ),
     # E=9: Electrity ID
     SensorEntityDescription(
-        key="1-0:0.0.9*255", name="Electricity ID", icon="mdi:flash"
+        key="1-0:0.0.9*255",
+        translation_key="electricity_id",
+        icon="mdi:flash",
     ),
     # D=2: Program entries
     SensorEntityDescription(
-        key="1-0:0.2.0*0", name="Configuration program version number", icon="mdi:flash"
+        key="1-0:0.2.0*0",
+        translation_key="configuration_program_version_number",
+        icon="mdi:flash",
     ),
     SensorEntityDescription(
-        key="1-0:0.2.0*1", name="Firmware version number", icon="mdi:flash"
+        key="1-0:0.2.0*1",
+        translation_key="firmware_version_number",
+        icon="mdi:flash",
     ),
     # C=1: Active power +
     # D=8: Time integral 1
     # E=0: Total
     SensorEntityDescription(
         key="1-0:1.8.0*255",
-        name="Positive active energy total",
+        translation_key="positive_active_energy_total",
         state_class=SensorStateClass.TOTAL_INCREASING,
         device_class=SensorDeviceClass.ENERGY,
     ),
     # E=1: Rate 1
     SensorEntityDescription(
         key="1-0:1.8.1*255",
-        name="Positive active energy in tariff T1",
+        translation_key="positive_active_energy_tariff_t1",
         state_class=SensorStateClass.TOTAL_INCREASING,
         device_class=SensorDeviceClass.ENERGY,
     ),
     # E=2: Rate 2
     SensorEntityDescription(
         key="1-0:1.8.2*255",
-        name="Positive active energy in tariff T2",
+        translation_key="positive_active_energy_tariff_t2",
         state_class=SensorStateClass.TOTAL_INCREASING,
         device_class=SensorDeviceClass.ENERGY,
     ),
@@ -93,28 +98,28 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # E=0: Total
     SensorEntityDescription(
         key="1-0:1.17.0*255",
-        name="Last signed positive active energy total",
+        translation_key="last_signed_positive_active_energy_total",
     ),
     # C=2: Active power -
     # D=8: Time integral 1
     # E=0: Total
     SensorEntityDescription(
         key="1-0:2.8.0*255",
-        name="Negative active energy total",
+        translation_key="negative_active_energy_total",
         state_class=SensorStateClass.TOTAL_INCREASING,
         device_class=SensorDeviceClass.ENERGY,
     ),
     # E=1: Rate 1
     SensorEntityDescription(
         key="1-0:2.8.1*255",
-        name="Negative active energy in tariff T1",
+        translation_key="negative_active_energy_tariff_t1",
         state_class=SensorStateClass.TOTAL_INCREASING,
         device_class=SensorDeviceClass.ENERGY,
     ),
     # E=2: Rate 2
     SensorEntityDescription(
         key="1-0:2.8.2*255",
-        name="Negative active energy in tariff T2",
+        translation_key="negative_active_energy_tariff_t2",
         state_class=SensorStateClass.TOTAL_INCREASING,
         device_class=SensorDeviceClass.ENERGY,
     ),
@@ -122,14 +127,16 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # D=7: Instantaneous value
     # E=0: Total
     SensorEntityDescription(
-        key="1-0:14.7.0*255", name="Supply frequency", icon="mdi:sine-wave"
+        key="1-0:14.7.0*255",
+        translation_key="supply_frequency",
+        icon="mdi:sine-wave",
     ),
     # C=15: Active power absolute
     # D=7: Instantaneous value
     # E=0: Total
     SensorEntityDescription(
         key="1-0:15.7.0*255",
-        name="Absolute active instantaneous power",
+        translation_key="absolute_active_instantaneous_power",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.POWER,
     ),
@@ -138,7 +145,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # E=0: Total
     SensorEntityDescription(
         key="1-0:16.7.0*255",
-        name="Sum active instantaneous power",
+        translation_key="sum_active_instantaneous_power",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.POWER,
     ),
@@ -147,7 +154,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # E=0: Total
     SensorEntityDescription(
         key="1-0:31.7.0*255",
-        name="L1 active instantaneous amperage",
+        translation_key="l1_active_instantaneous_amperage",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.CURRENT,
     ),
@@ -156,7 +163,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # E=0: Total
     SensorEntityDescription(
         key="1-0:32.7.0*255",
-        name="L1 active instantaneous voltage",
+        translation_key="l1_active_instantaneous_voltage",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.VOLTAGE,
     ),
@@ -165,7 +172,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # E=0: Total
     SensorEntityDescription(
         key="1-0:36.7.0*255",
-        name="L1 active instantaneous power",
+        translation_key="l1_active_instantaneous_power",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.POWER,
     ),
@@ -174,7 +181,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # E=0: Total
     SensorEntityDescription(
         key="1-0:51.7.0*255",
-        name="L2 active instantaneous amperage",
+        translation_key="l2_active_instantaneous_amperage",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.CURRENT,
     ),
@@ -183,7 +190,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # E=0: Total
     SensorEntityDescription(
         key="1-0:52.7.0*255",
-        name="L2 active instantaneous voltage",
+        translation_key="l2_active_instantaneous_voltage",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.VOLTAGE,
     ),
@@ -192,7 +199,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # E=0: Total
     SensorEntityDescription(
         key="1-0:56.7.0*255",
-        name="L2 active instantaneous power",
+        translation_key="l2_active_instantaneous_power",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.POWER,
     ),
@@ -201,7 +208,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # E=0: Total
     SensorEntityDescription(
         key="1-0:71.7.0*255",
-        name="L3 active instantaneous amperage",
+        translation_key="l3_active_instantaneous_amperage",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.CURRENT,
     ),
@@ -210,7 +217,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # E=0: Total
     SensorEntityDescription(
         key="1-0:72.7.0*255",
-        name="L3 active instantaneous voltage",
+        translation_key="l3_active_instantaneous_voltage",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.VOLTAGE,
     ),
@@ -219,7 +226,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # E=0: Total
     SensorEntityDescription(
         key="1-0:76.7.0*255",
-        name="L3 active instantaneous power",
+        translation_key="l3_active_instantaneous_power",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.POWER,
     ),
@@ -231,26 +238,40 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # E=15: U(L2) x I(L2)
     # E=26: U(L3) x I(L3)
     SensorEntityDescription(
-        key="1-0:81.7.1*255", name="U(L2)/U(L1) phase angle", icon="mdi:sine-wave"
+        key="1-0:81.7.1*255",
+        translation_key="u_l2_u_l1_phase_angle",
+        icon="mdi:sine-wave",
     ),
     SensorEntityDescription(
-        key="1-0:81.7.2*255", name="U(L3)/U(L1) phase angle", icon="mdi:sine-wave"
+        key="1-0:81.7.2*255",
+        translation_key="u_l3_u_l1_phase_angle",
+        icon="mdi:sine-wave",
     ),
     SensorEntityDescription(
-        key="1-0:81.7.4*255", name="U(L1)/I(L1) phase angle", icon="mdi:sine-wave"
+        key="1-0:81.7.4*255",
+        translation_key="u_l1_i_l1_phase_angle",
+        icon="mdi:sine-wave",
     ),
     SensorEntityDescription(
-        key="1-0:81.7.15*255", name="U(L2)/I(L2) phase angle", icon="mdi:sine-wave"
+        key="1-0:81.7.15*255",
+        translation_key="u_l2_i_l2_phase_angle",
+        icon="mdi:sine-wave",
     ),
     SensorEntityDescription(
-        key="1-0:81.7.26*255", name="U(L3)/I(L3) phase angle", icon="mdi:sine-wave"
+        key="1-0:81.7.26*255",
+        translation_key="u_l3_i_l3_phase_angle",
+        icon="mdi:sine-wave",
     ),
     # C=96: Electricity-related service entries
     SensorEntityDescription(
-        key="1-0:96.1.0*255", name="Metering point ID 1", icon="mdi:flash"
+        key="1-0:96.1.0*255",
+        translation_key="metering_point_id_1",
+        icon="mdi:flash",
     ),
     SensorEntityDescription(
-        key="1-0:96.5.0*255", name="Internal operating status", icon="mdi:flash"
+        key="1-0:96.5.0*255",
+        translation_key="internal_operating_status",
+        icon="mdi:flash",
     ),
 )
 
@@ -304,12 +325,11 @@ class EDL21:
         self._registered_obis: set[tuple[str, str]] = set()
         self._hass = hass
         self._async_add_entities = async_add_entities
-        self._name = config.get(CONF_NAME)
+        self._serial_port = config[CONF_SERIAL_PORT]
         self._proto = SmlProtocol(config[CONF_SERIAL_PORT])
         self._proto.add_listener(self.event, ["SmlGetListResponse"])
         LOGGER.debug(
-            "Initialized EDL21 for %s on %s",
-            config.get(CONF_NAME),
+            "Initialized EDL21 on %s",
             config[CONF_SERIAL_PORT],
         )
 
@@ -320,12 +340,14 @@ class EDL21:
     def event(self, message_body) -> None:
         """Handle events from pysml."""
         assert isinstance(message_body, SmlGetListResponse)
-        LOGGER.debug("Received sml message for %s: %s", self._name, message_body)
+        LOGGER.debug("Received sml message on %s: %s", self._serial_port, message_body)
 
         electricity_id = message_body["serverId"]
 
         if electricity_id is None:
-            LOGGER.debug("No electricity id found in sml message for %s", self._name)
+            LOGGER.debug(
+                "No electricity id found in sml message on %s", self._serial_port
+            )
             return
         electricity_id = electricity_id.replace(" ", "")
 
@@ -340,15 +362,11 @@ class EDL21:
                 )
             else:
                 entity_description = SENSORS.get(obis)
-                if entity_description and entity_description.name:
-                    # self._name is only used for backwards YAML compatibility
-                    # This needs to be cleaned up when YAML support is removed
-                    device_name = self._name or DEFAULT_DEVICE_NAME
+                if entity_description:
                     new_entities.append(
                         EDL21Entity(
                             electricity_id,
                             obis,
-                            device_name,
                             entity_description,
                             telegram,
                         )
@@ -372,7 +390,7 @@ class EDL21Entity(SensorEntity):
     _attr_should_poll = False
     _attr_has_entity_name = True
 
-    def __init__(self, electricity_id, obis, device_name, entity_description, telegram):
+    def __init__(self, electricity_id, obis, entity_description, telegram):
         """Initialize an EDL21Entity."""
         self._electricity_id = electricity_id
         self._obis = obis
@@ -384,7 +402,7 @@ class EDL21Entity(SensorEntity):
         self._attr_unique_id = f"{electricity_id}_{obis}"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, self._electricity_id)},
-            name=device_name,
+            name=DEFAULT_DEVICE_NAME,
         )
 
     async def async_added_to_hass(self) -> None:
diff --git a/homeassistant/components/edl21/strings.json b/homeassistant/components/edl21/strings.json
index 764cc41d2a4..43978642943 100644
--- a/homeassistant/components/edl21/strings.json
+++ b/homeassistant/components/edl21/strings.json
@@ -11,5 +11,99 @@
         }
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "ownership_id": {
+        "name": "Ownership ID"
+      },
+      "electricity_id": {
+        "name": "Electricity ID"
+      },
+      "configuration_program_version_number": {
+        "name": "Configuration program version number"
+      },
+      "firmware_version_number": {
+        "name": "Firmware version number"
+      },
+      "positive_active_energy_total": {
+        "name": "Positive active energy total"
+      },
+      "positive_active_energy_tariff_t1": {
+        "name": "Positive active energy in tariff T1"
+      },
+      "positive_active_energy_tariff_t2": {
+        "name": "Positive active energy in tariff T2"
+      },
+      "last_signed_positive_active_energy_total": {
+        "name": "Last signed positive active energy total"
+      },
+      "negative_active_energy_total": {
+        "name": "Negative active energy total"
+      },
+      "negative_active_energy_tariff_t1": {
+        "name": "Negative active energy in tariff T1"
+      },
+      "negative_active_energy_tariff_t2": {
+        "name": "Negative active energy in tariff T2"
+      },
+      "supply_frequency": {
+        "name": "Supply frequency"
+      },
+      "absolute_active_instantaneous_power": {
+        "name": "Absolute active instantaneous power"
+      },
+      "sum_active_instantaneous_power": {
+        "name": "Sum active instantaneous power"
+      },
+      "l1_active_instantaneous_amperage": {
+        "name": "L1 active instantaneous amperage"
+      },
+      "l1_active_instantaneous_voltage": {
+        "name": "L1 active instantaneous voltage"
+      },
+      "l1_active_instantaneous_power": {
+        "name": "L1 active instantaneous power"
+      },
+      "l2_active_instantaneous_amperage": {
+        "name": "L2 active instantaneous amperage"
+      },
+      "l2_active_instantaneous_voltage": {
+        "name": "L2 active instantaneous voltage"
+      },
+      "l2_active_instantaneous_power": {
+        "name": "L2 active instantaneous power"
+      },
+      "l3_active_instantaneous_amperage": {
+        "name": "L3 active instantaneous amperage"
+      },
+      "l3_active_instantaneous_voltage": {
+        "name": "L3 active instantaneous voltage"
+      },
+      "l3_active_instantaneous_power": {
+        "name": "L3 active instantaneous power"
+      },
+      "u_l2_u_l1_phase_angle": {
+        "name": "U(L2)/U(L1) phase angle"
+      },
+      "u_l3_u_l1_phase_angle": {
+        "name": "U(L3)/U(L1) phase angle"
+      },
+      "u_l1_i_l1_phase_angle": {
+        "name": "U(L1)/I(L1) phase angle"
+      },
+      "u_l2_i_l2_phase_angle": {
+        "name": "U(L2)/I(L2) phase angle"
+      },
+      "u_l3_i_l3_phase_angle": {
+        "name": "U(L3)/I(L3) phase angle"
+      },
+      "metering_point_id_1": {
+        "name": "Metering point ID 1"
+      },
+      "internal_operating_status": {
+        "name": "Internal operating status"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/efergy/sensor.py b/homeassistant/components/efergy/sensor.py
index 1f544a7a97b..6fc6eed40f6 100644
--- a/homeassistant/components/efergy/sensor.py
+++ b/homeassistant/components/efergy/sensor.py
@@ -25,14 +25,14 @@ from .const import CONF_CURRENT_VALUES, DOMAIN, LOGGER
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="instant_readings",
-        name="Power Usage",
+        translation_key="instant_readings",
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="energy_day",
-        name="Daily Consumption",
+        translation_key="energy_day",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.TOTAL_INCREASING,
@@ -40,7 +40,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     ),
     SensorEntityDescription(
         key="energy_week",
-        name="Weekly Consumption",
+        translation_key="energy_week",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.TOTAL_INCREASING,
@@ -48,14 +48,14 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     ),
     SensorEntityDescription(
         key="energy_month",
-        name="Monthly Consumption",
+        translation_key="energy_month",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="energy_year",
-        name="Yearly Consumption",
+        translation_key="energy_year",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.TOTAL_INCREASING,
@@ -63,32 +63,32 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     ),
     SensorEntityDescription(
         key="budget",
-        name="Energy Budget",
+        translation_key="budget",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="cost_day",
-        name="Daily Energy Cost",
+        translation_key="cost_day",
         device_class=SensorDeviceClass.MONETARY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="cost_week",
-        name="Weekly Energy Cost",
+        translation_key="cost_week",
         device_class=SensorDeviceClass.MONETARY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="cost_month",
-        name="Monthly Energy Cost",
+        translation_key="cost_month",
         device_class=SensorDeviceClass.MONETARY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="cost_year",
-        name="Yearly Energy Cost",
+        translation_key="cost_year",
         device_class=SensorDeviceClass.MONETARY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         entity_registry_enabled_default=False,
@@ -137,6 +137,8 @@ async def async_setup_entry(
 class EfergySensor(EfergyEntity, SensorEntity):
     """Implementation of an Efergy sensor."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         api: Efergy,
diff --git a/homeassistant/components/efergy/strings.json b/homeassistant/components/efergy/strings.json
index 924d5a56bcf..3b17bf07f1a 100644
--- a/homeassistant/components/efergy/strings.json
+++ b/homeassistant/components/efergy/strings.json
@@ -16,5 +16,39 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "instant_readings": {
+        "name": "Power usage"
+      },
+      "energy_day": {
+        "name": "Daily consumption"
+      },
+      "energy_week": {
+        "name": "Weekly consumption"
+      },
+      "energy_month": {
+        "name": "Monthly consumption"
+      },
+      "energy_year": {
+        "name": "Yearly consumption"
+      },
+      "budget": {
+        "name": "Energy budget"
+      },
+      "cost_day": {
+        "name": "Daily energy cost"
+      },
+      "cost_week": {
+        "name": "Weekly energy cost"
+      },
+      "cost_month": {
+        "name": "Monthly energy cost"
+      },
+      "cost_year": {
+        "name": "Yearly energy cost"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/eight_sleep/manifest.json b/homeassistant/components/eight_sleep/manifest.json
index b95e24823d6..71e01f75d46 100644
--- a/homeassistant/components/eight_sleep/manifest.json
+++ b/homeassistant/components/eight_sleep/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/eight_sleep",
   "iot_class": "cloud_polling",
   "loggers": ["pyeight"],
-  "requirements": ["pyeight==0.3.2"]
+  "requirements": ["pyEight==0.3.2"]
 }
diff --git a/homeassistant/components/electrasmart/climate.py b/homeassistant/components/electrasmart/climate.py
index a9688939048..59523d5a4cb 100644
--- a/homeassistant/components/electrasmart/climate.py
+++ b/homeassistant/components/electrasmart/climate.py
@@ -109,15 +109,18 @@ class ElectraClimateEntity(ClimateEntity):
     _attr_min_temp = MIN_TEMP
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_hvac_modes = ELECTRA_MODES
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, device: ElectraAirConditioner, api: ElectraAPI) -> None:
         """Initialize Electra climate entity."""
         self._api = api
         self._electra_ac_device = device
-        self._attr_name = device.name
         self._attr_unique_id = device.mac
         self._attr_supported_features = (
-            ClimateEntityFeature.TARGET_TEMPERATURE | ClimateEntityFeature.FAN_MODE
+            ClimateEntityFeature.TARGET_TEMPERATURE
+            | ClimateEntityFeature.FAN_MODE
+            | ClimateEntityFeature.PRESET_MODE
         )
 
         swing_modes: list = []
@@ -140,7 +143,7 @@ class ElectraClimateEntity(ClimateEntity):
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, self._electra_ac_device.mac)},
-            name=self.name,
+            name=device.name,
             model=self._electra_ac_device.model,
             manufacturer=self._electra_ac_device.manufactor,
         )
diff --git a/homeassistant/components/electrasmart/manifest.json b/homeassistant/components/electrasmart/manifest.json
index a2a3f928eeb..405d9ee688a 100644
--- a/homeassistant/components/electrasmart/manifest.json
+++ b/homeassistant/components/electrasmart/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/electrasmart",
   "iot_class": "cloud_polling",
-  "requirements": ["pyelectra==1.2.0"]
+  "requirements": ["pyElectra==1.2.0"]
 }
diff --git a/homeassistant/components/elgato/button.py b/homeassistant/components/elgato/button.py
index 97673a79b9a..b05cd532c16 100644
--- a/homeassistant/components/elgato/button.py
+++ b/homeassistant/components/elgato/button.py
@@ -40,14 +40,12 @@ class ElgatoButtonEntityDescription(
 BUTTONS = [
     ElgatoButtonEntityDescription(
         key="identify",
-        translation_key="identify",
-        icon="mdi:help",
+        device_class=ButtonDeviceClass.IDENTIFY,
         entity_category=EntityCategory.CONFIG,
         press_fn=lambda client: client.identify(),
     ),
     ElgatoButtonEntityDescription(
         key="restart",
-        translation_key="restart",
         device_class=ButtonDeviceClass.RESTART,
         entity_category=EntityCategory.CONFIG,
         press_fn=lambda client: client.restart(),
diff --git a/homeassistant/components/elgato/light.py b/homeassistant/components/elgato/light.py
index 47da87306a3..f74ec04476f 100644
--- a/homeassistant/components/elgato/light.py
+++ b/homeassistant/components/elgato/light.py
@@ -47,6 +47,7 @@ async def async_setup_entry(
 class ElgatoLight(ElgatoEntity, LightEntity):
     """Defines an Elgato Light."""
 
+    _attr_name = None
     _attr_min_mireds = 143
     _attr_max_mireds = 344
 
diff --git a/homeassistant/components/elgato/sensor.py b/homeassistant/components/elgato/sensor.py
index 371840de013..8ed8265705c 100644
--- a/homeassistant/components/elgato/sensor.py
+++ b/homeassistant/components/elgato/sensor.py
@@ -45,7 +45,6 @@ class ElgatoSensorEntityDescription(
 SENSORS = [
     ElgatoSensorEntityDescription(
         key="battery",
-        translation_key="battery",
         device_class=SensorDeviceClass.BATTERY,
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=PERCENTAGE,
diff --git a/homeassistant/components/elgato/strings.json b/homeassistant/components/elgato/strings.json
index c5fc016aeb9..8a2f20f209f 100644
--- a/homeassistant/components/elgato/strings.json
+++ b/homeassistant/components/elgato/strings.json
@@ -23,18 +23,7 @@
     }
   },
   "entity": {
-    "button": {
-      "identify": {
-        "name": "Identify"
-      },
-      "restart": {
-        "name": "[%key:component::button::entity_component::restart::name%]"
-      }
-    },
     "sensor": {
-      "battery": {
-        "name": "[%key:component::sensor::entity_component::battery::name%]"
-      },
       "charge_power": {
         "name": "Charging power"
       },
diff --git a/homeassistant/components/elkm1/climate.py b/homeassistant/components/elkm1/climate.py
index 570c8567403..d0094a5b37b 100644
--- a/homeassistant/components/elkm1/climate.py
+++ b/homeassistant/components/elkm1/climate.py
@@ -85,7 +85,7 @@ class ElkThermostat(ElkEntity, ClimateEntity):
     def __init__(self, element: Element, elk: Elk, elk_data: dict[str, Any]) -> None:
         """Initialize climate entity."""
         super().__init__(element, elk, elk_data)
-        self._state: str | None = None
+        self._state: HVACMode | None = None
 
     @property
     def temperature_unit(self) -> str:
@@ -130,7 +130,7 @@ class ElkThermostat(ElkEntity, ClimateEntity):
         return self._element.humidity
 
     @property
-    def hvac_mode(self) -> str | None:
+    def hvac_mode(self) -> HVACMode | None:
         """Return current operation ie. heat, cool, idle."""
         return self._state
 
diff --git a/homeassistant/components/elmax/manifest.json b/homeassistant/components/elmax/manifest.json
index e6e8d76be91..dfb90763c83 100644
--- a/homeassistant/components/elmax/manifest.json
+++ b/homeassistant/components/elmax/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/elmax",
   "iot_class": "cloud_polling",
   "loggers": ["elmax_api"],
-  "requirements": ["elmax_api==0.0.4"]
+  "requirements": ["elmax-api==0.0.4"]
 }
diff --git a/homeassistant/components/emby/manifest.json b/homeassistant/components/emby/manifest.json
index 872b3cca1e1..f90dda79352 100644
--- a/homeassistant/components/emby/manifest.json
+++ b/homeassistant/components/emby/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/emby",
   "iot_class": "local_push",
   "loggers": ["pyemby"],
-  "requirements": ["pyemby==1.8"]
+  "requirements": ["pyEmby==1.9"]
 }
diff --git a/homeassistant/components/emonitor/sensor.py b/homeassistant/components/emonitor/sensor.py
index dc7159001d8..0cf4f0f2346 100644
--- a/homeassistant/components/emonitor/sensor.py
+++ b/homeassistant/components/emonitor/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import StateType
+from homeassistant.helpers.typing import UNDEFINED, StateType
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -80,7 +80,7 @@ class EmonitorPowerSensor(CoordinatorEntity, SensorEntity):
         mac_address = self.emonitor_status.network.mac_address
         device_name = name_short_mac(mac_address[-6:])
         label = self.channel_data.label or f"{device_name} {channel_number}"
-        if description.name:
+        if description.name is not UNDEFINED:
             self._attr_name = f"{label} {description.name}"
             self._attr_unique_id = f"{mac_address}_{channel_number}_{description.key}"
         else:
diff --git a/homeassistant/components/emulated_hue/manifest.json b/homeassistant/components/emulated_hue/manifest.json
index ff3591e0066..01dae2dca77 100644
--- a/homeassistant/components/emulated_hue/manifest.json
+++ b/homeassistant/components/emulated_hue/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/emulated_hue",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["aiohttp_cors==0.7.0"]
+  "requirements": ["aiohttp-cors==0.7.0"]
 }
diff --git a/homeassistant/components/emulated_kasa/manifest.json b/homeassistant/components/emulated_kasa/manifest.json
index eea3f18adc0..324279db7d9 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.11.2"]
+  "requirements": ["sense_energy==0.12.0"]
 }
diff --git a/homeassistant/components/emulated_roku/manifest.json b/homeassistant/components/emulated_roku/manifest.json
index 960b3d41f63..739f3b04ec0 100644
--- a/homeassistant/components/emulated_roku/manifest.json
+++ b/homeassistant/components/emulated_roku/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/emulated_roku",
   "iot_class": "local_push",
   "loggers": ["emulated_roku"],
-  "requirements": ["emulated_roku==0.2.1"]
+  "requirements": ["emulated-roku==0.2.1"]
 }
diff --git a/homeassistant/components/energy/sensor.py b/homeassistant/components/energy/sensor.py
index 7518b163f3c..ae92ee2de58 100644
--- a/homeassistant/components/energy/sensor.py
+++ b/homeassistant/components/energy/sensor.py
@@ -434,6 +434,7 @@ class EnergyCostSensor(SensorEntity):
     def add_to_platform_abort(self) -> None:
         """Abort adding an entity to a platform."""
         self.add_finished.set()
+        super().add_to_platform_abort()
 
     async def async_will_remove_from_hass(self) -> None:
         """Handle removing from hass."""
diff --git a/homeassistant/components/energyzero/sensor.py b/homeassistant/components/energyzero/sensor.py
index 75b5fa6fea6..17052dfab57 100644
--- a/homeassistant/components/energyzero/sensor.py
+++ b/homeassistant/components/energyzero/sensor.py
@@ -42,7 +42,7 @@ class EnergyZeroSensorEntityDescription(
 SENSORS: tuple[EnergyZeroSensorEntityDescription, ...] = (
     EnergyZeroSensorEntityDescription(
         key="current_hour_price",
-        name="Current hour",
+        translation_key="current_hour_price",
         service_type="today_gas",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfVolume.CUBIC_METERS}",
@@ -50,14 +50,14 @@ SENSORS: tuple[EnergyZeroSensorEntityDescription, ...] = (
     ),
     EnergyZeroSensorEntityDescription(
         key="next_hour_price",
-        name="Next hour",
+        translation_key="next_hour_price",
         service_type="today_gas",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfVolume.CUBIC_METERS}",
         value_fn=lambda data: get_gas_price(data, 1),
     ),
     EnergyZeroSensorEntityDescription(
         key="current_hour_price",
-        name="Current hour",
+        translation_key="current_hour_price",
         service_type="today_energy",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
@@ -65,7 +65,7 @@ SENSORS: tuple[EnergyZeroSensorEntityDescription, ...] = (
     ),
     EnergyZeroSensorEntityDescription(
         key="next_hour_price",
-        name="Next hour",
+        translation_key="next_hour_price",
         service_type="today_energy",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.price_at_time(
@@ -74,42 +74,42 @@ SENSORS: tuple[EnergyZeroSensorEntityDescription, ...] = (
     ),
     EnergyZeroSensorEntityDescription(
         key="average_price",
-        name="Average - today",
+        translation_key="average_price",
         service_type="today_energy",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.average_price,
     ),
     EnergyZeroSensorEntityDescription(
         key="max_price",
-        name="Highest price - today",
+        translation_key="max_price",
         service_type="today_energy",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.extreme_prices[1],
     ),
     EnergyZeroSensorEntityDescription(
         key="min_price",
-        name="Lowest price - today",
+        translation_key="min_price",
         service_type="today_energy",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.extreme_prices[0],
     ),
     EnergyZeroSensorEntityDescription(
         key="highest_price_time",
-        name="Time of highest price - today",
+        translation_key="highest_price_time",
         service_type="today_energy",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.energy_today.highest_price_time,
     ),
     EnergyZeroSensorEntityDescription(
         key="lowest_price_time",
-        name="Time of lowest price - today",
+        translation_key="lowest_price_time",
         service_type="today_energy",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.energy_today.lowest_price_time,
     ),
     EnergyZeroSensorEntityDescription(
         key="percentage_of_max",
-        name="Current percentage of highest price - today",
+        translation_key="percentage_of_max",
         service_type="today_energy",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:percent",
diff --git a/homeassistant/components/energyzero/strings.json b/homeassistant/components/energyzero/strings.json
index ed89e0068d4..93fb264b01d 100644
--- a/homeassistant/components/energyzero/strings.json
+++ b/homeassistant/components/energyzero/strings.json
@@ -8,5 +8,39 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "current_hour_price": {
+        "name": "Current hour"
+      },
+      "next_hour_price": {
+        "name": "Next hour"
+      },
+      "average_price": {
+        "name": "Average - today"
+      },
+      "max_price": {
+        "name": "Highest price - today"
+      },
+      "min_price": {
+        "name": "Lowest price - today"
+      },
+      "highest_price_time": {
+        "name": "Time of highest price - today"
+      },
+      "lowest_price_time": {
+        "name": "Time of lowest price - today"
+      },
+      "percentage_of_max": {
+        "name": "Current percentage of highest price - today"
+      },
+      "hours_priced_equal_or_lower": {
+        "name": "Hours priced equal or lower than current - today"
+      },
+      "hours_priced_equal_or_higher": {
+        "name": "Hours priced equal or higher than current - today"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/enphase_envoy/manifest.json b/homeassistant/components/enphase_envoy/manifest.json
index 447c9034309..28a8d0ba28a 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": ["envoy_reader"],
-  "requirements": ["envoy_reader==0.20.1"],
+  "requirements": ["envoy-reader==0.20.1"],
   "zeroconf": [
     {
       "type": "_enphase-envoy._tcp.local."
diff --git a/homeassistant/components/enphase_envoy/sensor.py b/homeassistant/components/enphase_envoy/sensor.py
index 2870a61d9a0..44ffbcdb497 100644
--- a/homeassistant/components/enphase_envoy/sensor.py
+++ b/homeassistant/components/enphase_envoy/sensor.py
@@ -18,6 +18,7 @@ from homeassistant.const import UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import UNDEFINED
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -168,7 +169,7 @@ class EnvoyInverter(CoordinatorEntity, SensorEntity):
         """Initialize Envoy inverter entity."""
         self.entity_description = description
         self._serial_number = serial_number
-        if description.name:
+        if description.name is not UNDEFINED:
             self._attr_name = (
                 f"{envoy_name} Inverter {serial_number} {description.name}"
             )
diff --git a/homeassistant/components/environment_canada/camera.py b/homeassistant/components/environment_canada/camera.py
index 7b93f0b28f4..385f973a25a 100644
--- a/homeassistant/components/environment_canada/camera.py
+++ b/homeassistant/components/environment_canada/camera.py
@@ -42,7 +42,7 @@ class ECCamera(CoordinatorEntity, Camera):
     """Implementation of an Environment Canada radar camera."""
 
     _attr_has_entity_name = True
-    _attr_name = "Radar"
+    _attr_translation_key = "radar"
 
     def __init__(self, coordinator):
         """Initialize the camera."""
diff --git a/homeassistant/components/environment_canada/manifest.json b/homeassistant/components/environment_canada/manifest.json
index 6262a28302f..4a8a9dec587 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.5.34"]
+  "requirements": ["env-canada==0.5.35"]
 }
diff --git a/homeassistant/components/environment_canada/sensor.py b/homeassistant/components/environment_canada/sensor.py
index e7eceb8dadc..987a779d2e8 100644
--- a/homeassistant/components/environment_canada/sensor.py
+++ b/homeassistant/components/environment_canada/sensor.py
@@ -52,12 +52,12 @@ class ECSensorEntityDescription(
 SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ECSensorEntityDescription(
         key="condition",
-        name="Current condition",
+        translation_key="condition",
         value_fn=lambda data: data.conditions.get("condition", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="dewpoint",
-        name="Dew point",
+        translation_key="dewpoint",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -65,7 +65,7 @@ SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ),
     ECSensorEntityDescription(
         key="high_temp",
-        name="High temperature",
+        translation_key="high_temp",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -73,7 +73,7 @@ SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ),
     ECSensorEntityDescription(
         key="humidex",
-        name="Humidex",
+        translation_key="humidex",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -81,7 +81,6 @@ SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ),
     ECSensorEntityDescription(
         key="humidity",
-        name="Humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -89,11 +88,13 @@ SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ),
     ECSensorEntityDescription(
         key="icon_code",
+        translation_key="icon_code",
         name="Icon code",
         value_fn=lambda data: data.conditions.get("icon_code", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="low_temp",
+        translation_key="low_temp",
         name="Low temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
@@ -102,27 +103,27 @@ SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ),
     ECSensorEntityDescription(
         key="normal_high",
-        name="Normal high temperature",
+        translation_key="normal_high",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         value_fn=lambda data: data.conditions.get("normal_high", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="normal_low",
-        name="Normal low temperature",
+        translation_key="normal_low",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         value_fn=lambda data: data.conditions.get("normal_low", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="pop",
-        name="Chance of precipitation",
+        translation_key="pop",
         native_unit_of_measurement=PERCENTAGE,
         value_fn=lambda data: data.conditions.get("pop", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="precip_yesterday",
-        name="Precipitation yesterday",
+        translation_key="precip_yesterday",
         device_class=SensorDeviceClass.PRECIPITATION,
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -130,7 +131,7 @@ SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ),
     ECSensorEntityDescription(
         key="pressure",
-        name="Barometric pressure",
+        translation_key="pressure",
         device_class=SensorDeviceClass.PRESSURE,
         native_unit_of_measurement=UnitOfPressure.KPA,
         state_class=SensorStateClass.MEASUREMENT,
@@ -138,7 +139,6 @@ SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ),
     ECSensorEntityDescription(
         key="temperature",
-        name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -146,32 +146,32 @@ SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ),
     ECSensorEntityDescription(
         key="tendency",
-        name="Tendency",
+        translation_key="tendency",
         value_fn=lambda data: data.conditions.get("tendency", {}).get("value"),
         transform=lambda val: str(val).capitalize(),
     ),
     ECSensorEntityDescription(
         key="text_summary",
-        name="Summary",
+        translation_key="text_summary",
         value_fn=lambda data: data.conditions.get("text_summary", {}).get("value"),
         transform=lambda val: val[:255],
     ),
     ECSensorEntityDescription(
         key="timestamp",
-        name="Observation time",
+        translation_key="timestamp",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.metadata.get("timestamp"),
     ),
     ECSensorEntityDescription(
         key="uv_index",
-        name="UV index",
+        translation_key="uv_index",
         native_unit_of_measurement=UV_INDEX,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.conditions.get("uv_index", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="visibility",
-        name="Visibility",
+        translation_key="visibility",
         native_unit_of_measurement=UnitOfLength.KILOMETERS,
         device_class=SensorDeviceClass.DISTANCE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -179,13 +179,13 @@ SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ),
     ECSensorEntityDescription(
         key="wind_bearing",
-        name="Wind bearing",
+        translation_key="wind_bearing",
         native_unit_of_measurement=DEGREE,
         value_fn=lambda data: data.conditions.get("wind_bearing", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="wind_chill",
-        name="Wind chill",
+        translation_key="wind_chill",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -193,12 +193,12 @@ SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ),
     ECSensorEntityDescription(
         key="wind_dir",
-        name="Wind direction",
+        translation_key="wind_dir",
         value_fn=lambda data: data.conditions.get("wind_dir", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="wind_gust",
-        name="Wind gust",
+        translation_key="wind_gust",
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         device_class=SensorDeviceClass.WIND_SPEED,
         state_class=SensorStateClass.MEASUREMENT,
@@ -206,7 +206,6 @@ SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ),
     ECSensorEntityDescription(
         key="wind_speed",
-        name="Wind speed",
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         device_class=SensorDeviceClass.WIND_SPEED,
         state_class=SensorStateClass.MEASUREMENT,
@@ -226,7 +225,7 @@ def _get_aqhi_value(data):
 
 AQHI_SENSOR = ECSensorEntityDescription(
     key="aqhi",
-    name="AQHI",
+    translation_key="aqhi",
     device_class=SensorDeviceClass.AQI,
     state_class=SensorStateClass.MEASUREMENT,
     value_fn=_get_aqhi_value,
@@ -235,35 +234,35 @@ AQHI_SENSOR = ECSensorEntityDescription(
 ALERT_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ECSensorEntityDescription(
         key="advisories",
-        name="Advisory",
+        translation_key="advisories",
         icon="mdi:bell-alert",
         value_fn=lambda data: data.alerts.get("advisories", {}).get("value"),
         transform=len,
     ),
     ECSensorEntityDescription(
         key="endings",
-        name="Endings",
+        translation_key="endings",
         icon="mdi:alert-circle-check",
         value_fn=lambda data: data.alerts.get("endings", {}).get("value"),
         transform=len,
     ),
     ECSensorEntityDescription(
         key="statements",
-        name="Statements",
+        translation_key="statements",
         icon="mdi:bell-alert",
         value_fn=lambda data: data.alerts.get("statements", {}).get("value"),
         transform=len,
     ),
     ECSensorEntityDescription(
         key="warnings",
-        name="Warnings",
+        translation_key="warnings",
         icon="mdi:alert-octagon",
         value_fn=lambda data: data.alerts.get("warnings", {}).get("value"),
         transform=len,
     ),
     ECSensorEntityDescription(
         key="watches",
-        name="Watches",
+        translation_key="watches",
         icon="mdi:alert",
         value_fn=lambda data: data.alerts.get("watches", {}).get("value"),
         transform=len,
diff --git a/homeassistant/components/environment_canada/strings.json b/homeassistant/components/environment_canada/strings.json
index 4c6d75cfeb6..d30124ddf5a 100644
--- a/homeassistant/components/environment_canada/strings.json
+++ b/homeassistant/components/environment_canada/strings.json
@@ -22,5 +22,100 @@
       "too_many_attempts": "Connections to Environment Canada are rate limited; Try again in 60 seconds",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "condition": {
+        "name": "Current condition"
+      },
+      "dewpoint": {
+        "name": "Dew point"
+      },
+      "high_temp": {
+        "name": "High temperature"
+      },
+      "humidex": {
+        "name": "Humidex"
+      },
+      "icon_code": {
+        "name": "Icon code"
+      },
+      "low_temp": {
+        "name": "Low temperature"
+      },
+      "normal_high": {
+        "name": "Normal high temperature"
+      },
+      "normal_low": {
+        "name": "Normal low temperature"
+      },
+      "pop": {
+        "name": "Chance of precipitation"
+      },
+      "precip_yesterday": {
+        "name": "Precipitation yesterday"
+      },
+      "pressure": {
+        "name": "Barometric pressure"
+      },
+      "tendency": {
+        "name": "Tendency"
+      },
+      "text_summary": {
+        "name": "Summary"
+      },
+      "timestamp": {
+        "name": "Observation time"
+      },
+      "uv_index": {
+        "name": "UV index"
+      },
+      "visibility": {
+        "name": "Visibility"
+      },
+      "wind_bearing": {
+        "name": "Wind bearing"
+      },
+      "wind_chill": {
+        "name": "Wind chill"
+      },
+      "wind_dir": {
+        "name": "Wind direction"
+      },
+      "wind_gust": {
+        "name": "Wind gust"
+      },
+      "aqhi": {
+        "name": "AQHI"
+      },
+      "advisories": {
+        "name": "Advisory"
+      },
+      "endings": {
+        "name": "Endings"
+      },
+      "statements": {
+        "name": "Statements"
+      },
+      "warnings": {
+        "name": "Warnings"
+      },
+      "watches": {
+        "name": "Watches"
+      }
+    },
+    "camera": {
+      "radar": {
+        "name": "Radar"
+      }
+    },
+    "weather": {
+      "hourly_forecast": {
+        "name": "Hourly forecast"
+      },
+      "forecast": {
+        "name": "Forecast"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/environment_canada/weather.py b/homeassistant/components/environment_canada/weather.py
index 32ccfa901db..a9f79907b54 100644
--- a/homeassistant/components/environment_canada/weather.py
+++ b/homeassistant/components/environment_canada/weather.py
@@ -80,7 +80,7 @@ class ECWeather(CoordinatorEntity, WeatherEntity):
         super().__init__(coordinator)
         self.ec_data = coordinator.ec_data
         self._attr_attribution = self.ec_data.metadata["attribution"]
-        self._attr_name = "Hourly forecast" if hourly else "Forecast"
+        self._attr_translation_key = "hourly_forecast" if hourly else "forecast"
         self._attr_unique_id = (
             f"{coordinator.config_entry.unique_id}{'-hourly' if hourly else '-daily'}"
         )
diff --git a/homeassistant/components/esphome/__init__.py b/homeassistant/components/esphome/__init__.py
index f95763d3a6c..afaefe117ba 100644
--- a/homeassistant/components/esphome/__init__.py
+++ b/homeassistant/components/esphome/__init__.py
@@ -1,20 +1,14 @@
 """Support for esphome devices."""
 from __future__ import annotations
 
-from collections.abc import Callable
-import functools
 import logging
-import math
-from typing import Any, Generic, NamedTuple, TypeVar, cast
+from typing import Any, NamedTuple, TypeVar
 
 from aioesphomeapi import (
     APIClient,
     APIConnectionError,
     APIVersion,
     DeviceInfo as EsphomeDeviceInfo,
-    EntityCategory as EsphomeEntityCategory,
-    EntityInfo,
-    EntityState,
     HomeassistantServiceCall,
     InvalidAuthAPIError,
     InvalidEncryptionKeyAPIError,
@@ -36,7 +30,6 @@ from homeassistant.const import (
     CONF_PASSWORD,
     CONF_PORT,
     EVENT_HOMEASSISTANT_STOP,
-    EntityCategory,
     __version__ as ha_version,
 )
 from homeassistant.core import Event, HomeAssistant, ServiceCall, State, callback
@@ -45,9 +38,6 @@ from homeassistant.helpers import template
 import homeassistant.helpers.config_validation as cv
 import homeassistant.helpers.device_registry as dr
 from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity import DeviceInfo, Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.issue_registry import (
     IssueSeverity,
@@ -56,15 +46,19 @@ from homeassistant.helpers.issue_registry import (
 )
 from homeassistant.helpers.service import async_set_service_schema
 from homeassistant.helpers.template import Template
+from homeassistant.helpers.typing import ConfigType
 
 from .bluetooth import async_connect_scanner
-from .const import DOMAIN
-from .dashboard import async_get_dashboard
+from .const import (
+    CONF_ALLOW_SERVICE_CALLS,
+    DEFAULT_ALLOW_SERVICE_CALLS,
+    DOMAIN,
+)
+from .dashboard import async_get_dashboard, async_setup as async_setup_dashboard
 from .domain_data import DomainData
 
 # Import config flow so that it's added to the registry
 from .entry_data import RuntimeEntryData
-from .enum_mapper import EsphomeEnumMapper
 from .voice_assistant import VoiceAssistantUDPServer
 
 CONF_DEVICE_NAME = "device_name"
@@ -72,23 +66,25 @@ CONF_NOISE_PSK = "noise_psk"
 _LOGGER = logging.getLogger(__name__)
 _R = TypeVar("_R")
 
-STABLE_BLE_VERSION_STR = "2023.4.0"
+STABLE_BLE_VERSION_STR = "2023.6.0"
 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"
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 @callback
 def _async_check_firmware_version(
-    hass: HomeAssistant, device_info: EsphomeDeviceInfo
+    hass: HomeAssistant, device_info: EsphomeDeviceInfo, api_version: APIVersion
 ) -> None:
     """Create or delete an the ble_firmware_outdated issue."""
     # ESPHome device_info.mac_address is the unique_id
     issue = f"ble_firmware_outdated-{device_info.mac_address}"
     if (
-        not device_info.bluetooth_proxy_version
+        not device_info.bluetooth_proxy_feature_flags_compat(api_version)
         # If the device has a project name its up to that project
         # to tell them about the firmware version update so we don't notify here
         or (device_info.project_name and device_info.project_name not in PROJECT_URLS)
@@ -135,6 +131,12 @@ def _async_check_using_api_password(
     )
 
 
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the esphome component."""
+    await async_setup_dashboard(hass)
+    return True
+
+
 async def async_setup_entry(  # noqa: C901
     hass: HomeAssistant, entry: ConfigEntry
 ) -> bool:
@@ -143,7 +145,7 @@ async def async_setup_entry(  # noqa: C901
     port = entry.data[CONF_PORT]
     password = entry.data[CONF_PASSWORD]
     noise_psk = entry.data.get(CONF_NOISE_PSK)
-    device_id: str | None = None
+    device_id: str = None  # type: ignore[assignment]
 
     zeroconf_instance = await zeroconf.async_get_instance(hass)
 
@@ -156,11 +158,16 @@ async def async_setup_entry(  # noqa: C901
         noise_psk=noise_psk,
     )
 
+    services_issue = f"service_calls_not_enabled-{entry.unique_id}"
+    if entry.options.get(CONF_ALLOW_SERVICE_CALLS, DEFAULT_ALLOW_SERVICE_CALLS):
+        async_delete_issue(hass, DOMAIN, services_issue)
+
     domain_data = DomainData.get(hass)
     entry_data = RuntimeEntryData(
         client=cli,
         entry_id=entry.entry_id,
         store=domain_data.get_or_create_store(hass, entry),
+        original_options=dict(entry.options),
     )
     domain_data.set_entry_data(entry, entry_data)
 
@@ -179,6 +186,8 @@ async def async_setup_entry(  # noqa: C901
     @callback
     def async_on_service_call(service: HomeassistantServiceCall) -> None:
         """Call service when user automation in ESPHome config is triggered."""
+        device_info = entry_data.device_info
+        assert device_info is not None
         domain, service_name = service.service.split(".", 1)
         service_data = service.data
 
@@ -196,7 +205,7 @@ async def async_setup_entry(  # noqa: C901
                 return
 
         if service.is_event:
-            # ESPHome uses servicecall packet for both events and service calls
+            # ESPHome uses service call packet for both events and service calls
             # Ensure the user can only send events of form 'esphome.xyz'
             if domain != "esphome":
                 _LOGGER.error(
@@ -217,12 +226,34 @@ async def async_setup_entry(  # noqa: C901
                     **service_data,
                 },
             )
-        else:
+        elif entry.options.get(CONF_ALLOW_SERVICE_CALLS, DEFAULT_ALLOW_SERVICE_CALLS):
             hass.async_create_task(
                 hass.services.async_call(
                     domain, service_name, service_data, blocking=True
                 )
             )
+        else:
+            async_create_issue(
+                hass,
+                DOMAIN,
+                services_issue,
+                is_fixable=False,
+                severity=IssueSeverity.WARNING,
+                translation_key="service_calls_not_allowed",
+                translation_placeholders={
+                    "name": device_info.friendly_name or device_info.name,
+                },
+            )
+            _LOGGER.error(
+                "%s: Service call %s.%s: with data %s rejected; "
+                "If you trust this device and want to allow access for it to make "
+                "Home Assistant service calls, you can enable this "
+                "functionality in the options flow",
+                device_info.friendly_name or device_info.name,
+                domain,
+                service_name,
+                service_data,
+            )
 
     async def _send_home_assistant_state(
         entity_id: str, attribute: str | None, state: State | None
@@ -316,6 +347,7 @@ async def async_setup_entry(  # noqa: C901
 
         hass.async_create_background_task(
             voice_assistant_udp_server.run_pipeline(
+                device_id=device_id,
                 conversation_id=conversation_id or None,
                 use_vad=use_vad,
             ),
@@ -359,7 +391,7 @@ async def async_setup_entry(  # noqa: C901
             if entry_data.device_info.name:
                 reconnect_logic.name = entry_data.device_info.name
 
-            if device_info.bluetooth_proxy_version:
+            if device_info.bluetooth_proxy_feature_flags_compat(cli.api_version):
                 entry_data.disconnect_callbacks.append(
                     await async_connect_scanner(hass, entry, cli, entry_data)
                 )
@@ -390,17 +422,23 @@ async def async_setup_entry(  # noqa: C901
             # Re-connection logic will trigger after this
             await cli.disconnect()
         else:
-            _async_check_firmware_version(hass, device_info)
+            _async_check_firmware_version(hass, device_info, entry_data.api_version)
             _async_check_using_api_password(hass, device_info, bool(password))
 
-    async def on_disconnect() -> None:
+    async def on_disconnect(expected_disconnect: bool) -> None:
         """Run disconnect callbacks on API disconnect."""
         name = entry_data.device_info.name if entry_data.device_info else host
-        _LOGGER.debug("%s: %s disconnected, running disconnected callbacks", name, host)
+        _LOGGER.debug(
+            "%s: %s disconnected (expected=%s), running disconnected callbacks",
+            name,
+            host,
+            expected_disconnect,
+        )
         for disconnect_cb in entry_data.disconnect_callbacks:
             disconnect_cb()
         entry_data.disconnect_callbacks = []
         entry_data.available = False
+        entry_data.expected_disconnect = expected_disconnect
         # Mark state as stale so that we will always dispatch
         # the next state update of that type when the device reconnects
         entry_data.stale_state = {
@@ -450,6 +488,8 @@ async def async_setup_entry(  # noqa: C901
     await reconnect_logic.start()
     entry_data.cleanup_callbacks.append(reconnect_logic.stop_callback)
 
+    entry.async_on_unload(entry.add_update_listener(entry_data.async_update_listener))
+
     return True
 
 
@@ -641,6 +681,7 @@ async def _cleanup_instance(
     data.disconnect_callbacks = []
     for cleanup_callback in data.cleanup_callbacks:
         cleanup_callback()
+    await data.async_cleanup()
     await data.client.disconnect()
     return data
 
@@ -656,291 +697,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Remove an esphome config entry."""
     await DomainData.get(hass).get_or_create_store(hass, entry).async_remove()
-
-
-_InfoT = TypeVar("_InfoT", bound=EntityInfo)
-_EntityT = TypeVar("_EntityT", bound="EsphomeEntity[Any,Any]")
-_StateT = TypeVar("_StateT", bound=EntityState)
-
-
-async def platform_async_setup_entry(
-    hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-    *,
-    component_key: str,
-    info_type: type[_InfoT],
-    entity_type: type[_EntityT],
-    state_type: type[_StateT],
-) -> None:
-    """Set up an esphome platform.
-
-    This method is in charge of receiving, distributing and storing
-    info and state updates.
-    """
-    entry_data: RuntimeEntryData = DomainData.get(hass).get_entry_data(entry)
-    entry_data.info[component_key] = {}
-    entry_data.old_info[component_key] = {}
-    entry_data.state.setdefault(state_type, {})
-
-    @callback
-    def async_list_entities(infos: list[EntityInfo]) -> None:
-        """Update entities of this platform when entities are listed."""
-        old_infos = entry_data.info[component_key]
-        new_infos: dict[int, EntityInfo] = {}
-        add_entities: list[_EntityT] = []
-        for info in infos:
-            if not isinstance(info, info_type):
-                # Filter out infos that don't belong to this platform.
-                continue
-
-            if info.key in old_infos:
-                # Update existing entity
-                old_infos.pop(info.key)
-            else:
-                # Create new entity
-                entity = entity_type(entry_data, component_key, info.key, state_type)
-                add_entities.append(entity)
-            new_infos[info.key] = info
-
-        # Remove old entities
-        for info in old_infos.values():
-            entry_data.async_remove_entity(hass, component_key, info.key)
-
-        # First copy the now-old info into the backup object
-        entry_data.old_info[component_key] = entry_data.info[component_key]
-        # Then update the actual info
-        entry_data.info[component_key] = new_infos
-
-        # Add entities to Home Assistant
-        async_add_entities(add_entities)
-
-    entry_data.cleanup_callbacks.append(
-        async_dispatcher_connect(
-            hass, entry_data.signal_static_info_updated, async_list_entities
-        )
-    )
-
-
-def esphome_state_property(
-    func: Callable[[_EntityT], _R]
-) -> Callable[[_EntityT], _R | None]:
-    """Wrap a state property of an esphome entity.
-
-    This checks if the state object in the entity is set, and
-    prevents writing NAN values to the Home Assistant state machine.
-    """
-
-    @functools.wraps(func)
-    def _wrapper(self: _EntityT) -> _R | None:
-        # pylint: disable-next=protected-access
-        if not self._has_state:
-            return None
-        val = func(self)
-        if isinstance(val, float) and math.isnan(val):
-            # Home Assistant doesn't use NAN values in state machine
-            # (not JSON serializable)
-            return None
-        return val
-
-    return _wrapper
-
-
-ICON_SCHEMA = vol.Schema(cv.icon)
-
-
-ENTITY_CATEGORIES: EsphomeEnumMapper[
-    EsphomeEntityCategory, EntityCategory | None
-] = EsphomeEnumMapper(
-    {
-        EsphomeEntityCategory.NONE: None,
-        EsphomeEntityCategory.CONFIG: EntityCategory.CONFIG,
-        EsphomeEntityCategory.DIAGNOSTIC: EntityCategory.DIAGNOSTIC,
-    }
-)
-
-
-class EsphomeEntity(Entity, Generic[_InfoT, _StateT]):
-    """Define a base esphome entity."""
-
-    _attr_should_poll = False
-
-    def __init__(
-        self,
-        entry_data: RuntimeEntryData,
-        component_key: str,
-        key: int,
-        state_type: type[_StateT],
-    ) -> None:
-        """Initialize."""
-        self._entry_data = entry_data
-        self._component_key = component_key
-        self._key = key
-        self._state_type = state_type
-        if entry_data.device_info is not None and entry_data.device_info.friendly_name:
-            self._attr_has_entity_name = True
-
-    async def async_added_to_hass(self) -> None:
-        """Register callbacks."""
-        self.async_on_remove(
-            async_dispatcher_connect(
-                self.hass,
-                f"esphome_{self._entry_id}_remove_{self._component_key}_{self._key}",
-                functools.partial(self.async_remove, force_remove=True),
-            )
-        )
-
-        self.async_on_remove(
-            async_dispatcher_connect(
-                self.hass,
-                self._entry_data.signal_device_updated,
-                self._on_device_update,
-            )
-        )
-
-        self.async_on_remove(
-            self._entry_data.async_subscribe_state_update(
-                self._state_type, self._key, self._on_state_update
-            )
-        )
-
-    @callback
-    def _on_state_update(self) -> None:
-        # Behavior can be changed in child classes
-        self.async_write_ha_state()
-
-    @callback
-    def _on_device_update(self) -> None:
-        """Update the entity state when device info has changed."""
-        if self._entry_data.available:
-            # Don't update the HA state yet when the device comes online.
-            # Only update the HA state when the full state arrives
-            # through the next entity state packet.
-            return
-        self._on_state_update()
-
-    @property
-    def _entry_id(self) -> str:
-        return self._entry_data.entry_id
-
-    @property
-    def _api_version(self) -> APIVersion:
-        return self._entry_data.api_version
-
-    @property
-    def _static_info(self) -> _InfoT:
-        # Check if value is in info database. Use a single lookup.
-        info = self._entry_data.info[self._component_key].get(self._key)
-        if info is not None:
-            return cast(_InfoT, info)
-        # This entity is in the removal project and has been removed from .info
-        # already, look in old_info
-        return cast(_InfoT, self._entry_data.old_info[self._component_key][self._key])
-
-    @property
-    def _device_info(self) -> EsphomeDeviceInfo:
-        assert self._entry_data.device_info is not None
-        return self._entry_data.device_info
-
-    @property
-    def _client(self) -> APIClient:
-        return self._entry_data.client
-
-    @property
-    def _state(self) -> _StateT:
-        return cast(_StateT, self._entry_data.state[self._state_type][self._key])
-
-    @property
-    def _has_state(self) -> bool:
-        return self._key in self._entry_data.state[self._state_type]
-
-    @property
-    def available(self) -> bool:
-        """Return if the entity is available."""
-        device = self._device_info
-
-        if device.has_deep_sleep:
-            # During deep sleep the ESP will not be connectable (by design)
-            # For these cases, show it as available
-            return True
-
-        return self._entry_data.available
-
-    @property
-    def unique_id(self) -> str | None:
-        """Return a unique id identifying the entity."""
-        if not self._static_info.unique_id:
-            return None
-        return self._static_info.unique_id
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device registry information for this entity."""
-        return DeviceInfo(
-            connections={(dr.CONNECTION_NETWORK_MAC, self._device_info.mac_address)}
-        )
-
-    @property
-    def name(self) -> str:
-        """Return the name of the entity."""
-        return self._static_info.name
-
-    @property
-    def icon(self) -> str | None:
-        """Return the icon."""
-        if not self._static_info.icon:
-            return None
-
-        return cast(str, ICON_SCHEMA(self._static_info.icon))
-
-    @property
-    def entity_registry_enabled_default(self) -> bool:
-        """Return if the entity should be enabled when first added.
-
-        This only applies when fist added to the entity registry.
-        """
-        return not self._static_info.disabled_by_default
-
-    @property
-    def entity_category(self) -> EntityCategory | None:
-        """Return the category of the entity, if any."""
-        if not self._static_info.entity_category:
-            return None
-        return ENTITY_CATEGORIES.from_esphome(self._static_info.entity_category)
-
-
-class EsphomeAssistEntity(Entity):
-    """Define a base entity for Assist Pipeline entities."""
-
-    _attr_has_entity_name = True
-    _attr_should_poll = False
-
-    def __init__(self, entry_data: RuntimeEntryData) -> None:
-        """Initialize the binary sensor."""
-        self._entry_data: RuntimeEntryData = entry_data
-        self._attr_unique_id = (
-            f"{self._device_info.mac_address}-{self.entity_description.key}"
-        )
-
-    @property
-    def _device_info(self) -> EsphomeDeviceInfo:
-        assert self._entry_data.device_info is not None
-        return self._entry_data.device_info
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device registry information for this entity."""
-        return DeviceInfo(
-            connections={(dr.CONNECTION_NETWORK_MAC, self._device_info.mac_address)}
-        )
-
-    @callback
-    def _update(self) -> None:
-        self.async_write_ha_state()
-
-    async def async_added_to_hass(self) -> None:
-        """Register update callback."""
-        await super().async_added_to_hass()
-        self.async_on_remove(
-            self._entry_data.async_subscribe_assist_pipeline_update(self._update)
-        )
diff --git a/homeassistant/components/esphome/alarm_control_panel.py b/homeassistant/components/esphome/alarm_control_panel.py
new file mode 100644
index 00000000000..639f47272d9
--- /dev/null
+++ b/homeassistant/components/esphome/alarm_control_panel.py
@@ -0,0 +1,160 @@
+"""Support for ESPHome Alarm Control Panel."""
+from __future__ import annotations
+
+from aioesphomeapi import (
+    AlarmControlPanelCommand,
+    AlarmControlPanelEntityState,
+    AlarmControlPanelInfo,
+    AlarmControlPanelState,
+    APIIntEnum,
+    EntityInfo,
+)
+
+from homeassistant.components.alarm_control_panel import (
+    AlarmControlPanelEntity,
+    AlarmControlPanelEntityFeature,
+    CodeFormat,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_DISARMING,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
+from .enum_mapper import EsphomeEnumMapper
+
+_ESPHOME_ACP_STATE_TO_HASS_STATE: EsphomeEnumMapper[
+    AlarmControlPanelState, str
+] = EsphomeEnumMapper(
+    {
+        AlarmControlPanelState.DISARMED: STATE_ALARM_DISARMED,
+        AlarmControlPanelState.ARMED_HOME: STATE_ALARM_ARMED_HOME,
+        AlarmControlPanelState.ARMED_AWAY: STATE_ALARM_ARMED_AWAY,
+        AlarmControlPanelState.ARMED_NIGHT: STATE_ALARM_ARMED_NIGHT,
+        AlarmControlPanelState.ARMED_VACATION: STATE_ALARM_ARMED_VACATION,
+        AlarmControlPanelState.ARMED_CUSTOM_BYPASS: STATE_ALARM_ARMED_CUSTOM_BYPASS,
+        AlarmControlPanelState.PENDING: STATE_ALARM_PENDING,
+        AlarmControlPanelState.ARMING: STATE_ALARM_ARMING,
+        AlarmControlPanelState.DISARMING: STATE_ALARM_DISARMING,
+        AlarmControlPanelState.TRIGGERED: STATE_ALARM_TRIGGERED,
+    }
+)
+
+
+class EspHomeACPFeatures(APIIntEnum):
+    """ESPHome AlarmCintolPanel feature numbers."""
+
+    ARM_HOME = 1
+    ARM_AWAY = 2
+    ARM_NIGHT = 4
+    TRIGGER = 8
+    ARM_CUSTOM_BYPASS = 16
+    ARM_VACATION = 32
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up ESPHome switches based on a config entry."""
+    await platform_async_setup_entry(
+        hass,
+        entry,
+        async_add_entities,
+        info_type=AlarmControlPanelInfo,
+        entity_type=EsphomeAlarmControlPanel,
+        state_type=AlarmControlPanelEntityState,
+    )
+
+
+class EsphomeAlarmControlPanel(
+    EsphomeEntity[AlarmControlPanelInfo, AlarmControlPanelEntityState],
+    AlarmControlPanelEntity,
+):
+    """An Alarm Control Panel implementation for ESPHome."""
+
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        feature = 0
+        if self._static_info.supported_features & EspHomeACPFeatures.ARM_HOME:
+            feature |= AlarmControlPanelEntityFeature.ARM_HOME
+        if self._static_info.supported_features & EspHomeACPFeatures.ARM_AWAY:
+            feature |= AlarmControlPanelEntityFeature.ARM_AWAY
+        if self._static_info.supported_features & EspHomeACPFeatures.ARM_NIGHT:
+            feature |= AlarmControlPanelEntityFeature.ARM_NIGHT
+        if self._static_info.supported_features & EspHomeACPFeatures.TRIGGER:
+            feature |= AlarmControlPanelEntityFeature.TRIGGER
+        if self._static_info.supported_features & EspHomeACPFeatures.ARM_CUSTOM_BYPASS:
+            feature |= AlarmControlPanelEntityFeature.ARM_CUSTOM_BYPASS
+        if self._static_info.supported_features & EspHomeACPFeatures.ARM_VACATION:
+            feature |= AlarmControlPanelEntityFeature.ARM_VACATION
+        self._attr_supported_features = AlarmControlPanelEntityFeature(feature)
+        self._attr_code_format = (
+            CodeFormat.NUMBER if static_info.requires_code else None
+        )
+        self._attr_code_arm_required = bool(static_info.requires_code_to_arm)
+
+    @property
+    @esphome_state_property
+    def state(self) -> str | None:
+        """Return the state of the device."""
+        return _ESPHOME_ACP_STATE_TO_HASS_STATE.from_esphome(self._state.state)
+
+    async def async_alarm_disarm(self, code: str | None = None) -> None:
+        """Send disarm command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.DISARM, code
+        )
+
+    async def async_alarm_arm_home(self, code: str | None = None) -> None:
+        """Send arm home command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.ARM_HOME, code
+        )
+
+    async def async_alarm_arm_away(self, code: str | None = None) -> None:
+        """Send arm away command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.ARM_AWAY, code
+        )
+
+    async def async_alarm_arm_night(self, code: str | None = None) -> None:
+        """Send arm away command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.ARM_NIGHT, code
+        )
+
+    async def async_alarm_arm_custom_bypass(self, code: str | None = None) -> None:
+        """Send arm away command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.ARM_CUSTOM_BYPASS, code
+        )
+
+    async def async_alarm_arm_vacation(self, code: str | None = None) -> None:
+        """Send arm away command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.ARM_VACATION, code
+        )
+
+    async def async_alarm_trigger(self, code: str | None = None) -> None:
+        """Send alarm trigger command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.TRIGGER, code
+        )
diff --git a/homeassistant/components/esphome/binary_sensor.py b/homeassistant/components/esphome/binary_sensor.py
index 77ec780acb3..65a237de4f7 100644
--- a/homeassistant/components/esphome/binary_sensor.py
+++ b/homeassistant/components/esphome/binary_sensor.py
@@ -1,7 +1,7 @@
 """Support for ESPHome binary sensors."""
 from __future__ import annotations
 
-from aioesphomeapi import BinarySensorInfo, BinarySensorState
+from aioesphomeapi import BinarySensorInfo, BinarySensorState, EntityInfo
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -9,12 +9,16 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import EsphomeAssistEntity, EsphomeEntity, platform_async_setup_entry
 from .domain_data import DomainData
+from .entity import (
+    EsphomeAssistEntity,
+    EsphomeEntity,
+    platform_async_setup_entry,
+)
 
 
 async def async_setup_entry(
@@ -25,7 +29,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="binary_sensor",
         info_type=BinarySensorInfo,
         entity_type=EsphomeBinarySensor,
         state_type=BinarySensorState,
@@ -49,23 +52,22 @@ class EsphomeBinarySensor(
             # Status binary sensors indicated connected state.
             # So in their case what's usually _availability_ is now state
             return self._entry_data.available
-        if not self._has_state:
-            return None
-        if self._state.missing_state:
+        if not self._has_state or self._state.missing_state:
             return None
         return self._state.state
 
-    @property
-    def device_class(self) -> BinarySensorDeviceClass | None:
-        """Return the class of this device, from component DEVICE_CLASSES."""
-        return try_parse_enum(BinarySensorDeviceClass, self._static_info.device_class)
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        self._attr_device_class = try_parse_enum(
+            BinarySensorDeviceClass, self._static_info.device_class
+        )
 
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
-        if self._static_info.is_status_binary_sensor:
-            return True
-        return super().available
+        return self._static_info.is_status_binary_sensor or super().available
 
 
 class EsphomeAssistInProgressBinarySensor(EsphomeAssistEntity, BinarySensorEntity):
diff --git a/homeassistant/components/esphome/bluetooth/__init__.py b/homeassistant/components/esphome/bluetooth/__init__.py
index e62b54655c8..aea65f9358e 100644
--- a/homeassistant/components/esphome/bluetooth/__init__.py
+++ b/homeassistant/components/esphome/bluetooth/__init__.py
@@ -5,7 +5,7 @@ from collections.abc import Callable
 from functools import partial
 import logging
 
-from aioesphomeapi import APIClient
+from aioesphomeapi import APIClient, BluetoothProxyFeature
 
 from homeassistant.components.bluetooth import (
     HaBluetoothConnector,
@@ -59,13 +59,15 @@ async def async_connect_scanner(
     source = str(entry.unique_id)
     new_info_callback = async_get_advertisement_callback(hass)
     assert entry_data.device_info is not None
-    version = entry_data.device_info.bluetooth_proxy_version
-    connectable = version >= 2
+    feature_flags = entry_data.device_info.bluetooth_proxy_feature_flags_compat(
+        entry_data.api_version
+    )
+    connectable = bool(feature_flags & BluetoothProxyFeature.ACTIVE_CONNECTIONS)
     _LOGGER.debug(
-        "%s [%s]: Connecting scanner version=%s, connectable=%s",
+        "%s [%s]: Connecting scanner feature_flags=%s, connectable=%s",
         entry.title,
         source,
-        version,
+        feature_flags,
         connectable,
     )
     connector = HaBluetoothConnector(
@@ -89,7 +91,12 @@ async def async_connect_scanner(
         async_register_scanner(hass, scanner, connectable),
         scanner.async_setup(),
     ]
-    await cli.subscribe_bluetooth_le_advertisements(scanner.async_on_advertisement)
+    if feature_flags & BluetoothProxyFeature.RAW_ADVERTISEMENTS:
+        await cli.subscribe_bluetooth_le_raw_advertisements(
+            scanner.async_on_raw_advertisements
+        )
+    else:
+        await cli.subscribe_bluetooth_le_advertisements(scanner.async_on_advertisement)
 
     @hass_callback
     def _async_unload() -> None:
diff --git a/homeassistant/components/esphome/bluetooth/client.py b/homeassistant/components/esphome/bluetooth/client.py
index 914021b467e..d452ab8764a 100644
--- a/homeassistant/components/esphome/bluetooth/client.py
+++ b/homeassistant/components/esphome/bluetooth/client.py
@@ -12,6 +12,7 @@ from aioesphomeapi import (
     ESP_CONNECTION_ERROR_DESCRIPTION,
     ESPHOME_GATT_ERRORS,
     BLEConnectionError,
+    BluetoothProxyFeature,
 )
 from aioesphomeapi.connection import APIConnectionError, TimeoutAPIError
 from aioesphomeapi.core import BluetoothGATTAPIError
@@ -42,10 +43,6 @@ CCCD_UUID = "00002902-0000-1000-8000-00805f9b34fb"
 CCCD_NOTIFY_BYTES = b"\x01\x00"
 CCCD_INDICATE_BYTES = b"\x02\x00"
 
-MIN_BLUETOOTH_PROXY_VERSION_HAS_CACHE = 3
-MIN_BLUETOOTH_PROXY_HAS_PAIRING = 4
-MIN_BLUETOOTH_PROXY_HAS_CLEAR_CACHE = 5
-
 DEFAULT_MAX_WRITE_WITHOUT_RESPONSE = DEFAULT_MTU - GATT_HEADER_SIZE
 _LOGGER = logging.getLogger(__name__)
 
@@ -158,7 +155,10 @@ class ESPHomeClient(BaseBleakClient):
         self._disconnected_event: asyncio.Event | None = None
         device_info = self.entry_data.device_info
         assert device_info is not None
-        self._connection_version = device_info.bluetooth_proxy_version
+        self._device_info = device_info
+        self._feature_flags = device_info.bluetooth_proxy_feature_flags_compat(
+            self.entry_data.api_version
+        )
         self._address_type = address_or_ble_device.details["address_type"]
         self._source_name = f"{config_entry.title} [{self._source}]"
 
@@ -233,7 +233,7 @@ class ESPHomeClient(BaseBleakClient):
     ) -> bool:
         """Connect to a specified Peripheral.
 
-        Keyword Args:
+        **kwargs:
             timeout (float): Timeout for required
                 ``BleakScanner.find_device_by_address`` call. Defaults to 10.0.
 
@@ -247,7 +247,7 @@ class ESPHomeClient(BaseBleakClient):
         self._mtu = domain_data.get_gatt_mtu_cache(self._address_as_int)
         has_cache = bool(
             dangerous_use_bleak_cache
-            and self._connection_version >= MIN_BLUETOOTH_PROXY_VERSION_HAS_CACHE
+            and self._feature_flags & BluetoothProxyFeature.REMOTE_CACHING
             and domain_data.get_gatt_services_cache(self._address_as_int)
             and self._mtu
         )
@@ -319,7 +319,7 @@ class ESPHomeClient(BaseBleakClient):
                         _on_bluetooth_connection_state,
                         timeout=timeout,
                         has_cache=has_cache,
-                        version=self._connection_version,
+                        feature_flags=self._feature_flags,
                         address_type=self._address_type,
                     )
                 )
@@ -397,9 +397,10 @@ class ESPHomeClient(BaseBleakClient):
     @api_error_as_bleak_error
     async def pair(self, *args: Any, **kwargs: Any) -> bool:
         """Attempt to pair."""
-        if self._connection_version < MIN_BLUETOOTH_PROXY_HAS_PAIRING:
+        if not self._feature_flags & BluetoothProxyFeature.PAIRING:
             raise NotImplementedError(
-                "Pairing is not available in ESPHome with version {self._connection_version}."
+                "Pairing is not available in this version ESPHome; "
+                f"Upgrade the ESPHome version on the {self._device_info.name} device."
             )
         response = await self._client.bluetooth_device_pair(self._address_as_int)
         if response.paired:
@@ -413,9 +414,10 @@ class ESPHomeClient(BaseBleakClient):
     @api_error_as_bleak_error
     async def unpair(self) -> bool:
         """Attempt to unpair."""
-        if self._connection_version < MIN_BLUETOOTH_PROXY_HAS_PAIRING:
+        if not self._feature_flags & BluetoothProxyFeature.PAIRING:
             raise NotImplementedError(
-                "Unpairing is not available in ESPHome with version {self._connection_version}."
+                "Unpairing is not available in this version ESPHome; "
+                f"Upgrade the ESPHome version on the {self._device_info.name} device."
             )
         response = await self._client.bluetooth_device_unpair(self._address_as_int)
         if response.success:
@@ -441,7 +443,7 @@ class ESPHomeClient(BaseBleakClient):
         # because the esp has already wiped the services list to
         # save memory.
         if (
-            self._connection_version >= MIN_BLUETOOTH_PROXY_VERSION_HAS_CACHE
+            self._feature_flags & BluetoothProxyFeature.REMOTE_CACHING
             or dangerous_use_bleak_cache
         ) and (cached_services := domain_data.get_gatt_services_cache(address_as_int)):
             _LOGGER.debug(
@@ -524,12 +526,11 @@ class ESPHomeClient(BaseBleakClient):
         """Clear the GATT cache."""
         self.domain_data.clear_gatt_services_cache(self._address_as_int)
         self.domain_data.clear_gatt_mtu_cache(self._address_as_int)
-        if self._connection_version < MIN_BLUETOOTH_PROXY_HAS_CLEAR_CACHE:
+        if not self._feature_flags & BluetoothProxyFeature.CACHE_CLEARING:
             _LOGGER.warning(
-                "On device cache clear is not available with ESPHome Bluetooth version %s, "
-                "version %s is needed; Only memory cache will be cleared",
-                self._connection_version,
-                MIN_BLUETOOTH_PROXY_HAS_CLEAR_CACHE,
+                "On device cache clear is not available with this ESPHome version; "
+                "Upgrade the ESPHome version on the device %s; Only memory cache will be cleared",
+                self._device_info.name,
             )
             return True
         response = await self._client.bluetooth_device_clear_cache(self._address_as_int)
@@ -673,7 +674,7 @@ class ESPHomeClient(BaseBleakClient):
             lambda handle, data: callback(data),
         )
 
-        if self._connection_version < MIN_BLUETOOTH_PROXY_VERSION_HAS_CACHE:
+        if not self._feature_flags & BluetoothProxyFeature.REMOTE_CACHING:
             return
 
         # For connection v3 we are responsible for enabling notifications
diff --git a/homeassistant/components/esphome/bluetooth/scanner.py b/homeassistant/components/esphome/bluetooth/scanner.py
index 6151ed30429..5013a288dcf 100644
--- a/homeassistant/components/esphome/bluetooth/scanner.py
+++ b/homeassistant/components/esphome/bluetooth/scanner.py
@@ -1,10 +1,10 @@
 """Bluetooth scanner for esphome."""
 from __future__ import annotations
 
-from aioesphomeapi import BluetoothLEAdvertisement
-from bluetooth_data_tools import int_to_bluetooth_address
+from aioesphomeapi import BluetoothLEAdvertisement, BluetoothLERawAdvertisement
+from bluetooth_data_tools import int_to_bluetooth_address, parse_advertisement_data
 
-from homeassistant.components.bluetooth import BaseHaRemoteScanner
+from homeassistant.components.bluetooth import MONOTONIC_TIME, BaseHaRemoteScanner
 from homeassistant.core import callback
 
 
@@ -24,4 +24,25 @@ class ESPHomeScanner(BaseHaRemoteScanner):
             adv.manufacturer_data,
             None,
             {"address_type": adv.address_type},
+            MONOTONIC_TIME(),
         )
+
+    @callback
+    def async_on_raw_advertisements(
+        self, advertisements: list[BluetoothLERawAdvertisement]
+    ) -> None:
+        """Call the registered callback."""
+        now = MONOTONIC_TIME()
+        for adv in advertisements:
+            parsed = parse_advertisement_data((adv.data,))
+            self._async_on_advertisement(
+                int_to_bluetooth_address(adv.address),
+                adv.rssi,
+                parsed.local_name,
+                parsed.service_uuids,
+                parsed.service_data,
+                parsed.manufacturer_data,
+                None,
+                {"address_type": adv.address_type},
+                now,
+            )
diff --git a/homeassistant/components/esphome/button.py b/homeassistant/components/esphome/button.py
index 0cb577f30c9..eca8d226c69 100644
--- a/homeassistant/components/esphome/button.py
+++ b/homeassistant/components/esphome/button.py
@@ -1,7 +1,7 @@
 """Support for ESPHome buttons."""
 from __future__ import annotations
 
-from aioesphomeapi import ButtonInfo, EntityState
+from aioesphomeapi import ButtonInfo, EntityInfo, EntityState
 
 from homeassistant.components.button import ButtonDeviceClass, ButtonEntity
 from homeassistant.config_entries import ConfigEntry
@@ -9,7 +9,10 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import EsphomeEntity, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    platform_async_setup_entry,
+)
 
 
 async def async_setup_entry(
@@ -20,7 +23,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="button",
         info_type=ButtonInfo,
         entity_type=EsphomeButton,
         state_type=EntityState,
@@ -30,18 +32,29 @@ async def async_setup_entry(
 class EsphomeButton(EsphomeEntity[ButtonInfo, EntityState], ButtonEntity):
     """A button implementation for ESPHome."""
 
-    @property
-    def device_class(self) -> ButtonDeviceClass | None:
-        """Return the class of this entity."""
-        return try_parse_enum(ButtonDeviceClass, self._static_info.device_class)
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        self._attr_device_class = try_parse_enum(
+            ButtonDeviceClass, self._static_info.device_class
+        )
 
     @callback
     def _on_device_update(self) -> None:
-        """Update the entity state when device info has changed."""
-        # This override the EsphomeEntity method as the button entity
-        # never gets a state update.
-        self._on_state_update()
+        """Call when device updates or entry data changes.
+
+        The default behavior is only to write entity state when the
+        device is unavailable when the device state changes.
+        This method overrides the default behavior since buttons do
+        not have a state, so we will never get a state update for a
+        button. As such, we need to write the state on every device
+        update to ensure the button goes available and unavailable
+        as the device becomes available or unavailable.
+        """
+        self._on_entry_data_changed()
+        self.async_write_ha_state()
 
     async def async_press(self) -> None:
         """Press the button."""
-        await self._client.button_command(self._static_info.key)
+        await self._client.button_command(self._key)
diff --git a/homeassistant/components/esphome/camera.py b/homeassistant/components/esphome/camera.py
index 390208f689d..94a9b03b90c 100644
--- a/homeassistant/components/esphome/camera.py
+++ b/homeassistant/components/esphome/camera.py
@@ -13,7 +13,10 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import EsphomeEntity, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    platform_async_setup_entry,
+)
 
 
 async def async_setup_entry(
@@ -24,7 +27,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="camera",
         info_type=CameraInfo,
         entity_type=EsphomeCamera,
         state_type=CameraState,
diff --git a/homeassistant/components/esphome/climate.py b/homeassistant/components/esphome/climate.py
index e40df234d58..34043da012e 100644
--- a/homeassistant/components/esphome/climate.py
+++ b/homeassistant/components/esphome/climate.py
@@ -11,6 +11,7 @@ from aioesphomeapi import (
     ClimatePreset,
     ClimateState,
     ClimateSwingMode,
+    EntityInfo,
 )
 
 from homeassistant.components.climate import (
@@ -51,10 +52,14 @@ from homeassistant.const import (
     PRECISION_WHOLE,
     UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 from .enum_mapper import EsphomeEnumMapper
 
 FAN_QUIET = "quiet"
@@ -68,7 +73,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="climate",
         info_type=ClimateInfo,
         entity_type=EsphomeClimateEntity,
         state_type=ClimateState,
@@ -137,71 +141,32 @@ class EsphomeClimateEntity(EsphomeEntity[ClimateInfo, ClimateState], ClimateEnti
 
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
-    @property
-    def precision(self) -> float:
-        """Return the precision of the climate device."""
-        precicions = [PRECISION_WHOLE, PRECISION_HALVES, PRECISION_TENTHS]
-        if self._static_info.visual_current_temperature_step != 0:
-            step = self._static_info.visual_current_temperature_step
-        else:
-            step = self._static_info.visual_target_temperature_step
-        for prec in precicions:
-            if step >= prec:
-                return prec
-        # Fall back to highest precision, tenths
-        return PRECISION_TENTHS
-
-    @property
-    def hvac_modes(self) -> list[str]:
-        """Return the list of available operation modes."""
-        return [
-            _CLIMATE_MODES.from_esphome(mode)
-            for mode in self._static_info.supported_modes
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        self._attr_precision = self._get_precision()
+        self._attr_hvac_modes = [
+            _CLIMATE_MODES.from_esphome(mode) for mode in static_info.supported_modes
         ]
-
-    @property
-    def fan_modes(self) -> list[str]:
-        """Return the list of available fan modes."""
-        return [
-            _FAN_MODES.from_esphome(mode)
-            for mode in self._static_info.supported_fan_modes
-        ] + self._static_info.supported_custom_fan_modes
-
-    @property
-    def preset_modes(self) -> list[str]:
-        """Return preset modes."""
-        return [
+        self._attr_fan_modes = [
+            _FAN_MODES.from_esphome(mode) for mode in static_info.supported_fan_modes
+        ] + static_info.supported_custom_fan_modes
+        self._attr_preset_modes = [
             _PRESETS.from_esphome(preset)
-            for preset in self._static_info.supported_presets_compat(self._api_version)
-        ] + self._static_info.supported_custom_presets
-
-    @property
-    def swing_modes(self) -> list[str]:
-        """Return the list of available swing modes."""
-        return [
+            for preset in static_info.supported_presets_compat(self._api_version)
+        ] + static_info.supported_custom_presets
+        self._attr_swing_modes = [
             _SWING_MODES.from_esphome(mode)
-            for mode in self._static_info.supported_swing_modes
+            for mode in static_info.supported_swing_modes
         ]
-
-    @property
-    def target_temperature_step(self) -> float:
-        """Return the supported step of target temperature."""
         # Round to one digit because of floating point math
-        return round(self._static_info.visual_target_temperature_step, 1)
-
-    @property
-    def min_temp(self) -> float:
-        """Return the minimum temperature."""
-        return self._static_info.visual_min_temperature
-
-    @property
-    def max_temp(self) -> float:
-        """Return the maximum temperature."""
-        return self._static_info.visual_max_temperature
-
-    @property
-    def supported_features(self) -> ClimateEntityFeature:
-        """Return the list of supported features."""
+        self._attr_target_temperature_step = round(
+            static_info.visual_target_temperature_step, 1
+        )
+        self._attr_min_temp = static_info.visual_min_temperature
+        self._attr_max_temp = static_info.visual_max_temperature
         features = ClimateEntityFeature(0)
         if self._static_info.supports_two_point_target_temperature:
             features |= ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
@@ -213,17 +178,31 @@ class EsphomeClimateEntity(EsphomeEntity[ClimateInfo, ClimateState], ClimateEnti
             features |= ClimateEntityFeature.FAN_MODE
         if self.swing_modes:
             features |= ClimateEntityFeature.SWING_MODE
-        return features
+        self._attr_supported_features = features
+
+    def _get_precision(self) -> float:
+        """Return the precision of the climate device."""
+        precicions = [PRECISION_WHOLE, PRECISION_HALVES, PRECISION_TENTHS]
+        static_info = self._static_info
+        if static_info.visual_current_temperature_step != 0:
+            step = static_info.visual_current_temperature_step
+        else:
+            step = static_info.visual_target_temperature_step
+        for prec in precicions:
+            if step >= prec:
+                return prec
+        # Fall back to highest precision, tenths
+        return PRECISION_TENTHS
 
     @property
     @esphome_state_property
-    def hvac_mode(self) -> str | None:
+    def hvac_mode(self) -> HVACMode | None:
         """Return current operation ie. heat, cool, idle."""
         return _CLIMATE_MODES.from_esphome(self._state.mode)
 
     @property
     @esphome_state_property
-    def hvac_action(self) -> str | None:
+    def hvac_action(self) -> HVACAction | None:
         """Return current action."""
         # HA has no support feature field for hvac_action
         if not self._static_info.supports_action:
@@ -234,16 +213,16 @@ class EsphomeClimateEntity(EsphomeEntity[ClimateInfo, ClimateState], ClimateEnti
     @esphome_state_property
     def fan_mode(self) -> str | None:
         """Return current fan setting."""
-        return self._state.custom_fan_mode or _FAN_MODES.from_esphome(
-            self._state.fan_mode
-        )
+        state = self._state
+        return state.custom_fan_mode or _FAN_MODES.from_esphome(state.fan_mode)
 
     @property
     @esphome_state_property
     def preset_mode(self) -> str | None:
         """Return current preset mode."""
-        return self._state.custom_preset or _PRESETS.from_esphome(
-            self._state.preset_compat(self._api_version)
+        state = self._state
+        return state.custom_preset or _PRESETS.from_esphome(
+            state.preset_compat(self._api_version)
         )
 
     @property
@@ -278,7 +257,7 @@ class EsphomeClimateEntity(EsphomeEntity[ClimateInfo, ClimateState], ClimateEnti
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature (and operation mode if set)."""
-        data: dict[str, Any] = {"key": self._static_info.key}
+        data: dict[str, Any] = {"key": self._key}
         if ATTR_HVAC_MODE in kwargs:
             data["mode"] = _CLIMATE_MODES.from_hass(
                 cast(HVACMode, kwargs[ATTR_HVAC_MODE])
@@ -294,12 +273,12 @@ class EsphomeClimateEntity(EsphomeEntity[ClimateInfo, ClimateState], ClimateEnti
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target operation mode."""
         await self._client.climate_command(
-            key=self._static_info.key, mode=_CLIMATE_MODES.from_hass(hvac_mode)
+            key=self._key, mode=_CLIMATE_MODES.from_hass(hvac_mode)
         )
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set preset mode."""
-        kwargs: dict[str, Any] = {"key": self._static_info.key}
+        kwargs: dict[str, Any] = {"key": self._key}
         if preset_mode in self._static_info.supported_custom_presets:
             kwargs["custom_preset"] = preset_mode
         else:
@@ -308,7 +287,7 @@ class EsphomeClimateEntity(EsphomeEntity[ClimateInfo, ClimateState], ClimateEnti
 
     async def async_set_fan_mode(self, fan_mode: str) -> None:
         """Set new fan mode."""
-        kwargs: dict[str, Any] = {"key": self._static_info.key}
+        kwargs: dict[str, Any] = {"key": self._key}
         if fan_mode in self._static_info.supported_custom_fan_modes:
             kwargs["custom_fan_mode"] = fan_mode
         else:
@@ -318,5 +297,5 @@ class EsphomeClimateEntity(EsphomeEntity[ClimateInfo, ClimateState], ClimateEnti
     async def async_set_swing_mode(self, swing_mode: str) -> None:
         """Set new swing mode."""
         await self._client.climate_command(
-            key=self._static_info.key, swing_mode=_SWING_MODES.from_hass(swing_mode)
+            key=self._key, swing_mode=_SWING_MODES.from_hass(swing_mode)
         )
diff --git a/homeassistant/components/esphome/config_flow.py b/homeassistant/components/esphome/config_flow.py
index acc94bc7ea0..731743e48c8 100644
--- a/homeassistant/components/esphome/config_flow.py
+++ b/homeassistant/components/esphome/config_flow.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 
 from collections import OrderedDict
 from collections.abc import Mapping
+import json
 import logging
 from typing import Any
 
@@ -20,14 +21,19 @@ import voluptuous as vol
 
 from homeassistant.components import dhcp, zeroconf
 from homeassistant.components.hassio import HassioServiceInfo
-from homeassistant.config_entries import ConfigEntry, ConfigFlow
+from homeassistant.config_entries import ConfigEntry, ConfigFlow, OptionsFlow
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import callback
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers.device_registry import format_mac
 
 from . import CONF_DEVICE_NAME, CONF_NOISE_PSK
-from .const import DOMAIN
+from .const import (
+    CONF_ALLOW_SERVICE_CALLS,
+    DEFAULT_ALLOW_SERVICE_CALLS,
+    DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
+    DOMAIN,
+)
 from .dashboard import async_get_dashboard, async_set_dashboard_info
 
 ERROR_REQUIRES_ENCRYPTION_KEY = "requires_encryption_key"
@@ -35,6 +41,8 @@ ERROR_INVALID_ENCRYPTION_KEY = "invalid_psk"
 ESPHOME_URL = "https://esphome.io/"
 _LOGGER = logging.getLogger(__name__)
 
+ZERO_NOISE_PSK = "MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA="
+
 
 class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a esphome config flow."""
@@ -144,11 +152,22 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
     async def _async_try_fetch_device_info(self) -> FlowResult:
         error = await self.fetch_device_info()
 
-        if (
-            error == ERROR_REQUIRES_ENCRYPTION_KEY
-            and await self._retrieve_encryption_key_from_dashboard()
-        ):
-            error = await self.fetch_device_info()
+        if error == ERROR_REQUIRES_ENCRYPTION_KEY:
+            if not self._device_name and not self._noise_psk:
+                # If device name is not set we can send a zero noise psk
+                # to get the device name which will allow us to populate
+                # the device name and hopefully get the encryption key
+                # from the dashboard.
+                self._noise_psk = ZERO_NOISE_PSK
+                error = await self.fetch_device_info()
+                self._noise_psk = None
+
+            if (
+                self._device_name
+                and await self._retrieve_encryption_key_from_dashboard()
+            ):
+                error = await self.fetch_device_info()
+
             # If the fetched key is invalid, unset it again.
             if error == ERROR_INVALID_ENCRYPTION_KEY:
                 self._noise_psk = None
@@ -237,6 +256,9 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
             CONF_NOISE_PSK: self._noise_psk or "",
             CONF_DEVICE_NAME: self._device_name,
         }
+        config_options = {
+            CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
+        }
         if self._reauth_entry:
             entry = self._reauth_entry
             self.hass.config_entries.async_update_entry(
@@ -253,6 +275,7 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
         return self.async_create_entry(
             title=self._name,
             data=config_data,
+            options=config_options,
         )
 
     async def async_step_encryption_key(
@@ -314,7 +337,10 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
             self._device_info = await cli.device_info()
         except RequiresEncryptionAPIError:
             return ERROR_REQUIRES_ENCRYPTION_KEY
-        except InvalidEncryptionKeyAPIError:
+        except InvalidEncryptionKeyAPIError as ex:
+            if ex.received_name:
+                self._device_name = ex.received_name
+                self._name = ex.received_name
             return ERROR_INVALID_ENCRYPTION_KEY
         except ResolveAPIError:
             return "resolve_error"
@@ -325,9 +351,8 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
 
         self._name = self._device_info.friendly_name or self._device_info.name
         self._device_name = self._device_info.name
-        await self.async_set_unique_id(
-            self._device_info.mac_address, raise_on_progress=False
-        )
+        mac_address = format_mac(self._device_info.mac_address)
+        await self.async_set_unique_id(mac_address, raise_on_progress=False)
         if not self._reauth_entry:
             self._abort_if_unique_id_configured(
                 updates={CONF_HOST: self._host, CONF_PORT: self._port}
@@ -364,14 +389,13 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
 
         Return boolean if a key was retrieved.
         """
-        if self._device_name is None:
-            return False
-
-        if (dashboard := async_get_dashboard(self.hass)) is None:
+        if (
+            self._device_name is None
+            or (dashboard := async_get_dashboard(self.hass)) is None
+        ):
             return False
 
         await dashboard.async_request_refresh()
-
         if not dashboard.last_update_success:
             return False
 
@@ -385,6 +409,46 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
         except aiohttp.ClientError as err:
             _LOGGER.error("Error talking to the dashboard: %s", err)
             return False
+        except json.JSONDecodeError as err:
+            _LOGGER.error(
+                "Error parsing response from dashboard: %s", err, exc_info=True
+            )
+            return False
 
         self._noise_psk = noise_psk
         return True
+
+    @staticmethod
+    @callback
+    def async_get_options_flow(
+        config_entry: ConfigEntry,
+    ) -> OptionsFlowHandler:
+        """Get the options flow for this handler."""
+        return OptionsFlowHandler(config_entry)
+
+
+class OptionsFlowHandler(OptionsFlow):
+    """Handle a option flow for esphome."""
+
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize options flow."""
+        self.config_entry = config_entry
+
+    async def async_step_init(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """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_ALLOW_SERVICE_CALLS,
+                    default=self.config_entry.options.get(
+                        CONF_ALLOW_SERVICE_CALLS, DEFAULT_ALLOW_SERVICE_CALLS
+                    ),
+                ): 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 617c817924b..a53bb2db8ed 100644
--- a/homeassistant/components/esphome/const.py
+++ b/homeassistant/components/esphome/const.py
@@ -1,3 +1,7 @@
 """ESPHome constants."""
 
 DOMAIN = "esphome"
+
+CONF_ALLOW_SERVICE_CALLS = "allow_service_calls"
+DEFAULT_ALLOW_SERVICE_CALLS = True
+DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS = False
diff --git a/homeassistant/components/esphome/cover.py b/homeassistant/components/esphome/cover.py
index 9d82b285291..45ef8a132f9 100644
--- a/homeassistant/components/esphome/cover.py
+++ b/homeassistant/components/esphome/cover.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from aioesphomeapi import APIVersion, CoverInfo, CoverOperation, CoverState
+from aioesphomeapi import APIVersion, CoverInfo, CoverOperation, CoverState, EntityInfo
 
 from homeassistant.components.cover import (
     ATTR_POSITION,
@@ -13,11 +13,15 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 
 
 async def async_setup_entry(
@@ -28,7 +32,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="cover",
         info_type=CoverInfo,
         entity_type=EsphomeCover,
         state_type=CoverState,
@@ -38,32 +41,27 @@ async def async_setup_entry(
 class EsphomeCover(EsphomeEntity[CoverInfo, CoverState], CoverEntity):
     """A cover implementation for ESPHome."""
 
-    @property
-    def supported_features(self) -> CoverEntityFeature:
-        """Flag supported features."""
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
         flags = CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
-
-        if self._api_version < APIVersion(1, 8) or self._static_info.supports_stop:
+        if self._api_version < APIVersion(1, 8) or static_info.supports_stop:
             flags |= CoverEntityFeature.STOP
-        if self._static_info.supports_position:
+        if static_info.supports_position:
             flags |= CoverEntityFeature.SET_POSITION
-        if self._static_info.supports_tilt:
+        if static_info.supports_tilt:
             flags |= (
                 CoverEntityFeature.OPEN_TILT
                 | CoverEntityFeature.CLOSE_TILT
                 | CoverEntityFeature.SET_TILT_POSITION
             )
-        return flags
-
-    @property
-    def device_class(self) -> CoverDeviceClass | None:
-        """Return the class of this device, from component DEVICE_CLASSES."""
-        return try_parse_enum(CoverDeviceClass, self._static_info.device_class)
-
-    @property
-    def assumed_state(self) -> bool:
-        """Return true if we do optimistic updates."""
-        return self._static_info.assumed_state
+        self._attr_supported_features = flags
+        self._attr_device_class = try_parse_enum(
+            CoverDeviceClass, static_info.device_class
+        )
+        self._attr_assumed_state = static_info.assumed_state
 
     @property
     @esphome_state_property
@@ -102,33 +100,31 @@ class EsphomeCover(EsphomeEntity[CoverInfo, CoverState], CoverEntity):
 
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Open the cover."""
-        await self._client.cover_command(key=self._static_info.key, position=1.0)
+        await self._client.cover_command(key=self._key, position=1.0)
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Close cover."""
-        await self._client.cover_command(key=self._static_info.key, position=0.0)
+        await self._client.cover_command(key=self._key, position=0.0)
 
     async def async_stop_cover(self, **kwargs: Any) -> None:
         """Stop the cover."""
-        await self._client.cover_command(key=self._static_info.key, stop=True)
+        await self._client.cover_command(key=self._key, stop=True)
 
     async def async_set_cover_position(self, **kwargs: Any) -> None:
         """Move the cover to a specific position."""
         await self._client.cover_command(
-            key=self._static_info.key, position=kwargs[ATTR_POSITION] / 100
+            key=self._key, position=kwargs[ATTR_POSITION] / 100
         )
 
     async def async_open_cover_tilt(self, **kwargs: Any) -> None:
         """Open the cover tilt."""
-        await self._client.cover_command(key=self._static_info.key, tilt=1.0)
+        await self._client.cover_command(key=self._key, tilt=1.0)
 
     async def async_close_cover_tilt(self, **kwargs: Any) -> None:
         """Close the cover tilt."""
-        await self._client.cover_command(key=self._static_info.key, tilt=0.0)
+        await self._client.cover_command(key=self._key, tilt=0.0)
 
     async def async_set_cover_tilt_position(self, **kwargs: Any) -> None:
         """Move the cover tilt to a specific position."""
         tilt_position: int = kwargs[ATTR_TILT_POSITION]
-        await self._client.cover_command(
-            key=self._static_info.key, tilt=tilt_position / 100
-        )
+        await self._client.cover_command(key=self._key, tilt=tilt_position / 100)
diff --git a/homeassistant/components/esphome/dashboard.py b/homeassistant/components/esphome/dashboard.py
index a8332f8d040..35e9cf74555 100644
--- a/homeassistant/components/esphome/dashboard.py
+++ b/homeassistant/components/esphome/dashboard.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 import asyncio
 from datetime import timedelta
 import logging
+from typing import Any
 
 import aiohttp
 from awesomeversion import AwesomeVersion
@@ -11,62 +12,148 @@ from esphome_dashboard_api import ConfiguredDevice, ESPHomeDashboardAPI
 
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
-from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.helpers.singleton import singleton
+from homeassistant.helpers.storage import Store
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN
 
-KEY_DASHBOARD = "esphome_dashboard"
+_LOGGER = logging.getLogger(__name__)
+
+
+KEY_DASHBOARD_MANAGER = "esphome_dashboard_manager"
+
+STORAGE_KEY = "esphome.dashboard"
+STORAGE_VERSION = 1
+
+
+async def async_setup(hass: HomeAssistant) -> None:
+    """Set up the ESPHome dashboard."""
+    # Try to restore the dashboard manager from storage
+    # to avoid reloading every ESPHome config entry after
+    # Home Assistant starts and the dashboard is discovered.
+    await async_get_or_create_dashboard_manager(hass)
+
+
+@singleton(KEY_DASHBOARD_MANAGER)
+async def async_get_or_create_dashboard_manager(
+    hass: HomeAssistant,
+) -> ESPHomeDashboardManager:
+    """Get the dashboard manager or create it."""
+    manager = ESPHomeDashboardManager(hass)
+    await manager.async_setup()
+    return manager
+
+
+class ESPHomeDashboardManager:
+    """Class to manage the dashboard and restore it from storage."""
+
+    def __init__(self, hass: HomeAssistant) -> None:
+        """Initialize the dashboard manager."""
+        self._hass = hass
+        self._store: Store[dict[str, Any]] = Store(hass, STORAGE_VERSION, STORAGE_KEY)
+        self._data: dict[str, Any] | None = None
+        self._current_dashboard: ESPHomeDashboard | None = None
+        self._cancel_shutdown: CALLBACK_TYPE | None = None
+
+    async def async_setup(self) -> None:
+        """Restore the dashboard from storage."""
+        self._data = await self._store.async_load()
+        if (data := self._data) and (info := data.get("info")):
+            await self.async_set_dashboard_info(
+                info["addon_slug"], info["host"], info["port"]
+            )
+
+    @callback
+    def async_get(self) -> ESPHomeDashboard | None:
+        """Get the current dashboard."""
+        return self._current_dashboard
+
+    async def async_set_dashboard_info(
+        self, addon_slug: str, host: str, port: int
+    ) -> None:
+        """Set the dashboard info."""
+        url = f"http://{host}:{port}"
+        hass = self._hass
+
+        if cur_dashboard := self._current_dashboard:
+            if cur_dashboard.addon_slug == addon_slug and cur_dashboard.url == url:
+                # Do nothing if we already have this data.
+                return
+            # Clear and make way for new dashboard
+            await cur_dashboard.async_shutdown()
+            if self._cancel_shutdown is not None:
+                self._cancel_shutdown()
+                self._cancel_shutdown = None
+            self._current_dashboard = None
+
+        dashboard = ESPHomeDashboard(
+            hass, addon_slug, url, async_get_clientsession(hass)
+        )
+        await dashboard.async_request_refresh()
+        if not cur_dashboard and not dashboard.last_update_success:
+            # If there was no previous dashboard and the new one is not available,
+            # we skip setup and wait for discovery.
+            _LOGGER.error(
+                "Dashboard unavailable; skipping setup: %s", dashboard.last_exception
+            )
+            return
+
+        self._current_dashboard = dashboard
+
+        async def on_hass_stop(_: Event) -> None:
+            await dashboard.async_shutdown()
+
+        self._cancel_shutdown = hass.bus.async_listen_once(
+            EVENT_HOMEASSISTANT_STOP, on_hass_stop
+        )
+
+        new_data = {"info": {"addon_slug": addon_slug, "host": host, "port": port}}
+        if self._data != new_data:
+            await self._store.async_save(new_data)
+
+        reloads = [
+            hass.config_entries.async_reload(entry.entry_id)
+            for entry in hass.config_entries.async_entries(DOMAIN)
+            if entry.state == ConfigEntryState.LOADED
+        ]
+        # 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.
+        if dashboard.last_update_success:
+            reauths = [
+                hass.config_entries.flow.async_configure(flow["flow_id"])
+                for flow in hass.config_entries.flow.async_progress()
+                if flow["handler"] == DOMAIN
+                and flow["context"]["source"] == SOURCE_REAUTH
+            ]
+        else:
+            reauths = []
+            _LOGGER.error(
+                "Dashboard unavailable; skipping reauth: %s", dashboard.last_exception
+            )
+
+        _LOGGER.debug(
+            "Reloading %d and re-authenticating %d", len(reloads), len(reauths)
+        )
+        if reloads or reauths:
+            await asyncio.gather(*reloads, *reauths)
 
 
 @callback
 def async_get_dashboard(hass: HomeAssistant) -> ESPHomeDashboard | None:
     """Get an instance of the dashboard if set."""
-    return hass.data.get(KEY_DASHBOARD)
+    manager: ESPHomeDashboardManager | None = hass.data.get(KEY_DASHBOARD_MANAGER)
+    return manager.async_get() if manager else None
 
 
 async def async_set_dashboard_info(
     hass: HomeAssistant, addon_slug: str, host: str, port: int
 ) -> None:
     """Set the dashboard info."""
-    url = f"http://{host}:{port}"
-
-    if cur_dashboard := async_get_dashboard(hass):
-        if cur_dashboard.addon_slug == addon_slug and cur_dashboard.url == url:
-            # Do nothing if we already have this data.
-            return
-        # Clear and make way for new dashboard
-        await cur_dashboard.async_shutdown()
-        del hass.data[KEY_DASHBOARD]
-
-    dashboard = ESPHomeDashboard(hass, addon_slug, url, async_get_clientsession(hass))
-    try:
-        await dashboard.async_request_refresh()
-    except UpdateFailed as err:
-        logging.getLogger(__name__).error("Ignoring dashboard info: %s", err)
-        return
-
-    hass.data[KEY_DASHBOARD] = dashboard
-
-    async def on_hass_stop(_: Event) -> None:
-        await dashboard.async_shutdown()
-
-    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, on_hass_stop)
-
-    reloads = [
-        hass.config_entries.async_reload(entry.entry_id)
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state == ConfigEntryState.LOADED
-    ]
-    # Re-auth flows will check the dashboard for encryption key when the form is requested
-    reauths = [
-        hass.config_entries.flow.async_configure(flow["flow_id"])
-        for flow in hass.config_entries.flow.async_progress()
-        if flow["handler"] == DOMAIN and flow["context"]["source"] == SOURCE_REAUTH
-    ]
-    if reloads or reauths:
-        await asyncio.gather(*reloads, *reauths)
+    manager = await async_get_or_create_dashboard_manager(hass)
+    await manager.async_set_dashboard_info(addon_slug, host, port)
 
 
 class ESPHomeDashboard(DataUpdateCoordinator[dict[str, ConfiguredDevice]]):
@@ -82,7 +169,7 @@ class ESPHomeDashboard(DataUpdateCoordinator[dict[str, ConfiguredDevice]]):
         """Initialize."""
         super().__init__(
             hass,
-            logging.getLogger(__name__),
+            _LOGGER,
             name="ESPHome Dashboard",
             update_interval=timedelta(minutes=5),
         )
diff --git a/homeassistant/components/esphome/diagnostics.py b/homeassistant/components/esphome/diagnostics.py
index 8de1501bc43..292d1921abf 100644
--- a/homeassistant/components/esphome/diagnostics.py
+++ b/homeassistant/components/esphome/diagnostics.py
@@ -1,7 +1,7 @@
 """Diagnostics support for ESPHome."""
 from __future__ import annotations
 
-from typing import Any, cast
+from typing import Any
 
 from homeassistant.components.bluetooth import async_scanner_by_source
 from homeassistant.components.diagnostics import async_redact_data
@@ -28,7 +28,6 @@ async def async_get_config_entry_diagnostics(
     entry_data = DomainData.get(hass).get_entry_data(config_entry)
 
     if (storage_data := await entry_data.store.async_load()) is not None:
-        storage_data = cast("dict[str, Any]", storage_data)
         diag["storage_data"] = storage_data
 
     if config_entry.unique_id and (
diff --git a/homeassistant/components/esphome/domain_data.py b/homeassistant/components/esphome/domain_data.py
index 32d2d1effff..2fc32129d1f 100644
--- a/homeassistant/components/esphome/domain_data.py
+++ b/homeassistant/components/esphome/domain_data.py
@@ -12,10 +12,9 @@ from typing_extensions import Self
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.json import JSONEncoder
-from homeassistant.helpers.storage import Store
 
 from .const import DOMAIN
-from .entry_data import RuntimeEntryData
+from .entry_data import ESPHomeStorage, RuntimeEntryData
 
 STORAGE_VERSION = 1
 MAX_CACHED_SERVICES = 128
@@ -26,12 +25,12 @@ class DomainData:
     """Define a class that stores global esphome data in hass.data[DOMAIN]."""
 
     _entry_datas: dict[str, RuntimeEntryData] = field(default_factory=dict)
-    _stores: dict[str, Store] = field(default_factory=dict)
+    _stores: dict[str, ESPHomeStorage] = field(default_factory=dict)
     _gatt_services_cache: MutableMapping[int, BleakGATTServiceCollection] = field(
-        default_factory=lambda: LRU(MAX_CACHED_SERVICES)  # type: ignore[no-any-return]
+        default_factory=lambda: LRU(MAX_CACHED_SERVICES)
     )
     _gatt_mtu_cache: MutableMapping[int, int] = field(
-        default_factory=lambda: LRU(MAX_CACHED_SERVICES)  # type: ignore[no-any-return]
+        default_factory=lambda: LRU(MAX_CACHED_SERVICES)
     )
 
     def get_gatt_services_cache(
@@ -83,11 +82,13 @@ class DomainData:
         """Check whether the given entry is loaded."""
         return entry.entry_id in self._entry_datas
 
-    def get_or_create_store(self, hass: HomeAssistant, entry: ConfigEntry) -> Store:
+    def get_or_create_store(
+        self, hass: HomeAssistant, entry: ConfigEntry
+    ) -> ESPHomeStorage:
         """Get or create a Store instance for the given config entry."""
         return self._stores.setdefault(
             entry.entry_id,
-            Store(
+            ESPHomeStorage(
                 hass, STORAGE_VERSION, f"esphome.{entry.entry_id}", encoder=JSONEncoder
             ),
         )
diff --git a/homeassistant/components/esphome/entity.py b/homeassistant/components/esphome/entity.py
new file mode 100644
index 00000000000..15c136f17c3
--- /dev/null
+++ b/homeassistant/components/esphome/entity.py
@@ -0,0 +1,295 @@
+"""Support for esphome entities."""
+from __future__ import annotations
+
+from collections.abc import Callable
+import functools
+import math
+from typing import (  # pylint: disable=unused-import
+    Any,
+    Generic,
+    TypeVar,
+    cast,
+)
+
+from aioesphomeapi import (
+    EntityCategory as EsphomeEntityCategory,
+    EntityInfo,
+    EntityState,
+)
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    EntityCategory,
+)
+from homeassistant.core import HomeAssistant, callback
+import homeassistant.helpers.config_validation as cv
+import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers.dispatcher import (
+    async_dispatcher_connect,
+)
+from homeassistant.helpers.entity import DeviceInfo, Entity
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .domain_data import DomainData
+
+# Import config flow so that it's added to the registry
+from .entry_data import RuntimeEntryData
+from .enum_mapper import EsphomeEnumMapper
+
+_R = TypeVar("_R")
+_InfoT = TypeVar("_InfoT", bound=EntityInfo)
+_EntityT = TypeVar("_EntityT", bound="EsphomeEntity[Any,Any]")
+_StateT = TypeVar("_StateT", bound=EntityState)
+
+
+async def platform_async_setup_entry(
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+    *,
+    info_type: type[_InfoT],
+    entity_type: type[_EntityT],
+    state_type: type[_StateT],
+) -> None:
+    """Set up an esphome platform.
+
+    This method is in charge of receiving, distributing and storing
+    info and state updates.
+    """
+    entry_data: RuntimeEntryData = DomainData.get(hass).get_entry_data(entry)
+    entry_data.info[info_type] = {}
+    entry_data.state.setdefault(state_type, {})
+
+    @callback
+    def async_list_entities(infos: list[EntityInfo]) -> None:
+        """Update entities of this platform when entities are listed."""
+        current_infos = entry_data.info[info_type]
+        new_infos: dict[int, EntityInfo] = {}
+        add_entities: list[_EntityT] = []
+
+        for info in infos:
+            if not current_infos.pop(info.key, None):
+                # Create new entity
+                entity = entity_type(entry_data, info, state_type)
+                add_entities.append(entity)
+            new_infos[info.key] = info
+
+        # Anything still in current_infos is now gone
+        if current_infos:
+            hass.async_create_task(
+                entry_data.async_remove_entities(current_infos.values())
+            )
+
+        # Then update the actual info
+        entry_data.info[info_type] = new_infos
+
+        if new_infos:
+            entry_data.async_update_entity_infos(new_infos.values())
+
+        if add_entities:
+            # Add entities to Home Assistant
+            async_add_entities(add_entities)
+
+    entry_data.cleanup_callbacks.append(
+        entry_data.async_register_static_info_callback(info_type, async_list_entities)
+    )
+
+
+def esphome_state_property(
+    func: Callable[[_EntityT], _R]
+) -> Callable[[_EntityT], _R | None]:
+    """Wrap a state property of an esphome entity.
+
+    This checks if the state object in the entity is set, and
+    prevents writing NAN values to the Home Assistant state machine.
+    """
+
+    @functools.wraps(func)
+    def _wrapper(self: _EntityT) -> _R | None:
+        # pylint: disable-next=protected-access
+        if not self._has_state:
+            return None
+        val = func(self)
+        if isinstance(val, float) and math.isnan(val):
+            # Home Assistant doesn't use NAN values in state machine
+            # (not JSON serializable)
+            return None
+        return val
+
+    return _wrapper
+
+
+ICON_SCHEMA = vol.Schema(cv.icon)
+
+
+ENTITY_CATEGORIES: EsphomeEnumMapper[
+    EsphomeEntityCategory, EntityCategory | None
+] = EsphomeEnumMapper(
+    {
+        EsphomeEntityCategory.NONE: None,
+        EsphomeEntityCategory.CONFIG: EntityCategory.CONFIG,
+        EsphomeEntityCategory.DIAGNOSTIC: EntityCategory.DIAGNOSTIC,
+    }
+)
+
+
+class EsphomeEntity(Entity, Generic[_InfoT, _StateT]):
+    """Define a base esphome entity."""
+
+    _attr_should_poll = False
+    _static_info: _InfoT
+    _state: _StateT
+    _has_state: bool
+
+    def __init__(
+        self,
+        entry_data: RuntimeEntryData,
+        entity_info: EntityInfo,
+        state_type: type[_StateT],
+    ) -> None:
+        """Initialize."""
+        self._entry_data = entry_data
+        self._on_entry_data_changed()
+        self._key = entity_info.key
+        self._state_type = state_type
+        self._on_static_info_update(entity_info)
+        assert entry_data.device_info is not None
+        device_info = entry_data.device_info
+        self._device_info = device_info
+        self._attr_has_entity_name = bool(device_info.friendly_name)
+        self._attr_device_info = DeviceInfo(
+            connections={(dr.CONNECTION_NETWORK_MAC, device_info.mac_address)}
+        )
+        self._entry_id = entry_data.entry_id
+
+    async def async_added_to_hass(self) -> None:
+        """Register callbacks."""
+        entry_data = self._entry_data
+        hass = self.hass
+        key = self._key
+
+        self.async_on_remove(
+            entry_data.async_register_key_static_info_remove_callback(
+                self._static_info,
+                functools.partial(self.async_remove, force_remove=True),
+            )
+        )
+        self.async_on_remove(
+            async_dispatcher_connect(
+                hass,
+                entry_data.signal_device_updated,
+                self._on_device_update,
+            )
+        )
+        self.async_on_remove(
+            entry_data.async_subscribe_state_update(
+                self._state_type, key, self._on_state_update
+            )
+        )
+        self.async_on_remove(
+            entry_data.async_register_key_static_info_updated_callback(
+                self._static_info, self._on_static_info_update
+            )
+        )
+        self._update_state_from_entry_data()
+
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Save the static info for this entity when it changes.
+
+        This method can be overridden in child classes to know
+        when the static info changes.
+        """
+        static_info = cast(_InfoT, static_info)
+        self._static_info = static_info
+        self._attr_unique_id = static_info.unique_id
+        self._attr_entity_registry_enabled_default = not static_info.disabled_by_default
+        self._attr_name = static_info.name
+        if entity_category := static_info.entity_category:
+            self._attr_entity_category = ENTITY_CATEGORIES.from_esphome(entity_category)
+        else:
+            self._attr_entity_category = None
+        if icon := static_info.icon:
+            self._attr_icon = cast(str, ICON_SCHEMA(icon))
+        else:
+            self._attr_icon = None
+
+    @callback
+    def _update_state_from_entry_data(self) -> None:
+        """Update state from entry data."""
+
+        state = self._entry_data.state
+        key = self._key
+        state_type = self._state_type
+        has_state = key in state[state_type]
+        if has_state:
+            self._state = cast(_StateT, state[state_type][key])
+        self._has_state = has_state
+
+    @callback
+    def _on_state_update(self) -> None:
+        """Call when state changed.
+
+        Behavior can be changed in child classes
+        """
+        self._update_state_from_entry_data()
+        self.async_write_ha_state()
+
+    @callback
+    def _on_entry_data_changed(self) -> None:
+        entry_data = self._entry_data
+        self._api_version = entry_data.api_version
+        self._client = entry_data.client
+
+    @callback
+    def _on_device_update(self) -> None:
+        """Call when device updates or entry data changes."""
+        self._on_entry_data_changed()
+        if not self._entry_data.available:
+            # Only write state if the device has gone unavailable
+            # since _on_state_update will be called if the device
+            # is available when the full state arrives
+            # through the next entity state packet.
+            self.async_write_ha_state()
+
+    @property
+    def available(self) -> bool:
+        """Return if the entity is available."""
+        if self._device_info.has_deep_sleep:
+            # During deep sleep the ESP will not be connectable (by design)
+            # For these cases, show it as available
+            return self._entry_data.expected_disconnect
+
+        return self._entry_data.available
+
+
+class EsphomeAssistEntity(Entity):
+    """Define a base entity for Assist Pipeline entities."""
+
+    _attr_has_entity_name = True
+    _attr_should_poll = False
+
+    def __init__(self, entry_data: RuntimeEntryData) -> None:
+        """Initialize the binary sensor."""
+        self._entry_data: RuntimeEntryData = entry_data
+        assert entry_data.device_info is not None
+        device_info = entry_data.device_info
+        self._device_info = device_info
+        self._attr_unique_id = (
+            f"{device_info.mac_address}-{self.entity_description.key}"
+        )
+        self._attr_device_info = DeviceInfo(
+            connections={(dr.CONNECTION_NETWORK_MAC, device_info.mac_address)}
+        )
+
+    @callback
+    def _update(self) -> None:
+        self.async_write_ha_state()
+
+    async def async_added_to_hass(self) -> None:
+        """Register update callback."""
+        await super().async_added_to_hass()
+        self.async_on_remove(
+            self._entry_data.async_subscribe_assist_pipeline_update(self._update)
+        )
diff --git a/homeassistant/components/esphome/entry_data.py b/homeassistant/components/esphome/entry_data.py
index 225ae3961e8..a7c81543a94 100644
--- a/homeassistant/components/esphome/entry_data.py
+++ b/homeassistant/components/esphome/entry_data.py
@@ -2,13 +2,14 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Callable
+from collections.abc import Callable, Coroutine, Iterable
 from dataclasses import dataclass, field
 import logging
-from typing import Any, cast
+from typing import TYPE_CHECKING, Any, Final, TypedDict, cast
 
 from aioesphomeapi import (
     COMPONENT_TYPE_TO_INFO,
+    AlarmControlPanelInfo,
     APIClient,
     APIVersion,
     BinarySensorInfo,
@@ -34,18 +35,21 @@ from aioesphomeapi.model import ButtonInfo
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.storage import Store
 
 from .dashboard import async_get_dashboard
 
+INFO_TO_COMPONENT_TYPE: Final = {v: k for k, v in COMPONENT_TYPE_TO_INFO.items()}
+
 _SENTINEL = object()
 SAVE_DELAY = 120
 _LOGGER = logging.getLogger(__name__)
 
 # Mapping from ESPHome info type to HA platform
 INFO_TYPE_TO_PLATFORM: dict[type[EntityInfo], Platform] = {
+    AlarmControlPanelInfo: Platform.ALARM_CONTROL_PANEL,
     BinarySensorInfo: Platform.BINARY_SENSOR,
     ButtonInfo: Platform.BUTTON,
     CameraInfo: Platform.CAMERA,
@@ -63,28 +67,34 @@ INFO_TYPE_TO_PLATFORM: dict[type[EntityInfo], Platform] = {
 }
 
 
+class StoreData(TypedDict, total=False):
+    """ESPHome storage data."""
+
+    device_info: dict[str, Any]
+    services: list[dict[str, Any]]
+    api_version: dict[str, Any]
+
+
+class ESPHomeStorage(Store[StoreData]):
+    """ESPHome Storage."""
+
+
 @dataclass
 class RuntimeEntryData:
     """Store runtime data for esphome config entries."""
 
     entry_id: str
     client: APIClient
-    store: Store
+    store: ESPHomeStorage
     state: dict[type[EntityState], dict[int, EntityState]] = field(default_factory=dict)
     # When the disconnect callback is called, we mark all states
     # as stale so we will always dispatch a state update when the
     # device reconnects. This is the same format as state_subscriptions.
     stale_state: set[tuple[type[EntityState], int]] = field(default_factory=set)
-    info: dict[str, dict[int, EntityInfo]] = field(default_factory=dict)
-
-    # A second list of EntityInfo objects
-    # This is necessary for when an entity is being removed. HA requires
-    # some static info to be accessible during removal (unique_id, maybe others)
-    # If an entity can't find anything in the info array, it will look for info here.
-    old_info: dict[str, dict[int, EntityInfo]] = field(default_factory=dict)
-
+    info: dict[type[EntityInfo], dict[int, EntityInfo]] = field(default_factory=dict)
     services: dict[int, UserService] = field(default_factory=dict)
     available: bool = False
+    expected_disconnect: bool = False  # Last disconnect was expected (e.g. deep sleep)
     device_info: DeviceInfo | None = None
     api_version: APIVersion = field(default_factory=APIVersion)
     cleanup_callbacks: list[Callable[[], None]] = field(default_factory=list)
@@ -94,7 +104,8 @@ class RuntimeEntryData:
     ] = field(default_factory=dict)
     loaded_platforms: set[Platform] = field(default_factory=set)
     platform_load_lock: asyncio.Lock = field(default_factory=asyncio.Lock)
-    _storage_contents: dict[str, Any] | None = None
+    _storage_contents: StoreData | None = None
+    _pending_storage: Callable[[], StoreData] | None = None
     ble_connections_free: int = 0
     ble_connections_limit: int = 0
     _ble_connection_free_futures: list[asyncio.Future[int]] = field(
@@ -104,6 +115,16 @@ class RuntimeEntryData:
         default_factory=list
     )
     assist_pipeline_state: bool = False
+    entity_info_callbacks: dict[
+        type[EntityInfo], list[Callable[[list[EntityInfo]], None]]
+    ] = field(default_factory=dict)
+    entity_info_key_remove_callbacks: dict[
+        tuple[type[EntityInfo], int], list[Callable[[], Coroutine[Any, Any, None]]]
+    ] = field(default_factory=dict)
+    entity_info_key_updated_callbacks: dict[
+        tuple[type[EntityInfo], int], list[Callable[[EntityInfo], None]]
+    ] = field(default_factory=dict)
+    original_options: dict[str, Any] = field(default_factory=dict)
 
     @property
     def name(self) -> str:
@@ -127,6 +148,53 @@ class RuntimeEntryData:
         """Return the signal to listen to for updates on static info."""
         return f"esphome_{self.entry_id}_on_list"
 
+    @callback
+    def async_register_static_info_callback(
+        self,
+        entity_info_type: type[EntityInfo],
+        callback_: Callable[[list[EntityInfo]], None],
+    ) -> CALLBACK_TYPE:
+        """Register to receive callbacks when static info changes for an EntityInfo type."""
+        callbacks = self.entity_info_callbacks.setdefault(entity_info_type, [])
+        callbacks.append(callback_)
+
+        def _unsub() -> None:
+            callbacks.remove(callback_)
+
+        return _unsub
+
+    @callback
+    def async_register_key_static_info_remove_callback(
+        self,
+        static_info: EntityInfo,
+        callback_: Callable[[], Coroutine[Any, Any, None]],
+    ) -> CALLBACK_TYPE:
+        """Register to receive callbacks when static info is removed for a specific key."""
+        callback_key = (type(static_info), static_info.key)
+        callbacks = self.entity_info_key_remove_callbacks.setdefault(callback_key, [])
+        callbacks.append(callback_)
+
+        def _unsub() -> None:
+            callbacks.remove(callback_)
+
+        return _unsub
+
+    @callback
+    def async_register_key_static_info_updated_callback(
+        self,
+        static_info: EntityInfo,
+        callback_: Callable[[EntityInfo], None],
+    ) -> CALLBACK_TYPE:
+        """Register to receive callbacks when static info is updated for a specific key."""
+        callback_key = (type(static_info), static_info.key)
+        callbacks = self.entity_info_key_updated_callbacks.setdefault(callback_key, [])
+        callbacks.append(callback_)
+
+        def _unsub() -> None:
+            callbacks.remove(callback_)
+
+        return _unsub
+
     @callback
     def async_update_ble_connection_limits(self, free: int, limit: int) -> None:
         """Update the BLE connection limits."""
@@ -176,13 +244,25 @@ class RuntimeEntryData:
         self.assist_pipeline_update_callbacks.append(update_callback)
         return _unsubscribe
 
-    @callback
-    def async_remove_entity(
-        self, hass: HomeAssistant, component_key: str, key: int
-    ) -> None:
+    async def async_remove_entities(self, static_infos: Iterable[EntityInfo]) -> None:
         """Schedule the removal of an entity."""
-        signal = f"esphome_{self.entry_id}_remove_{component_key}_{key}"
-        async_dispatcher_send(hass, signal)
+        callbacks: list[Coroutine[Any, Any, None]] = []
+        for static_info in static_infos:
+            callback_key = (type(static_info), static_info.key)
+            if key_callbacks := self.entity_info_key_remove_callbacks.get(callback_key):
+                callbacks.extend([callback_() for callback_ in key_callbacks])
+        if callbacks:
+            await asyncio.gather(*callbacks)
+
+    @callback
+    def async_update_entity_infos(self, static_infos: Iterable[EntityInfo]) -> None:
+        """Call static info updated callbacks."""
+        for static_info in static_infos:
+            callback_key = (type(static_info), static_info.key)
+            for callback_ in self.entity_info_key_updated_callbacks.get(
+                callback_key, []
+            ):
+                callback_(static_info)
 
     async def _ensure_platforms_loaded(
         self, hass: HomeAssistant, entry: ConfigEntry, platforms: set[Platform]
@@ -214,6 +294,21 @@ class RuntimeEntryData:
                     break
         await self._ensure_platforms_loaded(hass, entry, needed_platforms)
 
+        # Make a dict of the EntityInfo by type and send
+        # them to the listeners for each specific EntityInfo type
+        infos_by_type: dict[type[EntityInfo], list[EntityInfo]] = {}
+        for info in infos:
+            info_type = type(info)
+            if info_type not in infos_by_type:
+                infos_by_type[info_type] = []
+            infos_by_type[info_type].append(info)
+
+        callbacks_by_type = self.entity_info_callbacks
+        for type_, entity_infos in infos_by_type.items():
+            if callbacks_ := callbacks_by_type.get(type_):
+                for callback_ in callbacks_:
+                    callback_(entity_infos)
+
         # Then send dispatcher event
         async_dispatcher_send(hass, self.signal_static_info_updated, infos)
 
@@ -246,7 +341,7 @@ class RuntimeEntryData:
             and subscription_key not in stale_state
             and not (
                 type(state) is SensorState  # pylint: disable=unidiomatic-typecheck
-                and (platform_info := self.info.get(Platform.SENSOR))
+                and (platform_info := self.info.get(SensorInfo))
                 and (entity_info := platform_info.get(state.key))
                 and (cast(SensorInfo, entity_info)).force_update
             )
@@ -284,43 +379,61 @@ class RuntimeEntryData:
         """Load the retained data from store and return de-serialized data."""
         if (restored := await self.store.async_load()) is None:
             return [], []
-        restored = cast("dict[str, Any]", restored)
         self._storage_contents = restored.copy()
 
         self.device_info = DeviceInfo.from_dict(restored.pop("device_info"))
         self.api_version = APIVersion.from_dict(restored.pop("api_version", {}))
-        infos = []
+        infos: list[EntityInfo] = []
         for comp_type, restored_infos in restored.items():
+            if TYPE_CHECKING:
+                restored_infos = cast(list[dict[str, Any]], restored_infos)
             if comp_type not in COMPONENT_TYPE_TO_INFO:
                 continue
             for info in restored_infos:
                 cls = COMPONENT_TYPE_TO_INFO[comp_type]
                 infos.append(cls.from_dict(info))
-        services = []
-        for service in restored.get("services", []):
-            services.append(UserService.from_dict(service))
+        services = [
+            UserService.from_dict(service) for service in restored.pop("services", [])
+        ]
         return infos, services
 
     async def async_save_to_store(self) -> None:
         """Generate dynamic data to store and save it to the filesystem."""
         if self.device_info is None:
             raise ValueError("device_info is not set yet")
-        store_data: dict[str, Any] = {
+        store_data: StoreData = {
             "device_info": self.device_info.to_dict(),
             "services": [],
             "api_version": self.api_version.to_dict(),
         }
-
-        for comp_type, infos in self.info.items():
-            store_data[comp_type] = [info.to_dict() for info in infos.values()]
+        for info_type, infos in self.info.items():
+            comp_type = INFO_TO_COMPONENT_TYPE[info_type]
+            store_data[comp_type] = [info.to_dict() for info in infos.values()]  # type: ignore[literal-required]
         for service in self.services.values():
             store_data["services"].append(service.to_dict())
 
         if store_data == self._storage_contents:
             return
 
-        def _memorized_storage() -> dict[str, Any]:
+        def _memorized_storage() -> StoreData:
+            self._pending_storage = None
             self._storage_contents = store_data
             return store_data
 
+        self._pending_storage = _memorized_storage
         self.store.async_delay_save(_memorized_storage, SAVE_DELAY)
+
+    async def async_cleanup(self) -> None:
+        """Cleanup the entry data when disconnected or unloading."""
+        if self._pending_storage:
+            # Ensure we save the data if we are unloading before the
+            # save delay has passed.
+            await self.store.async_save(self._pending_storage())
+
+    async def async_update_listener(
+        self, hass: HomeAssistant, entry: ConfigEntry
+    ) -> None:
+        """Handle options update."""
+        if self.original_options == entry.options:
+            return
+        hass.async_create_task(hass.config_entries.async_reload(entry.entry_id))
diff --git a/homeassistant/components/esphome/fan.py b/homeassistant/components/esphome/fan.py
index 01060630964..c6be200e2b2 100644
--- a/homeassistant/components/esphome/fan.py
+++ b/homeassistant/components/esphome/fan.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 import math
 from typing import Any
 
-from aioesphomeapi import FanDirection, FanInfo, FanSpeed, FanState
+from aioesphomeapi import EntityInfo, FanDirection, FanInfo, FanSpeed, FanState
 
 from homeassistant.components.fan import (
     DIRECTION_FORWARD,
@@ -13,7 +13,7 @@ from homeassistant.components.fan import (
     FanEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.percentage import (
     ordered_list_item_to_percentage,
@@ -22,7 +22,11 @@ from homeassistant.util.percentage import (
     ranged_value_to_percentage,
 )
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 from .enum_mapper import EsphomeEnumMapper
 
 ORDERED_NAMED_FAN_SPEEDS = [FanSpeed.LOW, FanSpeed.MEDIUM, FanSpeed.HIGH]
@@ -36,7 +40,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="fan",
         info_type=FanInfo,
         entity_type=EsphomeFan,
         state_type=FanState,
@@ -68,7 +71,7 @@ class EsphomeFan(EsphomeEntity[FanInfo, FanState], FanEntity):
             await self.async_turn_off()
             return
 
-        data: dict[str, Any] = {"key": self._static_info.key, "state": True}
+        data: dict[str, Any] = {"key": self._key, "state": True}
         if percentage is not None:
             if self._supports_speed_levels:
                 data["speed_level"] = math.ceil(
@@ -94,18 +97,16 @@ class EsphomeFan(EsphomeEntity[FanInfo, FanState], FanEntity):
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off the fan."""
-        await self._client.fan_command(key=self._static_info.key, state=False)
+        await self._client.fan_command(key=self._key, state=False)
 
     async def async_oscillate(self, oscillating: bool) -> None:
         """Oscillate the fan."""
-        await self._client.fan_command(
-            key=self._static_info.key, oscillating=oscillating
-        )
+        await self._client.fan_command(key=self._key, oscillating=oscillating)
 
     async def async_set_direction(self, direction: str) -> None:
         """Set direction of the fan."""
         await self._client.fan_command(
-            key=self._static_info.key, direction=_FAN_DIRECTIONS.from_hass(direction)
+            key=self._key, direction=_FAN_DIRECTIONS.from_hass(direction)
         )
 
     @property
@@ -141,26 +142,24 @@ class EsphomeFan(EsphomeEntity[FanInfo, FanState], FanEntity):
     @esphome_state_property
     def oscillating(self) -> bool | None:
         """Return the oscillation state."""
-        if not self._static_info.supports_oscillation:
-            return None
         return self._state.oscillating
 
     @property
     @esphome_state_property
     def current_direction(self) -> str | None:
         """Return the current fan direction."""
-        if not self._static_info.supports_direction:
-            return None
         return _FAN_DIRECTIONS.from_esphome(self._state.direction)
 
-    @property
-    def supported_features(self) -> FanEntityFeature:
-        """Flag supported features."""
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
         flags = FanEntityFeature(0)
-        if self._static_info.supports_oscillation:
+        if static_info.supports_oscillation:
             flags |= FanEntityFeature.OSCILLATE
-        if self._static_info.supports_speed:
+        if static_info.supports_speed:
             flags |= FanEntityFeature.SET_SPEED
-        if self._static_info.supports_direction:
+        if static_info.supports_direction:
             flags |= FanEntityFeature.DIRECTION
-        return flags
+        self._attr_supported_features = flags
diff --git a/homeassistant/components/esphome/light.py b/homeassistant/components/esphome/light.py
index 5e16f2476bb..1ecc99730bf 100644
--- a/homeassistant/components/esphome/light.py
+++ b/homeassistant/components/esphome/light.py
@@ -3,11 +3,17 @@ from __future__ import annotations
 
 from typing import Any, cast
 
-from aioesphomeapi import APIVersion, LightColorCapability, LightInfo, LightState
+from aioesphomeapi import (
+    APIVersion,
+    EntityInfo,
+    LightColorCapability,
+    LightInfo,
+    LightState,
+)
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
-    ATTR_COLOR_TEMP,
+    ATTR_COLOR_TEMP_KELVIN,
     ATTR_EFFECT,
     ATTR_FLASH,
     ATTR_RGB_COLOR,
@@ -22,10 +28,14 @@ from homeassistant.components.light import (
     LightEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 
 FLASH_LENGTHS = {FLASH_SHORT: 2, FLASH_LONG: 10}
 
@@ -38,7 +48,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="light",
         info_type=LightInfo,
         entity_type=EsphomeLight,
         state_type=LightState,
@@ -92,6 +101,20 @@ _COLOR_MODE_MAPPING = {
 }
 
 
+def _mired_to_kelvin(mired_temperature: float) -> int:
+    """Convert absolute mired shift to degrees kelvin.
+
+    This function rounds the converted value instead of flooring the value as
+    is done in homeassistant.util.color.color_temperature_mired_to_kelvin().
+
+    If the value of mired_temperature is less than or equal to zero, return
+    the original value to avoid a divide by zero.
+    """
+    if mired_temperature <= 0:
+        return round(mired_temperature)
+    return round(1000000 / mired_temperature)
+
+
 def _color_mode_to_ha(mode: int) -> str:
     """Convert an esphome color mode to a HA color mode constant.
 
@@ -128,10 +151,8 @@ def _filter_color_modes(
 class EsphomeLight(EsphomeEntity[LightInfo, LightState], LightEntity):
     """A light implementation for ESPHome."""
 
-    @property
-    def _supports_color_mode(self) -> bool:
-        """Return whether the client supports the new color mode system natively."""
-        return self._api_version >= APIVersion(1, 6)
+    _native_supported_color_modes: list[int]
+    _supports_color_mode = False
 
     @property
     @esphome_state_property
@@ -141,7 +162,7 @@ class EsphomeLight(EsphomeEntity[LightInfo, LightState], LightEntity):
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the entity on."""
-        data: dict[str, Any] = {"key": self._static_info.key, "state": True}
+        data: dict[str, Any] = {"key": self._key, "state": True}
         # The list of color modes that would fit this service call
         color_modes = self._native_supported_color_modes
         try_keep_current_mode = True
@@ -194,8 +215,9 @@ class EsphomeLight(EsphomeEntity[LightInfo, LightState], LightEntity):
                 # need to convert cw+ww part to white+color_temp
                 white = data["white"] = max(cw, ww)
                 if white != 0:
-                    min_ct = self.min_mireds
-                    max_ct = self.max_mireds
+                    static_info = self._static_info
+                    min_ct = static_info.min_mireds
+                    max_ct = static_info.max_mireds
                     ct_ratio = ww / (cw + ww)
                     data["color_temperature"] = min_ct + ct_ratio * (max_ct - min_ct)
                 color_modes = _filter_color_modes(
@@ -212,8 +234,9 @@ class EsphomeLight(EsphomeEntity[LightInfo, LightState], LightEntity):
         if (transition := kwargs.get(ATTR_TRANSITION)) is not None:
             data["transition_length"] = transition
 
-        if (color_temp := kwargs.get(ATTR_COLOR_TEMP)) is not None:
-            data["color_temperature"] = color_temp
+        if (color_temp_k := kwargs.get(ATTR_COLOR_TEMP_KELVIN)) is not None:
+            # Do not use kelvin_to_mired here to prevent precision loss
+            data["color_temperature"] = 1000000.0 / color_temp_k
             if _filter_color_modes(color_modes, LightColorCapability.COLOR_TEMPERATURE):
                 color_modes = _filter_color_modes(
                     color_modes, LightColorCapability.COLOR_TEMPERATURE
@@ -259,7 +282,7 @@ class EsphomeLight(EsphomeEntity[LightInfo, LightState], LightEntity):
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the entity off."""
-        data: dict[str, Any] = {"key": self._static_info.key, "state": False}
+        data: dict[str, Any] = {"key": self._key, "state": False}
         if ATTR_FLASH in kwargs:
             data["flash_length"] = FLASH_LENGTHS[kwargs[ATTR_FLASH]]
         if ATTR_TRANSITION in kwargs:
@@ -287,17 +310,18 @@ class EsphomeLight(EsphomeEntity[LightInfo, LightState], LightEntity):
     @esphome_state_property
     def rgb_color(self) -> tuple[int, int, int] | None:
         """Return the rgb color value [int, int, int]."""
+        state = self._state
         if not self._supports_color_mode:
             return (
-                round(self._state.red * 255),
-                round(self._state.green * 255),
-                round(self._state.blue * 255),
+                round(state.red * 255),
+                round(state.green * 255),
+                round(state.blue * 255),
             )
 
         return (
-            round(self._state.red * self._state.color_brightness * 255),
-            round(self._state.green * self._state.color_brightness * 255),
-            round(self._state.blue * self._state.color_brightness * 255),
+            round(state.red * state.color_brightness * 255),
+            round(state.green * state.color_brightness * 255),
+            round(state.blue * state.color_brightness * 255),
         )
 
     @property
@@ -312,15 +336,17 @@ class EsphomeLight(EsphomeEntity[LightInfo, LightState], LightEntity):
     @esphome_state_property
     def rgbww_color(self) -> tuple[int, int, int, int, int] | None:
         """Return the rgbww color value [int, int, int, int, int]."""
+        state = self._state
         rgb = cast("tuple[int, int, int]", self.rgb_color)
         if not _filter_color_modes(
             self._native_supported_color_modes, LightColorCapability.COLD_WARM_WHITE
         ):
             # Try to reverse white + color temp to cwww
-            min_ct = self._static_info.min_mireds
-            max_ct = self._static_info.max_mireds
-            color_temp = min(max(self._state.color_temperature, min_ct), max_ct)
-            white = self._state.white
+            static_info = self._static_info
+            min_ct = static_info.min_mireds
+            max_ct = static_info.max_mireds
+            color_temp = min(max(state.color_temperature, min_ct), max_ct)
+            white = state.white
 
             ww_frac = (color_temp - min_ct) / (max_ct - min_ct)
             cw_frac = 1 - ww_frac
@@ -332,15 +358,15 @@ class EsphomeLight(EsphomeEntity[LightInfo, LightState], LightEntity):
             )
         return (
             *rgb,
-            round(self._state.cold_white * 255),
-            round(self._state.warm_white * 255),
+            round(state.cold_white * 255),
+            round(state.warm_white * 255),
         )
 
     @property
     @esphome_state_property
-    def color_temp(self) -> int:
-        """Return the CT color value in mireds."""
-        return round(self._state.color_temperature)
+    def color_temp_kelvin(self) -> int:
+        """Return the CT color value in Kelvin."""
+        return _mired_to_kelvin(self._state.color_temperature)
 
     @property
     @esphome_state_property
@@ -348,26 +374,25 @@ class EsphomeLight(EsphomeEntity[LightInfo, LightState], LightEntity):
         """Return the current effect."""
         return self._state.effect
 
-    @property
-    def _native_supported_color_modes(self) -> list[int]:
-        return self._static_info.supported_color_modes_compat(self._api_version)
-
-    @property
-    def supported_features(self) -> LightEntityFeature:
-        """Flag supported features."""
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        self._supports_color_mode = self._api_version >= APIVersion(1, 6)
+        self._native_supported_color_modes = static_info.supported_color_modes_compat(
+            self._api_version
+        )
         flags = LightEntityFeature.FLASH
 
         # All color modes except UNKNOWN,ON_OFF support transition
         modes = self._native_supported_color_modes
         if any(m not in (0, LightColorCapability.ON_OFF) for m in modes):
             flags |= LightEntityFeature.TRANSITION
-        if self._static_info.effects:
+        if static_info.effects:
             flags |= LightEntityFeature.EFFECT
-        return flags
+        self._attr_supported_features = flags
 
-    @property
-    def supported_color_modes(self) -> set[str] | None:
-        """Flag supported color modes."""
         supported = set(map(_color_mode_to_ha, self._native_supported_color_modes))
         if ColorMode.ONOFF in supported and len(supported) > 1:
             supported.remove(ColorMode.ONOFF)
@@ -375,19 +400,10 @@ class EsphomeLight(EsphomeEntity[LightInfo, LightState], LightEntity):
             supported.remove(ColorMode.BRIGHTNESS)
         if ColorMode.WHITE in supported and len(supported) == 1:
             supported.remove(ColorMode.WHITE)
-        return supported
-
-    @property
-    def effect_list(self) -> list[str]:
-        """Return the list of supported effects."""
-        return self._static_info.effects
-
-    @property
-    def min_mireds(self) -> int:
-        """Return the coldest color_temp that this light supports."""
-        return round(self._static_info.min_mireds)
-
-    @property
-    def max_mireds(self) -> int:
-        """Return the warmest color_temp that this light supports."""
-        return round(self._static_info.max_mireds)
+        self._attr_supported_color_modes = supported
+        self._attr_effect_list = static_info.effects
+        self._attr_min_mireds = round(static_info.min_mireds)
+        self._attr_max_mireds = round(static_info.max_mireds)
+        if ColorMode.COLOR_TEMP in supported:
+            self._attr_min_color_temp_kelvin = _mired_to_kelvin(static_info.max_mireds)
+            self._attr_max_color_temp_kelvin = _mired_to_kelvin(static_info.min_mireds)
diff --git a/homeassistant/components/esphome/lock.py b/homeassistant/components/esphome/lock.py
index 947ea4729bb..00b94cd15ff 100644
--- a/homeassistant/components/esphome/lock.py
+++ b/homeassistant/components/esphome/lock.py
@@ -3,15 +3,19 @@ from __future__ import annotations
 
 from typing import Any
 
-from aioesphomeapi import LockCommand, LockEntityState, LockInfo, LockState
+from aioesphomeapi import EntityInfo, LockCommand, LockEntityState, LockInfo, LockState
 
 from homeassistant.components.lock import LockEntity, LockEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_CODE
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 
 
 async def async_setup_entry(
@@ -22,7 +26,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="lock",
         info_type=LockInfo,
         entity_type=EsphomeLock,
         state_type=LockEntityState,
@@ -32,24 +35,19 @@ async def async_setup_entry(
 class EsphomeLock(EsphomeEntity[LockInfo, LockEntityState], LockEntity):
     """A lock implementation for ESPHome."""
 
-    @property
-    def assumed_state(self) -> bool:
-        """Return True if unable to access real state of the entity."""
-        return self._static_info.assumed_state
-
-    @property
-    def supported_features(self) -> LockEntityFeature:
-        """Flag supported features."""
-        if self._static_info.supports_open:
-            return LockEntityFeature.OPEN
-        return LockEntityFeature(0)
-
-    @property
-    def code_format(self) -> str | None:
-        """Regex for code format or None if no code is required."""
-        if self._static_info.requires_code:
-            return self._static_info.code_format
-        return None
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        self._attr_assumed_state = static_info.assumed_state
+        self._attr_supported_features = LockEntityFeature(0)
+        if static_info.supports_open:
+            self._attr_supported_features |= LockEntityFeature.OPEN
+        if static_info.requires_code:
+            self._attr_code_format = static_info.code_format
+        else:
+            self._attr_code_format = None
 
     @property
     @esphome_state_property
@@ -77,13 +75,13 @@ class EsphomeLock(EsphomeEntity[LockInfo, LockEntityState], LockEntity):
 
     async def async_lock(self, **kwargs: Any) -> None:
         """Lock the lock."""
-        await self._client.lock_command(self._static_info.key, LockCommand.LOCK)
+        await self._client.lock_command(self._key, LockCommand.LOCK)
 
     async def async_unlock(self, **kwargs: Any) -> None:
         """Unlock the lock."""
         code = kwargs.get(ATTR_CODE, None)
-        await self._client.lock_command(self._static_info.key, LockCommand.UNLOCK, code)
+        await self._client.lock_command(self._key, LockCommand.UNLOCK, code)
 
     async def async_open(self, **kwargs: Any) -> None:
         """Open the door latch."""
-        await self._client.lock_command(self._static_info.key, LockCommand.OPEN)
+        await self._client.lock_command(self._key, LockCommand.OPEN)
diff --git a/homeassistant/components/esphome/manifest.json b/homeassistant/components/esphome/manifest.json
index c6e430d7845..8f5e6b95c39 100644
--- a/homeassistant/components/esphome/manifest.json
+++ b/homeassistant/components/esphome/manifest.json
@@ -2,7 +2,7 @@
   "domain": "esphome",
   "name": "ESPHome",
   "after_dependencies": ["zeroconf", "tag"],
-  "codeowners": ["@OttoWinter", "@jesserockz"],
+  "codeowners": ["@OttoWinter", "@jesserockz", "@bdraco"],
   "config_flow": true,
   "dependencies": ["assist_pipeline", "bluetooth"],
   "dhcp": [
@@ -15,8 +15,8 @@
   "iot_class": "local_push",
   "loggers": ["aioesphomeapi", "noiseprotocol"],
   "requirements": [
-    "aioesphomeapi==13.9.0",
-    "bluetooth-data-tools==0.4.0",
+    "aioesphomeapi==15.1.1",
+    "bluetooth-data-tools==1.3.0",
     "esphome-dashboard-api==1.2.3"
   ],
   "zeroconf": ["_esphomelib._tcp.local."]
diff --git a/homeassistant/components/esphome/media_player.py b/homeassistant/components/esphome/media_player.py
index d818e040965..9d008300966 100644
--- a/homeassistant/components/esphome/media_player.py
+++ b/homeassistant/components/esphome/media_player.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 from typing import Any
 
 from aioesphomeapi import (
+    EntityInfo,
     MediaPlayerCommand,
     MediaPlayerEntityState,
     MediaPlayerInfo,
@@ -21,10 +22,14 @@ from homeassistant.components.media_player import (
     async_process_play_media_url,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 from .enum_mapper import EsphomeEnumMapper
 
 
@@ -38,7 +43,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="media_player",
         info_type=MediaPlayerInfo,
         entity_type=EsphomeMediaPlayer,
         state_type=MediaPlayerEntityState,
@@ -61,6 +65,21 @@ class EsphomeMediaPlayer(
 
     _attr_device_class = MediaPlayerDeviceClass.SPEAKER
 
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        flags = (
+            MediaPlayerEntityFeature.PLAY_MEDIA
+            | MediaPlayerEntityFeature.BROWSE_MEDIA
+            | MediaPlayerEntityFeature.STOP
+            | MediaPlayerEntityFeature.VOLUME_SET
+            | MediaPlayerEntityFeature.VOLUME_MUTE
+        )
+        if self._static_info.supports_pause:
+            flags |= MediaPlayerEntityFeature.PAUSE | MediaPlayerEntityFeature.PLAY
+        self._attr_supported_features = flags
+
     @property
     @esphome_state_property
     def state(self) -> MediaPlayerState | None:
@@ -79,20 +98,6 @@ class EsphomeMediaPlayer(
         """Volume level of the media player (0..1)."""
         return self._state.volume
 
-    @property
-    def supported_features(self) -> MediaPlayerEntityFeature:
-        """Flag supported features."""
-        flags = (
-            MediaPlayerEntityFeature.PLAY_MEDIA
-            | MediaPlayerEntityFeature.BROWSE_MEDIA
-            | MediaPlayerEntityFeature.STOP
-            | MediaPlayerEntityFeature.VOLUME_SET
-            | MediaPlayerEntityFeature.VOLUME_MUTE
-        )
-        if self._static_info.supports_pause:
-            flags |= MediaPlayerEntityFeature.PAUSE | MediaPlayerEntityFeature.PLAY
-        return flags
-
     async def async_play_media(
         self, media_type: MediaType | str, media_id: str, **kwargs: Any
     ) -> None:
@@ -106,7 +111,7 @@ class EsphomeMediaPlayer(
         media_id = async_process_play_media_url(self.hass, media_id)
 
         await self._client.media_player_command(
-            self._static_info.key,
+            self._key,
             media_url=media_id,
         )
 
@@ -124,35 +129,29 @@ class EsphomeMediaPlayer(
 
     async def async_set_volume_level(self, volume: float) -> None:
         """Set volume level, range 0..1."""
-        await self._client.media_player_command(
-            self._static_info.key,
-            volume=volume,
-        )
+        await self._client.media_player_command(self._key, volume=volume)
 
     async def async_media_pause(self) -> None:
         """Send pause command."""
         await self._client.media_player_command(
-            self._static_info.key,
-            command=MediaPlayerCommand.PAUSE,
+            self._key, command=MediaPlayerCommand.PAUSE
         )
 
     async def async_media_play(self) -> None:
         """Send play command."""
         await self._client.media_player_command(
-            self._static_info.key,
-            command=MediaPlayerCommand.PLAY,
+            self._key, command=MediaPlayerCommand.PLAY
         )
 
     async def async_media_stop(self) -> None:
         """Send stop command."""
         await self._client.media_player_command(
-            self._static_info.key,
-            command=MediaPlayerCommand.STOP,
+            self._key, command=MediaPlayerCommand.STOP
         )
 
     async def async_mute_volume(self, mute: bool) -> None:
         """Mute the volume."""
         await self._client.media_player_command(
-            self._static_info.key,
+            self._key,
             command=MediaPlayerCommand.MUTE if mute else MediaPlayerCommand.UNMUTE,
         )
diff --git a/homeassistant/components/esphome/number.py b/homeassistant/components/esphome/number.py
index 3ca8e0b9728..4e3d052e6ef 100644
--- a/homeassistant/components/esphome/number.py
+++ b/homeassistant/components/esphome/number.py
@@ -3,15 +3,24 @@ from __future__ import annotations
 
 import math
 
-from aioesphomeapi import NumberInfo, NumberMode as EsphomeNumberMode, NumberState
+from aioesphomeapi import (
+    EntityInfo,
+    NumberInfo,
+    NumberMode as EsphomeNumberMode,
+    NumberState,
+)
 
 from homeassistant.components.number import NumberDeviceClass, NumberEntity, NumberMode
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 from .enum_mapper import EsphomeEnumMapper
 
 
@@ -25,7 +34,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="number",
         info_type=NumberInfo,
         entity_type=EsphomeNumber,
         state_type=NumberState,
@@ -44,48 +52,32 @@ NUMBER_MODES: EsphomeEnumMapper[EsphomeNumberMode, NumberMode] = EsphomeEnumMapp
 class EsphomeNumber(EsphomeEntity[NumberInfo, NumberState], NumberEntity):
     """A number implementation for esphome."""
 
-    @property
-    def device_class(self) -> NumberDeviceClass | None:
-        """Return the class of this entity."""
-        return try_parse_enum(NumberDeviceClass, self._static_info.device_class)
-
-    @property
-    def native_min_value(self) -> float:
-        """Return the minimum value."""
-        return super()._static_info.min_value
-
-    @property
-    def native_max_value(self) -> float:
-        """Return the maximum value."""
-        return super()._static_info.max_value
-
-    @property
-    def native_step(self) -> float:
-        """Return the increment/decrement step."""
-        return super()._static_info.step
-
-    @property
-    def native_unit_of_measurement(self) -> str | None:
-        """Return the unit of measurement."""
-        return super()._static_info.unit_of_measurement
-
-    @property
-    def mode(self) -> NumberMode:
-        """Return the mode of the entity."""
-        if self._static_info.mode:
-            return NUMBER_MODES.from_esphome(self._static_info.mode)
-        return NumberMode.AUTO
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        self._attr_device_class = try_parse_enum(
+            NumberDeviceClass, self._static_info.device_class
+        )
+        self._attr_native_min_value = static_info.min_value
+        self._attr_native_max_value = static_info.max_value
+        self._attr_native_step = static_info.step
+        self._attr_native_unit_of_measurement = static_info.unit_of_measurement
+        if mode := static_info.mode:
+            self._attr_mode = NUMBER_MODES.from_esphome(mode)
+        else:
+            self._attr_mode = NumberMode.AUTO
 
     @property
     @esphome_state_property
     def native_value(self) -> float | None:
         """Return the state of the entity."""
-        if math.isnan(self._state.state):
+        state = self._state
+        if state.missing_state or math.isnan(state.state):
             return None
-        if self._state.missing_state:
-            return None
-        return self._state.state
+        return state.state
 
     async def async_set_native_value(self, value: float) -> None:
         """Update the current value."""
-        await self._client.number_command(self._static_info.key, value)
+        await self._client.number_command(self._key, value)
diff --git a/homeassistant/components/esphome/select.py b/homeassistant/components/esphome/select.py
index e4cac21dbc8..a3464b137dc 100644
--- a/homeassistant/components/esphome/select.py
+++ b/homeassistant/components/esphome/select.py
@@ -1,21 +1,24 @@
 """Support for esphome selects."""
 from __future__ import annotations
 
-from aioesphomeapi import SelectInfo, SelectState
+from aioesphomeapi import EntityInfo, SelectInfo, SelectState
 
-from homeassistant.components.assist_pipeline.select import AssistPipelineSelect
+from homeassistant.components.assist_pipeline.select import (
+    AssistPipelineSelect,
+    VadSensitivitySelect,
+)
 from homeassistant.components.select import SelectEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import (
+from .domain_data import DomainData
+from .entity import (
     EsphomeAssistEntity,
     EsphomeEntity,
     esphome_state_property,
     platform_async_setup_entry,
 )
-from .domain_data import DomainData
 from .entry_data import RuntimeEntryData
 
 
@@ -29,7 +32,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="select",
         info_type=SelectInfo,
         entity_type=EsphomeSelect,
         state_type=SelectState,
@@ -38,28 +40,33 @@ async def async_setup_entry(
     entry_data = DomainData.get(hass).get_entry_data(entry)
     assert entry_data.device_info is not None
     if entry_data.device_info.voice_assistant_version:
-        async_add_entities([EsphomeAssistPipelineSelect(hass, entry_data)])
+        async_add_entities(
+            [
+                EsphomeAssistPipelineSelect(hass, entry_data),
+                EsphomeVadSensitivitySelect(hass, entry_data),
+            ]
+        )
 
 
 class EsphomeSelect(EsphomeEntity[SelectInfo, SelectState], SelectEntity):
     """A select implementation for esphome."""
 
-    @property
-    def options(self) -> list[str]:
-        """Return a set of selectable options."""
-        return self._static_info.options
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        self._attr_options = self._static_info.options
 
     @property
     @esphome_state_property
     def current_option(self) -> str | None:
         """Return the state of the entity."""
-        if self._state.missing_state:
-            return None
-        return self._state.state
+        state = self._state
+        return None if state.missing_state else state.state
 
     async def async_select_option(self, option: str) -> None:
         """Change the selected option."""
-        await self._client.select_command(self._static_info.key, option)
+        await self._client.select_command(self._key, option)
 
 
 class EsphomeAssistPipelineSelect(EsphomeAssistEntity, AssistPipelineSelect):
@@ -69,3 +76,12 @@ class EsphomeAssistPipelineSelect(EsphomeAssistEntity, AssistPipelineSelect):
         """Initialize a pipeline selector."""
         EsphomeAssistEntity.__init__(self, entry_data)
         AssistPipelineSelect.__init__(self, hass, self._device_info.mac_address)
+
+
+class EsphomeVadSensitivitySelect(EsphomeAssistEntity, VadSensitivitySelect):
+    """VAD sensitivity selector for VoIP devices."""
+
+    def __init__(self, hass: HomeAssistant, entry_data: RuntimeEntryData) -> None:
+        """Initialize a VAD sensitivity selector."""
+        EsphomeAssistEntity.__init__(self, entry_data)
+        VadSensitivitySelect.__init__(self, hass, self._device_info.mac_address)
diff --git a/homeassistant/components/esphome/sensor.py b/homeassistant/components/esphome/sensor.py
index 7a1234341be..3185a5eb536 100644
--- a/homeassistant/components/esphome/sensor.py
+++ b/homeassistant/components/esphome/sensor.py
@@ -5,6 +5,7 @@ from datetime import datetime
 import math
 
 from aioesphomeapi import (
+    EntityInfo,
     SensorInfo,
     SensorState,
     SensorStateClass as EsphomeSensorStateClass,
@@ -19,12 +20,16 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import dt as dt_util
 from homeassistant.util.enum import try_parse_enum
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 from .enum_mapper import EsphomeEnumMapper
 
 
@@ -36,7 +41,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="sensor",
         info_type=SensorInfo,
         entity_type=EsphomeSensor,
         state_type=SensorState,
@@ -45,7 +49,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="text_sensor",
         info_type=TextSensorInfo,
         entity_type=EsphomeTextSensor,
         state_type=TextSensorState,
@@ -67,50 +70,38 @@ _STATE_CLASSES: EsphomeEnumMapper[
 class EsphomeSensor(EsphomeEntity[SensorInfo, SensorState], SensorEntity):
     """A sensor implementation for esphome."""
 
-    @property
-    def force_update(self) -> bool:
-        """Return if this sensor should force a state update."""
-        return self._static_info.force_update
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        self._attr_force_update = static_info.force_update
+        self._attr_native_unit_of_measurement = static_info.unit_of_measurement
+        self._attr_device_class = try_parse_enum(
+            SensorDeviceClass, static_info.device_class
+        )
+        if not (state_class := static_info.state_class):
+            return
+        if (
+            state_class == EsphomeSensorStateClass.MEASUREMENT
+            and static_info.last_reset_type == LastResetType.AUTO
+        ):
+            # Legacy, last_reset_type auto was the equivalent to the
+            # TOTAL_INCREASING state class
+            self._attr_state_class = SensorStateClass.TOTAL_INCREASING
+        else:
+            self._attr_state_class = _STATE_CLASSES.from_esphome(state_class)
 
     @property
     @esphome_state_property
     def native_value(self) -> datetime | str | None:
         """Return the state of the entity."""
-        if math.isnan(self._state.state):
+        state = self._state
+        if math.isnan(state.state) or state.missing_state:
             return None
-        if self._state.missing_state:
-            return None
-        if self.device_class == SensorDeviceClass.TIMESTAMP:
-            return dt_util.utc_from_timestamp(self._state.state)
-        return f"{self._state.state:.{self._static_info.accuracy_decimals}f}"
-
-    @property
-    def native_unit_of_measurement(self) -> str | None:
-        """Return the unit the value is expressed in."""
-        if not self._static_info.unit_of_measurement:
-            return None
-        return self._static_info.unit_of_measurement
-
-    @property
-    def device_class(self) -> SensorDeviceClass | None:
-        """Return the class of this device, from component DEVICE_CLASSES."""
-        return try_parse_enum(SensorDeviceClass, self._static_info.device_class)
-
-    @property
-    def state_class(self) -> SensorStateClass | None:
-        """Return the state class of this entity."""
-        if not self._static_info.state_class:
-            return None
-        state_class = self._static_info.state_class
-        reset_type = self._static_info.last_reset_type
-        if (
-            state_class == EsphomeSensorStateClass.MEASUREMENT
-            and reset_type == LastResetType.AUTO
-        ):
-            # Legacy, last_reset_type auto was the equivalent to the
-            # TOTAL_INCREASING state class
-            return SensorStateClass.TOTAL_INCREASING
-        return _STATE_CLASSES.from_esphome(self._static_info.state_class)
+        if self._attr_device_class == SensorDeviceClass.TIMESTAMP:
+            return dt_util.utc_from_timestamp(state.state)
+        return f"{state.state:.{self._static_info.accuracy_decimals}f}"
 
 
 class EsphomeTextSensor(EsphomeEntity[TextSensorInfo, TextSensorState], SensorEntity):
@@ -120,6 +111,5 @@ class EsphomeTextSensor(EsphomeEntity[TextSensorInfo, TextSensorState], SensorEn
     @esphome_state_property
     def native_value(self) -> str | None:
         """Return the state of the entity."""
-        if self._state.missing_state:
-            return None
-        return self._state.state
+        state = self._state
+        return None if state.missing_state else state.state
diff --git a/homeassistant/components/esphome/strings.json b/homeassistant/components/esphome/strings.json
index 81350c2c653..2ec1fe1bc41 100644
--- a/homeassistant/components/esphome/strings.json
+++ b/homeassistant/components/esphome/strings.json
@@ -46,6 +46,15 @@
     },
     "flow_title": "{name}"
   },
+  "options": {
+    "step": {
+      "init": {
+        "data": {
+          "allow_service_calls": "Allow the device to make Home Assistant service calls."
+        }
+      }
+    }
+  },
   "entity": {
     "binary_sensor": {
       "assist_in_progress": {
@@ -58,6 +67,14 @@
         "state": {
           "preferred": "[%key:component::assist_pipeline::entity::select::pipeline::state::preferred%]"
         }
+      },
+      "vad_sensitivity": {
+        "name": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::name%]",
+        "state": {
+          "default": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::state::default%]",
+          "aggressive": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::state::aggressive%]",
+          "relaxed": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::state::relaxed%]"
+        }
       }
     }
   },
@@ -69,6 +86,10 @@
     "api_password_deprecated": {
       "title": "API Password deprecated on {name}",
       "description": "The API password for ESPHome is deprecated and the use of an API encryption key is recommended instead.\n\nRemove the API password and add an encryption key to your ESPHome device to resolve this issue."
+    },
+    "service_calls_not_allowed": {
+      "title": "{name} is not permitted to call Home Assistant services",
+      "description": "The ESPHome device attempted to make a Home Assistant service call, but this functionality is not enabled.\n\nIf you trust this device and want to allow it to make Home Assistant service calls, you can enable this functionality in the options flow."
     }
   }
 }
diff --git a/homeassistant/components/esphome/switch.py b/homeassistant/components/esphome/switch.py
index 83148542435..99894b8501e 100644
--- a/homeassistant/components/esphome/switch.py
+++ b/homeassistant/components/esphome/switch.py
@@ -3,15 +3,19 @@ from __future__ import annotations
 
 from typing import Any
 
-from aioesphomeapi import SwitchInfo, SwitchState
+from aioesphomeapi import EntityInfo, SwitchInfo, SwitchState
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 
 
 async def async_setup_entry(
@@ -22,7 +26,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="switch",
         info_type=SwitchInfo,
         entity_type=EsphomeSwitch,
         state_type=SwitchState,
@@ -32,10 +35,15 @@ async def async_setup_entry(
 class EsphomeSwitch(EsphomeEntity[SwitchInfo, SwitchState], SwitchEntity):
     """A switch implementation for ESPHome."""
 
-    @property
-    def assumed_state(self) -> bool:
-        """Return true if we do optimistic updates."""
-        return self._static_info.assumed_state
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        self._attr_assumed_state = static_info.assumed_state
+        self._attr_device_class = try_parse_enum(
+            SwitchDeviceClass, static_info.device_class
+        )
 
     @property
     @esphome_state_property
@@ -43,15 +51,10 @@ class EsphomeSwitch(EsphomeEntity[SwitchInfo, SwitchState], SwitchEntity):
         """Return true if the switch is on."""
         return self._state.state
 
-    @property
-    def device_class(self) -> SwitchDeviceClass | None:
-        """Return the class of this device."""
-        return try_parse_enum(SwitchDeviceClass, self._static_info.device_class)
-
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the entity on."""
-        await self._client.switch_command(self._static_info.key, True)
+        await self._client.switch_command(self._key, True)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the entity off."""
-        await self._client.switch_command(self._static_info.key, False)
+        await self._client.switch_command(self._key, False)
diff --git a/homeassistant/components/esphome/update.py b/homeassistant/components/esphome/update.py
index 618e31024b1..6f51b9df744 100644
--- a/homeassistant/components/esphome/update.py
+++ b/homeassistant/components/esphome/update.py
@@ -111,7 +111,11 @@ class ESPHomeUpdateEntity(CoordinatorEntity[ESPHomeDashboard], UpdateEntity):
         """
         return (
             super().available
-            and (self._entry_data.available or self._device_info.has_deep_sleep)
+            and (
+                self._entry_data.available
+                or self._entry_data.expected_disconnect
+                or self._device_info.has_deep_sleep
+            )
             and self._device_info.name in self.coordinator.data
         )
 
diff --git a/homeassistant/components/esphome/voice_assistant.py b/homeassistant/components/esphome/voice_assistant.py
index efb4162ae1a..6b49549d812 100644
--- a/homeassistant/components/esphome/voice_assistant.py
+++ b/homeassistant/components/esphome/voice_assistant.py
@@ -19,7 +19,10 @@ from homeassistant.components.assist_pipeline import (
     async_pipeline_from_audio_stream,
     select as pipeline_select,
 )
-from homeassistant.components.assist_pipeline.vad import VoiceCommandSegmenter
+from homeassistant.components.assist_pipeline.vad import (
+    VadSensitivity,
+    VoiceCommandSegmenter,
+)
 from homeassistant.components.media_player import async_process_play_media_url
 from homeassistant.core import Context, HomeAssistant, callback
 
@@ -251,9 +254,9 @@ class VoiceAssistantUDPServer(asyncio.DatagramProtocol):
                 chunk = await self.queue.get()
 
     async def _iterate_packets_with_vad(
-        self, pipeline_timeout: float
+        self, pipeline_timeout: float, silence_seconds: float
     ) -> Callable[[], AsyncIterable[bytes]] | None:
-        segmenter = VoiceCommandSegmenter()
+        segmenter = VoiceCommandSegmenter(silence_seconds=silence_seconds)
         chunk_buffer: deque[bytes] = deque(maxlen=100)
         try:
             async with async_timeout.timeout(pipeline_timeout):
@@ -293,6 +296,7 @@ class VoiceAssistantUDPServer(asyncio.DatagramProtocol):
 
     async def run_pipeline(
         self,
+        device_id: str,
         conversation_id: str | None,
         use_vad: bool = False,
         pipeline_timeout: float = 30.0,
@@ -304,7 +308,16 @@ class VoiceAssistantUDPServer(asyncio.DatagramProtocol):
         )
 
         if use_vad:
-            stt_stream = await self._iterate_packets_with_vad(pipeline_timeout)
+            stt_stream = await self._iterate_packets_with_vad(
+                pipeline_timeout,
+                silence_seconds=VadSensitivity.to_seconds(
+                    pipeline_select.get_vad_sensitivity(
+                        self.hass,
+                        DOMAIN,
+                        self.device_info.mac_address,
+                    )
+                ),
+            )
             # Error or timeout occurred and was handled already
             if stt_stream is None:
                 return
@@ -331,6 +344,7 @@ class VoiceAssistantUDPServer(asyncio.DatagramProtocol):
                         self.hass, DOMAIN, self.device_info.mac_address
                     ),
                     conversation_id=conversation_id,
+                    device_id=device_id,
                     tts_audio_output=tts_audio_output,
                 )
 
diff --git a/homeassistant/components/eufylife_ble/manifest.json b/homeassistant/components/eufylife_ble/manifest.json
index ad70dd97d58..c3a2357ebca 100644
--- a/homeassistant/components/eufylife_ble/manifest.json
+++ b/homeassistant/components/eufylife_ble/manifest.json
@@ -24,5 +24,5 @@
   "documentation": "https://www.home-assistant.io/integrations/eufylife_ble",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["eufylife_ble_client==0.1.7"]
+  "requirements": ["eufylife-ble-client==0.1.7"]
 }
diff --git a/homeassistant/components/eufylife_ble/sensor.py b/homeassistant/components/eufylife_ble/sensor.py
index d7c69dec165..741f71b34d2 100644
--- a/homeassistant/components/eufylife_ble/sensor.py
+++ b/homeassistant/components/eufylife_ble/sensor.py
@@ -86,7 +86,7 @@ class EufyLifeSensorEntity(SensorEntity):
 class EufyLifeRealTimeWeightSensorEntity(EufyLifeSensorEntity):
     """Representation of an EufyLife real-time weight sensor."""
 
-    _attr_name = "Real-time weight"
+    _attr_translation_key = "real_time_weight"
     _attr_native_unit_of_measurement = UnitOfMass.KILOGRAMS
     _attr_device_class = SensorDeviceClass.WEIGHT
 
@@ -115,7 +115,7 @@ class EufyLifeRealTimeWeightSensorEntity(EufyLifeSensorEntity):
 class EufyLifeWeightSensorEntity(RestoreEntity, EufyLifeSensorEntity):
     """Representation of an EufyLife weight sensor."""
 
-    _attr_name = "Weight"
+    _attr_translation_key = "weight"
     _attr_native_unit_of_measurement = UnitOfMass.KILOGRAMS
     _attr_device_class = SensorDeviceClass.WEIGHT
 
@@ -176,7 +176,7 @@ class EufyLifeWeightSensorEntity(RestoreEntity, EufyLifeSensorEntity):
 class EufyLifeHeartRateSensorEntity(RestoreEntity, EufyLifeSensorEntity):
     """Representation of an EufyLife heart rate sensor."""
 
-    _attr_name = "Heart rate"
+    _attr_translation_key = "heart_rate"
     _attr_icon = "mdi:heart-pulse"
     _attr_native_unit_of_measurement = "bpm"
 
diff --git a/homeassistant/components/eufylife_ble/strings.json b/homeassistant/components/eufylife_ble/strings.json
index a045d84771e..5f7924f4cbd 100644
--- a/homeassistant/components/eufylife_ble/strings.json
+++ b/homeassistant/components/eufylife_ble/strings.json
@@ -18,5 +18,18 @@
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "real_time_weight": {
+        "name": "Real-time weight"
+      },
+      "weight": {
+        "name": "Weight"
+      },
+      "heart_rate": {
+        "name": "Heart rate"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/evohome/climate.py b/homeassistant/components/evohome/climate.py
index d4ee8f3d5df..3bee1d6062e 100644
--- a/homeassistant/components/evohome/climate.py
+++ b/homeassistant/components/evohome/climate.py
@@ -131,7 +131,7 @@ class EvoClimateEntity(EvoDevice, ClimateEntity):
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
     @property
-    def hvac_modes(self) -> list[str]:
+    def hvac_modes(self) -> list[HVACMode]:
         """Return a list of available hvac operation modes."""
         return list(HA_HVAC_TO_TCS)
 
@@ -191,7 +191,7 @@ class EvoZone(EvoChild, EvoClimateEntity):
         )
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return the current operating mode of a Zone."""
         if self._evo_tcs.systemModeStatus["mode"] in (EVO_AWAY, EVO_HEATOFF):
             return HVACMode.AUTO
@@ -356,7 +356,7 @@ class EvoController(EvoClimateEntity):
         )
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return the current operating mode of a Controller."""
         tcs_mode = self._evo_tcs.systemModeStatus["mode"]
         return HVACMode.OFF if tcs_mode == EVO_HEATOFF else HVACMode.HEAT
diff --git a/homeassistant/components/ezviz/__init__.py b/homeassistant/components/ezviz/__init__.py
index 2966c339f95..9386a407acb 100644
--- a/homeassistant/components/ezviz/__init__.py
+++ b/homeassistant/components/ezviz/__init__.py
@@ -35,6 +35,7 @@ PLATFORMS_BY_TYPE: dict[str, list] = {
     ATTR_TYPE_CLOUD: [
         Platform.BINARY_SENSOR,
         Platform.CAMERA,
+        Platform.LIGHT,
         Platform.NUMBER,
         Platform.SENSOR,
         Platform.SWITCH,
diff --git a/homeassistant/components/ezviz/camera.py b/homeassistant/components/ezviz/camera.py
index 57be995a489..60a332446ce 100644
--- a/homeassistant/components/ezviz/camera.py
+++ b/homeassistant/components/ezviz/camera.py
@@ -312,7 +312,7 @@ class EzvizCamera(EzvizEntity, Camera):
             self.hass,
             DOMAIN,
             "service_depreciation_detection_sensibility",
-            breaks_in_ha_version="2023.8.0",
+            breaks_in_ha_version="2023.12.0",
             is_fixable=False,
             severity=ir.IssueSeverity.WARNING,
             translation_key="service_depreciation_detection_sensibility",
diff --git a/homeassistant/components/ezviz/entity.py b/homeassistant/components/ezviz/entity.py
index 1c966c7f82e..ccf273a970b 100644
--- a/homeassistant/components/ezviz/entity.py
+++ b/homeassistant/components/ezviz/entity.py
@@ -38,3 +38,32 @@ class EzvizEntity(CoordinatorEntity[EzvizDataUpdateCoordinator], Entity):
     def data(self) -> dict[str, Any]:
         """Return coordinator data for this entity."""
         return self.coordinator.data[self._serial]
+
+
+class EzvizBaseEntity(Entity):
+    """Generic entity for EZVIZ individual poll entities."""
+
+    def __init__(
+        self,
+        coordinator: EzvizDataUpdateCoordinator,
+        serial: str,
+    ) -> None:
+        """Initialize the entity."""
+        self._serial = serial
+        self.coordinator = coordinator
+        self._camera_name = self.data["name"]
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, serial)},
+            connections={
+                (CONNECTION_NETWORK_MAC, self.data["mac_address"]),
+            },
+            manufacturer=MANUFACTURER,
+            model=self.data["device_sub_category"],
+            name=self.data["name"],
+            sw_version=self.data["version"],
+        )
+
+    @property
+    def data(self) -> dict[str, Any]:
+        """Return coordinator data for this entity."""
+        return self.coordinator.data[self._serial]
diff --git a/homeassistant/components/ezviz/light.py b/homeassistant/components/ezviz/light.py
new file mode 100644
index 00000000000..38007962e4e
--- /dev/null
+++ b/homeassistant/components/ezviz/light.py
@@ -0,0 +1,125 @@
+"""Support for EZVIZ light entity."""
+from __future__ import annotations
+
+from typing import Any
+
+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
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.util.percentage import (
+    percentage_to_ranged_value,
+    ranged_value_to_percentage,
+)
+
+from .const import DATA_COORDINATOR, DOMAIN
+from .coordinator import EzvizDataUpdateCoordinator
+from .entity import EzvizEntity
+
+PARALLEL_UPDATES = 1
+BRIGHTNESS_RANGE = (1, 255)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up EZVIZ lights based on a config entry."""
+    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
+        DATA_COORDINATOR
+    ]
+
+    async_add_entities(
+        EzvizLight(coordinator, camera)
+        for camera in coordinator.data
+        for capibility, value in coordinator.data[camera]["supportExt"].items()
+        if capibility == str(SupportExt.SupportAlarmLight.value)
+        if value == "1"
+    )
+
+
+class EzvizLight(EzvizEntity, LightEntity):
+    """Representation of a EZVIZ light."""
+
+    _attr_has_entity_name = True
+    _attr_color_mode = ColorMode.BRIGHTNESS
+    _attr_supported_color_modes = {ColorMode.BRIGHTNESS}
+
+    def __init__(
+        self,
+        coordinator: EzvizDataUpdateCoordinator,
+        serial: str,
+    ) -> None:
+        """Initialize the light."""
+        super().__init__(coordinator, serial)
+        self.battery_cam_type = bool(
+            self.data["device_category"]
+            == DeviceCatagories.BATTERY_CAMERA_DEVICE_CATEGORY.value
+        )
+        self._attr_unique_id = f"{serial}_Light"
+        self._attr_name = "Light"
+
+    @property
+    def brightness(self) -> int | None:
+        """Return the brightness of this light between 0..255."""
+        return round(
+            percentage_to_ranged_value(
+                BRIGHTNESS_RANGE,
+                self.coordinator.data[self._serial]["alarm_light_luminance"],
+            )
+        )
+
+    @property
+    def is_on(self) -> bool:
+        """Return the state of the light."""
+        return self.data["switches"][DeviceSwitchType.ALARM_LIGHT.value]
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn on light."""
+        try:
+            if ATTR_BRIGHTNESS in kwargs:
+                data = ranged_value_to_percentage(
+                    BRIGHTNESS_RANGE, kwargs[ATTR_BRIGHTNESS]
+                )
+
+                update_ok = await self.hass.async_add_executor_job(
+                    self.coordinator.ezviz_client.set_floodlight_brightness,
+                    self._serial,
+                    data,
+                )
+            else:
+                update_ok = await self.hass.async_add_executor_job(
+                    self.coordinator.ezviz_client.switch_status,
+                    self._serial,
+                    DeviceSwitchType.ALARM_LIGHT.value,
+                    1,
+                )
+
+        except (HTTPError, PyEzvizError) as err:
+            raise HomeAssistantError(
+                f"Failed to turn on light {self._attr_name}"
+            ) from err
+
+        if update_ok:
+            await self.coordinator.async_request_refresh()
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn off light."""
+        try:
+            update_ok = await self.hass.async_add_executor_job(
+                self.coordinator.ezviz_client.switch_status,
+                self._serial,
+                DeviceSwitchType.ALARM_LIGHT.value,
+                0,
+            )
+
+        except (HTTPError, PyEzvizError) as err:
+            raise HomeAssistantError(
+                f"Failed to turn off light {self._attr_name}"
+            ) from err
+
+        if update_ok:
+            await self.coordinator.async_request_refresh()
diff --git a/homeassistant/components/ezviz/manifest.json b/homeassistant/components/ezviz/manifest.json
index 219f4c87d13..53976bf3002 100644
--- a/homeassistant/components/ezviz/manifest.json
+++ b/homeassistant/components/ezviz/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ezviz",
   "iot_class": "cloud_polling",
   "loggers": ["paho_mqtt", "pyezviz"],
-  "requirements": ["pyezviz==0.2.0.12"]
+  "requirements": ["pyezviz==0.2.1.2"]
 }
diff --git a/homeassistant/components/ezviz/number.py b/homeassistant/components/ezviz/number.py
index 849bf2c400b..074685c69f9 100644
--- a/homeassistant/components/ezviz/number.py
+++ b/homeassistant/components/ezviz/number.py
@@ -1,8 +1,18 @@
 """Support for EZVIZ number controls."""
 from __future__ import annotations
 
-from pyezviz.constants import DeviceCatagories
-from pyezviz.exceptions import HTTPError, PyEzvizError
+from dataclasses import dataclass
+from datetime import timedelta
+import logging
+
+from pyezviz.constants import SupportExt
+from pyezviz.exceptions import (
+    EzvizAuthTokenExpired,
+    EzvizAuthVerificationCode,
+    HTTPError,
+    InvalidURL,
+    PyEzvizError,
+)
 
 from homeassistant.components.number import NumberEntity, NumberEntityDescription
 from homeassistant.config_entries import ConfigEntry
@@ -13,17 +23,37 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DATA_COORDINATOR, DOMAIN
 from .coordinator import EzvizDataUpdateCoordinator
-from .entity import EzvizEntity
+from .entity import EzvizBaseEntity
 
-PARALLEL_UPDATES = 1
+SCAN_INTERVAL = timedelta(seconds=3600)
+PARALLEL_UPDATES = 0
+_LOGGER = logging.getLogger(__name__)
 
-NUMBER_TYPES = NumberEntityDescription(
+
+@dataclass
+class EzvizNumberEntityDescriptionMixin:
+    """Mixin values for EZVIZ Number entities."""
+
+    supported_ext: str
+    supported_ext_value: list
+
+
+@dataclass
+class EzvizNumberEntityDescription(
+    NumberEntityDescription, EzvizNumberEntityDescriptionMixin
+):
+    """Describe a EZVIZ Number."""
+
+
+NUMBER_TYPE = EzvizNumberEntityDescription(
     key="detection_sensibility",
     name="Detection sensitivity",
     icon="mdi:eye",
     entity_category=EntityCategory.CONFIG,
     native_min_value=0,
     native_step=1,
+    supported_ext=str(SupportExt.SupportSensibilityAdjust.value),
+    supported_ext_value=["1", "3"],
 )
 
 
@@ -36,15 +66,18 @@ async def async_setup_entry(
     ]
 
     async_add_entities(
-        EzvizSensor(coordinator, camera, sensor, NUMBER_TYPES)
-        for camera in coordinator.data
-        for sensor, value in coordinator.data[camera].items()
-        if sensor in NUMBER_TYPES.key
-        if value
+        [
+            EzvizSensor(coordinator, camera, value, entry.entry_id)
+            for camera in coordinator.data
+            for capibility, value in coordinator.data[camera]["supportExt"].items()
+            if capibility == NUMBER_TYPE.supported_ext
+            if value in NUMBER_TYPE.supported_ext_value
+        ],
+        update_before_add=True,
     )
 
 
-class EzvizSensor(EzvizEntity, NumberEntity):
+class EzvizSensor(EzvizBaseEntity, NumberEntity):
     """Representation of a EZVIZ number entity."""
 
     _attr_has_entity_name = True
@@ -53,46 +86,57 @@ class EzvizSensor(EzvizEntity, NumberEntity):
         self,
         coordinator: EzvizDataUpdateCoordinator,
         serial: str,
-        sensor: str,
-        description: NumberEntityDescription,
+        value: str,
+        config_entry_id: str,
     ) -> None:
         """Initialize the sensor."""
         super().__init__(coordinator, serial)
-        self._sensor_name = sensor
-        self.battery_cam_type = bool(
-            self.data["device_category"]
-            == DeviceCatagories.BATTERY_CAMERA_DEVICE_CATEGORY.value
-        )
-        self._attr_unique_id = f"{serial}_{sensor}"
-        self._attr_native_max_value = 100 if self.battery_cam_type else 6
-        self.entity_description = description
+        self.sensitivity_type = 3 if value == "3" else 0
+        self._attr_native_max_value = 100 if value == "3" else 6
+        self._attr_unique_id = f"{serial}_{NUMBER_TYPE.key}"
+        self.entity_description = NUMBER_TYPE
+        self.config_entry_id = config_entry_id
+        self.sensor_value: int | None = None
 
     @property
     def native_value(self) -> float | None:
         """Return the state of the entity."""
-        try:
-            return float(self.data[self._sensor_name])
-        except ValueError:
-            return None
+        if self.sensor_value is not None:
+            return float(self.sensor_value)
+        return None
 
     def set_native_value(self, value: float) -> None:
         """Set camera detection sensitivity."""
         level = int(value)
         try:
-            if self.battery_cam_type:
-                self.coordinator.ezviz_client.detection_sensibility(
-                    self._serial,
-                    level,
-                    3,
-                )
-            else:
-                self.coordinator.ezviz_client.detection_sensibility(
-                    self._serial,
-                    level,
-                    0,
-                )
+            self.coordinator.ezviz_client.detection_sensibility(
+                self._serial,
+                level,
+                self.sensitivity_type,
+            )
 
         except (HTTPError, PyEzvizError) as err:
             raise HomeAssistantError(
                 f"Cannot set detection sensitivity level on {self.name}"
             ) from err
+
+        self.sensor_value = level
+
+    def update(self) -> None:
+        """Fetch data from EZVIZ."""
+        _LOGGER.debug("Updating %s", self.name)
+        try:
+            self.sensor_value = self.coordinator.ezviz_client.get_detection_sensibility(
+                self._serial,
+                str(self.sensitivity_type),
+            )
+
+        except (EzvizAuthTokenExpired, EzvizAuthVerificationCode):
+            _LOGGER.debug("Failed to login to EZVIZ API")
+            self.hass.async_create_task(
+                self.hass.config_entries.async_reload(self.config_entry_id)
+            )
+            return
+
+        except (InvalidURL, HTTPError, PyEzvizError) as error:
+            raise HomeAssistantError(f"Invalid response from API: {error}") from error
diff --git a/homeassistant/components/ezviz/strings.json b/homeassistant/components/ezviz/strings.json
index 6f00568cf2b..5711aff2a4a 100644
--- a/homeassistant/components/ezviz/strings.json
+++ b/homeassistant/components/ezviz/strings.json
@@ -62,7 +62,7 @@
   "issues": {
     "service_depreciation_detection_sensibility": {
       "title": "Ezviz Detection sensitivity service is being removed",
-      "description": "Ezviz Detection sensitivity service is deprecated and will be removed in Home Assistant 2023.8; Please adjust the automation or script that uses the service and select submit below to mark this issue as resolved."
+      "description": "Ezviz Detection sensitivity service is deprecated and will be removed in Home Assistant 2023.12; Please adjust the automation or script that uses the service and select submit below to mark this issue as resolved."
     }
   }
 }
diff --git a/homeassistant/components/fan/device_condition.py b/homeassistant/components/fan/device_condition.py
index d4bd5f2e419..920f970185b 100644
--- a/homeassistant/components/fan/device_condition.py
+++ b/homeassistant/components/fan/device_condition.py
@@ -28,7 +28,7 @@ CONDITION_TYPES = {"is_on", "is_off"}
 
 CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
     }
 )
@@ -50,7 +50,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions += [{**base_condition, CONF_TYPE: cond} for cond in CONDITION_TYPES]
@@ -63,6 +63,9 @@ def async_condition_from_config(
     hass: HomeAssistant, config: ConfigType
 ) -> condition.ConditionCheckerType:
     """Create a function to test a device condition."""
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
+
     if config[CONF_TYPE] == "is_on":
         state = STATE_ON
     else:
@@ -71,6 +74,6 @@ def async_condition_from_config(
     @callback
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        return condition.state(hass, config[ATTR_ENTITY_ID], state)
+        return condition.state(hass, entity_id, state)
 
     return test_is_state
diff --git a/homeassistant/components/fan/services.yaml b/homeassistant/components/fan/services.yaml
index cfc44029e23..52d5aca070a 100644
--- a/homeassistant/components/fan/services.yaml
+++ b/homeassistant/components/fan/services.yaml
@@ -1,19 +1,4 @@
 # Describes the format for available fan services
-set_speed:
-  name: Set speed
-  description: Set fan speed.
-  target:
-    entity:
-      domain: fan
-  fields:
-    speed:
-      name: Speed
-      description: Speed setting.
-      required: true
-      example: "low"
-      selector:
-        text:
-
 set_preset_mode:
   name: Set preset mode
   description: Set preset mode for a fan device.
@@ -53,12 +38,6 @@ turn_on:
     entity:
       domain: fan
   fields:
-    speed:
-      name: Speed
-      description: Speed setting.
-      example: "high"
-      selector:
-        text:
     percentage:
       name: Percentage
       description: Percentage speed setting.
diff --git a/homeassistant/components/fibaro/climate.py b/homeassistant/components/fibaro/climate.py
index f4b1cd0c1f5..a56056ade03 100644
--- a/homeassistant/components/fibaro/climate.py
+++ b/homeassistant/components/fibaro/climate.py
@@ -263,7 +263,7 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
         return device.mode
 
     @property
-    def hvac_mode(self) -> HVACMode | str | None:
+    def hvac_mode(self) -> HVACMode | None:
         """Return hvac operation ie. heat, cool, idle."""
         fibaro_operation_mode = self.fibaro_op_mode
         if isinstance(fibaro_operation_mode, str):
diff --git a/homeassistant/components/fido/sensor.py b/homeassistant/components/fido/sensor.py
index 9112351ce06..b7942056a2c 100644
--- a/homeassistant/components/fido/sensor.py
+++ b/homeassistant/components/fido/sensor.py
@@ -235,11 +235,10 @@ class FidoSensor(SensorEntity):
         if (sensor_type := self.entity_description.key) == "balance":
             if self.fido_data.data.get(sensor_type) is not None:
                 self._attr_native_value = round(self.fido_data.data[sensor_type], 2)
-        else:
-            if self.fido_data.data.get(self._number, {}).get(sensor_type) is not None:
-                self._attr_native_value = round(
-                    self.fido_data.data[self._number][sensor_type], 2
-                )
+        elif self.fido_data.data.get(self._number, {}).get(sensor_type) is not None:
+            self._attr_native_value = round(
+                self.fido_data.data[self._number][sensor_type], 2
+            )
 
 
 class FidoData:
diff --git a/homeassistant/components/filesize/sensor.py b/homeassistant/components/filesize/sensor.py
index 6f7e31a1e67..0b5c39f3629 100644
--- a/homeassistant/components/filesize/sensor.py
+++ b/homeassistant/components/filesize/sensor.py
@@ -34,17 +34,17 @@ ICON = "mdi:file"
 SENSOR_TYPES = (
     SensorEntityDescription(
         key="file",
+        translation_key="size",
         icon=ICON,
-        name="Size",
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="bytes",
+        translation_key="size_bytes",
         entity_registry_enabled_default=False,
         icon=ICON,
-        name="Size bytes",
         native_unit_of_measurement=UnitOfInformation.BYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -52,9 +52,9 @@ SENSOR_TYPES = (
     ),
     SensorEntityDescription(
         key="last_updated",
+        translation_key="last_updated",
         entity_registry_enabled_default=False,
         icon=ICON,
-        name="Last Updated",
         device_class=SensorDeviceClass.TIMESTAMP,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
diff --git a/homeassistant/components/filesize/strings.json b/homeassistant/components/filesize/strings.json
index 90c286e7088..3323c3411b2 100644
--- a/homeassistant/components/filesize/strings.json
+++ b/homeassistant/components/filesize/strings.json
@@ -15,5 +15,18 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   },
-  "title": "Filesize"
+  "title": "Filesize",
+  "entity": {
+    "sensor": {
+      "size": {
+        "name": "Size"
+      },
+      "size_bytes": {
+        "name": "Size in bytes"
+      },
+      "last_updated": {
+        "name": "Last updated"
+      }
+    }
+  }
 }
diff --git a/homeassistant/components/fints/sensor.py b/homeassistant/components/fints/sensor.py
index 479e59d9cdf..3b961054544 100644
--- a/homeassistant/components/fints/sensor.py
+++ b/homeassistant/components/fints/sensor.py
@@ -3,7 +3,6 @@ from __future__ import annotations
 
 from collections import namedtuple
 from datetime import timedelta
-from functools import cached_property
 import logging
 from typing import Any
 
@@ -11,6 +10,7 @@ from fints.client import FinTS3PinTanClient
 from fints.models import SEPAAccount
 import voluptuous as vol
 
+from homeassistant.backports.functools import cached_property
 from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity
 from homeassistant.const import CONF_NAME, CONF_PIN, CONF_URL, CONF_USERNAME
 from homeassistant.core import HomeAssistant
diff --git a/homeassistant/components/fireservicerota/binary_sensor.py b/homeassistant/components/fireservicerota/binary_sensor.py
index 9e4d5b123f5..27f2c4a4526 100644
--- a/homeassistant/components/fireservicerota/binary_sensor.py
+++ b/homeassistant/components/fireservicerota/binary_sensor.py
@@ -35,6 +35,9 @@ async def async_setup_entry(
 class ResponseBinarySensor(CoordinatorEntity, BinarySensorEntity):
     """Representation of an FireServiceRota sensor."""
 
+    _attr_has_entity_name = True
+    _attr_translation_key = "duty"
+
     def __init__(
         self,
         coordinator: DataUpdateCoordinator,
@@ -44,15 +47,10 @@ class ResponseBinarySensor(CoordinatorEntity, BinarySensorEntity):
         """Initialize."""
         super().__init__(coordinator)
         self._client = client
-        self._unique_id = f"{entry.unique_id}_Duty"
+        self._attr_unique_id = f"{entry.unique_id}_Duty"
 
         self._state: bool | None = None
 
-    @property
-    def name(self) -> str:
-        """Return the name of the sensor."""
-        return "Duty"
-
     @property
     def icon(self) -> str:
         """Return the icon to use in the frontend."""
@@ -61,11 +59,6 @@ class ResponseBinarySensor(CoordinatorEntity, BinarySensorEntity):
 
         return "mdi:calendar-remove"
 
-    @property
-    def unique_id(self) -> str:
-        """Return the unique ID for this binary sensor."""
-        return self._unique_id
-
     @property
     def is_on(self) -> bool | None:
         """Return the state of the binary sensor."""
diff --git a/homeassistant/components/fireservicerota/sensor.py b/homeassistant/components/fireservicerota/sensor.py
index 20f8589d2a2..797e39e99cd 100644
--- a/homeassistant/components/fireservicerota/sensor.py
+++ b/homeassistant/components/fireservicerota/sensor.py
@@ -28,20 +28,17 @@ class IncidentsSensor(RestoreEntity, SensorEntity):
     """Representation of FireServiceRota incidents sensor."""
 
     _attr_should_poll = False
+    _attr_has_entity_name = True
+    _attr_translation_key = "incidents"
 
     def __init__(self, client):
         """Initialize."""
         self._client = client
         self._entry_id = self._client.entry_id
-        self._unique_id = f"{self._client.unique_id}_Incidents"
+        self._attr_unique_id = f"{self._client.unique_id}_Incidents"
         self._state = None
         self._state_attributes = {}
 
-    @property
-    def name(self) -> str:
-        """Return the name of the sensor."""
-        return "Incidents"
-
     @property
     def icon(self) -> str:
         """Return the icon to use in the frontend."""
@@ -58,11 +55,6 @@ class IncidentsSensor(RestoreEntity, SensorEntity):
         """Return the state of the sensor."""
         return self._state
 
-    @property
-    def unique_id(self) -> str:
-        """Return the unique ID of the sensor."""
-        return self._unique_id
-
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return available attributes for sensor."""
diff --git a/homeassistant/components/fireservicerota/strings.json b/homeassistant/components/fireservicerota/strings.json
index 7c60b438264..7b4bd583b63 100644
--- a/homeassistant/components/fireservicerota/strings.json
+++ b/homeassistant/components/fireservicerota/strings.json
@@ -25,5 +25,22 @@
     "create_entry": {
       "default": "[%key:common::config_flow::create_entry::authenticated%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "duty": {
+        "name": "Duty"
+      }
+    },
+    "sensor": {
+      "incidents": {
+        "name": "Incidents"
+      }
+    },
+    "switch": {
+      "incident_response": {
+        "name": "Incident response"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/fireservicerota/switch.py b/homeassistant/components/fireservicerota/switch.py
index 49c6d577b30..7409b2e53b4 100644
--- a/homeassistant/components/fireservicerota/switch.py
+++ b/homeassistant/components/fireservicerota/switch.py
@@ -28,23 +28,20 @@ class ResponseSwitch(SwitchEntity):
     """Representation of an FireServiceRota switch."""
 
     _attr_should_poll = False
+    _attr_has_entity_name = True
+    _attr_translation_key = "incident_response"
 
     def __init__(self, coordinator, client, entry):
         """Initialize."""
         self._coordinator = coordinator
         self._client = client
-        self._unique_id = f"{entry.unique_id}_Response"
+        self._attr_unique_id = f"{entry.unique_id}_Response"
         self._entry_id = entry.entry_id
 
         self._state = None
         self._state_attributes = {}
         self._state_icon = None
 
-    @property
-    def name(self) -> str:
-        """Return the name of the switch."""
-        return "Incident Response"
-
     @property
     def icon(self) -> str:
         """Return the icon to use in the frontend."""
@@ -60,11 +57,6 @@ class ResponseSwitch(SwitchEntity):
         """Get the assumed state of the switch."""
         return self._state
 
-    @property
-    def unique_id(self) -> str:
-        """Return the unique ID for this switch."""
-        return self._unique_id
-
     @property
     def available(self) -> bool:
         """Return if switch is available."""
diff --git a/homeassistant/components/fitbit/sensor.py b/homeassistant/components/fitbit/sensor.py
index c53c01c84a7..11946c42173 100644
--- a/homeassistant/components/fitbit/sensor.py
+++ b/homeassistant/components/fitbit/sensor.py
@@ -442,14 +442,13 @@ class FitbitSensor(SensorEntity):
                     self._attr_native_value = f"{hours}:{minutes:02d} {setting}"
                 else:
                     self._attr_native_value = raw_state
+            elif self.is_metric:
+                self._attr_native_value = raw_state
             else:
-                if self.is_metric:
+                try:
+                    self._attr_native_value = int(raw_state)
+                except TypeError:
                     self._attr_native_value = raw_state
-                else:
-                    try:
-                        self._attr_native_value = int(raw_state)
-                    except TypeError:
-                        self._attr_native_value = raw_state
 
         if resource_type == "activities/heart":
             self._attr_native_value = (
diff --git a/homeassistant/components/fivem/__init__.py b/homeassistant/components/fivem/__init__.py
index 7b0ae2e2758..93adda2b4fd 100644
--- a/homeassistant/components/fivem/__init__.py
+++ b/homeassistant/components/fivem/__init__.py
@@ -1,36 +1,19 @@
 """The FiveM integration."""
 from __future__ import annotations
 
-from collections.abc import Mapping
-from dataclasses import dataclass
-from datetime import timedelta
 import logging
-from typing import Any
 
-from fivem import FiveM, FiveMServerOfflineError
+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 homeassistant.helpers.entity import DeviceInfo, EntityDescription
-from homeassistant.helpers.update_coordinator import (
-    CoordinatorEntity,
-    DataUpdateCoordinator,
-    UpdateFailed,
-)
 
 from .const import (
-    ATTR_PLAYERS_LIST,
-    ATTR_RESOURCES_LIST,
     DOMAIN,
-    MANUFACTURER,
-    NAME_PLAYERS_MAX,
-    NAME_PLAYERS_ONLINE,
-    NAME_RESOURCES,
-    NAME_STATUS,
-    SCAN_INTERVAL,
 )
+from .coordinator import FiveMDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
@@ -67,98 +50,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         hass.data[DOMAIN].pop(entry.entry_id)
 
     return unload_ok
-
-
-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:
-        """Initialize server instance."""
-        self.unique_id = unique_id
-        self.server = None
-        self.version = None
-        self.game_name: str | None = None
-
-        self.host = config_data[CONF_HOST]
-
-        self._fivem = FiveM(self.host, config_data[CONF_PORT])
-
-        update_interval = timedelta(seconds=SCAN_INTERVAL)
-
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
-
-    async def initialize(self) -> None:
-        """Initialize the FiveM server."""
-        info = await self._fivem.get_info_raw()
-        self.server = info["server"]
-        self.version = info["version"]
-        self.game_name = info["vars"]["gamename"]
-
-    async def _async_update_data(self) -> dict[str, Any]:
-        """Get server data from 3rd party library and update properties."""
-        try:
-            server = await self._fivem.get_server()
-        except FiveMServerOfflineError as err:
-            raise UpdateFailed from err
-
-        players_list: list[str] = []
-        for player in server.players:
-            players_list.append(player.name)
-        players_list.sort()
-
-        resources_list = server.resources
-        resources_list.sort()
-
-        return {
-            NAME_PLAYERS_ONLINE: len(players_list),
-            NAME_PLAYERS_MAX: server.max_players,
-            NAME_RESOURCES: len(resources_list),
-            NAME_STATUS: self.last_update_success,
-            ATTR_PLAYERS_LIST: players_list,
-            ATTR_RESOURCES_LIST: resources_list,
-        }
-
-
-@dataclass
-class FiveMEntityDescription(EntityDescription):
-    """Describes FiveM entity."""
-
-    extra_attrs: list[str] | None = None
-
-
-class FiveMEntity(CoordinatorEntity[FiveMDataUpdateCoordinator]):
-    """Representation of a FiveM base entity."""
-
-    entity_description: FiveMEntityDescription
-
-    def __init__(
-        self,
-        coordinator: FiveMDataUpdateCoordinator,
-        description: FiveMEntityDescription,
-    ) -> None:
-        """Initialize base entity."""
-        super().__init__(coordinator)
-        self.entity_description = description
-
-        self._attr_name = f"{self.coordinator.host} {description.name}"
-        self._attr_unique_id = f"{self.coordinator.unique_id}-{description.key}".lower()
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self.coordinator.unique_id)},
-            manufacturer=MANUFACTURER,
-            model=self.coordinator.server,
-            name=self.coordinator.host,
-            sw_version=self.coordinator.version,
-        )
-
-    @property
-    def extra_state_attributes(self) -> Mapping[str, Any] | None:
-        """Return the extra attributes of the sensor."""
-        if self.entity_description.extra_attrs is None:
-            return None
-
-        return {
-            attr: self.coordinator.data[attr]
-            for attr in self.entity_description.extra_attrs
-        }
diff --git a/homeassistant/components/fivem/binary_sensor.py b/homeassistant/components/fivem/binary_sensor.py
index f3f253fe530..153732d2ce5 100644
--- a/homeassistant/components/fivem/binary_sensor.py
+++ b/homeassistant/components/fivem/binary_sensor.py
@@ -10,8 +10,8 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import FiveMEntity, FiveMEntityDescription
 from .const import DOMAIN, NAME_STATUS
+from .entity import FiveMEntity, FiveMEntityDescription
 
 
 @dataclass
@@ -24,7 +24,7 @@ class FiveMBinarySensorEntityDescription(
 BINARY_SENSORS: tuple[FiveMBinarySensorEntityDescription, ...] = (
     FiveMBinarySensorEntityDescription(
         key=NAME_STATUS,
-        name=NAME_STATUS,
+        translation_key="status",
         device_class=BinarySensorDeviceClass.CONNECTIVITY,
     ),
 )
diff --git a/homeassistant/components/fivem/coordinator.py b/homeassistant/components/fivem/coordinator.py
new file mode 100644
index 00000000000..e7fa4c426db
--- /dev/null
+++ b/homeassistant/components/fivem/coordinator.py
@@ -0,0 +1,81 @@
+"""The FiveM update coordinator."""
+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.const import CONF_HOST, CONF_PORT
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import (
+    DataUpdateCoordinator,
+    UpdateFailed,
+)
+
+from .const import (
+    ATTR_PLAYERS_LIST,
+    ATTR_RESOURCES_LIST,
+    DOMAIN,
+    NAME_PLAYERS_MAX,
+    NAME_PLAYERS_ONLINE,
+    NAME_RESOURCES,
+    NAME_STATUS,
+    SCAN_INTERVAL,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+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:
+        """Initialize server instance."""
+        self.unique_id = unique_id
+        self.server = None
+        self.version = None
+        self.game_name: str | None = None
+
+        self.host = config_data[CONF_HOST]
+
+        self._fivem = FiveM(self.host, config_data[CONF_PORT])
+
+        update_interval = timedelta(seconds=SCAN_INTERVAL)
+
+        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
+
+    async def initialize(self) -> None:
+        """Initialize the FiveM server."""
+        info = await self._fivem.get_info_raw()
+        self.server = info["server"]
+        self.version = info["version"]
+        self.game_name = info["vars"]["gamename"]
+
+    async def _async_update_data(self) -> dict[str, Any]:
+        """Get server data from 3rd party library and update properties."""
+        try:
+            server = await self._fivem.get_server()
+        except FiveMServerOfflineError as err:
+            raise UpdateFailed from err
+
+        players_list: list[str] = []
+        for player in server.players:
+            players_list.append(player.name)
+        players_list.sort()
+
+        resources_list = server.resources
+        resources_list.sort()
+
+        return {
+            NAME_PLAYERS_ONLINE: len(players_list),
+            NAME_PLAYERS_MAX: server.max_players,
+            NAME_RESOURCES: len(resources_list),
+            NAME_STATUS: self.last_update_success,
+            ATTR_PLAYERS_LIST: players_list,
+            ATTR_RESOURCES_LIST: resources_list,
+        }
diff --git a/homeassistant/components/fivem/entity.py b/homeassistant/components/fivem/entity.py
new file mode 100644
index 00000000000..53c35716276
--- /dev/null
+++ b/homeassistant/components/fivem/entity.py
@@ -0,0 +1,64 @@
+"""The FiveM entity."""
+from __future__ import annotations
+
+from collections.abc import Mapping
+from dataclasses import dataclass
+import logging
+from typing import Any
+
+from homeassistant.helpers.entity import DeviceInfo, EntityDescription
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+)
+
+from .const import (
+    DOMAIN,
+    MANUFACTURER,
+)
+from .coordinator import FiveMDataUpdateCoordinator
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@dataclass
+class FiveMEntityDescription(EntityDescription):
+    """Describes FiveM entity."""
+
+    extra_attrs: list[str] | None = None
+
+
+class FiveMEntity(CoordinatorEntity[FiveMDataUpdateCoordinator]):
+    """Representation of a FiveM base entity."""
+
+    _attr_has_entity_name = True
+
+    entity_description: FiveMEntityDescription
+
+    def __init__(
+        self,
+        coordinator: FiveMDataUpdateCoordinator,
+        description: FiveMEntityDescription,
+    ) -> None:
+        """Initialize base entity."""
+        super().__init__(coordinator)
+        self.entity_description = description
+
+        self._attr_unique_id = f"{self.coordinator.unique_id}-{description.key}".lower()
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, self.coordinator.unique_id)},
+            manufacturer=MANUFACTURER,
+            model=self.coordinator.server,
+            name=self.coordinator.host,
+            sw_version=self.coordinator.version,
+        )
+
+    @property
+    def extra_state_attributes(self) -> Mapping[str, Any] | None:
+        """Return the extra attributes of the sensor."""
+        if self.entity_description.extra_attrs is None:
+            return None
+
+        return {
+            attr: self.coordinator.data[attr]
+            for attr in self.entity_description.extra_attrs
+        }
diff --git a/homeassistant/components/fivem/sensor.py b/homeassistant/components/fivem/sensor.py
index 9afe5890162..1c4e4b77c45 100644
--- a/homeassistant/components/fivem/sensor.py
+++ b/homeassistant/components/fivem/sensor.py
@@ -7,7 +7,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import FiveMEntity, FiveMEntityDescription
 from .const import (
     ATTR_PLAYERS_LIST,
     ATTR_RESOURCES_LIST,
@@ -22,6 +21,7 @@ from .const import (
     UNIT_PLAYERS_ONLINE,
     UNIT_RESOURCES,
 )
+from .entity import FiveMEntity, FiveMEntityDescription
 
 
 @dataclass
@@ -32,20 +32,20 @@ class FiveMSensorEntityDescription(SensorEntityDescription, FiveMEntityDescripti
 SENSORS: tuple[FiveMSensorEntityDescription, ...] = (
     FiveMSensorEntityDescription(
         key=NAME_PLAYERS_MAX,
-        name=NAME_PLAYERS_MAX,
+        translation_key="max_players",
         icon=ICON_PLAYERS_MAX,
         native_unit_of_measurement=UNIT_PLAYERS_MAX,
     ),
     FiveMSensorEntityDescription(
         key=NAME_PLAYERS_ONLINE,
-        name=NAME_PLAYERS_ONLINE,
+        translation_key="online_players",
         icon=ICON_PLAYERS_ONLINE,
         native_unit_of_measurement=UNIT_PLAYERS_ONLINE,
         extra_attrs=[ATTR_PLAYERS_LIST],
     ),
     FiveMSensorEntityDescription(
         key=NAME_RESOURCES,
-        name=NAME_RESOURCES,
+        translation_key="resources",
         icon=ICON_RESOURCES,
         native_unit_of_measurement=UNIT_RESOURCES,
         extra_attrs=[ATTR_RESOURCES_LIST],
diff --git a/homeassistant/components/fivem/strings.json b/homeassistant/components/fivem/strings.json
index 4378ef535bd..2ffb401f8c0 100644
--- a/homeassistant/components/fivem/strings.json
+++ b/homeassistant/components/fivem/strings.json
@@ -17,5 +17,23 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "status": {
+        "name": "Status"
+      }
+    },
+    "sensor": {
+      "max_players": {
+        "name": "Players max"
+      },
+      "online_players": {
+        "name": "Players online"
+      },
+      "resources": {
+        "name": "Resources"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/fjaraskupan/__init__.py b/homeassistant/components/fjaraskupan/__init__.py
index 044d17662cf..e867e624e8a 100644
--- a/homeassistant/components/fjaraskupan/__init__.py
+++ b/homeassistant/components/fjaraskupan/__init__.py
@@ -1,28 +1,23 @@
 """The Fjäråskupan integration."""
 from __future__ import annotations
 
-from collections.abc import AsyncIterator, Callable
-from contextlib import asynccontextmanager
+from collections.abc import Callable
 from dataclasses import dataclass
-from datetime import timedelta
 import logging
 
-from fjaraskupan import Device, State
+from fjaraskupan import Device
 
 from homeassistant.components.bluetooth import (
     BluetoothCallbackMatcher,
     BluetoothChange,
     BluetoothScanningMode,
     BluetoothServiceInfoBleak,
-    async_address_present,
-    async_ble_device_from_address,
     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.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
@@ -30,14 +25,9 @@ from homeassistant.helpers.dispatcher import (
 )
 from homeassistant.helpers.entity import DeviceInfo, Entity
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DISPATCH_DETECTION, DOMAIN
-
-
-class UnableToConnect(HomeAssistantError):
-    """Exception to indicate that we cannot connect to device."""
-
+from .coordinator import FjaraskupanCoordinator
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -50,81 +40,11 @@ PLATFORMS = [
 _LOGGER = logging.getLogger(__name__)
 
 
-class Coordinator(DataUpdateCoordinator[State]):
-    """Update coordinator for each device."""
-
-    def __init__(
-        self, hass: HomeAssistant, device: Device, device_info: DeviceInfo
-    ) -> None:
-        """Initialize the coordinator."""
-        self.device = device
-        self.device_info = device_info
-        self._refresh_was_scheduled = False
-
-        super().__init__(
-            hass, _LOGGER, name="Fjäråskupan", update_interval=timedelta(seconds=120)
-        )
-
-    async def _async_refresh(
-        self,
-        log_failures: bool = True,
-        raise_on_auth_failed: bool = False,
-        scheduled: bool = False,
-        raise_on_entry_error: bool = False,
-    ) -> None:
-        self._refresh_was_scheduled = scheduled
-        await super()._async_refresh(
-            log_failures=log_failures,
-            raise_on_auth_failed=raise_on_auth_failed,
-            scheduled=scheduled,
-            raise_on_entry_error=raise_on_entry_error,
-        )
-
-    async def _async_update_data(self) -> State:
-        """Handle an explicit update request."""
-        if self._refresh_was_scheduled:
-            if async_address_present(self.hass, self.device.address, False):
-                return self.device.state
-            raise UpdateFailed(
-                "No data received within schedule, and device is no longer present"
-            )
-
-        if (
-            ble_device := async_ble_device_from_address(
-                self.hass, self.device.address, True
-            )
-        ) is None:
-            raise UpdateFailed("No connectable path to device")
-        async with self.device.connect(ble_device) as device:
-            await device.update()
-        return self.device.state
-
-    def detection_callback(self, service_info: BluetoothServiceInfoBleak) -> None:
-        """Handle a new announcement of data."""
-        self.device.detection_callback(service_info.device, service_info.advertisement)
-        self.async_set_updated_data(self.device.state)
-
-    @asynccontextmanager
-    async def async_connect_and_update(self) -> AsyncIterator[Device]:
-        """Provide an up to date device for use during connections."""
-        if (
-            ble_device := async_ble_device_from_address(
-                self.hass, self.device.address, True
-            )
-        ) is None:
-            raise UnableToConnect("No connectable path to device")
-
-        async with self.device.connect(ble_device) as device:
-            yield device
-
-        self.async_set_updated_data(self.device.state)
-
-
 @dataclass
 class EntryState:
     """Store state of config entry."""
 
-    coordinators: dict[str, Coordinator]
+    coordinators: dict[str, FjaraskupanCoordinator]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
@@ -153,7 +73,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
                 name="Fjäråskupan",
             )
 
-            coordinator: Coordinator = Coordinator(hass, device, device_info)
+            coordinator: FjaraskupanCoordinator = FjaraskupanCoordinator(
+                hass, device, device_info
+            )
             coordinator.detection_callback(service_info)
 
             state.coordinators[service_info.address] = coordinator
@@ -183,7 +105,7 @@ def async_setup_entry_platform(
     hass: HomeAssistant,
     entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    constructor: Callable[[Coordinator], list[Entity]],
+    constructor: Callable[[FjaraskupanCoordinator], list[Entity]],
 ) -> None:
     """Set up a platform with added entities."""
 
@@ -195,7 +117,7 @@ def async_setup_entry_platform(
     )
 
     @callback
-    def _detection(coordinator: Coordinator) -> None:
+    def _detection(coordinator: FjaraskupanCoordinator) -> None:
         async_add_entities(constructor(coordinator))
 
     entry.async_on_unload(
diff --git a/homeassistant/components/fjaraskupan/binary_sensor.py b/homeassistant/components/fjaraskupan/binary_sensor.py
index 0ea5c1669db..8b641013eb4 100644
--- a/homeassistant/components/fjaraskupan/binary_sensor.py
+++ b/homeassistant/components/fjaraskupan/binary_sensor.py
@@ -17,7 +17,8 @@ from homeassistant.helpers.entity import DeviceInfo, Entity
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import Coordinator, async_setup_entry_platform
+from . import async_setup_entry_platform
+from .coordinator import FjaraskupanCoordinator
 
 
 @dataclass
@@ -30,13 +31,13 @@ class EntityDescription(BinarySensorEntityDescription):
 SENSORS = (
     EntityDescription(
         key="grease-filter",
-        name="Grease filter",
+        translation_key="grease_filter",
         device_class=BinarySensorDeviceClass.PROBLEM,
         is_on=lambda state: state.grease_filter_full,
     ),
     EntityDescription(
         key="carbon-filter",
-        name="Carbon filter",
+        translation_key="carbon_filter",
         device_class=BinarySensorDeviceClass.PROBLEM,
         is_on=lambda state: state.carbon_filter_full,
     ),
@@ -50,7 +51,7 @@ async def async_setup_entry(
 ) -> None:
     """Set up sensors dynamically through discovery."""
 
-    def _constructor(coordinator: Coordinator) -> list[Entity]:
+    def _constructor(coordinator: FjaraskupanCoordinator) -> list[Entity]:
         return [
             BinarySensor(
                 coordinator,
@@ -64,7 +65,7 @@ async def async_setup_entry(
     async_setup_entry_platform(hass, config_entry, async_add_entities, _constructor)
 
 
-class BinarySensor(CoordinatorEntity[Coordinator], BinarySensorEntity):
+class BinarySensor(CoordinatorEntity[FjaraskupanCoordinator], BinarySensorEntity):
     """Grease filter sensor."""
 
     entity_description: EntityDescription
@@ -72,7 +73,7 @@ class BinarySensor(CoordinatorEntity[Coordinator], BinarySensorEntity):
 
     def __init__(
         self,
-        coordinator: Coordinator,
+        coordinator: FjaraskupanCoordinator,
         device: Device,
         device_info: DeviceInfo,
         entity_description: EntityDescription,
diff --git a/homeassistant/components/fjaraskupan/coordinator.py b/homeassistant/components/fjaraskupan/coordinator.py
new file mode 100644
index 00000000000..16e8157b094
--- /dev/null
+++ b/homeassistant/components/fjaraskupan/coordinator.py
@@ -0,0 +1,95 @@
+"""The Fjäråskupan data update coordinator."""
+from __future__ import annotations
+
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
+from datetime import timedelta
+import logging
+
+from fjaraskupan import Device, State
+
+from homeassistant.components.bluetooth import (
+    BluetoothServiceInfoBleak,
+    async_address_present,
+    async_ble_device_from_address,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class UnableToConnect(HomeAssistantError):
+    """Exception to indicate that we cannot connect to device."""
+
+
+class FjaraskupanCoordinator(DataUpdateCoordinator[State]):
+    """Update coordinator for each device."""
+
+    def __init__(
+        self, hass: HomeAssistant, device: Device, device_info: DeviceInfo
+    ) -> None:
+        """Initialize the coordinator."""
+        self.device = device
+        self.device_info = device_info
+        self._refresh_was_scheduled = False
+
+        super().__init__(
+            hass, _LOGGER, name="Fjäråskupan", update_interval=timedelta(seconds=120)
+        )
+
+    async def _async_refresh(
+        self,
+        log_failures: bool = True,
+        raise_on_auth_failed: bool = False,
+        scheduled: bool = False,
+        raise_on_entry_error: bool = False,
+    ) -> None:
+        self._refresh_was_scheduled = scheduled
+        await super()._async_refresh(
+            log_failures=log_failures,
+            raise_on_auth_failed=raise_on_auth_failed,
+            scheduled=scheduled,
+            raise_on_entry_error=raise_on_entry_error,
+        )
+
+    async def _async_update_data(self) -> State:
+        """Handle an explicit update request."""
+        if self._refresh_was_scheduled:
+            if async_address_present(self.hass, self.device.address, False):
+                return self.device.state
+            raise UpdateFailed(
+                "No data received within schedule, and device is no longer present"
+            )
+
+        if (
+            ble_device := async_ble_device_from_address(
+                self.hass, self.device.address, True
+            )
+        ) is None:
+            raise UpdateFailed("No connectable path to device")
+        async with self.device.connect(ble_device) as device:
+            await device.update()
+        return self.device.state
+
+    def detection_callback(self, service_info: BluetoothServiceInfoBleak) -> None:
+        """Handle a new announcement of data."""
+        self.device.detection_callback(service_info.device, service_info.advertisement)
+        self.async_set_updated_data(self.device.state)
+
+    @asynccontextmanager
+    async def async_connect_and_update(self) -> AsyncIterator[Device]:
+        """Provide an up-to-date device for use during connections."""
+        if (
+            ble_device := async_ble_device_from_address(
+                self.hass, self.device.address, True
+            )
+        ) is None:
+            raise UnableToConnect("No connectable path to device")
+
+        async with self.device.connect(ble_device) as device:
+            yield device
+
+        self.async_set_updated_data(self.device.state)
diff --git a/homeassistant/components/fjaraskupan/fan.py b/homeassistant/components/fjaraskupan/fan.py
index c856a94fa07..e19a0965524 100644
--- a/homeassistant/components/fjaraskupan/fan.py
+++ b/homeassistant/components/fjaraskupan/fan.py
@@ -23,7 +23,8 @@ from homeassistant.util.percentage import (
     percentage_to_ordered_list_item,
 )
 
-from . import Coordinator, async_setup_entry_platform
+from . import async_setup_entry_platform
+from .coordinator import FjaraskupanCoordinator
 
 ORDERED_NAMED_FAN_SPEEDS = ["1", "2", "3", "4", "5", "6", "7", "8"]
 
@@ -54,21 +55,22 @@ async def async_setup_entry(
 ) -> None:
     """Set up sensors dynamically through discovery."""
 
-    def _constructor(coordinator: Coordinator):
+    def _constructor(coordinator: FjaraskupanCoordinator):
         return [Fan(coordinator, coordinator.device_info)]
 
     async_setup_entry_platform(hass, config_entry, async_add_entities, _constructor)
 
 
-class Fan(CoordinatorEntity[Coordinator], FanEntity):
+class Fan(CoordinatorEntity[FjaraskupanCoordinator], FanEntity):
     """Fan entity."""
 
     _attr_supported_features = FanEntityFeature.SET_SPEED | FanEntityFeature.PRESET_MODE
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
-        coordinator: Coordinator,
+        coordinator: FjaraskupanCoordinator,
         device_info: DeviceInfo,
     ) -> None:
         """Init fan entity."""
diff --git a/homeassistant/components/fjaraskupan/light.py b/homeassistant/components/fjaraskupan/light.py
index b6028e017d4..f4aa8c5a2dc 100644
--- a/homeassistant/components/fjaraskupan/light.py
+++ b/homeassistant/components/fjaraskupan/light.py
@@ -12,7 +12,8 @@ from homeassistant.helpers.entity import DeviceInfo, Entity
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import Coordinator, async_setup_entry_platform
+from . import async_setup_entry_platform
+from .coordinator import FjaraskupanCoordinator
 
 
 async def async_setup_entry(
@@ -22,20 +23,21 @@ async def async_setup_entry(
 ) -> None:
     """Set up tuya sensors dynamically through tuya discovery."""
 
-    def _constructor(coordinator: Coordinator) -> list[Entity]:
+    def _constructor(coordinator: FjaraskupanCoordinator) -> list[Entity]:
         return [Light(coordinator, coordinator.device_info)]
 
     async_setup_entry_platform(hass, config_entry, async_add_entities, _constructor)
 
 
-class Light(CoordinatorEntity[Coordinator], LightEntity):
+class Light(CoordinatorEntity[FjaraskupanCoordinator], LightEntity):
     """Light device."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
-        coordinator: Coordinator,
+        coordinator: FjaraskupanCoordinator,
         device_info: DeviceInfo,
     ) -> None:
         """Init light entity."""
@@ -50,9 +52,8 @@ class Light(CoordinatorEntity[Coordinator], LightEntity):
         async with self.coordinator.async_connect_and_update() as device:
             if ATTR_BRIGHTNESS in kwargs:
                 await device.send_dim(int(kwargs[ATTR_BRIGHTNESS] * (100.0 / 255.0)))
-            else:
-                if not self.is_on:
-                    await device.send_command(COMMAND_LIGHT_ON_OFF)
+            elif not self.is_on:
+                await device.send_command(COMMAND_LIGHT_ON_OFF)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the entity off."""
diff --git a/homeassistant/components/fjaraskupan/number.py b/homeassistant/components/fjaraskupan/number.py
index a7f9226b57a..46c5f6db90b 100644
--- a/homeassistant/components/fjaraskupan/number.py
+++ b/homeassistant/components/fjaraskupan/number.py
@@ -9,7 +9,8 @@ from homeassistant.helpers.entity import DeviceInfo, Entity
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import Coordinator, async_setup_entry_platform
+from . import async_setup_entry_platform
+from .coordinator import FjaraskupanCoordinator
 
 
 async def async_setup_entry(
@@ -19,7 +20,7 @@ async def async_setup_entry(
 ) -> None:
     """Set up number entities dynamically through discovery."""
 
-    def _constructor(coordinator: Coordinator) -> list[Entity]:
+    def _constructor(coordinator: FjaraskupanCoordinator) -> list[Entity]:
         return [
             PeriodicVentingTime(coordinator, coordinator.device_info),
         ]
@@ -27,7 +28,7 @@ async def async_setup_entry(
     async_setup_entry_platform(hass, config_entry, async_add_entities, _constructor)
 
 
-class PeriodicVentingTime(CoordinatorEntity[Coordinator], NumberEntity):
+class PeriodicVentingTime(CoordinatorEntity[FjaraskupanCoordinator], NumberEntity):
     """Periodic Venting."""
 
     _attr_has_entity_name = True
@@ -37,17 +38,17 @@ class PeriodicVentingTime(CoordinatorEntity[Coordinator], NumberEntity):
     _attr_native_step: float = 1
     _attr_entity_category = EntityCategory.CONFIG
     _attr_native_unit_of_measurement = UnitOfTime.MINUTES
+    _attr_translation_key = "periodic_venting"
 
     def __init__(
         self,
-        coordinator: Coordinator,
+        coordinator: FjaraskupanCoordinator,
         device_info: DeviceInfo,
     ) -> None:
         """Init number entities."""
         super().__init__(coordinator)
         self._attr_unique_id = f"{coordinator.device.address}-periodic-venting"
         self._attr_device_info = device_info
-        self._attr_name = "Periodic venting"
 
     @property
     def native_value(self) -> float | None:
diff --git a/homeassistant/components/fjaraskupan/sensor.py b/homeassistant/components/fjaraskupan/sensor.py
index e06790bf9ac..e9bf84e0ed0 100644
--- a/homeassistant/components/fjaraskupan/sensor.py
+++ b/homeassistant/components/fjaraskupan/sensor.py
@@ -16,7 +16,8 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import Coordinator, async_setup_entry_platform
+from . import async_setup_entry_platform
+from .coordinator import FjaraskupanCoordinator
 
 
 async def async_setup_entry(
@@ -26,20 +27,25 @@ async def async_setup_entry(
 ) -> None:
     """Set up sensors dynamically through discovery."""
 
-    def _constructor(coordinator: Coordinator) -> list[Entity]:
+    def _constructor(coordinator: FjaraskupanCoordinator) -> list[Entity]:
         return [RssiSensor(coordinator, coordinator.device, coordinator.device_info)]
 
     async_setup_entry_platform(hass, config_entry, async_add_entities, _constructor)
 
 
-class RssiSensor(CoordinatorEntity[Coordinator], SensorEntity):
+class RssiSensor(CoordinatorEntity[FjaraskupanCoordinator], SensorEntity):
     """Sensor device."""
 
     _attr_has_entity_name = True
+    _attr_device_class = SensorDeviceClass.SIGNAL_STRENGTH
+    _attr_state_class = SensorStateClass.MEASUREMENT
+    _attr_native_unit_of_measurement = SIGNAL_STRENGTH_DECIBELS_MILLIWATT
+    _attr_entity_registry_enabled_default = False
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
 
     def __init__(
         self,
-        coordinator: Coordinator,
+        coordinator: FjaraskupanCoordinator,
         device: Device,
         device_info: DeviceInfo,
     ) -> None:
@@ -47,12 +53,6 @@ class RssiSensor(CoordinatorEntity[Coordinator], SensorEntity):
         super().__init__(coordinator)
         self._attr_unique_id = f"{device.address}-signal-strength"
         self._attr_device_info = device_info
-        self._attr_name = "Signal strength"
-        self._attr_device_class = SensorDeviceClass.SIGNAL_STRENGTH
-        self._attr_state_class = SensorStateClass.MEASUREMENT
-        self._attr_native_unit_of_measurement = SIGNAL_STRENGTH_DECIBELS_MILLIWATT
-        self._attr_entity_registry_enabled_default = False
-        self._attr_entity_category = EntityCategory.DIAGNOSTIC
 
     @property
     def native_value(self) -> StateType:
diff --git a/homeassistant/components/fjaraskupan/strings.json b/homeassistant/components/fjaraskupan/strings.json
index c6d5edd02d4..d91cc47dea1 100644
--- a/homeassistant/components/fjaraskupan/strings.json
+++ b/homeassistant/components/fjaraskupan/strings.json
@@ -9,5 +9,20 @@
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
       "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "grease_filter": {
+        "name": "Grease filter"
+      },
+      "carbon_filter": {
+        "name": "Carbon filter"
+      }
+    },
+    "number": {
+      "periodic_venting": {
+        "name": "Periodic venting"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/flick_electric/sensor.py b/homeassistant/components/flick_electric/sensor.py
index 18daaa9d4e2..2210f44bf7a 100644
--- a/homeassistant/components/flick_electric/sensor.py
+++ b/homeassistant/components/flick_electric/sensor.py
@@ -8,7 +8,7 @@ from pyflick import FlickAPI, FlickPrice
 
 from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_FRIENDLY_NAME, CURRENCY_CENT, UnitOfEnergy
+from homeassistant.const import CURRENCY_CENT, UnitOfEnergy
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.dt import utcnow
@@ -19,8 +19,6 @@ _LOGGER = logging.getLogger(__name__)
 
 SCAN_INTERVAL = timedelta(minutes=5)
 
-FRIENDLY_NAME = "Flick Power Price"
-
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
@@ -36,19 +34,13 @@ class FlickPricingSensor(SensorEntity):
 
     _attr_attribution = "Data provided by Flick Electric"
     _attr_native_unit_of_measurement = f"{CURRENCY_CENT}/{UnitOfEnergy.KILO_WATT_HOUR}"
+    _attr_translation_key = "power_price"
+    _attributes: dict[str, Any] = {}
 
     def __init__(self, api: FlickAPI) -> None:
         """Entity object for Flick Electric sensor."""
         self._api: FlickAPI = api
         self._price: FlickPrice = None
-        self._attributes: dict[str, Any] = {
-            ATTR_FRIENDLY_NAME: FRIENDLY_NAME,
-        }
-
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return FRIENDLY_NAME
 
     @property
     def native_value(self):
diff --git a/homeassistant/components/flick_electric/strings.json b/homeassistant/components/flick_electric/strings.json
index cb8382539b4..8b55bef939e 100644
--- a/homeassistant/components/flick_electric/strings.json
+++ b/homeassistant/components/flick_electric/strings.json
@@ -19,5 +19,12 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "power_price": {
+        "name": "Flick power price"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/flipr/__init__.py b/homeassistant/components/flipr/__init__.py
index f02911e30d5..9eba3206720 100644
--- a/homeassistant/components/flipr/__init__.py
+++ b/homeassistant/components/flipr/__init__.py
@@ -15,7 +15,7 @@ from homeassistant.helpers.update_coordinator import (
     UpdateFailed,
 )
 
-from .const import ATTRIBUTION, CONF_FLIPR_ID, DOMAIN, MANUFACTURER, NAME
+from .const import ATTRIBUTION, CONF_FLIPR_ID, DOMAIN, MANUFACTURER
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -84,6 +84,7 @@ class FliprEntity(CoordinatorEntity):
     """Implements a common class elements representing the Flipr component."""
 
     _attr_attribution = ATTRIBUTION
+    _attr_has_entity_name = True
 
     def __init__(
         self, coordinator: DataUpdateCoordinator, description: EntityDescription
@@ -98,7 +99,5 @@ class FliprEntity(CoordinatorEntity):
             self._attr_device_info = DeviceInfo(
                 identifiers={(DOMAIN, flipr_id)},
                 manufacturer=MANUFACTURER,
-                name=NAME,
+                name=f"Flipr {flipr_id}",
             )
-
-            self._attr_name = f"Flipr {flipr_id} {description.name}"
diff --git a/homeassistant/components/flipr/binary_sensor.py b/homeassistant/components/flipr/binary_sensor.py
index 646e260bd60..76385167d38 100644
--- a/homeassistant/components/flipr/binary_sensor.py
+++ b/homeassistant/components/flipr/binary_sensor.py
@@ -16,12 +16,12 @@ from .const import DOMAIN
 BINARY_SENSORS_TYPES: tuple[BinarySensorEntityDescription, ...] = (
     BinarySensorEntityDescription(
         key="ph_status",
-        name="PH Status",
+        translation_key="ph_status",
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
     BinarySensorEntityDescription(
         key="chlorine_status",
-        name="Chlorine Status",
+        translation_key="chlorine_status",
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
 )
diff --git a/homeassistant/components/flipr/sensor.py b/homeassistant/components/flipr/sensor.py
index 57044289110..078e581edda 100644
--- a/homeassistant/components/flipr/sensor.py
+++ b/homeassistant/components/flipr/sensor.py
@@ -18,39 +18,38 @@ from .const import DOMAIN
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="chlorine",
-        name="Chlorine",
+        translation_key="chlorine",
         native_unit_of_measurement=UnitOfElectricPotential.MILLIVOLT,
         icon="mdi:pool",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="ph",
-        name="pH",
+        translation_key="ph",
         icon="mdi:pool",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="temperature",
-        name="Water Temp",
+        translation_key="water_temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="date_time",
-        name="Last Measured",
+        translation_key="last_measured",
         device_class=SensorDeviceClass.TIMESTAMP,
     ),
     SensorEntityDescription(
         key="red_ox",
-        name="Red OX",
+        translation_key="red_ox",
         native_unit_of_measurement=UnitOfElectricPotential.MILLIVOLT,
         icon="mdi:pool",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="battery",
-        name="Battery Level",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.BATTERY,
diff --git a/homeassistant/components/flipr/strings.json b/homeassistant/components/flipr/strings.json
index 55feaa691f7..24557ff177b 100644
--- a/homeassistant/components/flipr/strings.json
+++ b/homeassistant/components/flipr/strings.json
@@ -26,5 +26,32 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "ph_status": {
+        "name": "pH status"
+      },
+      "chlorine_status": {
+        "name": "Chlorine status"
+      }
+    },
+    "sensor": {
+      "chlorine": {
+        "name": "Chlorine"
+      },
+      "ph": {
+        "name": "pH"
+      },
+      "water_temperature": {
+        "name": "Water temperature"
+      },
+      "last_measured": {
+        "name": "Last measured"
+      },
+      "red_ox": {
+        "name": "Red OX"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/flo/binary_sensor.py b/homeassistant/components/flo/binary_sensor.py
index f5c051d1a70..d61f67cc623 100644
--- a/homeassistant/components/flo/binary_sensor.py
+++ b/homeassistant/components/flo/binary_sensor.py
@@ -45,10 +45,11 @@ class FloPendingAlertsBinarySensor(FloEntity, BinarySensorEntity):
     """Binary sensor that reports on if there are any pending system alerts."""
 
     _attr_device_class = BinarySensorDeviceClass.PROBLEM
+    _attr_translation_key = "pending_system_alerts"
 
     def __init__(self, device):
         """Initialize the pending alerts binary sensor."""
-        super().__init__("pending_system_alerts", "Pending system alerts", device)
+        super().__init__("pending_system_alerts", device)
 
     @property
     def is_on(self):
@@ -71,10 +72,11 @@ class FloWaterDetectedBinarySensor(FloEntity, BinarySensorEntity):
     """Binary sensor that reports if water is detected (for leak detectors)."""
 
     _attr_device_class = BinarySensorDeviceClass.PROBLEM
+    _attr_translation_key = "water_detected"
 
     def __init__(self, device):
         """Initialize the pending alerts binary sensor."""
-        super().__init__("water_detected", "Water detected", device)
+        super().__init__("water_detected", device)
 
     @property
     def is_on(self):
diff --git a/homeassistant/components/flo/entity.py b/homeassistant/components/flo/entity.py
index 39ad57f5c03..e9d02432598 100644
--- a/homeassistant/components/flo/entity.py
+++ b/homeassistant/components/flo/entity.py
@@ -20,12 +20,10 @@ class FloEntity(Entity):
     def __init__(
         self,
         entity_type: str,
-        name: str,
         device: FloDeviceDataUpdateCoordinator,
         **kwargs,
     ) -> None:
         """Init Flo entity."""
-        self._attr_name = name
         self._attr_unique_id = f"{device.mac_address}_{entity_type}"
 
         self._device: FloDeviceDataUpdateCoordinator = device
diff --git a/homeassistant/components/flo/sensor.py b/homeassistant/components/flo/sensor.py
index 2c89123dac1..f0aca366cfb 100644
--- a/homeassistant/components/flo/sensor.py
+++ b/homeassistant/components/flo/sensor.py
@@ -22,14 +22,6 @@ from .entity import FloEntity
 
 WATER_ICON = "mdi:water"
 GAUGE_ICON = "mdi:gauge"
-NAME_DAILY_USAGE = "Today's water usage"
-NAME_CURRENT_SYSTEM_MODE = "Current system mode"
-NAME_FLOW_RATE = "Water flow rate"
-NAME_WATER_TEMPERATURE = "Water temperature"
-NAME_AIR_TEMPERATURE = "Temperature"
-NAME_WATER_PRESSURE = "Water pressure"
-NAME_HUMIDITY = "Humidity"
-NAME_BATTERY = "Battery"
 
 
 async def async_setup_entry(
@@ -46,7 +38,7 @@ async def async_setup_entry(
         if device.device_type == "puck_oem":
             entities.extend(
                 [
-                    FloTemperatureSensor(NAME_AIR_TEMPERATURE, device),
+                    FloTemperatureSensor(device, False),
                     FloHumiditySensor(device),
                     FloBatterySensor(device),
                 ]
@@ -57,7 +49,7 @@ async def async_setup_entry(
                     FloDailyUsageSensor(device),
                     FloSystemModeSensor(device),
                     FloCurrentFlowRateSensor(device),
-                    FloTemperatureSensor(NAME_WATER_TEMPERATURE, device),
+                    FloTemperatureSensor(device, True),
                     FloPressureSensor(device),
                 ]
             )
@@ -71,10 +63,11 @@ class FloDailyUsageSensor(FloEntity, SensorEntity):
     _attr_native_unit_of_measurement = UnitOfVolume.GALLONS
     _attr_state_class: SensorStateClass = SensorStateClass.TOTAL_INCREASING
     _attr_device_class = SensorDeviceClass.WATER
+    _attr_translation_key = "daily_consumption"
 
     def __init__(self, device):
         """Initialize the daily water usage sensor."""
-        super().__init__("daily_consumption", NAME_DAILY_USAGE, device)
+        super().__init__("daily_consumption", device)
         self._state: float = None
 
     @property
@@ -88,9 +81,11 @@ class FloDailyUsageSensor(FloEntity, SensorEntity):
 class FloSystemModeSensor(FloEntity, SensorEntity):
     """Monitors the current Flo system mode."""
 
+    _attr_translation_key = "current_system_mode"
+
     def __init__(self, device):
         """Initialize the system mode sensor."""
-        super().__init__("current_system_mode", NAME_CURRENT_SYSTEM_MODE, device)
+        super().__init__("current_system_mode", device)
         self._state: str = None
 
     @property
@@ -107,10 +102,11 @@ class FloCurrentFlowRateSensor(FloEntity, SensorEntity):
     _attr_icon = GAUGE_ICON
     _attr_native_unit_of_measurement = "gpm"
     _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT
+    _attr_translation_key = "current_flow_rate"
 
     def __init__(self, device):
         """Initialize the flow rate sensor."""
-        super().__init__("current_flow_rate", NAME_FLOW_RATE, device)
+        super().__init__("current_flow_rate", device)
         self._state: float = None
 
     @property
@@ -128,9 +124,11 @@ class FloTemperatureSensor(FloEntity, SensorEntity):
     _attr_native_unit_of_measurement = UnitOfTemperature.FAHRENHEIT
     _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT
 
-    def __init__(self, name, device):
+    def __init__(self, device, is_water):
         """Initialize the temperature sensor."""
-        super().__init__("temperature", name, device)
+        super().__init__("temperature", device)
+        if is_water:
+            self._attr_translation_key = "water_temperature"
         self._state: float = None
 
     @property
@@ -150,7 +148,7 @@ class FloHumiditySensor(FloEntity, SensorEntity):
 
     def __init__(self, device):
         """Initialize the humidity sensor."""
-        super().__init__("humidity", NAME_HUMIDITY, device)
+        super().__init__("humidity", device)
         self._state: float = None
 
     @property
@@ -167,10 +165,11 @@ class FloPressureSensor(FloEntity, SensorEntity):
     _attr_device_class = SensorDeviceClass.PRESSURE
     _attr_native_unit_of_measurement = UnitOfPressure.PSI
     _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT
+    _attr_translation_key = "water_pressure"
 
     def __init__(self, device):
         """Initialize the pressure sensor."""
-        super().__init__("water_pressure", NAME_WATER_PRESSURE, device)
+        super().__init__("water_pressure", device)
         self._state: float = None
 
     @property
@@ -190,7 +189,7 @@ class FloBatterySensor(FloEntity, SensorEntity):
 
     def __init__(self, device):
         """Initialize the battery sensor."""
-        super().__init__("battery", NAME_BATTERY, device)
+        super().__init__("battery", device)
         self._state: float = None
 
     @property
diff --git a/homeassistant/components/flo/strings.json b/homeassistant/components/flo/strings.json
index d6e3212b4ea..fadfc304fce 100644
--- a/homeassistant/components/flo/strings.json
+++ b/homeassistant/components/flo/strings.json
@@ -17,5 +17,37 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "pending_system_alerts": {
+        "name": "Pending system alerts"
+      },
+      "water_detected": {
+        "name": "Water detected"
+      }
+    },
+    "sensor": {
+      "daily_consumption": {
+        "name": "Today's water usage"
+      },
+      "current_system_mode": {
+        "name": "Current system mode"
+      },
+      "current_flow_rate": {
+        "name": "Water flow rate"
+      },
+      "water_temperature": {
+        "name": "Water temperature"
+      },
+      "water_pressure": {
+        "name": "Water pressure"
+      }
+    },
+    "switch": {
+      "shutoff_valve": {
+        "name": "Shutoff valve"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/flo/switch.py b/homeassistant/components/flo/switch.py
index 84c37bb4987..cd522ed177d 100644
--- a/homeassistant/components/flo/switch.py
+++ b/homeassistant/components/flo/switch.py
@@ -68,9 +68,11 @@ async def async_setup_entry(
 class FloSwitch(FloEntity, SwitchEntity):
     """Switch class for the Flo by Moen valve."""
 
+    _attr_translation_key = "shutoff_valve"
+
     def __init__(self, device: FloDeviceDataUpdateCoordinator) -> None:
         """Initialize the Flo switch."""
-        super().__init__("shutoff_valve", "Shutoff valve", device)
+        super().__init__("shutoff_valve", device)
         self._state = self._device.last_known_valve_state == "open"
 
     @property
diff --git a/homeassistant/components/flume/binary_sensor.py b/homeassistant/components/flume/binary_sensor.py
index 0d7b7b5dd56..453e259bf46 100644
--- a/homeassistant/components/flume/binary_sensor.py
+++ b/homeassistant/components/flume/binary_sensor.py
@@ -34,8 +34,7 @@ from .entity import FlumeEntity
 from .util import get_valid_flume_devices
 
 BINARY_SENSOR_DESCRIPTION_CONNECTED = BinarySensorEntityDescription(
-    name="Connected",
-    key="connected",
+    key="connected", device_class=BinarySensorDeviceClass.CONNECTIVITY
 )
 
 
@@ -56,14 +55,14 @@ class FlumeBinarySensorEntityDescription(
 FLUME_BINARY_NOTIFICATION_SENSORS: tuple[FlumeBinarySensorEntityDescription, ...] = (
     FlumeBinarySensorEntityDescription(
         key="leak",
-        name="Leak detected",
+        translation_key="leak",
         entity_category=EntityCategory.DIAGNOSTIC,
         event_rule=NOTIFICATION_LEAK_DETECTED,
         icon="mdi:pipe-leak",
     ),
     FlumeBinarySensorEntityDescription(
         key="flow",
-        name="High flow",
+        translation_key="flow",
         entity_category=EntityCategory.DIAGNOSTIC,
         event_rule=NOTIFICATION_HIGH_FLOW,
         icon="mdi:waves",
diff --git a/homeassistant/components/flume/manifest.json b/homeassistant/components/flume/manifest.json
index f3b2bacbafe..17a2b0b53be 100644
--- a/homeassistant/components/flume/manifest.json
+++ b/homeassistant/components/flume/manifest.json
@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/flume/",
   "iot_class": "cloud_polling",
   "loggers": ["pyflume"],
-  "requirements": ["pyflume==0.6.5"]
+  "requirements": ["PyFlume==0.6.5"]
 }
diff --git a/homeassistant/components/flume/sensor.py b/homeassistant/components/flume/sensor.py
index b656f5e9715..fc08fee476c 100644
--- a/homeassistant/components/flume/sensor.py
+++ b/homeassistant/components/flume/sensor.py
@@ -1,5 +1,4 @@
 """Sensor for displaying the number of result from Flume."""
-from numbers import Number
 
 from pyflume import FlumeData
 
@@ -34,45 +33,52 @@ from .util import get_valid_flume_devices
 FLUME_QUERIES_SENSOR: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="current_interval",
-        name="Current",
+        translation_key="current_interval",
+        suggested_display_precision=2,
         native_unit_of_measurement=f"{UnitOfVolume.GALLONS}/m",
     ),
     SensorEntityDescription(
         key="month_to_date",
-        name="Current Month",
+        translation_key="month_to_date",
+        suggested_display_precision=2,
         native_unit_of_measurement=UnitOfVolume.GALLONS,
         device_class=SensorDeviceClass.WATER,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="week_to_date",
-        name="Current Week",
+        translation_key="week_to_date",
+        suggested_display_precision=2,
         native_unit_of_measurement=UnitOfVolume.GALLONS,
         device_class=SensorDeviceClass.WATER,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="today",
-        name="Current Day",
+        translation_key="today",
+        suggested_display_precision=2,
         native_unit_of_measurement=UnitOfVolume.GALLONS,
         device_class=SensorDeviceClass.WATER,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="last_60_min",
-        name="60 Minutes",
+        translation_key="last_60_min",
+        suggested_display_precision=2,
         native_unit_of_measurement=f"{UnitOfVolume.GALLONS}/h",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="last_24_hrs",
-        name="24 Hours",
+        translation_key="last_24_hrs",
+        suggested_display_precision=2,
         native_unit_of_measurement=f"{UnitOfVolume.GALLONS}/d",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="last_30_days",
-        name="30 Days",
+        translation_key="last_30_days",
+        suggested_display_precision=2,
         native_unit_of_measurement=f"{UnitOfVolume.GALLONS}/mo",
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -139,8 +145,4 @@ class FlumeSensor(FlumeEntity[FlumeDeviceDataUpdateCoordinator], SensorEntity):
         if sensor_key not in self.coordinator.flume_device.values:
             return None
 
-        return _format_state_value(self.coordinator.flume_device.values[sensor_key])
-
-
-def _format_state_value(value):
-    return round(value, 1) if isinstance(value, Number) else None
+        return self.coordinator.flume_device.values[sensor_key]
diff --git a/homeassistant/components/flume/strings.json b/homeassistant/components/flume/strings.json
index 080f10deee1..2c1a900c091 100644
--- a/homeassistant/components/flume/strings.json
+++ b/homeassistant/components/flume/strings.json
@@ -28,5 +28,38 @@
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "leak": {
+        "name": "Leak detected"
+      },
+      "flow": {
+        "name": "High flow"
+      }
+    },
+    "sensor": {
+      "current_interval": {
+        "name": "Current"
+      },
+      "month_to_date": {
+        "name": "Current month"
+      },
+      "week_to_date": {
+        "name": "Current week"
+      },
+      "today": {
+        "name": "Current day"
+      },
+      "last_60_min": {
+        "name": "60 minutes"
+      },
+      "last_24_hrs": {
+        "name": "24 hours"
+      },
+      "last_30_days": {
+        "name": "30 days"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/flux_led/__init__.py b/homeassistant/components/flux_led/__init__.py
index 94f50caa1a2..100d63d8bf7 100644
--- a/homeassistant/components/flux_led/__init__.py
+++ b/homeassistant/components/flux_led/__init__.py
@@ -14,7 +14,11 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, EVENT_HOMEASSISTANT_STARTED, 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 import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
@@ -71,6 +75,8 @@ NAME_TO_WHITE_CHANNEL_TYPE: Final = {
     option.name.lower(): option for option in WhiteChannelType
 }
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 @callback
 def async_wifi_bulb_for_host(
diff --git a/homeassistant/components/flux_led/button.py b/homeassistant/components/flux_led/button.py
index ead25930c77..eb3a7341d4d 100644
--- a/homeassistant/components/flux_led/button.py
+++ b/homeassistant/components/flux_led/button.py
@@ -10,7 +10,7 @@ from homeassistant.components.button import (
     ButtonEntity,
     ButtonEntityDescription,
 )
-from homeassistant.const import CONF_NAME, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -22,10 +22,13 @@ _RESTART_KEY = "restart"
 _UNPAIR_REMOTES_KEY = "unpair_remotes"
 
 RESTART_BUTTON_DESCRIPTION = ButtonEntityDescription(
-    key=_RESTART_KEY, name="Restart", device_class=ButtonDeviceClass.RESTART
+    key=_RESTART_KEY,
+    device_class=ButtonDeviceClass.RESTART,
 )
 UNPAIR_REMOTES_DESCRIPTION = ButtonEntityDescription(
-    key=_UNPAIR_REMOTES_KEY, name="Unpair Remotes", icon="mdi:remote-off"
+    key=_UNPAIR_REMOTES_KEY,
+    translation_key="unpair_remotes",
+    icon="mdi:remote-off",
 )
 
 
@@ -62,7 +65,6 @@ class FluxButton(FluxBaseEntity, ButtonEntity):
         """Initialize the button."""
         self.entity_description = description
         super().__init__(device, entry)
-        self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} {description.name}"
         base_unique_id = entry.unique_id or entry.entry_id
         self._attr_unique_id = f"{base_unique_id}_{description.key}"
 
diff --git a/homeassistant/components/flux_led/entity.py b/homeassistant/components/flux_led/entity.py
index ef9038b1435..85600dd4dab 100644
--- a/homeassistant/components/flux_led/entity.py
+++ b/homeassistant/components/flux_led/entity.py
@@ -54,6 +54,7 @@ def _async_device_info(
 class FluxBaseEntity(Entity):
     """Representation of a Flux entity without a coordinator."""
 
+    _attr_has_entity_name = True
     _attr_should_poll = False
 
     def __init__(
@@ -70,18 +71,18 @@ class FluxBaseEntity(Entity):
 class FluxEntity(CoordinatorEntity[FluxLedUpdateCoordinator]):
     """Representation of a Flux entity with a coordinator."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: FluxLedUpdateCoordinator,
         base_unique_id: str,
-        name: str,
         key: str | None,
     ) -> None:
         """Initialize the light."""
         super().__init__(coordinator)
         self._device: AIOWifiLedBulb = coordinator.device
         self._responding = True
-        self._attr_name = name
         if key:
             self._attr_unique_id = f"{base_unique_id}_{key}"
         else:
diff --git a/homeassistant/components/flux_led/light.py b/homeassistant/components/flux_led/light.py
index 202f0f95e23..d880d517f1a 100644
--- a/homeassistant/components/flux_led/light.py
+++ b/homeassistant/components/flux_led/light.py
@@ -22,7 +22,6 @@ from homeassistant.components.light import (
     LightEntity,
     LightEntityFeature,
 )
-from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_platform
 import homeassistant.helpers.config_validation as cv
@@ -177,7 +176,6 @@ async def async_setup_entry(
             FluxLight(
                 coordinator,
                 entry.unique_id or entry.entry_id,
-                entry.data.get(CONF_NAME, entry.title),
                 list(custom_effect_colors),
                 options.get(CONF_CUSTOM_EFFECT_SPEED_PCT, DEFAULT_EFFECT_SPEED),
                 options.get(CONF_CUSTOM_EFFECT_TRANSITION, TRANSITION_GRADUAL),
@@ -191,19 +189,20 @@ class FluxLight(
 ):
     """Representation of a Flux light."""
 
+    _attr_name = None
+
     _attr_supported_features = LightEntityFeature.TRANSITION | LightEntityFeature.EFFECT
 
     def __init__(
         self,
         coordinator: FluxLedUpdateCoordinator,
         base_unique_id: str,
-        name: str,
         custom_effect_colors: list[tuple[int, int, int]],
         custom_effect_speed_pct: int,
         custom_effect_transition: str,
     ) -> None:
         """Initialize the light."""
-        super().__init__(coordinator, base_unique_id, name, None)
+        super().__init__(coordinator, base_unique_id, None)
         self._attr_min_mireds = color_temperature_kelvin_to_mired(self._device.max_temp)
         self._attr_max_mireds = color_temperature_kelvin_to_mired(self._device.min_temp)
         self._attr_supported_color_modes = _hass_color_modes(self._device)
diff --git a/homeassistant/components/flux_led/manifest.json b/homeassistant/components/flux_led/manifest.json
index a6e8183bcdb..13f7ba36bcd 100644
--- a/homeassistant/components/flux_led/manifest.json
+++ b/homeassistant/components/flux_led/manifest.json
@@ -51,5 +51,5 @@
   "iot_class": "local_push",
   "loggers": ["flux_led"],
   "quality_scale": "platinum",
-  "requirements": ["flux_led==0.28.37"]
+  "requirements": ["flux-led==0.28.37"]
 }
diff --git a/homeassistant/components/flux_led/number.py b/homeassistant/components/flux_led/number.py
index a5324efe680..ac23fbe64b5 100644
--- a/homeassistant/components/flux_led/number.py
+++ b/homeassistant/components/flux_led/number.py
@@ -18,7 +18,7 @@ from flux_led.protocol import (
 from homeassistant import config_entries
 from homeassistant.components.light import EFFECT_RANDOM
 from homeassistant.components.number import NumberEntity, NumberMode
-from homeassistant.const import CONF_NAME, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.debounce import Debouncer
@@ -50,7 +50,6 @@ async def async_setup_entry(
         | FluxMusicPixelsPerSegmentNumber
         | FluxMusicSegmentsNumber
     ] = []
-    name = entry.data.get(CONF_NAME, entry.title)
     base_unique_id = entry.unique_id or entry.entry_id
 
     if device.pixels_per_segment is not None:
@@ -58,35 +57,25 @@ async def async_setup_entry(
             FluxPixelsPerSegmentNumber(
                 coordinator,
                 base_unique_id,
-                f"{name} Pixels Per Segment",
                 "pixels_per_segment",
             )
         )
     if device.segments is not None:
-        entities.append(
-            FluxSegmentsNumber(
-                coordinator, base_unique_id, f"{name} Segments", "segments"
-            )
-        )
+        entities.append(FluxSegmentsNumber(coordinator, base_unique_id, "segments"))
     if device.music_pixels_per_segment is not None:
         entities.append(
             FluxMusicPixelsPerSegmentNumber(
                 coordinator,
                 base_unique_id,
-                f"{name} Music Pixels Per Segment",
                 "music_pixels_per_segment",
             )
         )
     if device.music_segments is not None:
         entities.append(
-            FluxMusicSegmentsNumber(
-                coordinator, base_unique_id, f"{name} Music Segments", "music_segments"
-            )
+            FluxMusicSegmentsNumber(coordinator, base_unique_id, "music_segments")
         )
     if device.effect_list and device.effect_list != [EFFECT_RANDOM]:
-        entities.append(
-            FluxSpeedNumber(coordinator, base_unique_id, f"{name} Effect Speed", None)
-        )
+        entities.append(FluxSpeedNumber(coordinator, base_unique_id, None))
 
     async_add_entities(entities)
 
@@ -101,6 +90,7 @@ class FluxSpeedNumber(
     _attr_native_step = 1
     _attr_mode = NumberMode.SLIDER
     _attr_icon = "mdi:speedometer"
+    _attr_translation_key = "effect_speed"
 
     @property
     def native_value(self) -> float:
@@ -137,11 +127,10 @@ class FluxConfigNumber(
         self,
         coordinator: FluxLedUpdateCoordinator,
         base_unique_id: str,
-        name: str,
         key: str | None,
     ) -> None:
         """Initialize the flux number."""
-        super().__init__(coordinator, base_unique_id, name, key)
+        super().__init__(coordinator, base_unique_id, key)
         self._debouncer: Debouncer[Coroutine[Any, Any, None]] | None = None
         self._pending_value: int | None = None
 
@@ -185,6 +174,7 @@ class FluxConfigNumber(
 class FluxPixelsPerSegmentNumber(FluxConfigNumber):
     """Defines a flux_led pixels per segment number."""
 
+    _attr_translation_key = "pixels_per_segment"
     _attr_icon = "mdi:dots-grid"
 
     @property
@@ -211,6 +201,7 @@ class FluxPixelsPerSegmentNumber(FluxConfigNumber):
 class FluxSegmentsNumber(FluxConfigNumber):
     """Defines a flux_led segments number."""
 
+    _attr_translation_key = "segments"
     _attr_icon = "mdi:segment"
 
     @property
@@ -245,6 +236,7 @@ class FluxMusicNumber(FluxConfigNumber):
 class FluxMusicPixelsPerSegmentNumber(FluxMusicNumber):
     """Defines a flux_led music pixels per segment number."""
 
+    _attr_translation_key = "music_pixels_per_segment"
     _attr_icon = "mdi:dots-grid"
 
     @property
@@ -273,6 +265,7 @@ class FluxMusicPixelsPerSegmentNumber(FluxMusicNumber):
 class FluxMusicSegmentsNumber(FluxMusicNumber):
     """Defines a flux_led music segments number."""
 
+    _attr_translation_key = "music_segments"
     _attr_icon = "mdi:segment"
 
     @property
diff --git a/homeassistant/components/flux_led/select.py b/homeassistant/components/flux_led/select.py
index 2b23f695b15..cca86e5a216 100644
--- a/homeassistant/components/flux_led/select.py
+++ b/homeassistant/components/flux_led/select.py
@@ -52,30 +52,22 @@ async def async_setup_entry(
         | FluxRemoteConfigSelect
         | FluxWhiteChannelSelect
     ] = []
-    name = entry.data.get(CONF_NAME, entry.title)
+    entry.data.get(CONF_NAME, entry.title)
     base_unique_id = entry.unique_id or entry.entry_id
 
     if device.device_type == DeviceType.Switch:
         entities.append(FluxPowerStateSelect(coordinator.device, entry))
     if device.operating_modes:
         entities.append(
-            FluxOperatingModesSelect(
-                coordinator, base_unique_id, f"{name} Operating Mode", "operating_mode"
-            )
+            FluxOperatingModesSelect(coordinator, base_unique_id, "operating_mode")
         )
     if device.wirings and device.wiring is not None:
-        entities.append(
-            FluxWiringsSelect(coordinator, base_unique_id, f"{name} Wiring", "wiring")
-        )
+        entities.append(FluxWiringsSelect(coordinator, base_unique_id, "wiring"))
     if device.ic_types:
-        entities.append(
-            FluxICTypeSelect(coordinator, base_unique_id, f"{name} IC Type", "ic_type")
-        )
+        entities.append(FluxICTypeSelect(coordinator, base_unique_id, "ic_type"))
     if device.remote_config:
         entities.append(
-            FluxRemoteConfigSelect(
-                coordinator, base_unique_id, f"{name} Remote Config", "remote_config"
-            )
+            FluxRemoteConfigSelect(coordinator, base_unique_id, "remote_config")
         )
     if FLUX_COLOR_MODE_RGBW in device.color_modes:
         entities.append(FluxWhiteChannelSelect(coordinator.device, entry))
@@ -98,6 +90,7 @@ class FluxConfigSelect(FluxEntity, SelectEntity):
 class FluxPowerStateSelect(FluxConfigAtStartSelect, SelectEntity):
     """Representation of a Flux power restore state option."""
 
+    _attr_translation_key = "power_restored"
     _attr_icon = "mdi:transmission-tower-off"
     _attr_options = list(NAME_TO_POWER_RESTORE_STATE)
 
@@ -108,7 +101,6 @@ class FluxPowerStateSelect(FluxConfigAtStartSelect, SelectEntity):
     ) -> None:
         """Initialize the power state select."""
         super().__init__(device, entry)
-        self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} Power Restored"
         base_unique_id = entry.unique_id or entry.entry_id
         self._attr_unique_id = f"{base_unique_id}_power_restored"
         self._async_set_current_option_from_device()
@@ -134,6 +126,7 @@ class FluxICTypeSelect(FluxConfigSelect):
     """Representation of Flux ic type."""
 
     _attr_icon = "mdi:chip"
+    _attr_translation_key = "ic_type"
 
     @property
     def options(self) -> list[str]:
@@ -156,6 +149,7 @@ class FluxWiringsSelect(FluxConfigSelect):
     """Representation of Flux wirings."""
 
     _attr_icon = "mdi:led-strip-variant"
+    _attr_translation_key = "wiring"
 
     @property
     def options(self) -> list[str]:
@@ -176,6 +170,8 @@ class FluxWiringsSelect(FluxConfigSelect):
 class FluxOperatingModesSelect(FluxConfigSelect):
     """Representation of Flux operating modes."""
 
+    _attr_translation_key = "operating_mode"
+
     @property
     def options(self) -> list[str]:
         """Return the current operating mode."""
@@ -196,15 +192,16 @@ class FluxOperatingModesSelect(FluxConfigSelect):
 class FluxRemoteConfigSelect(FluxConfigSelect):
     """Representation of Flux remote config type."""
 
+    _attr_translation_key = "remote_config"
+
     def __init__(
         self,
         coordinator: FluxLedUpdateCoordinator,
         base_unique_id: str,
-        name: str,
         key: str,
     ) -> None:
         """Initialize the remote config type select."""
-        super().__init__(coordinator, base_unique_id, name, key)
+        super().__init__(coordinator, base_unique_id, key)
         assert self._device.remote_config is not None
         self._name_to_state = {
             _human_readable_option(option.name): option for option in RemoteConfig
@@ -226,6 +223,8 @@ class FluxRemoteConfigSelect(FluxConfigSelect):
 class FluxWhiteChannelSelect(FluxConfigAtStartSelect):
     """Representation of Flux white channel."""
 
+    _attr_translation_key = "white_channel"
+
     _attr_options = [_human_readable_option(option.name) for option in WhiteChannelType]
 
     def __init__(
@@ -235,7 +234,6 @@ class FluxWhiteChannelSelect(FluxConfigAtStartSelect):
     ) -> None:
         """Initialize the white channel select."""
         super().__init__(device, entry)
-        self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} White Channel"
         base_unique_id = entry.unique_id or entry.entry_id
         self._attr_unique_id = f"{base_unique_id}_white_channel"
 
diff --git a/homeassistant/components/flux_led/sensor.py b/homeassistant/components/flux_led/sensor.py
index 3cff6d017f0..9a19c629383 100644
--- a/homeassistant/components/flux_led/sensor.py
+++ b/homeassistant/components/flux_led/sensor.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 
 from homeassistant import config_entries
 from homeassistant.components.sensor import SensorEntity
-from homeassistant.const import CONF_NAME, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -25,7 +25,6 @@ async def async_setup_entry(
                 FluxPairedRemotes(
                     coordinator,
                     entry.unique_id or entry.entry_id,
-                    f"{entry.data.get(CONF_NAME, entry.title)} Paired Remotes",
                     "paired_remotes",
                 )
             ]
@@ -37,6 +36,7 @@ class FluxPairedRemotes(FluxEntity, SensorEntity):
 
     _attr_icon = "mdi:remote"
     _attr_entity_category = EntityCategory.DIAGNOSTIC
+    _attr_translation_key = "paired_remotes"
 
     @property
     def native_value(self) -> int:
diff --git a/homeassistant/components/flux_led/strings.json b/homeassistant/components/flux_led/strings.json
index 09d9ed399ff..51edd207e95 100644
--- a/homeassistant/components/flux_led/strings.json
+++ b/homeassistant/components/flux_led/strings.json
@@ -32,5 +32,62 @@
         }
       }
     }
+  },
+  "entity": {
+    "button": {
+      "unpair_remotes": {
+        "name": "Unpair remotes"
+      }
+    },
+    "number": {
+      "pixels_per_segment": {
+        "name": "Pixels per segment"
+      },
+      "segments": {
+        "name": "Segments"
+      },
+      "music_pixels_per_segment": {
+        "name": "Music pixels per segment"
+      },
+      "music_segments": {
+        "name": "Music segments"
+      },
+      "effect_speed": {
+        "name": "Effect speed"
+      }
+    },
+    "select": {
+      "operating_mode": {
+        "name": "Operating mode"
+      },
+      "wiring": {
+        "name": "Wiring"
+      },
+      "ic_type": {
+        "name": "IC type"
+      },
+      "remote_config": {
+        "name": "Remote config"
+      },
+      "white_channel": {
+        "name": "White channel"
+      },
+      "power_restored": {
+        "name": "Power restored"
+      }
+    },
+    "sensor": {
+      "paired_remotes": {
+        "name": "Paired remotes"
+      }
+    },
+    "switch": {
+      "remote_access": {
+        "name": "Remote access"
+      },
+      "music": {
+        "name": "Music"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/flux_led/switch.py b/homeassistant/components/flux_led/switch.py
index d89f0020ba3..58aee132216 100644
--- a/homeassistant/components/flux_led/switch.py
+++ b/homeassistant/components/flux_led/switch.py
@@ -9,7 +9,7 @@ from flux_led.const import MODE_MUSIC
 
 from homeassistant import config_entries
 from homeassistant.components.switch import SwitchEntity
-from homeassistant.const import CONF_NAME, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -34,18 +34,15 @@ async def async_setup_entry(
     coordinator: FluxLedUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
     entities: list[FluxSwitch | FluxRemoteAccessSwitch | FluxMusicSwitch] = []
     base_unique_id = entry.unique_id or entry.entry_id
-    name = entry.data.get(CONF_NAME, entry.title)
 
     if coordinator.device.device_type == DeviceType.Switch:
-        entities.append(FluxSwitch(coordinator, base_unique_id, name, None))
+        entities.append(FluxSwitch(coordinator, base_unique_id, None))
 
     if entry.data.get(CONF_REMOTE_ACCESS_HOST):
         entities.append(FluxRemoteAccessSwitch(coordinator.device, entry))
 
     if coordinator.device.microphone:
-        entities.append(
-            FluxMusicSwitch(coordinator, base_unique_id, f"{name} Music", "music")
-        )
+        entities.append(FluxMusicSwitch(coordinator, base_unique_id, "music"))
 
     async_add_entities(entities)
 
@@ -55,6 +52,8 @@ class FluxSwitch(
 ):
     """Representation of a Flux switch."""
 
+    _attr_name = None
+
     async def _async_turn_on(self, **kwargs: Any) -> None:
         """Turn the device on."""
         if not self.is_on:
@@ -65,6 +64,7 @@ class FluxRemoteAccessSwitch(FluxBaseEntity, SwitchEntity):
     """Representation of a Flux remote access switch."""
 
     _attr_entity_category = EntityCategory.CONFIG
+    _attr_translation_key = "remote_access"
 
     def __init__(
         self,
@@ -73,7 +73,6 @@ class FluxRemoteAccessSwitch(FluxBaseEntity, SwitchEntity):
     ) -> None:
         """Initialize the light."""
         super().__init__(device, entry)
-        self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} Remote Access"
         base_unique_id = entry.unique_id or entry.entry_id
         self._attr_unique_id = f"{base_unique_id}_remote_access"
 
@@ -113,6 +112,8 @@ class FluxRemoteAccessSwitch(FluxBaseEntity, SwitchEntity):
 class FluxMusicSwitch(FluxEntity, SwitchEntity):
     """Representation of a Flux music switch."""
 
+    _attr_translation_key = "music"
+
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the microphone on."""
         await self._async_ensure_device_on()
diff --git a/homeassistant/components/foobot/manifest.json b/homeassistant/components/foobot/manifest.json
index a517f1fea6f..890cd95784c 100644
--- a/homeassistant/components/foobot/manifest.json
+++ b/homeassistant/components/foobot/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/foobot",
   "iot_class": "cloud_polling",
   "loggers": ["foobot_async"],
-  "requirements": ["foobot_async==1.0.0"]
+  "requirements": ["foobot-async==1.0.0"]
 }
diff --git a/homeassistant/components/forecast_solar/const.py b/homeassistant/components/forecast_solar/const.py
index 0e47fa9701b..e566733413b 100644
--- a/homeassistant/components/forecast_solar/const.py
+++ b/homeassistant/components/forecast_solar/const.py
@@ -1,14 +1,8 @@
 """Constants for the Forecast.Solar integration."""
 from __future__ import annotations
 
-from datetime import timedelta
 import logging
 
-from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
-from homeassistant.const import UnitOfEnergy, UnitOfPower
-
-from .models import ForecastSolarSensorEntityDescription
-
 DOMAIN = "forecast_solar"
 LOGGER = logging.getLogger(__package__)
 
@@ -17,99 +11,3 @@ CONF_AZIMUTH = "azimuth"
 CONF_MODULES_POWER = "modules power"
 CONF_DAMPING = "damping"
 CONF_INVERTER_SIZE = "inverter_size"
-
-SENSORS: tuple[ForecastSolarSensorEntityDescription, ...] = (
-    ForecastSolarSensorEntityDescription(
-        key="energy_production_today",
-        name="Estimated energy production - today",
-        state=lambda estimate: estimate.energy_production_today,
-        device_class=SensorDeviceClass.ENERGY,
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        suggested_display_precision=1,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="energy_production_today_remaining",
-        name="Estimated energy production - remaining today",
-        state=lambda estimate: estimate.energy_production_today_remaining,
-        device_class=SensorDeviceClass.ENERGY,
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        suggested_display_precision=1,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="energy_production_tomorrow",
-        name="Estimated energy production - tomorrow",
-        state=lambda estimate: estimate.energy_production_tomorrow,
-        device_class=SensorDeviceClass.ENERGY,
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        suggested_display_precision=1,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="power_highest_peak_time_today",
-        name="Highest power peak time - today",
-        device_class=SensorDeviceClass.TIMESTAMP,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="power_highest_peak_time_tomorrow",
-        name="Highest power peak time - tomorrow",
-        device_class=SensorDeviceClass.TIMESTAMP,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="power_production_now",
-        name="Estimated power production - now",
-        device_class=SensorDeviceClass.POWER,
-        state=lambda estimate: estimate.power_production_now,
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfPower.WATT,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="power_production_next_hour",
-        state=lambda estimate: estimate.power_production_at_time(
-            estimate.now() + timedelta(hours=1)
-        ),
-        name="Estimated power production - next hour",
-        device_class=SensorDeviceClass.POWER,
-        entity_registry_enabled_default=False,
-        native_unit_of_measurement=UnitOfPower.WATT,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="power_production_next_12hours",
-        state=lambda estimate: estimate.power_production_at_time(
-            estimate.now() + timedelta(hours=12)
-        ),
-        name="Estimated power production - next 12 hours",
-        device_class=SensorDeviceClass.POWER,
-        entity_registry_enabled_default=False,
-        native_unit_of_measurement=UnitOfPower.WATT,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="power_production_next_24hours",
-        state=lambda estimate: estimate.power_production_at_time(
-            estimate.now() + timedelta(hours=24)
-        ),
-        name="Estimated power production - next 24 hours",
-        device_class=SensorDeviceClass.POWER,
-        entity_registry_enabled_default=False,
-        native_unit_of_measurement=UnitOfPower.WATT,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="energy_current_hour",
-        name="Estimated energy production - this hour",
-        state=lambda estimate: estimate.energy_current_hour,
-        device_class=SensorDeviceClass.ENERGY,
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        suggested_display_precision=1,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="energy_next_hour",
-        state=lambda estimate: estimate.sum_energy_production(1),
-        name="Estimated energy production - next hour",
-        device_class=SensorDeviceClass.ENERGY,
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        suggested_display_precision=1,
-    ),
-)
diff --git a/homeassistant/components/forecast_solar/manifest.json b/homeassistant/components/forecast_solar/manifest.json
index ac6a3f7c308..94b603e108c 100644
--- a/homeassistant/components/forecast_solar/manifest.json
+++ b/homeassistant/components/forecast_solar/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "quality_scale": "platinum",
-  "requirements": ["forecast_solar==3.0.0"]
+  "requirements": ["forecast-solar==3.0.0"]
 }
diff --git a/homeassistant/components/forecast_solar/models.py b/homeassistant/components/forecast_solar/models.py
deleted file mode 100644
index af9b6125713..00000000000
--- a/homeassistant/components/forecast_solar/models.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""Models for the Forecast.Solar integration."""
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import Any
-
-from forecast_solar.models import Estimate
-
-from homeassistant.components.sensor import SensorEntityDescription
-
-
-@dataclass
-class ForecastSolarSensorEntityDescription(SensorEntityDescription):
-    """Describes a Forecast.Solar Sensor."""
-
-    state: Callable[[Estimate], Any] | None = None
diff --git a/homeassistant/components/forecast_solar/sensor.py b/homeassistant/components/forecast_solar/sensor.py
index 681e04f434f..2858bff098e 100644
--- a/homeassistant/components/forecast_solar/sensor.py
+++ b/homeassistant/components/forecast_solar/sensor.py
@@ -1,10 +1,22 @@
 """Support for the Forecast.Solar sensor service."""
 from __future__ import annotations
 
-from datetime import datetime
+from collections.abc import Callable
+from dataclasses import dataclass
+from datetime import datetime, timedelta
+from typing import Any
 
-from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorEntity
+from forecast_solar.models import Estimate
+
+from homeassistant.components.sensor import (
+    DOMAIN as SENSOR_DOMAIN,
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType
 from homeassistant.helpers.entity import DeviceInfo
@@ -12,9 +24,112 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import DOMAIN, SENSORS
+from .const import DOMAIN
 from .coordinator import ForecastSolarDataUpdateCoordinator
-from .models import ForecastSolarSensorEntityDescription
+
+
+@dataclass
+class ForecastSolarSensorEntityDescription(SensorEntityDescription):
+    """Describes a Forecast.Solar Sensor."""
+
+    state: Callable[[Estimate], Any] | None = None
+
+
+SENSORS: tuple[ForecastSolarSensorEntityDescription, ...] = (
+    ForecastSolarSensorEntityDescription(
+        key="energy_production_today",
+        name="Estimated energy production - today",
+        state=lambda estimate: estimate.energy_production_today,
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=1,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="energy_production_today_remaining",
+        name="Estimated energy production - remaining today",
+        state=lambda estimate: estimate.energy_production_today_remaining,
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=1,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="energy_production_tomorrow",
+        name="Estimated energy production - tomorrow",
+        state=lambda estimate: estimate.energy_production_tomorrow,
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=1,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="power_highest_peak_time_today",
+        name="Highest power peak time - today",
+        device_class=SensorDeviceClass.TIMESTAMP,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="power_highest_peak_time_tomorrow",
+        name="Highest power peak time - tomorrow",
+        device_class=SensorDeviceClass.TIMESTAMP,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="power_production_now",
+        name="Estimated power production - now",
+        device_class=SensorDeviceClass.POWER,
+        state=lambda estimate: estimate.power_production_now,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfPower.WATT,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="power_production_next_hour",
+        state=lambda estimate: estimate.power_production_at_time(
+            estimate.now() + timedelta(hours=1)
+        ),
+        name="Estimated power production - next hour",
+        device_class=SensorDeviceClass.POWER,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfPower.WATT,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="power_production_next_12hours",
+        state=lambda estimate: estimate.power_production_at_time(
+            estimate.now() + timedelta(hours=12)
+        ),
+        name="Estimated power production - next 12 hours",
+        device_class=SensorDeviceClass.POWER,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfPower.WATT,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="power_production_next_24hours",
+        state=lambda estimate: estimate.power_production_at_time(
+            estimate.now() + timedelta(hours=24)
+        ),
+        name="Estimated power production - next 24 hours",
+        device_class=SensorDeviceClass.POWER,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfPower.WATT,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="energy_current_hour",
+        name="Estimated energy production - this hour",
+        state=lambda estimate: estimate.energy_current_hour,
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=1,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="energy_next_hour",
+        state=lambda estimate: estimate.sum_energy_production(1),
+        name="Estimated energy production - next hour",
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=1,
+    ),
+)
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/freedompro/__init__.py b/homeassistant/components/freedompro/__init__.py
index 5e1f8e0b577..78871bc99bf 100644
--- a/homeassistant/components/freedompro/__init__.py
+++ b/homeassistant/components/freedompro/__init__.py
@@ -1,19 +1,15 @@
 """Support for freedompro."""
 from __future__ import annotations
 
-from datetime import timedelta
 import logging
-from typing import Any, Final
-
-from pyfreedompro import get_list, get_states
+from typing import Final
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -58,39 +54,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def update_listener(hass: HomeAssistant, config_entry: ConfigEntry) -> None:
     """Update listener."""
     await hass.config_entries.async_reload(config_entry.entry_id)
-
-
-class FreedomproDataUpdateCoordinator(DataUpdateCoordinator[list[dict[str, Any]]]):
-    """Class to manage fetching Freedompro data API."""
-
-    def __init__(self, hass, api_key):
-        """Initialize."""
-        self._hass = hass
-        self._api_key = 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)
-
-    async def _async_update_data(self):
-        if self._devices is None:
-            result = await get_list(
-                aiohttp_client.async_get_clientsession(self._hass), self._api_key
-            )
-            if result["state"]:
-                self._devices = result["devices"]
-            else:
-                raise UpdateFailed()
-
-        result = await get_states(
-            aiohttp_client.async_get_clientsession(self._hass), self._api_key
-        )
-
-        for device in self._devices:
-            dev = next(
-                (dev for dev in result if dev["uid"] == device["uid"]),
-                None,
-            )
-            if dev is not None and "state" in dev:
-                device["state"] = dev["state"]
-        return self._devices
diff --git a/homeassistant/components/freedompro/binary_sensor.py b/homeassistant/components/freedompro/binary_sensor.py
index c56d3cb2ad8..9f397d32899 100644
--- a/homeassistant/components/freedompro/binary_sensor.py
+++ b/homeassistant/components/freedompro/binary_sensor.py
@@ -11,8 +11,8 @@ from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 DEVICE_CLASS_MAP = {
     "smokeSensor": BinarySensorDeviceClass.SMOKE,
@@ -44,14 +44,16 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], BinarySensorEntity):
-    """Representation of an Freedompro binary_sensor."""
+    """Representation of a Freedompro binary_sensor."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self, device: dict[str, Any], coordinator: FreedomproDataUpdateCoordinator
     ) -> None:
         """Initialize the Freedompro binary_sensor."""
         super().__init__(coordinator)
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._type = device["type"]
         self._attr_device_info = DeviceInfo(
@@ -60,7 +62,7 @@ class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], BinarySensorEnt
             },
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
+            name=device["name"],
         )
         self._attr_device_class = DEVICE_CLASS_MAP[device["type"]]
 
diff --git a/homeassistant/components/freedompro/climate.py b/homeassistant/components/freedompro/climate.py
index 0ec08f0fdd0..8a0a706c0d9 100644
--- a/homeassistant/components/freedompro/climate.py
+++ b/homeassistant/components/freedompro/climate.py
@@ -22,8 +22,8 @@ from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -58,10 +58,16 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], ClimateEntity):
-    """Representation of an Freedompro climate."""
+    """Representation of a Freedompro climate."""
 
+    _attr_has_entity_name = True
     _attr_hvac_modes = SUPPORTED_HVAC_MODES
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
+    _attr_name = None
+    _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
+    _attr_current_temperature = 0
+    _attr_target_temperature = 0
+    _attr_hvac_mode = HVACMode.OFF
 
     def __init__(
         self,
@@ -74,7 +80,6 @@ class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], ClimateEntity):
         super().__init__(coordinator)
         self._session = session
         self._api_key = api_key
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._characteristics = device["characteristics"]
         self._attr_device_info = DeviceInfo(
@@ -83,12 +88,8 @@ class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], ClimateEntity):
             },
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
+            name=device["name"],
         )
-        self._attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
-        self._attr_current_temperature = 0
-        self._attr_target_temperature = 0
-        self._attr_hvac_mode = HVACMode.OFF
 
     @callback
     def _handle_coordinator_update(self) -> None:
@@ -121,8 +122,7 @@ class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], ClimateEntity):
         if hvac_mode not in SUPPORTED_HVAC_MODES:
             raise ValueError(f"Got unsupported hvac_mode {hvac_mode}")
 
-        payload = {}
-        payload["heatingCoolingState"] = HVAC_INVERT_MAP[hvac_mode]
+        payload = {"heatingCoolingState": HVAC_INVERT_MAP[hvac_mode]}
         await put_state(
             self._session,
             self._api_key,
diff --git a/homeassistant/components/freedompro/coordinator.py b/homeassistant/components/freedompro/coordinator.py
new file mode 100644
index 00000000000..c896f5ec203
--- /dev/null
+++ b/homeassistant/components/freedompro/coordinator.py
@@ -0,0 +1,51 @@
+"""Freedompro data update coordinator."""
+from __future__ import annotations
+
+from datetime import timedelta
+import logging
+from typing import Any
+
+from pyfreedompro import get_list, get_states
+
+from homeassistant.helpers import aiohttp_client
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class FreedomproDataUpdateCoordinator(DataUpdateCoordinator[list[dict[str, Any]]]):
+    """Class to manage fetching Freedompro data API."""
+
+    def __init__(self, hass, api_key):
+        """Initialize."""
+        self._hass = hass
+        self._api_key = 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)
+
+    async def _async_update_data(self):
+        if self._devices is None:
+            result = await get_list(
+                aiohttp_client.async_get_clientsession(self._hass), self._api_key
+            )
+            if result["state"]:
+                self._devices = result["devices"]
+            else:
+                raise UpdateFailed()
+
+        result = await get_states(
+            aiohttp_client.async_get_clientsession(self._hass), self._api_key
+        )
+
+        for device in self._devices:
+            dev = next(
+                (dev for dev in result if dev["uid"] == device["uid"]),
+                None,
+            )
+            if dev is not None and "state" in dev:
+                device["state"] = dev["state"]
+        return self._devices
diff --git a/homeassistant/components/freedompro/cover.py b/homeassistant/components/freedompro/cover.py
index 3839415d31b..59e58d75c43 100644
--- a/homeassistant/components/freedompro/cover.py
+++ b/homeassistant/components/freedompro/cover.py
@@ -18,8 +18,8 @@ from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 DEVICE_CLASS_MAP = {
     "windowCovering": CoverDeviceClass.BLIND,
@@ -46,7 +46,17 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], CoverEntity):
-    """Representation of an Freedompro cover."""
+    """Representation of a Freedompro cover."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
+    _attr_current_cover_position = 0
+    _attr_is_closed = True
+    _attr_supported_features = (
+        CoverEntityFeature.CLOSE
+        | CoverEntityFeature.OPEN
+        | CoverEntityFeature.SET_POSITION
+    )
 
     def __init__(
         self,
@@ -59,7 +69,6 @@ class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], CoverEntity):
         super().__init__(coordinator)
         self._session = aiohttp_client.async_get_clientsession(hass)
         self._api_key = api_key
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._attr_device_info = DeviceInfo(
             identifiers={
@@ -67,14 +76,7 @@ class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], CoverEntity):
             },
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
-        )
-        self._attr_current_cover_position = 0
-        self._attr_is_closed = True
-        self._attr_supported_features = (
-            CoverEntityFeature.CLOSE
-            | CoverEntityFeature.OPEN
-            | CoverEntityFeature.SET_POSITION
+            name=device["name"],
         )
         self._attr_device_class = DEVICE_CLASS_MAP[device["type"]]
 
diff --git a/homeassistant/components/freedompro/fan.py b/homeassistant/components/freedompro/fan.py
index 036c6c91471..68149b65fd7 100644
--- a/homeassistant/components/freedompro/fan.py
+++ b/homeassistant/components/freedompro/fan.py
@@ -15,8 +15,8 @@ from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 
 async def async_setup_entry(
@@ -33,7 +33,12 @@ async def async_setup_entry(
 
 
 class FreedomproFan(CoordinatorEntity[FreedomproDataUpdateCoordinator], FanEntity):
-    """Representation of an Freedompro fan."""
+    """Representation of a Freedompro fan."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
+    _attr_is_on = False
+    _attr_percentage = 0
 
     def __init__(
         self,
@@ -46,7 +51,6 @@ class FreedomproFan(CoordinatorEntity[FreedomproDataUpdateCoordinator], FanEntit
         super().__init__(coordinator)
         self._session = aiohttp_client.async_get_clientsession(hass)
         self._api_key = api_key
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._characteristics = device["characteristics"]
         self._attr_device_info = DeviceInfo(
@@ -55,10 +59,8 @@ class FreedomproFan(CoordinatorEntity[FreedomproDataUpdateCoordinator], FanEntit
             },
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
+            name=device["name"],
         )
-        self._attr_is_on = False
-        self._attr_percentage = 0
         if "rotationSpeed" in self._characteristics:
             self._attr_supported_features = FanEntityFeature.SET_SPEED
 
diff --git a/homeassistant/components/freedompro/light.py b/homeassistant/components/freedompro/light.py
index 7dc573f9225..2a101d5c82a 100644
--- a/homeassistant/components/freedompro/light.py
+++ b/homeassistant/components/freedompro/light.py
@@ -20,8 +20,8 @@ from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 
 async def async_setup_entry(
@@ -38,7 +38,12 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], LightEntity):
-    """Representation of an Freedompro light."""
+    """Representation of a Freedompro light."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
+    _attr_is_on = False
+    _attr_brightness = 0
 
     def __init__(
         self,
@@ -51,16 +56,13 @@ class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], LightEntity):
         super().__init__(coordinator)
         self._session = aiohttp_client.async_get_clientsession(hass)
         self._api_key = api_key
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, device["uid"])},
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
+            name=device["name"],
         )
-        self._attr_is_on = False
-        self._attr_brightness = 0
         color_mode = ColorMode.ONOFF
         if "hue" in device["characteristics"]:
             color_mode = ColorMode.HS
diff --git a/homeassistant/components/freedompro/lock.py b/homeassistant/components/freedompro/lock.py
index d803354c255..e1e8ee44b2d 100644
--- a/homeassistant/components/freedompro/lock.py
+++ b/homeassistant/components/freedompro/lock.py
@@ -13,8 +13,8 @@ from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 
 async def async_setup_entry(
@@ -31,7 +31,10 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], LockEntity):
-    """Representation of an Freedompro lock."""
+    """Representation of a Freedompro lock."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
@@ -45,7 +48,6 @@ class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], LockEntity):
         self._hass = hass
         self._session = aiohttp_client.async_get_clientsession(self._hass)
         self._api_key = api_key
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._type = device["type"]
         self._characteristics = device["characteristics"]
@@ -55,7 +57,7 @@ class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], LockEntity):
             },
             manufacturer="Freedompro",
             model=self._type,
-            name=self.name,
+            name=device["name"],
         )
 
     @callback
diff --git a/homeassistant/components/freedompro/sensor.py b/homeassistant/components/freedompro/sensor.py
index 286a528013a..85d70c30956 100644
--- a/homeassistant/components/freedompro/sensor.py
+++ b/homeassistant/components/freedompro/sensor.py
@@ -13,8 +13,8 @@ from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 DEVICE_CLASS_MAP = {
     "temperatureSensor": SensorDeviceClass.TEMPERATURE,
@@ -52,14 +52,16 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], SensorEntity):
-    """Representation of an Freedompro sensor."""
+    """Representation of a Freedompro sensor."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self, device: dict[str, Any], coordinator: FreedomproDataUpdateCoordinator
     ) -> None:
         """Initialize the Freedompro sensor."""
         super().__init__(coordinator)
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._type = device["type"]
         self._attr_device_info = DeviceInfo(
@@ -68,7 +70,7 @@ class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], SensorEntity):
             },
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
+            name=device["name"],
         )
         self._attr_device_class = DEVICE_CLASS_MAP[device["type"]]
         self._attr_state_class = STATE_CLASS_MAP[device["type"]]
diff --git a/homeassistant/components/freedompro/switch.py b/homeassistant/components/freedompro/switch.py
index 4a7ed80de1e..97f0a968cff 100644
--- a/homeassistant/components/freedompro/switch.py
+++ b/homeassistant/components/freedompro/switch.py
@@ -13,8 +13,8 @@ from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 
 async def async_setup_entry(
@@ -31,7 +31,10 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], SwitchEntity):
-    """Representation of an Freedompro switch."""
+    """Representation of a Freedompro switch."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
@@ -44,7 +47,6 @@ class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], SwitchEntity):
         super().__init__(coordinator)
         self._session = aiohttp_client.async_get_clientsession(hass)
         self._api_key = api_key
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._attr_device_info = DeviceInfo(
             identifiers={
@@ -52,7 +54,7 @@ class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], SwitchEntity):
             },
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
+            name=device["name"],
         )
         self._attr_is_on = False
 
diff --git a/homeassistant/components/fritz/button.py b/homeassistant/components/fritz/button.py
index f732e32b75a..d76279a0f14 100644
--- a/homeassistant/components/fritz/button.py
+++ b/homeassistant/components/fritz/button.py
@@ -46,7 +46,6 @@ BUTTONS: Final = [
     ),
     FritzButtonDescription(
         key="reboot",
-        translation_key="reboot",
         device_class=ButtonDeviceClass.RESTART,
         entity_category=EntityCategory.CONFIG,
         press_action=lambda avm_wrapper: avm_wrapper.async_trigger_reboot(),
diff --git a/homeassistant/components/fritz/const.py b/homeassistant/components/fritz/const.py
index d43ba2eda62..1ce21081f9c 100644
--- a/homeassistant/components/fritz/const.py
+++ b/homeassistant/components/fritz/const.py
@@ -31,6 +31,7 @@ PLATFORMS = [
     Platform.BUTTON,
     Platform.BINARY_SENSOR,
     Platform.DEVICE_TRACKER,
+    Platform.IMAGE,
     Platform.SENSOR,
     Platform.SWITCH,
     Platform.UPDATE,
diff --git a/homeassistant/components/fritz/device_tracker.py b/homeassistant/components/fritz/device_tracker.py
index e32ee152796..d4ba53aa6a2 100644
--- a/homeassistant/components/fritz/device_tracker.py
+++ b/homeassistant/components/fritz/device_tracker.py
@@ -21,9 +21,6 @@ from .const import DATA_FRITZ, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
-YAML_DEFAULT_HOST = "169.254.1.1"
-YAML_DEFAULT_USERNAME = "admin"
-
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
diff --git a/homeassistant/components/fritz/image.py b/homeassistant/components/fritz/image.py
new file mode 100644
index 00000000000..597dd8ddb53
--- /dev/null
+++ b/homeassistant/components/fritz/image.py
@@ -0,0 +1,95 @@
+"""FRITZ image integration."""
+
+from __future__ import annotations
+
+from io import BytesIO
+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.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.util import dt as dt_util, slugify
+
+from .common import AvmWrapper, FritzBoxBaseEntity
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up guest WiFi QR code for device."""
+    avm_wrapper: AvmWrapper = hass.data[DOMAIN][entry.entry_id]
+
+    guest_wifi_info = await hass.async_add_executor_job(
+        avm_wrapper.fritz_guest_wifi.get_info
+    )
+
+    if not guest_wifi_info.get("NewEnable"):
+        return
+
+    async_add_entities(
+        [
+            FritzGuestWifiQRImage(
+                hass, avm_wrapper, entry.title, guest_wifi_info["NewSSID"]
+            )
+        ]
+    )
+
+
+class FritzGuestWifiQRImage(FritzBoxBaseEntity, ImageEntity):
+    """Implementation of the FritzBox guest wifi QR code image entity."""
+
+    _attr_content_type = "image/png"
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
+    _attr_has_entity_name = True
+    _attr_should_poll = True
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        avm_wrapper: AvmWrapper,
+        device_friendly_name: str,
+        ssid: str,
+    ) -> None:
+        """Initialize the image entity."""
+        self._attr_name = ssid
+        self._attr_unique_id = slugify(f"{avm_wrapper.unique_id}-{ssid}-qr-code")
+        self._current_qr_bytes: bytes | None = None
+        super().__init__(avm_wrapper, device_friendly_name)
+        ImageEntity.__init__(self, hass)
+
+    async def _fetch_image(self) -> bytes:
+        """Fetch the QR code from the Fritz!Box."""
+        qr_stream: BytesIO = await self.hass.async_add_executor_job(
+            self._avm_wrapper.fritz_guest_wifi.get_wifi_qr_code, "png"
+        )
+        qr_bytes = qr_stream.getvalue()
+        _LOGGER.debug("fetched %s bytes", len(qr_bytes))
+
+        return qr_bytes
+
+    async def async_added_to_hass(self) -> None:
+        """Fetch and set initial data and state."""
+        self._current_qr_bytes = await self._fetch_image()
+        self._attr_image_last_updated = dt_util.utcnow()
+
+    async def async_update(self) -> None:
+        """Update the image entity data."""
+        qr_bytes = await self._fetch_image()
+
+        if self._current_qr_bytes != qr_bytes:
+            dt_now = dt_util.utcnow()
+            _LOGGER.debug("qr code has changed, reset image last updated property")
+            self._attr_image_last_updated = dt_now
+            self._current_qr_bytes = qr_bytes
+            self.async_write_ha_state()
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+        return self._current_qr_bytes
diff --git a/homeassistant/components/fritz/manifest.json b/homeassistant/components/fritz/manifest.json
index b117218e23d..54419d5ae3f 100644
--- a/homeassistant/components/fritz/manifest.json
+++ b/homeassistant/components/fritz/manifest.json
@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/fritz",
   "iot_class": "local_polling",
   "loggers": ["fritzconnection"],
-  "requirements": ["fritzconnection==1.12.0", "xmltodict==0.13.0"],
+  "requirements": ["fritzconnection[qr]==1.12.0", "xmltodict==0.13.0"],
   "ssdp": [
     {
       "st": "urn:schemas-upnp-org:device:fritzbox:1"
diff --git a/homeassistant/components/fritz/strings.json b/homeassistant/components/fritz/strings.json
index 45262d6f8ac..fcaa56424f1 100644
--- a/homeassistant/components/fritz/strings.json
+++ b/homeassistant/components/fritz/strings.json
@@ -61,9 +61,6 @@
     "button": {
       "cleanup": { "name": "Cleanup" },
       "firmware_update": { "name": "Firmware update" },
-      "reboot": {
-        "name": "[%key:component::button::entity_component::restart::name%]"
-      },
       "reconnect": { "name": "Reconnect" }
     },
     "sensor": {
diff --git a/homeassistant/components/fritzbox/binary_sensor.py b/homeassistant/components/fritzbox/binary_sensor.py
index f87beb34079..dc56bc0473e 100644
--- a/homeassistant/components/fritzbox/binary_sensor.py
+++ b/homeassistant/components/fritzbox/binary_sensor.py
@@ -42,8 +42,8 @@ BINARY_SENSOR_TYPES: Final[tuple[FritzBinarySensorEntityDescription, ...]] = (
         key="alarm",
         translation_key="alarm",
         device_class=BinarySensorDeviceClass.WINDOW,
-        suitable=lambda device: device.has_alarm,  # type: ignore[no-any-return]
-        is_on=lambda device: device.alert_state,  # type: ignore[no-any-return]
+        suitable=lambda device: device.has_alarm,
+        is_on=lambda device: device.alert_state,
     ),
     FritzBinarySensorEntityDescription(
         key="lock",
diff --git a/homeassistant/components/fritzbox/climate.py b/homeassistant/components/fritzbox/climate.py
index 31cdac47ec2..7c846789637 100644
--- a/homeassistant/components/fritzbox/climate.py
+++ b/homeassistant/components/fritzbox/climate.py
@@ -101,7 +101,7 @@ class FritzboxThermostat(FritzBoxDeviceEntity, ClimateEntity):
         await self.coordinator.async_refresh()
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return the current operation mode."""
         if self.data.target_temperature in (
             OFF_REPORT_SET_TEMPERATURE,
diff --git a/homeassistant/components/fritzbox/sensor.py b/homeassistant/components/fritzbox/sensor.py
index 7922224e195..46fa1a26561 100644
--- a/homeassistant/components/fritzbox/sensor.py
+++ b/homeassistant/components/fritzbox/sensor.py
@@ -91,66 +91,59 @@ def value_scheduled_preset(device: FritzhomeDevice) -> str:
 SENSOR_TYPES: Final[tuple[FritzSensorEntityDescription, ...]] = (
     FritzSensorEntityDescription(
         key="temperature",
-        translation_key="temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         suitable=suitable_temperature,
-        native_value=lambda device: device.temperature,  # type: ignore[no-any-return]
+        native_value=lambda device: device.temperature,
     ),
     FritzSensorEntityDescription(
         key="humidity",
-        translation_key="humidity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
         suitable=lambda device: device.rel_humidity is not None,
-        native_value=lambda device: device.rel_humidity,  # type: ignore[no-any-return]
+        native_value=lambda device: device.rel_humidity,
     ),
     FritzSensorEntityDescription(
         key="battery",
-        translation_key="battery",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
         entity_category=EntityCategory.DIAGNOSTIC,
         suitable=lambda device: device.battery_level is not None,
-        native_value=lambda device: device.battery_level,  # type: ignore[no-any-return]
+        native_value=lambda device: device.battery_level,
     ),
     FritzSensorEntityDescription(
         key="power_consumption",
-        translation_key="power_consumption",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suitable=lambda device: device.has_powermeter,  # type: ignore[no-any-return]
+        suitable=lambda device: device.has_powermeter,
         native_value=lambda device: round((device.power or 0.0) / 1000, 3),
     ),
     FritzSensorEntityDescription(
         key="voltage",
-        translation_key="voltage",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        suitable=lambda device: device.has_powermeter,  # type: ignore[no-any-return]
+        suitable=lambda device: device.has_powermeter,
         native_value=lambda device: round((device.voltage or 0.0) / 1000, 2),
     ),
     FritzSensorEntityDescription(
         key="electric_current",
-        translation_key="electric_current",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
-        suitable=lambda device: device.has_powermeter,  # type: ignore[no-any-return]
+        suitable=lambda device: device.has_powermeter,
         native_value=lambda device: round((device.current or 0.0) / 1000, 3),
     ),
     FritzSensorEntityDescription(
         key="total_energy",
-        translation_key="total_energy",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suitable=lambda device: device.has_powermeter,  # type: ignore[no-any-return]
+        suitable=lambda device: device.has_powermeter,
         native_value=lambda device: (device.energy or 0.0) / 1000,
     ),
     # Thermostat Sensors
@@ -161,7 +154,7 @@ SENSOR_TYPES: Final[tuple[FritzSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.DIAGNOSTIC,
         suitable=suitable_comfort_temperature,
-        native_value=lambda device: device.comfort_temperature,  # type: ignore[no-any-return]
+        native_value=lambda device: device.comfort_temperature,
     ),
     FritzSensorEntityDescription(
         key="eco_temperature",
@@ -170,7 +163,7 @@ SENSOR_TYPES: Final[tuple[FritzSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.DIAGNOSTIC,
         suitable=suitable_eco_temperature,
-        native_value=lambda device: device.eco_temperature,  # type: ignore[no-any-return]
+        native_value=lambda device: device.eco_temperature,
     ),
     FritzSensorEntityDescription(
         key="nextchange_temperature",
@@ -179,7 +172,7 @@ SENSOR_TYPES: Final[tuple[FritzSensorEntityDescription, ...]] = (
         device_class=SensorDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.DIAGNOSTIC,
         suitable=suitable_nextchange_temperature,
-        native_value=lambda device: device.nextchange_temperature,  # type: ignore[no-any-return]
+        native_value=lambda device: device.nextchange_temperature,
     ),
     FritzSensorEntityDescription(
         key="nextchange_time",
diff --git a/homeassistant/components/fritzbox/strings.json b/homeassistant/components/fritzbox/strings.json
index 0b4becd6ff7..d5607aa3090 100644
--- a/homeassistant/components/fritzbox/strings.json
+++ b/homeassistant/components/fritzbox/strings.json
@@ -44,33 +44,12 @@
       "lock": { "name": "Button lock on device" }
     },
     "sensor": {
-      "battery": {
-        "name": "[%key:component::sensor::entity_component::battery::name%]"
-      },
       "comfort_temperature": { "name": "Comfort temperature" },
       "eco_temperature": { "name": "Eco temperature" },
-      "electric_current": {
-        "name": "[%key:component::sensor::entity_component::current::name%]"
-      },
-      "humidity": {
-        "name": "[%key:component::sensor::entity_component::humidity::name%]"
-      },
       "nextchange_preset": { "name": "Next scheduled preset" },
       "nextchange_temperature": { "name": "Next scheduled temperature" },
       "nextchange_time": { "name": "Next scheduled change time" },
-      "power_consumption": {
-        "name": "[%key:component::sensor::entity_component::power::name%]"
-      },
-      "scheduled_preset": { "name": "Current scheduled preset" },
-      "temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      },
-      "total_energy": {
-        "name": "[%key:component::sensor::entity_component::energy::name%]"
-      },
-      "voltage": {
-        "name": "[%key:component::sensor::entity_component::voltage::name%]"
-      }
+      "scheduled_preset": { "name": "Current scheduled preset" }
     }
   }
 }
diff --git a/homeassistant/components/fritzbox_callmonitor/manifest.json b/homeassistant/components/fritzbox_callmonitor/manifest.json
index cde955caa1e..d445c12e4da 100644
--- a/homeassistant/components/fritzbox_callmonitor/manifest.json
+++ b/homeassistant/components/fritzbox_callmonitor/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["fritzconnection"],
-  "requirements": ["fritzconnection==1.12.0"]
+  "requirements": ["fritzconnection[qr]==1.12.0"]
 }
diff --git a/homeassistant/components/fronius/manifest.json b/homeassistant/components/fronius/manifest.json
index 7120530c973..ecf3f81b380 100644
--- a/homeassistant/components/fronius/manifest.json
+++ b/homeassistant/components/fronius/manifest.json
@@ -12,5 +12,5 @@
   "iot_class": "local_polling",
   "loggers": ["pyfronius"],
   "quality_scale": "platinum",
-  "requirements": ["pyfronius==0.7.1"]
+  "requirements": ["PyFronius==0.7.1"]
 }
diff --git a/homeassistant/components/frontend/manifest.json b/homeassistant/components/frontend/manifest.json
index 00753021b4c..9f53aef8165 100644
--- a/homeassistant/components/frontend/manifest.json
+++ b/homeassistant/components/frontend/manifest.json
@@ -20,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/frontend",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20230608.0"]
+  "requirements": ["home-assistant-frontend==20230705.0"]
 }
diff --git a/homeassistant/components/fully_kiosk/__init__.py b/homeassistant/components/fully_kiosk/__init__.py
index 217e73e4d1c..8b350433858 100644
--- a/homeassistant/components/fully_kiosk/__init__.py
+++ b/homeassistant/components/fully_kiosk/__init__.py
@@ -2,6 +2,7 @@
 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
@@ -17,6 +18,8 @@ PLATFORMS = [
     Platform.SWITCH,
 ]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Fully Kiosk Browser."""
diff --git a/homeassistant/components/fully_kiosk/binary_sensor.py b/homeassistant/components/fully_kiosk/binary_sensor.py
index f7371f4caed..5eebf8a77ab 100644
--- a/homeassistant/components/fully_kiosk/binary_sensor.py
+++ b/homeassistant/components/fully_kiosk/binary_sensor.py
@@ -18,18 +18,18 @@ from .entity import FullyKioskEntity
 SENSORS: tuple[BinarySensorEntityDescription, ...] = (
     BinarySensorEntityDescription(
         key="kioskMode",
-        name="Kiosk mode",
+        translation_key="kiosk_mode",
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     BinarySensorEntityDescription(
         key="plugged",
-        name="Plugged in",
+        translation_key="plugged_in",
         device_class=BinarySensorDeviceClass.PLUG,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     BinarySensorEntityDescription(
         key="isDeviceAdmin",
-        name="Device admin",
+        translation_key="device_admin",
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
 )
diff --git a/homeassistant/components/fully_kiosk/button.py b/homeassistant/components/fully_kiosk/button.py
index 65b44262c8b..9f4d60e9574 100644
--- a/homeassistant/components/fully_kiosk/button.py
+++ b/homeassistant/components/fully_kiosk/button.py
@@ -39,31 +39,31 @@ class FullyButtonEntityDescription(
 BUTTONS: tuple[FullyButtonEntityDescription, ...] = (
     FullyButtonEntityDescription(
         key="restartApp",
-        name="Restart browser",
+        translation_key="restart_browser",
         device_class=ButtonDeviceClass.RESTART,
         entity_category=EntityCategory.CONFIG,
         press_action=lambda fully: fully.restartApp(),
     ),
     FullyButtonEntityDescription(
         key="rebootDevice",
-        name="Reboot device",
+        translation_key="restart_device",
         device_class=ButtonDeviceClass.RESTART,
         entity_category=EntityCategory.CONFIG,
         press_action=lambda fully: fully.rebootDevice(),
     ),
     FullyButtonEntityDescription(
         key="toForeground",
-        name="Bring to foreground",
+        translation_key="to_foreground",
         press_action=lambda fully: fully.toForeground(),
     ),
     FullyButtonEntityDescription(
         key="toBackground",
-        name="Send to background",
+        translation_key="to_background",
         press_action=lambda fully: fully.toBackground(),
     ),
     FullyButtonEntityDescription(
         key="loadStartUrl",
-        name="Load start URL",
+        translation_key="load_start_url",
         press_action=lambda fully: fully.loadStartUrl(),
     ),
 )
diff --git a/homeassistant/components/fully_kiosk/const.py b/homeassistant/components/fully_kiosk/const.py
index b4fe90e01eb..3db33d21ef0 100644
--- a/homeassistant/components/fully_kiosk/const.py
+++ b/homeassistant/components/fully_kiosk/const.py
@@ -25,6 +25,9 @@ MEDIA_SUPPORT_FULLYKIOSK = (
 
 SERVICE_LOAD_URL = "load_url"
 SERVICE_START_APPLICATION = "start_application"
+SERVICE_SET_CONFIG = "set_config"
 
 ATTR_URL = "url"
 ATTR_APPLICATION = "application"
+ATTR_KEY = "key"
+ATTR_VALUE = "value"
diff --git a/homeassistant/components/fully_kiosk/entity.py b/homeassistant/components/fully_kiosk/entity.py
index 0e4329a5917..d1f98c5afff 100644
--- a/homeassistant/components/fully_kiosk/entity.py
+++ b/homeassistant/components/fully_kiosk/entity.py
@@ -9,6 +9,18 @@ from .const import DOMAIN
 from .coordinator import FullyKioskDataUpdateCoordinator
 
 
+def valid_global_mac_address(mac: str | None) -> bool:
+    """Check if a MAC address is valid, non-locally administered address."""
+    if not isinstance(mac, str):
+        return False
+    try:
+        first_octet = int(mac.split(":")[0], 16)
+        # If the second least-significant bit is set, it's a locally administered address, should not be used as an ID
+        return not bool(first_octet & 0x2)
+    except ValueError:
+        return False
+
+
 class FullyKioskEntity(CoordinatorEntity[FullyKioskDataUpdateCoordinator], Entity):
     """Defines a Fully Kiosk Browser entity."""
 
@@ -25,7 +37,9 @@ class FullyKioskEntity(CoordinatorEntity[FullyKioskDataUpdateCoordinator], Entit
             sw_version=coordinator.data["appVersionName"],
             configuration_url=f"http://{coordinator.data['ip4']}:2323",
         )
-        if "Mac" in coordinator.data and coordinator.data["Mac"]:
+        if "Mac" in coordinator.data and valid_global_mac_address(
+            coordinator.data["Mac"]
+        ):
             device_info["connections"] = {
                 (CONNECTION_NETWORK_MAC, coordinator.data["Mac"])
             }
diff --git a/homeassistant/components/fully_kiosk/media_player.py b/homeassistant/components/fully_kiosk/media_player.py
index 8c73d47dd74..0984d6a220f 100644
--- a/homeassistant/components/fully_kiosk/media_player.py
+++ b/homeassistant/components/fully_kiosk/media_player.py
@@ -33,6 +33,7 @@ async def async_setup_entry(
 class FullyMediaPlayer(FullyKioskEntity, MediaPlayerEntity):
     """Representation of a Fully Kiosk Browser media player entity."""
 
+    _attr_name = None
     _attr_supported_features = MEDIA_SUPPORT_FULLYKIOSK
     _attr_assumed_state = True
 
diff --git a/homeassistant/components/fully_kiosk/number.py b/homeassistant/components/fully_kiosk/number.py
index 11f5bd27452..298a58e2a11 100644
--- a/homeassistant/components/fully_kiosk/number.py
+++ b/homeassistant/components/fully_kiosk/number.py
@@ -16,7 +16,7 @@ from .entity import FullyKioskEntity
 ENTITY_TYPES: tuple[NumberEntityDescription, ...] = (
     NumberEntityDescription(
         key="timeToScreensaverV2",
-        name="Screensaver timer",
+        translation_key="screensaver_time",
         native_max_value=9999,
         native_step=1,
         native_min_value=0,
@@ -25,7 +25,7 @@ ENTITY_TYPES: tuple[NumberEntityDescription, ...] = (
     ),
     NumberEntityDescription(
         key="screensaverBrightness",
-        name="Screensaver brightness",
+        translation_key="screensaver_brightness",
         native_max_value=255,
         native_step=1,
         native_min_value=0,
@@ -33,7 +33,7 @@ ENTITY_TYPES: tuple[NumberEntityDescription, ...] = (
     ),
     NumberEntityDescription(
         key="timeToScreenOffV2",
-        name="Screen off timer",
+        translation_key="screen_off_time",
         native_max_value=9999,
         native_step=1,
         native_min_value=0,
@@ -42,7 +42,7 @@ ENTITY_TYPES: tuple[NumberEntityDescription, ...] = (
     ),
     NumberEntityDescription(
         key="screenBrightness",
-        name="Screen brightness",
+        translation_key="screen_brightness",
         native_max_value=255,
         native_step=1,
         native_min_value=0,
diff --git a/homeassistant/components/fully_kiosk/sensor.py b/homeassistant/components/fully_kiosk/sensor.py
index eed14f24674..dd775e7d55a 100644
--- a/homeassistant/components/fully_kiosk/sensor.py
+++ b/homeassistant/components/fully_kiosk/sensor.py
@@ -51,7 +51,6 @@ class FullySensorEntityDescription(SensorEntityDescription):
 SENSORS: tuple[FullySensorEntityDescription, ...] = (
     FullySensorEntityDescription(
         key="batteryLevel",
-        name="Battery",
         device_class=SensorDeviceClass.BATTERY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -59,23 +58,23 @@ SENSORS: tuple[FullySensorEntityDescription, ...] = (
     ),
     FullySensorEntityDescription(
         key="currentPage",
-        name="Current page",
+        translation_key="current_page",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_fn=truncate_url,
     ),
     FullySensorEntityDescription(
         key="screenOrientation",
-        name="Screen orientation",
+        translation_key="screen_orientation",
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     FullySensorEntityDescription(
         key="foregroundApp",
-        name="Foreground app",
+        translation_key="foreground_app",
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     FullySensorEntityDescription(
         key="internalStorageFreeSpace",
-        name="Internal storage free space",
+        translation_key="internal_storage_free_space",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
@@ -84,7 +83,7 @@ SENSORS: tuple[FullySensorEntityDescription, ...] = (
     ),
     FullySensorEntityDescription(
         key="internalStorageTotalSpace",
-        name="Internal storage total space",
+        translation_key="internal_storage_total_space",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
@@ -93,7 +92,7 @@ SENSORS: tuple[FullySensorEntityDescription, ...] = (
     ),
     FullySensorEntityDescription(
         key="ramFreeMemory",
-        name="Free memory",
+        translation_key="ram_free_memory",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
@@ -102,7 +101,7 @@ SENSORS: tuple[FullySensorEntityDescription, ...] = (
     ),
     FullySensorEntityDescription(
         key="ramTotalMemory",
-        name="Total memory",
+        translation_key="ram_total_memory",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
diff --git a/homeassistant/components/fully_kiosk/services.py b/homeassistant/components/fully_kiosk/services.py
index b3c5886187a..5106fd2e06e 100644
--- a/homeassistant/components/fully_kiosk/services.py
+++ b/homeassistant/components/fully_kiosk/services.py
@@ -12,9 +12,12 @@ import homeassistant.helpers.device_registry as dr
 
 from .const import (
     ATTR_APPLICATION,
+    ATTR_KEY,
     ATTR_URL,
+    ATTR_VALUE,
     DOMAIN,
     SERVICE_LOAD_URL,
+    SERVICE_SET_CONFIG,
     SERVICE_START_APPLICATION,
 )
 from .coordinator import FullyKioskDataUpdateCoordinator
@@ -62,6 +65,22 @@ async def async_setup_services(hass: HomeAssistant) -> None:
         for coordinator in await collect_coordinators(call.data[ATTR_DEVICE_ID]):
             await coordinator.fully.startApplication(call.data[ATTR_APPLICATION])
 
+    async def async_set_config(call: ServiceCall) -> None:
+        """Set a Fully Kiosk Browser config value on the device."""
+        for coordinator in await collect_coordinators(call.data[ATTR_DEVICE_ID]):
+            # Fully API has different methods for setting string and bool values.
+            # check if call.data[ATTR_VALUE] is a bool
+            if isinstance(call.data[ATTR_VALUE], bool) or call.data[
+                ATTR_VALUE
+            ].lower() in ("true", "false"):
+                await coordinator.fully.setConfigurationBool(
+                    call.data[ATTR_KEY], call.data[ATTR_VALUE]
+                )
+            else:
+                await coordinator.fully.setConfigurationString(
+                    call.data[ATTR_KEY], call.data[ATTR_VALUE]
+                )
+
     # Register all the above services
     service_mapping = [
         (async_load_url, SERVICE_LOAD_URL, ATTR_URL),
@@ -81,3 +100,18 @@ async def async_setup_services(hass: HomeAssistant) -> None:
                 )
             ),
         )
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_SET_CONFIG,
+        async_set_config,
+        schema=vol.Schema(
+            vol.All(
+                {
+                    vol.Required(ATTR_DEVICE_ID): cv.ensure_list,
+                    vol.Required(ATTR_KEY): cv.string,
+                    vol.Required(ATTR_VALUE): vol.Any(str, bool),
+                }
+            )
+        ),
+    )
diff --git a/homeassistant/components/fully_kiosk/services.yaml b/homeassistant/components/fully_kiosk/services.yaml
index 88178e35809..1f75e4a0347 100644
--- a/homeassistant/components/fully_kiosk/services.yaml
+++ b/homeassistant/components/fully_kiosk/services.yaml
@@ -13,6 +13,28 @@ load_url:
       selector:
         text:
 
+set_config:
+  name: Set Configuration
+  description: Set a configuration parameter on Fully Kiosk Browser.
+  target:
+    device:
+      integration: fully_kiosk
+  fields:
+    key:
+      name: Key
+      description: Configuration parameter to set.
+      example: "motionSensitivity"
+      required: true
+      selector:
+        text:
+    value:
+      name: Value
+      description: Value for the configuration parameter.
+      example: "90"
+      required: true
+      selector:
+        text:
+
 start_application:
   name: Start Application
   description: Start an application on the device running Fully Kiosk Browser.
diff --git a/homeassistant/components/fully_kiosk/strings.json b/homeassistant/components/fully_kiosk/strings.json
index a6442085683..c10b6162859 100644
--- a/homeassistant/components/fully_kiosk/strings.json
+++ b/homeassistant/components/fully_kiosk/strings.json
@@ -21,5 +21,89 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "kiosk_mode": {
+        "name": "Kiosk mode"
+      },
+      "plugged_in": {
+        "name": "Plugged in"
+      },
+      "device_admin": {
+        "name": "Device admin"
+      }
+    },
+    "button": {
+      "restart_browser": {
+        "name": "Restart browser"
+      },
+      "restart_device": {
+        "name": "Restart device"
+      },
+      "to_foreground": {
+        "name": "Bring to foreground"
+      },
+      "to_background": {
+        "name": "Send to background"
+      },
+      "load_start_url": {
+        "name": "Load start URL"
+      }
+    },
+    "number": {
+      "screensaver_time": {
+        "name": "Screensaver timer"
+      },
+      "screensaver_brightness": {
+        "name": "Screensaver brightness"
+      },
+      "screen_off_time": {
+        "name": "Screen off timer"
+      },
+      "screen_brightness": {
+        "name": "Screen brightness"
+      }
+    },
+    "sensor": {
+      "current_page": {
+        "name": "Current page"
+      },
+      "screen_orientation": {
+        "name": "Screen orientation"
+      },
+      "foreground_app": {
+        "name": "Foreground app"
+      },
+      "internal_storage_total_space": {
+        "name": "Internal storage total space"
+      },
+      "internal_storage_free_space": {
+        "name": "Internal storage free space"
+      },
+      "ram_free_memory": {
+        "name": "Free memory"
+      },
+      "ram_total_memory": {
+        "name": "Total memory"
+      }
+    },
+    "switch": {
+      "screensaver": {
+        "name": "Screensaver"
+      },
+      "maintenance": {
+        "name": "Maintenance mode"
+      },
+      "kiosk": {
+        "name": "Kiosk lock"
+      },
+      "motion_detection": {
+        "name": "Motion detection"
+      },
+      "screen_on": {
+        "name": "Screen"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/fully_kiosk/switch.py b/homeassistant/components/fully_kiosk/switch.py
index 1bd2a10fd21..500e154abd8 100644
--- a/homeassistant/components/fully_kiosk/switch.py
+++ b/homeassistant/components/fully_kiosk/switch.py
@@ -37,14 +37,14 @@ class FullySwitchEntityDescription(
 SWITCHES: tuple[FullySwitchEntityDescription, ...] = (
     FullySwitchEntityDescription(
         key="screensaver",
-        name="Screensaver",
+        translation_key="screensaver",
         on_action=lambda fully: fully.startScreensaver(),
         off_action=lambda fully: fully.stopScreensaver(),
         is_on_fn=lambda data: data.get("isInScreensaver"),
     ),
     FullySwitchEntityDescription(
         key="maintenance",
-        name="Maintenance mode",
+        translation_key="maintenance",
         entity_category=EntityCategory.CONFIG,
         on_action=lambda fully: fully.enableLockedMode(),
         off_action=lambda fully: fully.disableLockedMode(),
@@ -52,7 +52,7 @@ SWITCHES: tuple[FullySwitchEntityDescription, ...] = (
     ),
     FullySwitchEntityDescription(
         key="kiosk",
-        name="Kiosk lock",
+        translation_key="kiosk",
         entity_category=EntityCategory.CONFIG,
         on_action=lambda fully: fully.lockKiosk(),
         off_action=lambda fully: fully.unlockKiosk(),
@@ -60,7 +60,7 @@ SWITCHES: tuple[FullySwitchEntityDescription, ...] = (
     ),
     FullySwitchEntityDescription(
         key="motion-detection",
-        name="Motion detection",
+        translation_key="motion_detection",
         entity_category=EntityCategory.CONFIG,
         on_action=lambda fully: fully.enableMotionDetection(),
         off_action=lambda fully: fully.disableMotionDetection(),
@@ -68,7 +68,7 @@ SWITCHES: tuple[FullySwitchEntityDescription, ...] = (
     ),
     FullySwitchEntityDescription(
         key="screenOn",
-        name="Screen",
+        translation_key="screen_on",
         on_action=lambda fully: fully.screenOn(),
         off_action=lambda fully: fully.screenOff(),
         is_on_fn=lambda data: data.get("screenOn"),
diff --git a/homeassistant/components/gdacs/manifest.json b/homeassistant/components/gdacs/manifest.json
index 86904e3e9bc..b6fb3d8cee3 100644
--- a/homeassistant/components/gdacs/manifest.json
+++ b/homeassistant/components/gdacs/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aio_georss_gdacs", "aio_georss_client"],
   "quality_scale": "platinum",
-  "requirements": ["aio_georss_gdacs==0.8"]
+  "requirements": ["aio-georss-gdacs==0.8"]
 }
diff --git a/homeassistant/components/generic/camera.py b/homeassistant/components/generic/camera.py
index b039b32d73d..234795e9014 100644
--- a/homeassistant/components/generic/camera.py
+++ b/homeassistant/components/generic/camera.py
@@ -200,7 +200,7 @@ class GenericCamera(Camera):
         try:
             async_client = get_async_client(self.hass, verify_ssl=self.verify_ssl)
             response = await async_client.get(
-                url, auth=self._auth, timeout=GET_IMAGE_TIMEOUT
+                url, auth=self._auth, follow_redirects=True, timeout=GET_IMAGE_TIMEOUT
             )
             response.raise_for_status()
             self._last_image = response.content
diff --git a/homeassistant/components/generic/config_flow.py b/homeassistant/components/generic/config_flow.py
index 94a885a7c5d..34fc5713271 100644
--- a/homeassistant/components/generic/config_flow.py
+++ b/homeassistant/components/generic/config_flow.py
@@ -9,10 +9,10 @@ import io
 import logging
 from typing import Any
 
-import PIL
 from aiohttp import web
 from async_timeout import timeout
 from httpx import HTTPStatusError, RequestError, TimeoutException
+import PIL
 import voluptuous as vol
 import yarl
 
@@ -426,24 +426,12 @@ class GenericOptionsFlowHandler(OptionsFlow):
                     # is always jpeg
                     still_format = "image/jpeg"
                 data = {
-                    CONF_AUTHENTICATION: user_input.get(CONF_AUTHENTICATION),
-                    CONF_STREAM_SOURCE: user_input.get(CONF_STREAM_SOURCE),
-                    CONF_PASSWORD: user_input.get(CONF_PASSWORD),
-                    CONF_STILL_IMAGE_URL: user_input.get(CONF_STILL_IMAGE_URL),
+                    CONF_USE_WALLCLOCK_AS_TIMESTAMPS: self.config_entry.options.get(
+                        CONF_USE_WALLCLOCK_AS_TIMESTAMPS, False
+                    ),
+                    **user_input,
                     CONF_CONTENT_TYPE: still_format
                     or self.config_entry.options.get(CONF_CONTENT_TYPE),
-                    CONF_USERNAME: user_input.get(CONF_USERNAME),
-                    CONF_LIMIT_REFETCH_TO_URL_CHANGE: user_input[
-                        CONF_LIMIT_REFETCH_TO_URL_CHANGE
-                    ],
-                    CONF_FRAMERATE: user_input[CONF_FRAMERATE],
-                    CONF_VERIFY_SSL: user_input[CONF_VERIFY_SSL],
-                    CONF_USE_WALLCLOCK_AS_TIMESTAMPS: user_input.get(
-                        CONF_USE_WALLCLOCK_AS_TIMESTAMPS,
-                        self.config_entry.options.get(
-                            CONF_USE_WALLCLOCK_AS_TIMESTAMPS, False
-                        ),
-                    ),
                 }
                 self.user_input = data
                 # temporary preview for user to check the image
diff --git a/homeassistant/components/generic/manifest.json b/homeassistant/components/generic/manifest.json
index fc06155121b..134ce00ef70 100644
--- a/homeassistant/components/generic/manifest.json
+++ b/homeassistant/components/generic/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["http"],
   "documentation": "https://www.home-assistant.io/integrations/generic",
   "iot_class": "local_push",
-  "requirements": ["ha-av==10.1.0", "pillow==9.5.0"]
+  "requirements": ["ha-av==10.1.0", "Pillow==9.5.0"]
 }
diff --git a/homeassistant/components/generic_hygrostat/humidifier.py b/homeassistant/components/generic_hygrostat/humidifier.py
index a6e76330f29..01945f9e242 100644
--- a/homeassistant/components/generic_hygrostat/humidifier.py
+++ b/homeassistant/components/generic_hygrostat/humidifier.py
@@ -248,6 +248,11 @@ class GenericHygrostat(HumidifierEntity, RestoreEntity):
         """Return true if the hygrostat is on."""
         return self._state
 
+    @property
+    def current_humidity(self):
+        """Return the measured humidity."""
+        return self._cur_humidity
+
     @property
     def target_humidity(self):
         """Return the humidity we try to reach."""
@@ -430,17 +435,14 @@ class GenericHygrostat(HumidifierEntity, RestoreEntity):
                 elif time is not None:
                     # The time argument is passed only in keep-alive case
                     await self._async_device_turn_on()
-            else:
-                if (
-                    self._device_class == HumidifierDeviceClass.HUMIDIFIER and too_dry
-                ) or (
-                    self._device_class == HumidifierDeviceClass.DEHUMIDIFIER and too_wet
-                ):
-                    _LOGGER.info("Turning on humidifier %s", self._switch_entity_id)
-                    await self._async_device_turn_on()
-                elif time is not None:
-                    # The time argument is passed only in keep-alive case
-                    await self._async_device_turn_off()
+            elif (
+                self._device_class == HumidifierDeviceClass.HUMIDIFIER and too_dry
+            ) or (self._device_class == HumidifierDeviceClass.DEHUMIDIFIER and too_wet):
+                _LOGGER.info("Turning on humidifier %s", self._switch_entity_id)
+                await self._async_device_turn_on()
+            elif time is not None:
+                # The time argument is passed only in keep-alive case
+                await self._async_device_turn_off()
 
     @property
     def _is_device_active(self):
diff --git a/homeassistant/components/generic_thermostat/climate.py b/homeassistant/components/generic_thermostat/climate.py
index 22a3f98a9f0..e3eed8866c8 100644
--- a/homeassistant/components/generic_thermostat/climate.py
+++ b/homeassistant/components/generic_thermostat/climate.py
@@ -494,16 +494,15 @@ class GenericThermostat(ClimateEntity, RestoreEntity):
                         self.heater_entity_id,
                     )
                     await self._async_heater_turn_on()
-            else:
-                if (self.ac_mode and too_hot) or (not self.ac_mode and too_cold):
-                    _LOGGER.info("Turning on heater %s", self.heater_entity_id)
-                    await self._async_heater_turn_on()
-                elif time is not None:
-                    # The time argument is passed only in keep-alive case
-                    _LOGGER.info(
-                        "Keep-alive - Turning off heater %s", self.heater_entity_id
-                    )
-                    await self._async_heater_turn_off()
+            elif (self.ac_mode and too_hot) or (not self.ac_mode and too_cold):
+                _LOGGER.info("Turning on heater %s", self.heater_entity_id)
+                await self._async_heater_turn_on()
+            elif time is not None:
+                # The time argument is passed only in keep-alive case
+                _LOGGER.info(
+                    "Keep-alive - Turning off heater %s", self.heater_entity_id
+                )
+                await self._async_heater_turn_off()
 
     @property
     def _is_device_active(self):
diff --git a/homeassistant/components/geniushub/climate.py b/homeassistant/components/geniushub/climate.py
index c2b32582cef..bafda44501b 100644
--- a/homeassistant/components/geniushub/climate.py
+++ b/homeassistant/components/geniushub/climate.py
@@ -66,17 +66,17 @@ class GeniusClimateZone(GeniusHeatingZone, ClimateEntity):
         return "mdi:radiator"
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool mode."""
         return GH_HVAC_TO_HA.get(self._zone.data["mode"], HVACMode.HEAT)
 
     @property
-    def hvac_modes(self) -> list[str]:
+    def hvac_modes(self) -> list[HVACMode]:
         """Return the list of available hvac operation modes."""
         return list(HA_HVAC_TO_GH)
 
     @property
-    def hvac_action(self) -> str | None:
+    def hvac_action(self) -> HVACAction | None:
         """Return the current running hvac operation if supported."""
         if "_state" in self._zone.data:  # only for v3 API
             if self._zone.data["output"] == 1:
diff --git a/homeassistant/components/geo_json_events/geo_location.py b/homeassistant/components/geo_json_events/geo_location.py
index def8f77994e..b922d98f25e 100644
--- a/homeassistant/components/geo_json_events/geo_location.py
+++ b/homeassistant/components/geo_json_events/geo_location.py
@@ -83,7 +83,7 @@ async def async_setup_platform(
         hass,
         DOMAIN,
         "deprecated_yaml",
-        breaks_in_ha_version="2023.8.0",
+        breaks_in_ha_version="2023.12.0",
         is_fixable=False,
         severity=IssueSeverity.WARNING,
         translation_key="deprecated_yaml",
diff --git a/homeassistant/components/geo_json_events/manifest.json b/homeassistant/components/geo_json_events/manifest.json
index b02339eb20a..9f77f9b112e 100644
--- a/homeassistant/components/geo_json_events/manifest.json
+++ b/homeassistant/components/geo_json_events/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aio_geojson_generic_client"],
-  "requirements": ["aio_geojson_generic_client==0.3"]
+  "requirements": ["aio-geojson-generic-client==0.3"]
 }
diff --git a/homeassistant/components/geo_rss_events/manifest.json b/homeassistant/components/geo_rss_events/manifest.json
index 3ed5418fa0f..bdf8f126680 100644
--- a/homeassistant/components/geo_rss_events/manifest.json
+++ b/homeassistant/components/geo_rss_events/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/geo_rss_events",
   "iot_class": "cloud_polling",
   "loggers": ["georss_client", "georss_generic_client"],
-  "requirements": ["georss_generic_client==0.6"]
+  "requirements": ["georss-generic-client==0.6"]
 }
diff --git a/homeassistant/components/geocaching/sensor.py b/homeassistant/components/geocaching/sensor.py
index 134877d7509..d1be775e370 100644
--- a/homeassistant/components/geocaching/sensor.py
+++ b/homeassistant/components/geocaching/sensor.py
@@ -36,14 +36,14 @@ class GeocachingSensorEntityDescription(
 SENSORS: tuple[GeocachingSensorEntityDescription, ...] = (
     GeocachingSensorEntityDescription(
         key="find_count",
-        name="Total finds",
+        translation_key="find_count",
         icon="mdi:notebook-edit-outline",
         native_unit_of_measurement="caches",
         value_fn=lambda status: status.user.find_count,
     ),
     GeocachingSensorEntityDescription(
         key="hide_count",
-        name="Total hides",
+        translation_key="hide_count",
         icon="mdi:eye-off-outline",
         native_unit_of_measurement="caches",
         entity_registry_visible_default=False,
@@ -51,7 +51,7 @@ SENSORS: tuple[GeocachingSensorEntityDescription, ...] = (
     ),
     GeocachingSensorEntityDescription(
         key="favorite_points",
-        name="Favorite points",
+        translation_key="favorite_points",
         icon="mdi:heart-outline",
         native_unit_of_measurement="points",
         entity_registry_visible_default=False,
@@ -59,14 +59,14 @@ SENSORS: tuple[GeocachingSensorEntityDescription, ...] = (
     ),
     GeocachingSensorEntityDescription(
         key="souvenir_count",
-        name="Total souvenirs",
+        translation_key="souvenir_count",
         icon="mdi:license",
         native_unit_of_measurement="souvenirs",
         value_fn=lambda status: status.user.souvenir_count,
     ),
     GeocachingSensorEntityDescription(
         key="awarded_favorite_points",
-        name="Awarded favorite points",
+        translation_key="awarded_favorite_points",
         icon="mdi:heart",
         native_unit_of_measurement="points",
         entity_registry_visible_default=False,
diff --git a/homeassistant/components/geocaching/strings.json b/homeassistant/components/geocaching/strings.json
index 7c8547805d1..6dc2fe8ec1c 100644
--- a/homeassistant/components/geocaching/strings.json
+++ b/homeassistant/components/geocaching/strings.json
@@ -21,5 +21,24 @@
     "create_entry": {
       "default": "[%key:common::config_flow::create_entry::authenticated%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "find_count": {
+        "name": "Total finds"
+      },
+      "hide_count": {
+        "name": "Total hides"
+      },
+      "favorite_points": {
+        "name": "Favorite points"
+      },
+      "souvenir_count": {
+        "name": "Total souvenirs"
+      },
+      "awarded_favorite_points": {
+        "name": "Awarded favorite points"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/geonetnz_quakes/manifest.json b/homeassistant/components/geonetnz_quakes/manifest.json
index 74ca6406782..9ed59b2bc97 100644
--- a/homeassistant/components/geonetnz_quakes/manifest.json
+++ b/homeassistant/components/geonetnz_quakes/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aio_geojson_geonetnz_quakes"],
   "quality_scale": "platinum",
-  "requirements": ["aio_geojson_geonetnz_quakes==0.15"]
+  "requirements": ["aio-geojson-geonetnz-quakes==0.15"]
 }
diff --git a/homeassistant/components/geonetnz_volcano/manifest.json b/homeassistant/components/geonetnz_volcano/manifest.json
index c6cffad477d..6e9503e0243 100644
--- a/homeassistant/components/geonetnz_volcano/manifest.json
+++ b/homeassistant/components/geonetnz_volcano/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aio_geojson_geonetnz_volcano"],
-  "requirements": ["aio_geojson_geonetnz_volcano==0.8"]
+  "requirements": ["aio-geojson-geonetnz-volcano==0.8"]
 }
diff --git a/homeassistant/components/gios/sensor.py b/homeassistant/components/gios/sensor.py
index f078cc074e9..64119436230 100644
--- a/homeassistant/components/gios/sensor.py
+++ b/homeassistant/components/gios/sensor.py
@@ -91,7 +91,6 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
-        translation_key="no2",
     ),
     GiosSensorEntityDescription(
         key=ATTR_NO2,
@@ -109,7 +108,6 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.OZONE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
-        translation_key="o3",
     ),
     GiosSensorEntityDescription(
         key=ATTR_O3,
@@ -127,7 +125,6 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.PM10,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
-        translation_key="pm10",
     ),
     GiosSensorEntityDescription(
         key=ATTR_PM10,
@@ -145,7 +142,6 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.PM25,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
-        translation_key="pm25",
     ),
     GiosSensorEntityDescription(
         key=ATTR_PM25,
@@ -163,7 +159,6 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
-        translation_key="so2",
     ),
     GiosSensorEntityDescription(
         key=ATTR_SO2,
diff --git a/homeassistant/components/gios/strings.json b/homeassistant/components/gios/strings.json
index 5387c043fc3..ee0f50ef40c 100644
--- a/homeassistant/components/gios/strings.json
+++ b/homeassistant/components/gios/strings.json
@@ -42,9 +42,6 @@
       "co": {
         "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
       },
-      "no2": {
-        "name": "[%key:component::sensor::entity_component::nitrogen_dioxide::name%]"
-      },
       "no2_index": {
         "name": "Nitrogen dioxide index",
         "state": {
@@ -56,9 +53,6 @@
           "very_good": "[%key:component::gios::entity::sensor::aqi::state::very_good%]"
         }
       },
-      "o3": {
-        "name": "[%key:component::sensor::entity_component::ozone::name%]"
-      },
       "o3_index": {
         "name": "Ozone index",
         "state": {
@@ -70,9 +64,6 @@
           "very_good": "[%key:component::gios::entity::sensor::aqi::state::very_good%]"
         }
       },
-      "pm10": {
-        "name": "[%key:component::sensor::entity_component::pm10::name%]"
-      },
       "pm10_index": {
         "name": "PM10 index",
         "state": {
@@ -84,9 +75,6 @@
           "very_good": "[%key:component::gios::entity::sensor::aqi::state::very_good%]"
         }
       },
-      "pm25": {
-        "name": "[%key:component::sensor::entity_component::pm25::name%]"
-      },
       "pm25_index": {
         "name": "PM2.5 index",
         "state": {
@@ -98,9 +86,6 @@
           "very_good": "[%key:component::gios::entity::sensor::aqi::state::very_good%]"
         }
       },
-      "so2": {
-        "name": "[%key:component::sensor::entity_component::sulphur_dioxide::name%]"
-      },
       "so2_index": {
         "name": "Sulphur dioxide index",
         "state": {
diff --git a/homeassistant/components/github/sensor.py b/homeassistant/components/github/sensor.py
index af6e5e2ca4a..edcdd8c057b 100644
--- a/homeassistant/components/github/sensor.py
+++ b/homeassistant/components/github/sensor.py
@@ -47,7 +47,7 @@ class GitHubSensorEntityDescription(BaseEntityDescription, BaseEntityDescription
 SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
     GitHubSensorEntityDescription(
         key="discussions_count",
-        name="Discussions",
+        translation_key="discussions_count",
         native_unit_of_measurement="Discussions",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
@@ -55,7 +55,7 @@ SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
     ),
     GitHubSensorEntityDescription(
         key="stargazers_count",
-        name="Stars",
+        translation_key="stargazers_count",
         icon="mdi:star",
         native_unit_of_measurement="Stars",
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -64,7 +64,7 @@ SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
     ),
     GitHubSensorEntityDescription(
         key="subscribers_count",
-        name="Watchers",
+        translation_key="subscribers_count",
         icon="mdi:glasses",
         native_unit_of_measurement="Watchers",
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -73,7 +73,7 @@ SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
     ),
     GitHubSensorEntityDescription(
         key="forks_count",
-        name="Forks",
+        translation_key="forks_count",
         icon="mdi:source-fork",
         native_unit_of_measurement="Forks",
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -82,7 +82,7 @@ SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
     ),
     GitHubSensorEntityDescription(
         key="issues_count",
-        name="Issues",
+        translation_key="issues_count",
         native_unit_of_measurement="Issues",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
@@ -90,7 +90,7 @@ SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
     ),
     GitHubSensorEntityDescription(
         key="pulls_count",
-        name="Pull requests",
+        translation_key="pulls_count",
         native_unit_of_measurement="Pull Requests",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
@@ -98,7 +98,7 @@ SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
     ),
     GitHubSensorEntityDescription(
         key="latest_commit",
-        name="Latest commit",
+        translation_key="latest_commit",
         value_fn=lambda data: data["default_branch_ref"]["commit"]["message"][:255],
         attr_fn=lambda data: {
             "sha": data["default_branch_ref"]["commit"]["sha"],
@@ -107,7 +107,7 @@ SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
     ),
     GitHubSensorEntityDescription(
         key="latest_discussion",
-        name="Latest discussion",
+        translation_key="latest_discussion",
         avabl_fn=lambda data: data["discussion"]["discussions"],
         value_fn=lambda data: data["discussion"]["discussions"][0]["title"][:255],
         attr_fn=lambda data: {
@@ -117,7 +117,7 @@ SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
     ),
     GitHubSensorEntityDescription(
         key="latest_release",
-        name="Latest release",
+        translation_key="latest_release",
         avabl_fn=lambda data: data["release"] is not None,
         value_fn=lambda data: data["release"]["name"][:255],
         attr_fn=lambda data: {
@@ -127,7 +127,7 @@ SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
     ),
     GitHubSensorEntityDescription(
         key="latest_issue",
-        name="Latest issue",
+        translation_key="latest_issue",
         avabl_fn=lambda data: data["issue"]["issues"],
         value_fn=lambda data: data["issue"]["issues"][0]["title"][:255],
         attr_fn=lambda data: {
@@ -137,7 +137,7 @@ SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
     ),
     GitHubSensorEntityDescription(
         key="latest_pull_request",
-        name="Latest pull request",
+        translation_key="latest_pull_request",
         avabl_fn=lambda data: data["pull_request"]["pull_requests"],
         value_fn=lambda data: data["pull_request"]["pull_requests"][0]["title"][:255],
         attr_fn=lambda data: {
@@ -147,7 +147,7 @@ SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
     ),
     GitHubSensorEntityDescription(
         key="latest_tag",
-        name="Latest tag",
+        translation_key="latest_tag",
         avabl_fn=lambda data: data["refs"]["tags"],
         value_fn=lambda data: data["refs"]["tags"][0]["name"][:255],
         attr_fn=lambda data: {
diff --git a/homeassistant/components/github/strings.json b/homeassistant/components/github/strings.json
index fa981d3dcb5..7b7ae91b9fd 100644
--- a/homeassistant/components/github/strings.json
+++ b/homeassistant/components/github/strings.json
@@ -15,5 +15,45 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
       "could_not_register": "Could not register integration with GitHub"
     }
+  },
+  "entity": {
+    "sensor": {
+      "discussions_count": {
+        "name": "Discussions"
+      },
+      "stargazers_count": {
+        "name": "Stars"
+      },
+      "subscribers_count": {
+        "name": "Watchers"
+      },
+      "forks_count": {
+        "name": "Forks"
+      },
+      "issues_count": {
+        "name": "Issues"
+      },
+      "pulls_count": {
+        "name": "Pull requests"
+      },
+      "latest_commit": {
+        "name": "Latest commit"
+      },
+      "latest_discussion": {
+        "name": "Latest discussion"
+      },
+      "latest_release": {
+        "name": "Latest release"
+      },
+      "latest_issue": {
+        "name": "Latest issue"
+      },
+      "latest_pull_request": {
+        "name": "Latest pull request"
+      },
+      "latest_tag": {
+        "name": "Latest tag"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/glances/manifest.json b/homeassistant/components/glances/manifest.json
index 767a27ffdfd..d90f7b8274c 100644
--- a/homeassistant/components/glances/manifest.json
+++ b/homeassistant/components/glances/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/glances",
   "iot_class": "local_polling",
   "loggers": ["glances_api"],
-  "requirements": ["glances_api==0.4.2"]
+  "requirements": ["glances-api==0.4.3"]
 }
diff --git a/homeassistant/components/gogogate2/manifest.json b/homeassistant/components/gogogate2/manifest.json
index ec2834d00d8..faebcf7e353 100644
--- a/homeassistant/components/gogogate2/manifest.json
+++ b/homeassistant/components/gogogate2/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "gogogate2",
   "name": "Gogogate2 and ismartgate",
-  "codeowners": ["@vangorra", "@bdraco"],
+  "codeowners": ["@vangorra"],
   "config_flow": true,
   "dhcp": [
     {
diff --git a/homeassistant/components/google_assistant/__init__.py b/homeassistant/components/google_assistant/__init__.py
index 3a0315a5931..37f3a2c3edc 100644
--- a/homeassistant/components/google_assistant/__init__.py
+++ b/homeassistant/components/google_assistant/__init__.py
@@ -28,10 +28,10 @@ from .const import (  # noqa: F401
     DEFAULT_EXPOSE_BY_DEFAULT,
     DEFAULT_EXPOSED_DOMAINS,
     DOMAIN,
+    EVENT_QUERY_RECEIVED,  # noqa: F401
     SERVICE_REQUEST_SYNC,
     SOURCE_CLOUD,
 )
-from .const import EVENT_QUERY_RECEIVED  # noqa: F401
 from .http import GoogleAssistantView, GoogleConfig
 
 from .const import EVENT_COMMAND_RECEIVED, EVENT_SYNC_RECEIVED  # noqa: F401, isort:skip
diff --git a/homeassistant/components/google_assistant/const.py b/homeassistant/components/google_assistant/const.py
index 918cec046fb..6ec8ca5d747 100644
--- a/homeassistant/components/google_assistant/const.py
+++ b/homeassistant/components/google_assistant/const.py
@@ -170,6 +170,7 @@ DEVICE_CLASS_TO_GOOGLE_TYPES = {
     (media_player.DOMAIN, media_player.MediaPlayerDeviceClass.RECEIVER): TYPE_RECEIVER,
     (media_player.DOMAIN, media_player.MediaPlayerDeviceClass.SPEAKER): TYPE_SPEAKER,
     (media_player.DOMAIN, media_player.MediaPlayerDeviceClass.TV): TYPE_TV,
+    (sensor.DOMAIN, sensor.SensorDeviceClass.AQI): TYPE_SENSOR,
     (sensor.DOMAIN, sensor.SensorDeviceClass.HUMIDITY): TYPE_SENSOR,
     (sensor.DOMAIN, sensor.SensorDeviceClass.TEMPERATURE): TYPE_SENSOR,
     (switch.DOMAIN, switch.SwitchDeviceClass.OUTLET): TYPE_OUTLET,
diff --git a/homeassistant/components/google_assistant/smart_home.py b/homeassistant/components/google_assistant/smart_home.py
index 1b1b443baac..b8c57812540 100644
--- a/homeassistant/components/google_assistant/smart_home.py
+++ b/homeassistant/components/google_assistant/smart_home.py
@@ -278,7 +278,6 @@ async def async_devices_disconnect(
     """
     assert data.context.user_id is not None
     await data.config.async_disconnect_agent_user(data.context.user_id)
-    return None
 
 
 @HANDLERS.register("action.devices.IDENTIFY")
diff --git a/homeassistant/components/google_assistant/trait.py b/homeassistant/components/google_assistant/trait.py
index 6f7dbd2c3b0..36660820efb 100644
--- a/homeassistant/components/google_assistant/trait.py
+++ b/homeassistant/components/google_assistant/trait.py
@@ -922,9 +922,28 @@ class TemperatureSettingTrait(_Trait):
     def sync_attributes(self):
         """Return temperature point and modes attributes for a sync request."""
         response = {}
-        response["thermostatTemperatureUnit"] = _google_temp_unit(
-            self.hass.config.units.temperature_unit
+        attrs = self.state.attributes
+        unit = self.hass.config.units.temperature_unit
+        response["thermostatTemperatureUnit"] = _google_temp_unit(unit)
+
+        min_temp = round(
+            TemperatureConverter.convert(
+                float(attrs[climate.ATTR_MIN_TEMP]),
+                unit,
+                UnitOfTemperature.CELSIUS,
+            )
         )
+        max_temp = round(
+            TemperatureConverter.convert(
+                float(attrs[climate.ATTR_MAX_TEMP]),
+                unit,
+                UnitOfTemperature.CELSIUS,
+            )
+        )
+        response["thermostatTemperatureRange"] = {
+            "minThresholdCelsius": min_temp,
+            "maxThresholdCelsius": max_temp,
+        }
 
         modes = self.climate_google_modes
 
@@ -989,24 +1008,22 @@ class TemperatureSettingTrait(_Trait):
                     ),
                     1,
                 )
-            else:
-                if (target_temp := attrs.get(ATTR_TEMPERATURE)) is not None:
-                    target_temp = round(
-                        TemperatureConverter.convert(
-                            target_temp, unit, UnitOfTemperature.CELSIUS
-                        ),
-                        1,
-                    )
-                    response["thermostatTemperatureSetpointHigh"] = target_temp
-                    response["thermostatTemperatureSetpointLow"] = target_temp
-        else:
-            if (target_temp := attrs.get(ATTR_TEMPERATURE)) is not None:
-                response["thermostatTemperatureSetpoint"] = round(
+            elif (target_temp := attrs.get(ATTR_TEMPERATURE)) is not None:
+                target_temp = round(
                     TemperatureConverter.convert(
                         target_temp, unit, UnitOfTemperature.CELSIUS
                     ),
                     1,
                 )
+                response["thermostatTemperatureSetpointHigh"] = target_temp
+                response["thermostatTemperatureSetpointLow"] = target_temp
+        elif (target_temp := attrs.get(ATTR_TEMPERATURE)) is not None:
+            response["thermostatTemperatureSetpoint"] = round(
+                TemperatureConverter.convert(
+                    target_temp, unit, UnitOfTemperature.CELSIUS
+                ),
+                1,
+            )
 
         return response
 
@@ -1197,9 +1214,12 @@ class HumiditySettingTrait(_Trait):
                     response["humidityAmbientPercent"] = round(float(current_humidity))
 
         elif domain == humidifier.DOMAIN:
-            target_humidity = attrs.get(humidifier.ATTR_HUMIDITY)
+            target_humidity: int | None = attrs.get(humidifier.ATTR_HUMIDITY)
             if target_humidity is not None:
-                response["humiditySetpointPercent"] = round(float(target_humidity))
+                response["humiditySetpointPercent"] = target_humidity
+            current_humidity: int | None = attrs.get(humidifier.ATTR_CURRENT_HUMIDITY)
+            if current_humidity is not None:
+                response["humidityAmbientPercent"] = current_humidity
 
         return response
 
@@ -2393,6 +2413,23 @@ class SensorStateTrait(_Trait):
     name = TRAIT_SENSOR_STATE
     commands: list[str] = []
 
+    def _air_quality_description_for_aqi(self, aqi):
+        if aqi is None or aqi.isnumeric() is False:
+            return "unknown"
+        aqi = int(aqi)
+        if aqi <= 50:
+            return "healthy"
+        if aqi <= 100:
+            return "moderate"
+        if aqi <= 150:
+            return "unhealthy for sensitive groups"
+        if aqi <= 200:
+            return "unhealthy"
+        if aqi <= 300:
+            return "very unhealthy"
+
+        return "hazardous"
+
     @classmethod
     def supported(cls, domain, features, device_class, _):
         """Test if state is supported."""
@@ -2401,20 +2438,44 @@ class SensorStateTrait(_Trait):
     def sync_attributes(self):
         """Return attributes for a sync request."""
         device_class = self.state.attributes.get(ATTR_DEVICE_CLASS)
-        if (data := self.sensor_types.get(device_class)) is not None:
-            return {
-                "sensorStatesSupported": {
-                    "name": data[0],
-                    "numericCapabilities": {"rawValueUnit": data[1]},
-                }
+        data = self.sensor_types.get(device_class)
+
+        if device_class is None or data is None:
+            return {}
+
+        sensor_state = {
+            "name": data[0],
+            "numericCapabilities": {"rawValueUnit": data[1]},
+        }
+
+        if device_class == sensor.SensorDeviceClass.AQI:
+            sensor_state["descriptiveCapabilities"] = {
+                "availableStates": [
+                    "healthy",
+                    "moderate",
+                    "unhealthy for sensitive groups",
+                    "unhealthy",
+                    "very unhealthy",
+                    "hazardous",
+                    "unknown",
+                ],
             }
 
+        return {"sensorStatesSupported": [sensor_state]}
+
     def query_attributes(self):
         """Return the attributes of this trait for this entity."""
         device_class = self.state.attributes.get(ATTR_DEVICE_CLASS)
-        if (data := self.sensor_types.get(device_class)) is not None:
-            return {
-                "currentSensorStateData": [
-                    {"name": data[0], "rawValue": self.state.state}
-                ]
-            }
+        data = self.sensor_types.get(device_class)
+
+        if device_class is None or data is None:
+            return {}
+
+        sensor_data = {"name": data[0], "rawValue": self.state.state}
+
+        if device_class == sensor.SensorDeviceClass.AQI:
+            sensor_data["currentSensorState"] = self._air_quality_description_for_aqi(
+                self.state.state
+            )
+
+        return {"currentSensorStateData": [sensor_data]}
diff --git a/homeassistant/components/google_assistant_sdk/__init__.py b/homeassistant/components/google_assistant_sdk/__init__.py
index 7a9ca70bf14..db2a8d9512e 100644
--- a/homeassistant/components/google_assistant_sdk/__init__.py
+++ b/homeassistant/components/google_assistant_sdk/__init__.py
@@ -18,18 +18,11 @@ from homeassistant.helpers.config_entry_oauth2_flow import (
 )
 from homeassistant.helpers.typing import ConfigType
 
-from .const import (
-    CONF_ENABLE_CONVERSATION_AGENT,
-    CONF_LANGUAGE_CODE,
-    DATA_MEM_STORAGE,
-    DATA_SESSION,
-    DOMAIN,
-)
+from .const import DATA_MEM_STORAGE, DATA_SESSION, DOMAIN, SUPPORTED_LANGUAGE_CODES
 from .helpers import (
     GoogleAssistantSDKAudioView,
     InMemoryStorage,
     async_send_text_commands,
-    default_language_code,
 )
 
 SERVICE_SEND_TEXT_COMMAND = "send_text_command"
@@ -44,6 +37,8 @@ SERVICE_SEND_TEXT_COMMAND_SCHEMA = vol.All(
     },
 )
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Google Assistant SDK component."""
@@ -80,8 +75,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     await async_setup_service(hass)
 
-    entry.async_on_unload(entry.add_update_listener(update_listener))
-    await update_listener(hass, entry)
+    agent = GoogleAssistantConversationAgent(hass, entry)
+    conversation.async_set_agent(hass, entry, agent)
 
     return True
 
@@ -98,8 +93,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         for service_name in hass.services.async_services()[DOMAIN]:
             hass.services.async_remove(DOMAIN, service_name)
 
-    if entry.options.get(CONF_ENABLE_CONVERSATION_AGENT, False):
-        conversation.async_unset_agent(hass, entry)
+    conversation.async_unset_agent(hass, entry)
 
     return True
 
@@ -123,15 +117,6 @@ async def async_setup_service(hass: HomeAssistant) -> None:
     )
 
 
-async def update_listener(hass, entry):
-    """Handle options update."""
-    if entry.options.get(CONF_ENABLE_CONVERSATION_AGENT, False):
-        agent = GoogleAssistantConversationAgent(hass, entry)
-        conversation.async_set_agent(hass, entry, agent)
-    else:
-        conversation.async_unset_agent(hass, entry)
-
-
 class GoogleAssistantConversationAgent(conversation.AbstractConversationAgent):
     """Google Assistant SDK conversation agent."""
 
@@ -141,6 +126,7 @@ class GoogleAssistantConversationAgent(conversation.AbstractConversationAgent):
         self.entry = entry
         self.assistant: TextAssistant | None = None
         self.session: OAuth2Session | None = None
+        self.language: str | None = None
 
     @property
     def attribution(self):
@@ -153,10 +139,7 @@ class GoogleAssistantConversationAgent(conversation.AbstractConversationAgent):
     @property
     def supported_languages(self) -> list[str]:
         """Return a list of supported languages."""
-        language_code = self.entry.options.get(
-            CONF_LANGUAGE_CODE, default_language_code(self.hass)
-        )
-        return [language_code]
+        return SUPPORTED_LANGUAGE_CODES
 
     async def async_process(
         self, user_input: conversation.ConversationInput
@@ -170,12 +153,10 @@ class GoogleAssistantConversationAgent(conversation.AbstractConversationAgent):
         if not session.valid_token:
             await session.async_ensure_token_valid()
             self.assistant = None
-        if not self.assistant:
+        if not self.assistant or user_input.language != self.language:
             credentials = Credentials(session.token[CONF_ACCESS_TOKEN])
-            language_code = self.entry.options.get(
-                CONF_LANGUAGE_CODE, default_language_code(self.hass)
-            )
-            self.assistant = TextAssistant(credentials, language_code)
+            self.language = user_input.language
+            self.assistant = TextAssistant(credentials, self.language)
 
         resp = self.assistant.assist(user_input.text)
         text_response = resp[0] or "<empty response>"
diff --git a/homeassistant/components/google_assistant_sdk/config_flow.py b/homeassistant/components/google_assistant_sdk/config_flow.py
index b93a3be93f2..b4f617ca029 100644
--- a/homeassistant/components/google_assistant_sdk/config_flow.py
+++ b/homeassistant/components/google_assistant_sdk/config_flow.py
@@ -13,13 +13,7 @@ from homeassistant.core import callback
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers import config_entry_oauth2_flow
 
-from .const import (
-    CONF_ENABLE_CONVERSATION_AGENT,
-    CONF_LANGUAGE_CODE,
-    DEFAULT_NAME,
-    DOMAIN,
-    SUPPORTED_LANGUAGE_CODES,
-)
+from .const import CONF_LANGUAGE_CODE, DEFAULT_NAME, DOMAIN, SUPPORTED_LANGUAGE_CODES
 from .helpers import default_language_code
 
 _LOGGER = logging.getLogger(__name__)
@@ -114,12 +108,6 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
                         CONF_LANGUAGE_CODE,
                         default=self.config_entry.options.get(CONF_LANGUAGE_CODE),
                     ): vol.In(SUPPORTED_LANGUAGE_CODES),
-                    vol.Required(
-                        CONF_ENABLE_CONVERSATION_AGENT,
-                        default=self.config_entry.options.get(
-                            CONF_ENABLE_CONVERSATION_AGENT
-                        ),
-                    ): bool,
                 }
             ),
         )
diff --git a/homeassistant/components/google_assistant_sdk/const.py b/homeassistant/components/google_assistant_sdk/const.py
index c9f86160bb4..d63aec0ebd5 100644
--- a/homeassistant/components/google_assistant_sdk/const.py
+++ b/homeassistant/components/google_assistant_sdk/const.py
@@ -5,7 +5,6 @@ DOMAIN: Final = "google_assistant_sdk"
 
 DEFAULT_NAME: Final = "Google Assistant SDK"
 
-CONF_ENABLE_CONVERSATION_AGENT: Final = "enable_conversation_agent"
 CONF_LANGUAGE_CODE: Final = "language_code"
 
 DATA_MEM_STORAGE: Final = "mem_storage"
diff --git a/homeassistant/components/google_assistant_sdk/strings.json b/homeassistant/components/google_assistant_sdk/strings.json
index d4c85be91e5..66a2b975b5e 100644
--- a/homeassistant/components/google_assistant_sdk/strings.json
+++ b/homeassistant/components/google_assistant_sdk/strings.json
@@ -31,10 +31,8 @@
     "step": {
       "init": {
         "data": {
-          "enable_conversation_agent": "Enable the conversation agent",
           "language_code": "Language code"
-        },
-        "description": "Set language for interactions with Google Assistant and whether you want to enable the conversation agent."
+        }
       }
     }
   },
diff --git a/homeassistant/components/google_generative_ai_conversation/manifest.json b/homeassistant/components/google_generative_ai_conversation/manifest.json
index 52de9215535..65d9e0b3894 100644
--- a/homeassistant/components/google_generative_ai_conversation/manifest.json
+++ b/homeassistant/components/google_generative_ai_conversation/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/google_generative_ai_conversation",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["google-generativeai==0.1.0rc2"]
+  "requirements": ["google-generativeai==0.1.0"]
 }
diff --git a/homeassistant/components/google_mail/__init__.py b/homeassistant/components/google_mail/__init__.py
index a24d5c17874..15c4192ccf5 100644
--- a/homeassistant/components/google_mail/__init__.py
+++ b/homeassistant/components/google_mail/__init__.py
@@ -7,8 +7,7 @@ from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import discovery
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.config_entry_oauth2_flow import (
     OAuth2Session,
     async_get_config_entry_implementation,
@@ -21,6 +20,8 @@ from .services import async_setup_services
 
 PLATFORMS = [Platform.NOTIFY, Platform.SENSOR]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Google Mail platform."""
@@ -33,7 +34,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Google Mail from a config entry."""
     implementation = await async_get_config_entry_implementation(hass, entry)
     session = OAuth2Session(hass, entry, implementation)
-    auth = AsyncConfigEntryAuth(async_get_clientsession(hass), session)
+    auth = AsyncConfigEntryAuth(session)
     try:
         await auth.check_and_refresh_token()
     except ClientResponseError as err:
diff --git a/homeassistant/components/google_mail/api.py b/homeassistant/components/google_mail/api.py
index 202fa5b56b6..ffa33deae14 100644
--- a/homeassistant/components/google_mail/api.py
+++ b/homeassistant/components/google_mail/api.py
@@ -1,25 +1,21 @@
 """API for Google Mail bound to Home Assistant OAuth."""
-from aiohttp import ClientSession
 from google.auth.exceptions import RefreshError
 from google.oauth2.credentials import Credentials
-from google.oauth2.utils import OAuthClientAuthHandler
 from googleapiclient.discovery import Resource, build
 
 from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.helpers import config_entry_oauth2_flow
 
 
-class AsyncConfigEntryAuth(OAuthClientAuthHandler):
+class AsyncConfigEntryAuth:
     """Provide Google Mail authentication tied to an OAuth2 based config entry."""
 
     def __init__(
         self,
-        websession: ClientSession,
-        oauth2Session: config_entry_oauth2_flow.OAuth2Session,
+        oauth2_session: config_entry_oauth2_flow.OAuth2Session,
     ) -> None:
         """Initialize Google Mail Auth."""
-        self.oauth_session = oauth2Session
-        super().__init__(websession)
+        self.oauth_session = oauth2_session
 
     @property
     def access_token(self) -> str:
diff --git a/homeassistant/components/google_mail/sensor.py b/homeassistant/components/google_mail/sensor.py
index 8023b9222a0..a65e845095c 100644
--- a/homeassistant/components/google_mail/sensor.py
+++ b/homeassistant/components/google_mail/sensor.py
@@ -21,7 +21,7 @@ SCAN_INTERVAL = timedelta(minutes=15)
 
 SENSOR_TYPE = SensorEntityDescription(
     key="vacation_end_date",
-    name="Vacation end date",
+    translation_key="vacation_end_date",
     icon="mdi:clock",
     device_class=SensorDeviceClass.TIMESTAMP,
 )
diff --git a/homeassistant/components/google_mail/strings.json b/homeassistant/components/google_mail/strings.json
index eb44bffb134..2f76806dfd3 100644
--- a/homeassistant/components/google_mail/strings.json
+++ b/homeassistant/components/google_mail/strings.json
@@ -30,5 +30,12 @@
   },
   "application_credentials": {
     "description": "Follow the [instructions]({more_info_url}) for [OAuth consent screen]({oauth_consent_url}) to give Home Assistant access to your Google Mail. You also need to create Application Credentials linked to your account:\n1. Go to [Credentials]({oauth_creds_url}) and click **Create Credentials**.\n1. From the drop-down list select **OAuth client ID**.\n1. Select **Web application** for the Application Type.\n\n"
+  },
+  "entity": {
+    "sensor": {
+      "vacation_end_date": {
+        "name": "Vacation end date"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/google_translate/__init__.py b/homeassistant/components/google_translate/__init__.py
index f7860c57d99..ac6b07bd4b3 100644
--- a/homeassistant/components/google_translate/__init__.py
+++ b/homeassistant/components/google_translate/__init__.py
@@ -1 +1,20 @@
-"""The google_translate component."""
+"""The Google Translate text-to-speech integration."""
+from __future__ import annotations
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+
+PLATFORMS: list[Platform] = [Platform.TTS]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Google Translate text-to-speech from a config entry."""
+    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/google_translate/config_flow.py b/homeassistant/components/google_translate/config_flow.py
new file mode 100644
index 00000000000..3996d41df35
--- /dev/null
+++ b/homeassistant/components/google_translate/config_flow.py
@@ -0,0 +1,58 @@
+"""Config flow for Google Translate text-to-speech integration."""
+from __future__ import annotations
+
+from typing import Any
+
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.components.tts import CONF_LANG
+from homeassistant.data_entry_flow import FlowResult
+
+from .const import (
+    CONF_TLD,
+    DEFAULT_LANG,
+    DEFAULT_TLD,
+    DOMAIN,
+    SUPPORT_LANGUAGES,
+    SUPPORT_TLD,
+)
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Optional(CONF_LANG, default=DEFAULT_LANG): vol.In(SUPPORT_LANGUAGES),
+        vol.Optional(CONF_TLD, default=DEFAULT_TLD): vol.In(SUPPORT_TLD),
+    }
+)
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Google Translate text-to-speech."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        if user_input is not None:
+            self._async_abort_entries_match(
+                {
+                    CONF_LANG: user_input[CONF_LANG],
+                    CONF_TLD: user_input[CONF_TLD],
+                }
+            )
+            return self.async_create_entry(
+                title="Google Translate text-to-speech", data=user_input
+            )
+
+        return self.async_show_form(step_id="user", data_schema=STEP_USER_DATA_SCHEMA)
+
+    async def async_step_onboarding(
+        self, data: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle a flow initialized by onboarding."""
+        return self.async_create_entry(
+            title="Google Translate text-to-speech",
+            data={CONF_LANG: DEFAULT_LANG, CONF_TLD: DEFAULT_TLD},
+        )
diff --git a/homeassistant/components/google_translate/const.py b/homeassistant/components/google_translate/const.py
index e6361c1025e..0bb8663119b 100644
--- a/homeassistant/components/google_translate/const.py
+++ b/homeassistant/components/google_translate/const.py
@@ -1,6 +1,11 @@
-"""Constant for google_translate integration."""
+"""Constants for the Google Translate text-to-speech integration."""
 from dataclasses import dataclass
 
+CONF_TLD = "tld"
+DEFAULT_LANG = "en"
+DEFAULT_TLD = "com"
+DOMAIN = "google_translate"
+
 SUPPORT_LANGUAGES = [
     "af",
     "ar",
@@ -35,6 +40,7 @@ SUPPORT_LANGUAGES = [
     "ko",
     "la",
     "lv",
+    "lt",
     "mk",
     "ml",
     "mr",
diff --git a/homeassistant/components/google_translate/manifest.json b/homeassistant/components/google_translate/manifest.json
index 504925a4667..7074d0ed444 100644
--- a/homeassistant/components/google_translate/manifest.json
+++ b/homeassistant/components/google_translate/manifest.json
@@ -2,6 +2,7 @@
   "domain": "google_translate",
   "name": "Google Translate text-to-speech",
   "codeowners": [],
+  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/google_translate",
   "iot_class": "cloud_push",
   "loggers": ["gtts"],
diff --git a/homeassistant/components/google_translate/strings.json b/homeassistant/components/google_translate/strings.json
new file mode 100644
index 00000000000..a83e61f01f9
--- /dev/null
+++ b/homeassistant/components/google_translate/strings.json
@@ -0,0 +1,15 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "language": "Language",
+          "tld": "TLD"
+        }
+      }
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
+    }
+  }
+}
diff --git a/homeassistant/components/google_translate/tts.py b/homeassistant/components/google_translate/tts.py
index c02d262f6e5..45288e81996 100644
--- a/homeassistant/components/google_translate/tts.py
+++ b/homeassistant/components/google_translate/tts.py
@@ -1,33 +1,120 @@
 """Support for the Google speech service."""
+from __future__ import annotations
+
 from io import BytesIO
 import logging
+from typing import Any
 
 from gtts import gTTS, gTTSError
 import voluptuous as vol
 
-from homeassistant.components.tts import CONF_LANG, PLATFORM_SCHEMA, Provider
+from homeassistant.components.tts import (
+    CONF_LANG,
+    PLATFORM_SCHEMA,
+    Provider,
+    TextToSpeechEntity,
+    TtsAudioType,
+)
+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.typing import ConfigType, DiscoveryInfoType
 
-from .const import MAP_LANG_TLD, SUPPORT_LANGUAGES, SUPPORT_TLD
+from .const import (
+    CONF_TLD,
+    DEFAULT_LANG,
+    DEFAULT_TLD,
+    MAP_LANG_TLD,
+    SUPPORT_LANGUAGES,
+    SUPPORT_TLD,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
-DEFAULT_LANG = "en"
-
 SUPPORT_OPTIONS = ["tld"]
 
-DEFAULT_TLD = "com"
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
         vol.Optional(CONF_LANG, default=DEFAULT_LANG): vol.In(SUPPORT_LANGUAGES),
-        vol.Optional("tld", default=DEFAULT_TLD): vol.In(SUPPORT_TLD),
+        vol.Optional(CONF_TLD, default=DEFAULT_TLD): vol.In(SUPPORT_TLD),
     }
 )
 
 
-async def async_get_engine(hass, config, discovery_info=None):
+async def async_get_engine(
+    hass: HomeAssistant,
+    config: ConfigType,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> GoogleProvider:
     """Set up Google speech component."""
-    return GoogleProvider(hass, config[CONF_LANG], config["tld"])
+    return GoogleProvider(hass, config[CONF_LANG], config[CONF_TLD])
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up Google Translate speech platform via config entry."""
+    default_language = config_entry.data[CONF_LANG]
+    default_tld = config_entry.data[CONF_TLD]
+    async_add_entities([GoogleTTSEntity(config_entry, default_language, default_tld)])
+
+
+class GoogleTTSEntity(TextToSpeechEntity):
+    """The Google speech API entity."""
+
+    def __init__(self, config_entry: ConfigEntry, lang: str, tld: str) -> None:
+        """Init Google TTS service."""
+        if lang in MAP_LANG_TLD:
+            self._lang = MAP_LANG_TLD[lang].lang
+            self._tld = MAP_LANG_TLD[lang].tld
+        else:
+            self._lang = lang
+            self._tld = tld
+        self._attr_name = f"Google {self._lang} {self._tld}"
+        self._attr_unique_id = config_entry.entry_id
+
+    @property
+    def default_language(self):
+        """Return the default language."""
+        return self._lang
+
+    @property
+    def supported_languages(self):
+        """Return list of supported languages."""
+        return SUPPORT_LANGUAGES
+
+    @property
+    def supported_options(self):
+        """Return a list of supported options."""
+        return SUPPORT_OPTIONS
+
+    def get_tts_audio(
+        self, message: str, language: str, options: dict[str, Any] | None = None
+    ) -> TtsAudioType:
+        """Load TTS from google."""
+        tld = self._tld
+        if language in MAP_LANG_TLD:
+            tld_language = MAP_LANG_TLD[language]
+            tld = tld_language.tld
+            language = tld_language.lang
+        if options is not None and "tld" in options:
+            tld = options["tld"]
+
+        tts = gTTS(text=message, lang=language, tld=tld)
+        mp3_data = BytesIO()
+
+        try:
+            tts.write_to_fp(mp3_data)
+        except gTTSError as exc:
+            _LOGGER.debug(
+                "Error during processing of TTS request %s", exc, exc_info=True
+            )
+            raise HomeAssistantError(exc) from exc
+
+        return "mp3", mp3_data.getvalue()
 
 
 class GoogleProvider(Provider):
diff --git a/homeassistant/components/gpslogger/__init__.py b/homeassistant/components/gpslogger/__init__.py
index 5331f6e7029..9f00e2cb52d 100644
--- a/homeassistant/components/gpslogger/__init__.py
+++ b/homeassistant/components/gpslogger/__init__.py
@@ -12,7 +12,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_entry_flow
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.typing import ConfigType
 
 from .const import (
     ATTR_ACCURACY,
@@ -55,12 +54,6 @@ WEBHOOK_SCHEMA = vol.Schema(
 )
 
 
-async def async_setup(hass: HomeAssistant, hass_config: ConfigType) -> bool:
-    """Set up the GPSLogger component."""
-    hass.data[DOMAIN] = {"devices": set(), "unsub_device_tracker": {}}
-    return True
-
-
 async def handle_webhook(hass, webhook_id, request):
     """Handle incoming webhook with GPSLogger request."""
     try:
@@ -95,6 +88,7 @@ async def handle_webhook(hass, webhook_id, request):
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Configure based on config entry."""
+    hass.data.setdefault(DOMAIN, {"devices": set(), "unsub_device_tracker": {}})
     webhook.async_register(
         hass, DOMAIN, "GPSLogger", entry.data[CONF_WEBHOOK_ID], handle_webhook
     )
diff --git a/homeassistant/components/gree/switch.py b/homeassistant/components/gree/switch.py
index 01f98b996dd..68c11ad6e1f 100644
--- a/homeassistant/components/gree/switch.py
+++ b/homeassistant/components/gree/switch.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Any, cast
+from typing import Any
 
 from greeclimate.device import Device
 
@@ -33,6 +33,10 @@ class GreeRequiredKeysMixin:
 class GreeSwitchEntityDescription(SwitchEntityDescription, GreeRequiredKeysMixin):
     """Describes Gree switch entity."""
 
+    # GreeSwitch does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
 
 def _set_light(device: Device, value: bool) -> None:
     """Typed helper to set device light property."""
@@ -130,7 +134,7 @@ class GreeSwitch(GreeEntity, SwitchEntity):
         """Initialize the Gree device."""
         self.entity_description = description
 
-        super().__init__(coordinator, cast(str, description.name))
+        super().__init__(coordinator, description.name)
 
     @property
     def is_on(self) -> bool:
diff --git a/homeassistant/components/greeneye_monitor/manifest.json b/homeassistant/components/greeneye_monitor/manifest.json
index fcf4d004d26..33a4947c01d 100644
--- a/homeassistant/components/greeneye_monitor/manifest.json
+++ b/homeassistant/components/greeneye_monitor/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/greeneye_monitor",
   "iot_class": "local_push",
   "loggers": ["greeneye"],
-  "requirements": ["greeneye_monitor==3.0.3"]
+  "requirements": ["greeneye-monitor==3.0.3"]
 }
diff --git a/homeassistant/components/group/__init__.py b/homeassistant/components/group/__init__.py
index 4543bf79d52..9480fa3ce17 100644
--- a/homeassistant/components/group/__init__.py
+++ b/homeassistant/components/group/__init__.py
@@ -196,9 +196,8 @@ def expand_entity_ids(hass: HomeAssistant, entity_ids: Iterable[Any]) -> list[st
                     if ent_id not in found_ids
                 )
 
-            else:
-                if entity_id not in found_ids:
-                    found_ids.append(entity_id)
+            elif entity_id not in found_ids:
+                found_ids.append(entity_id)
 
         except AttributeError:
             # Raised by split_entity_id if entity_id is not a string
diff --git a/homeassistant/components/group/notify.py b/homeassistant/components/group/notify.py
index 378a7852343..2747ba55ee1 100644
--- a/homeassistant/components/group/notify.py
+++ b/homeassistant/components/group/notify.py
@@ -66,7 +66,7 @@ class GroupNotifyPlatform(BaseNotificationService):
         payload: dict[str, Any] = {ATTR_MESSAGE: message}
         payload.update({key: val for key, val in kwargs.items() if val})
 
-        tasks: list[asyncio.Task[bool | None]] = []
+        tasks: list[asyncio.Task[Any]] = []
         for entity in self.entities:
             sending_payload = deepcopy(payload.copy())
             if (default_data := entity.get(ATTR_DATA)) is not None:
@@ -74,7 +74,7 @@ class GroupNotifyPlatform(BaseNotificationService):
             tasks.append(
                 asyncio.create_task(
                     self.hass.services.async_call(
-                        DOMAIN, entity[ATTR_SERVICE], sending_payload
+                        DOMAIN, entity[ATTR_SERVICE], sending_payload, blocking=True
                     )
                 )
             )
diff --git a/homeassistant/components/growatt_server/sensor.py b/homeassistant/components/growatt_server/sensor.py
index a25f8f0342f..87822227cef 100644
--- a/homeassistant/components/growatt_server/sensor.py
+++ b/homeassistant/components/growatt_server/sensor.py
@@ -138,6 +138,8 @@ async def async_setup_entry(
 class GrowattInverter(SensorEntity):
     """Representation of a Growatt Sensor."""
 
+    _attr_has_entity_name = True
+
     entity_description: GrowattSensorEntityDescription
 
     def __init__(
@@ -147,7 +149,6 @@ class GrowattInverter(SensorEntity):
         self.probe = probe
         self.entity_description = description
 
-        self._attr_name = f"{name} {description.name}"
         self._attr_unique_id = unique_id
         self._attr_icon = "mdi:solar-power"
 
diff --git a/homeassistant/components/growatt_server/sensor_types/inverter.py b/homeassistant/components/growatt_server/sensor_types/inverter.py
index 746e4880cef..cfacadce528 100644
--- a/homeassistant/components/growatt_server/sensor_types/inverter.py
+++ b/homeassistant/components/growatt_server/sensor_types/inverter.py
@@ -16,7 +16,7 @@ from .sensor_entity_description import GrowattSensorEntityDescription
 INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     GrowattSensorEntityDescription(
         key="inverter_energy_today",
-        name="Energy today",
+        translation_key="inverter_energy_today",
         api_key="powerToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -24,7 +24,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_energy_total",
-        name="Lifetime energy output",
+        translation_key="inverter_energy_total",
         api_key="powerTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -33,7 +33,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_voltage_input_1",
-        name="Input 1 voltage",
+        translation_key="inverter_voltage_input_1",
         api_key="vpv1",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -41,7 +41,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_amperage_input_1",
-        name="Input 1 Amperage",
+        translation_key="inverter_amperage_input_1",
         api_key="ipv1",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -49,7 +49,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_wattage_input_1",
-        name="Input 1 Wattage",
+        translation_key="inverter_wattage_input_1",
         api_key="ppv1",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -57,7 +57,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_voltage_input_2",
-        name="Input 2 voltage",
+        translation_key="inverter_voltage_input_2",
         api_key="vpv2",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -65,7 +65,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_amperage_input_2",
-        name="Input 2 Amperage",
+        translation_key="inverter_amperage_input_2",
         api_key="ipv2",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -73,7 +73,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_wattage_input_2",
-        name="Input 2 Wattage",
+        translation_key="inverter_wattage_input_2",
         api_key="ppv2",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -81,7 +81,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_voltage_input_3",
-        name="Input 3 voltage",
+        translation_key="inverter_voltage_input_3",
         api_key="vpv3",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -89,7 +89,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_amperage_input_3",
-        name="Input 3 Amperage",
+        translation_key="inverter_amperage_input_3",
         api_key="ipv3",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -97,7 +97,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_wattage_input_3",
-        name="Input 3 Wattage",
+        translation_key="inverter_wattage_input_3",
         api_key="ppv3",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -105,7 +105,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_internal_wattage",
-        name="Internal wattage",
+        translation_key="inverter_internal_wattage",
         api_key="ppv",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -113,7 +113,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_reactive_voltage",
-        name="Reactive voltage",
+        translation_key="inverter_reactive_voltage",
         api_key="vacr",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -121,7 +121,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_inverter_reactive_amperage",
-        name="Reactive amperage",
+        translation_key="inverter_reactive_amperage",
         api_key="iacr",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -129,7 +129,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_frequency",
-        name="AC frequency",
+        translation_key="inverter_frequency",
         api_key="fac",
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
@@ -137,7 +137,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_current_wattage",
-        name="Output power",
+        translation_key="inverter_current_wattage",
         api_key="pac",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -145,7 +145,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_current_reactive_wattage",
-        name="Reactive wattage",
+        translation_key="inverter_current_reactive_wattage",
         api_key="pacr",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -153,7 +153,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_ipm_temperature",
-        name="Intelligent Power Management temperature",
+        translation_key="inverter_ipm_temperature",
         api_key="ipmTemperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -161,7 +161,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="inverter_temperature",
-        name="Temperature",
+        translation_key="inverter_temperature",
         api_key="temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
diff --git a/homeassistant/components/growatt_server/sensor_types/mix.py b/homeassistant/components/growatt_server/sensor_types/mix.py
index 76d37f4d193..e9722abda11 100644
--- a/homeassistant/components/growatt_server/sensor_types/mix.py
+++ b/homeassistant/components/growatt_server/sensor_types/mix.py
@@ -15,21 +15,21 @@ MIX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     # Values from 'mix_info' API call
     GrowattSensorEntityDescription(
         key="mix_statement_of_charge",
-        name="Statement of charge",
+        translation_key="mix_statement_of_charge",
         api_key="capacity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_charge_today",
-        name="Battery charged today",
+        translation_key="mix_battery_charge_today",
         api_key="eBatChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_charge_lifetime",
-        name="Lifetime battery charged",
+        translation_key="mix_battery_charge_lifetime",
         api_key="eBatChargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -37,14 +37,14 @@ MIX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_discharge_today",
-        name="Battery discharged today",
+        translation_key="mix_battery_discharge_today",
         api_key="eBatDisChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_discharge_lifetime",
-        name="Lifetime battery discharged",
+        translation_key="mix_battery_discharge_lifetime",
         api_key="eBatDisChargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -52,14 +52,14 @@ MIX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="mix_solar_generation_today",
-        name="Solar energy today",
+        translation_key="mix_solar_generation_today",
         api_key="epvToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_solar_generation_lifetime",
-        name="Lifetime solar energy",
+        translation_key="mix_solar_generation_lifetime",
         api_key="epvTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -67,28 +67,28 @@ MIX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_discharge_w",
-        name="Battery discharging W",
+        translation_key="mix_battery_discharge_w",
         api_key="pDischarge1",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_voltage",
-        name="Battery voltage",
+        translation_key="mix_battery_voltage",
         api_key="vbat",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
     ),
     GrowattSensorEntityDescription(
         key="mix_pv1_voltage",
-        name="PV1 voltage",
+        translation_key="mix_pv1_voltage",
         api_key="vpv1",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
     ),
     GrowattSensorEntityDescription(
         key="mix_pv2_voltage",
-        name="PV2 voltage",
+        translation_key="mix_pv2_voltage",
         api_key="vpv2",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -96,14 +96,14 @@ MIX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     # Values from 'mix_totals' API call
     GrowattSensorEntityDescription(
         key="mix_load_consumption_today",
-        name="Load consumption today",
+        translation_key="mix_load_consumption_today",
         api_key="elocalLoadToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_load_consumption_lifetime",
-        name="Lifetime load consumption",
+        translation_key="mix_load_consumption_lifetime",
         api_key="elocalLoadTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -111,14 +111,14 @@ MIX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="mix_export_to_grid_today",
-        name="Export to grid today",
+        translation_key="mix_export_to_grid_today",
         api_key="etoGridToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_export_to_grid_lifetime",
-        name="Lifetime export to grid",
+        translation_key="mix_export_to_grid_lifetime",
         api_key="etogridTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -127,63 +127,63 @@ MIX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     # Values from 'mix_system_status' API call
     GrowattSensorEntityDescription(
         key="mix_battery_charge",
-        name="Battery charging",
+        translation_key="mix_battery_charge",
         api_key="chargePower",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_load_consumption",
-        name="Load consumption",
+        translation_key="mix_load_consumption",
         api_key="pLocalLoad",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_wattage_pv_1",
-        name="PV1 Wattage",
+        translation_key="mix_wattage_pv_1",
         api_key="pPv1",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_wattage_pv_2",
-        name="PV2 Wattage",
+        translation_key="mix_wattage_pv_2",
         api_key="pPv2",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_wattage_pv_all",
-        name="All PV Wattage",
+        translation_key="mix_wattage_pv_all",
         api_key="ppv",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_export_to_grid",
-        name="Export to grid",
+        translation_key="mix_export_to_grid",
         api_key="pactogrid",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_import_from_grid",
-        name="Import from grid",
+        translation_key="mix_import_from_grid",
         api_key="pactouser",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_discharge_kw",
-        name="Battery discharging kW",
+        translation_key="mix_battery_discharge_kw",
         api_key="pdisCharge1",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_grid_voltage",
-        name="Grid voltage",
+        translation_key="mix_grid_voltage",
         api_key="vAc1",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -191,35 +191,35 @@ MIX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     # Values from 'mix_detail' API call
     GrowattSensorEntityDescription(
         key="mix_system_production_today",
-        name="System production today (self-consumption + export)",
+        translation_key="mix_system_production_today",
         api_key="eCharge",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_load_consumption_solar_today",
-        name="Load consumption today (solar)",
+        translation_key="mix_load_consumption_solar_today",
         api_key="eChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_self_consumption_today",
-        name="Self consumption today (solar + battery)",
+        translation_key="mix_self_consumption_today",
         api_key="eChargeToday1",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_load_consumption_battery_today",
-        name="Load consumption today (battery)",
+        translation_key="mix_load_consumption_battery_today",
         api_key="echarge1",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_import_from_grid_today",
-        name="Import from grid today (load)",
+        translation_key="mix_import_from_grid_today",
         api_key="etouser",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -227,14 +227,14 @@ MIX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     # This sensor is manually created using the most recent X-Axis value from the chartData
     GrowattSensorEntityDescription(
         key="mix_last_update",
-        name="Last Data Update",
+        translation_key="mix_last_update",
         api_key="lastdataupdate",
         device_class=SensorDeviceClass.TIMESTAMP,
     ),
     # Values from 'dashboard_data' API call
     GrowattSensorEntityDescription(
         key="mix_import_from_grid_today_combined",
-        name="Import from grid today (load + charging)",
+        translation_key="mix_import_from_grid_today_combined",
         api_key="etouser_combined",  # This id is not present in the raw API data, it is added by the sensor
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
diff --git a/homeassistant/components/growatt_server/sensor_types/storage.py b/homeassistant/components/growatt_server/sensor_types/storage.py
index d1305aa879d..4b60a73c979 100644
--- a/homeassistant/components/growatt_server/sensor_types/storage.py
+++ b/homeassistant/components/growatt_server/sensor_types/storage.py
@@ -16,14 +16,14 @@ from .sensor_entity_description import GrowattSensorEntityDescription
 STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     GrowattSensorEntityDescription(
         key="storage_storage_production_today",
-        name="Storage production today",
+        translation_key="storage_storage_production_today",
         api_key="eBatDisChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="storage_storage_production_lifetime",
-        name="Lifetime Storage production",
+        translation_key="storage_storage_production_lifetime",
         api_key="eBatDisChargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -31,21 +31,21 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_grid_discharge_today",
-        name="Grid discharged today",
+        translation_key="storage_grid_discharge_today",
         api_key="eacDisChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="storage_load_consumption_today",
-        name="Load consumption today",
+        translation_key="storage_load_consumption_today",
         api_key="eopDischrToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="storage_load_consumption_lifetime",
-        name="Lifetime load consumption",
+        translation_key="storage_load_consumption_lifetime",
         api_key="eopDischrTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -53,14 +53,14 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_grid_charged_today",
-        name="Grid charged today",
+        translation_key="storage_grid_charged_today",
         api_key="eacChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="storage_charge_storage_lifetime",
-        name="Lifetime storaged charged",
+        translation_key="storage_charge_storage_lifetime",
         api_key="eChargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -68,55 +68,55 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_solar_production",
-        name="Solar power production",
+        translation_key="storage_solar_production",
         api_key="ppv",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="storage_battery_percentage",
-        name="Battery percentage",
+        translation_key="storage_battery_percentage",
         api_key="capacity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
     ),
     GrowattSensorEntityDescription(
         key="storage_power_flow",
-        name="Storage charging/ discharging(-ve)",
+        translation_key="storage_power_flow",
         api_key="pCharge",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="storage_load_consumption_solar_storage",
-        name="Load consumption(Solar + Storage)",
+        translation_key="storage_load_consumption_solar_storage",
         api_key="rateVA",
         native_unit_of_measurement="VA",
     ),
     GrowattSensorEntityDescription(
         key="storage_charge_today",
-        name="Charge today",
+        translation_key="storage_charge_today",
         api_key="eChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="storage_import_from_grid",
-        name="Import from grid",
+        translation_key="storage_import_from_grid",
         api_key="pAcInPut",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="storage_import_from_grid_today",
-        name="Import from grid today",
+        translation_key="storage_import_from_grid_today",
         api_key="eToUserToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="storage_import_from_grid_total",
-        name="Import from grid total",
+        translation_key="storage_import_from_grid_total",
         api_key="eToUserTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -124,14 +124,14 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_load_consumption",
-        name="Load consumption",
+        translation_key="storage_load_consumption",
         api_key="outPutPower",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="storage_grid_voltage",
-        name="AC input voltage",
+        translation_key="storage_grid_voltage",
         api_key="vGrid",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -139,7 +139,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_pv_charging_voltage",
-        name="PV charging voltage",
+        translation_key="storage_pv_charging_voltage",
         api_key="vpv",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -147,7 +147,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_ac_input_frequency_out",
-        name="AC input frequency",
+        translation_key="storage_ac_input_frequency_out",
         api_key="freqOutPut",
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
@@ -155,7 +155,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_output_voltage",
-        name="Output voltage",
+        translation_key="storage_output_voltage",
         api_key="outPutVolt",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -163,7 +163,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_ac_output_frequency",
-        name="Ac output frequency",
+        translation_key="storage_ac_output_frequency",
         api_key="freqGrid",
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
@@ -171,7 +171,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_current_PV",
-        name="Solar charge current",
+        translation_key="storage_current_pv",
         api_key="iAcCharge",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -179,7 +179,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_current_1",
-        name="Solar current to storage",
+        translation_key="storage_current_1",
         api_key="iChargePV1",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -187,7 +187,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_grid_amperage_input",
-        name="Grid charge current",
+        translation_key="storage_grid_amperage_input",
         api_key="chgCurr",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -195,7 +195,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_grid_out_current",
-        name="Grid out current",
+        translation_key="storage_grid_out_current",
         api_key="outPutCurrent",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -203,7 +203,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_battery_voltage",
-        name="Battery voltage",
+        translation_key="storage_battery_voltage",
         api_key="vBat",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -211,7 +211,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="storage_load_percentage",
-        name="Load percentage",
+        translation_key="storage_load_percentage",
         api_key="loadPercent",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
diff --git a/homeassistant/components/growatt_server/sensor_types/tlx.py b/homeassistant/components/growatt_server/sensor_types/tlx.py
index 9c9bbd488d5..645b32db9d0 100644
--- a/homeassistant/components/growatt_server/sensor_types/tlx.py
+++ b/homeassistant/components/growatt_server/sensor_types/tlx.py
@@ -20,7 +20,7 @@ from .sensor_entity_description import GrowattSensorEntityDescription
 TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     GrowattSensorEntityDescription(
         key="tlx_energy_today",
-        name="Energy today",
+        translation_key="tlx_energy_today",
         api_key="eacToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -29,7 +29,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total",
-        name="Lifetime energy output",
+        translation_key="tlx_energy_total",
         api_key="eacTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -39,7 +39,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total_input_1",
-        name="Lifetime total energy input 1",
+        translation_key="tlx_energy_total_input_1",
         api_key="epv1Total",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -49,7 +49,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_today_input_1",
-        name="Energy Today Input 1",
+        translation_key="tlx_energy_today_input_1",
         api_key="epv1Today",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -58,7 +58,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_voltage_input_1",
-        name="Input 1 voltage",
+        translation_key="tlx_voltage_input_1",
         api_key="vpv1",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -66,7 +66,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_amperage_input_1",
-        name="Input 1 Amperage",
+        translation_key="tlx_amperage_input_1",
         api_key="ipv1",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -74,7 +74,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_wattage_input_1",
-        name="Input 1 Wattage",
+        translation_key="tlx_wattage_input_1",
         api_key="ppv1",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -82,7 +82,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total_input_2",
-        name="Lifetime total energy input 2",
+        translation_key="tlx_energy_total_input_2",
         api_key="epv2Total",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -92,7 +92,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_today_input_2",
-        name="Energy Today Input 2",
+        translation_key="tlx_energy_today_input_2",
         api_key="epv2Today",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -101,7 +101,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_voltage_input_2",
-        name="Input 2 voltage",
+        translation_key="tlx_voltage_input_2",
         api_key="vpv2",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -109,7 +109,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_amperage_input_2",
-        name="Input 2 Amperage",
+        translation_key="tlx_amperage_input_2",
         api_key="ipv2",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -117,7 +117,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_wattage_input_2",
-        name="Input 2 Wattage",
+        translation_key="tlx_wattage_input_2",
         api_key="ppv2",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -125,7 +125,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total_input_3",
-        name="Lifetime total energy input 3",
+        translation_key="tlx_energy_total_input_3",
         api_key="epv3Total",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -135,7 +135,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_today_input_3",
-        name="Energy Today Input 3",
+        translation_key="tlx_energy_today_input_3",
         api_key="epv3Today",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -144,7 +144,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_voltage_input_3",
-        name="Input 3 voltage",
+        translation_key="tlx_voltage_input_3",
         api_key="vpv3",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -152,7 +152,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_amperage_input_3",
-        name="Input 3 Amperage",
+        translation_key="tlx_amperage_input_3",
         api_key="ipv3",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -160,7 +160,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_wattage_input_3",
-        name="Input 3 Wattage",
+        translation_key="tlx_wattage_input_3",
         api_key="ppv3",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -168,7 +168,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total_input_4",
-        name="Lifetime total energy input 4",
+        translation_key="tlx_energy_total_input_4",
         api_key="epv4Total",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -178,7 +178,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_today_input_4",
-        name="Energy Today Input 4",
+        translation_key="tlx_energy_today_input_4",
         api_key="epv4Today",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -187,7 +187,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_voltage_input_4",
-        name="Input 4 voltage",
+        translation_key="tlx_voltage_input_4",
         api_key="vpv4",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -195,7 +195,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_amperage_input_4",
-        name="Input 4 Amperage",
+        translation_key="tlx_amperage_input_4",
         api_key="ipv4",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -203,7 +203,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_wattage_input_4",
-        name="Input 4 Wattage",
+        translation_key="tlx_wattage_input_4",
         api_key="ppv4",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -211,7 +211,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_solar_generation_total",
-        name="Lifetime total solar energy",
+        translation_key="tlx_solar_generation_total",
         api_key="epvTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -220,7 +220,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_internal_wattage",
-        name="Internal wattage",
+        translation_key="tlx_internal_wattage",
         api_key="ppv",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -228,7 +228,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_reactive_voltage",
-        name="Reactive voltage",
+        translation_key="tlx_reactive_voltage",
         api_key="vacrs",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -236,7 +236,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_frequency",
-        name="AC frequency",
+        translation_key="tlx_frequency",
         api_key="fac",
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
@@ -244,7 +244,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_current_wattage",
-        name="Output power",
+        translation_key="tlx_current_wattage",
         api_key="pac",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -252,7 +252,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_1",
-        name="Temperature 1",
+        translation_key="tlx_temperature_1",
         api_key="temp1",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -260,7 +260,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_2",
-        name="Temperature 2",
+        translation_key="tlx_temperature_2",
         api_key="temp2",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -268,7 +268,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_3",
-        name="Temperature 3",
+        translation_key="tlx_temperature_3",
         api_key="temp3",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -276,7 +276,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_4",
-        name="Temperature 4",
+        translation_key="tlx_temperature_4",
         api_key="temp4",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -284,7 +284,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_5",
-        name="Temperature 5",
+        translation_key="tlx_temperature_5",
         api_key="temp5",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -292,7 +292,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_all_batteries_discharge_today",
-        name="All batteries discharged today",
+        translation_key="tlx_all_batteries_discharge_today",
         api_key="edischargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -300,7 +300,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_all_batteries_discharge_total",
-        name="Lifetime total all batteries discharged",
+        translation_key="tlx_all_batteries_discharge_total",
         api_key="edischargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -309,14 +309,14 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_1_discharge_w",
-        name="Battery 1 discharging W",
+        translation_key="tlx_battery_1_discharge_w",
         api_key="bdc1DischargePower",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_1_discharge_total",
-        name="Lifetime total battery 1 discharged",
+        translation_key="tlx_battery_1_discharge_total",
         api_key="bdc1DischargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -325,14 +325,14 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_2_discharge_w",
-        name="Battery 2 discharging W",
+        translation_key="tlx_battery_2_discharge_w",
         api_key="bdc1DischargePower",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_2_discharge_total",
-        name="Lifetime total battery 2 discharged",
+        translation_key="tlx_battery_2_discharge_total",
         api_key="bdc1DischargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -341,7 +341,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_all_batteries_charge_today",
-        name="All batteries charged today",
+        translation_key="tlx_all_batteries_charge_today",
         api_key="echargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -349,7 +349,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_all_batteries_charge_total",
-        name="Lifetime total all batteries charged",
+        translation_key="tlx_all_batteries_charge_total",
         api_key="echargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -358,14 +358,14 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_1_charge_w",
-        name="Battery 1 charging W",
+        translation_key="tlx_battery_1_charge_w",
         api_key="bdc1ChargePower",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_1_charge_total",
-        name="Lifetime total battery 1 charged",
+        translation_key="tlx_battery_1_charge_total",
         api_key="bdc1ChargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -374,14 +374,14 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_2_charge_w",
-        name="Battery 2 charging W",
+        translation_key="tlx_battery_2_charge_w",
         api_key="bdc1ChargePower",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_2_charge_total",
-        name="Lifetime total battery 2 charged",
+        translation_key="tlx_battery_2_charge_total",
         api_key="bdc1ChargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -390,7 +390,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_export_to_grid_today",
-        name="Export to grid today",
+        translation_key="tlx_export_to_grid_today",
         api_key="etoGridToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -398,7 +398,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_export_to_grid_total",
-        name="Lifetime total export to grid",
+        translation_key="tlx_export_to_grid_total",
         api_key="etoGridTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -407,7 +407,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_load_consumption_today",
-        name="Load consumption today",
+        translation_key="tlx_load_consumption_today",
         api_key="elocalLoadToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -415,7 +415,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="mix_load_consumption_total",
-        name="Lifetime total load consumption",
+        translation_key="mix_load_consumption_total",
         api_key="elocalLoadTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -424,7 +424,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="tlx_statement_of_charge",
-        name="Statement of charge (SoC)",
+        translation_key="tlx_statement_of_charge",
         api_key="bmsSoc",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
diff --git a/homeassistant/components/growatt_server/sensor_types/total.py b/homeassistant/components/growatt_server/sensor_types/total.py
index 2056443af3d..5945ad20e40 100644
--- a/homeassistant/components/growatt_server/sensor_types/total.py
+++ b/homeassistant/components/growatt_server/sensor_types/total.py
@@ -9,33 +9,33 @@ from .sensor_entity_description import GrowattSensorEntityDescription
 TOTAL_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     GrowattSensorEntityDescription(
         key="total_money_today",
-        name="Total money today",
+        translation_key="total_money_today",
         api_key="plantMoneyText",
         currency=True,
     ),
     GrowattSensorEntityDescription(
         key="total_money_total",
-        name="Money lifetime",
+        translation_key="total_money_total",
         api_key="totalMoneyText",
         currency=True,
     ),
     GrowattSensorEntityDescription(
         key="total_energy_today",
-        name="Energy Today",
+        translation_key="total_energy_today",
         api_key="todayEnergy",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="total_output_power",
-        name="Output Power",
+        translation_key="total_output_power",
         api_key="invTodayPpv",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="total_energy_output",
-        name="Lifetime energy output",
+        translation_key="total_energy_output",
         api_key="totalEnergy",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -43,7 +43,7 @@ TOTAL_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     ),
     GrowattSensorEntityDescription(
         key="total_maximum_output",
-        name="Maximum power",
+        translation_key="total_maximum_output",
         api_key="nominalPower",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
diff --git a/homeassistant/components/growatt_server/strings.json b/homeassistant/components/growatt_server/strings.json
index 695b8a08c1c..d2c196dbfdd 100644
--- a/homeassistant/components/growatt_server/strings.json
+++ b/homeassistant/components/growatt_server/strings.json
@@ -25,5 +25,405 @@
       }
     }
   },
-  "title": "Growatt Server"
+  "title": "Growatt Server",
+  "entity": {
+    "sensor": {
+      "inverter_energy_today": {
+        "name": "Energy today"
+      },
+      "inverter_energy_total": {
+        "name": "Lifetime energy output"
+      },
+      "inverter_voltage_input_1": {
+        "name": "Input 1 voltage"
+      },
+      "inverter_amperage_input_1": {
+        "name": "Input 1 Amperage"
+      },
+      "inverter_wattage_input_1": {
+        "name": "Input 1 Wattage"
+      },
+      "inverter_voltage_input_2": {
+        "name": "Input 2 voltage"
+      },
+      "inverter_amperage_input_2": {
+        "name": "Input 2 Amperage"
+      },
+      "inverter_wattage_input_2": {
+        "name": "Input 2 Wattage"
+      },
+      "inverter_voltage_input_3": {
+        "name": "Input 3 voltage"
+      },
+      "inverter_amperage_input_3": {
+        "name": "Input 3 Amperage"
+      },
+      "inverter_wattage_input_3": {
+        "name": "Input 3 Wattage"
+      },
+      "inverter_internal_wattage": {
+        "name": "Internal wattage"
+      },
+      "inverter_reactive_voltage": {
+        "name": "Reactive voltage"
+      },
+      "inverter_reactive_amperage": {
+        "name": "Reactive amperage"
+      },
+      "inverter_frequency": {
+        "name": "AC frequency"
+      },
+      "inverter_current_wattage": {
+        "name": "Output power"
+      },
+      "inverter_current_reactive_wattage": {
+        "name": "Reactive wattage"
+      },
+      "inverter_ipm_temperature": {
+        "name": "Intelligent Power Management temperature"
+      },
+      "inverter_temperature": {
+        "name": "Inverter temperature"
+      },
+      "mix_statement_of_charge": {
+        "name": "Statement of charge"
+      },
+      "mix_battery_charge_today": {
+        "name": "Battery charged today"
+      },
+      "mix_battery_charge_lifetime": {
+        "name": "Lifetime battery charged"
+      },
+      "mix_battery_discharge_today": {
+        "name": "Battery discharged today"
+      },
+      "mix_battery_discharge_lifetime": {
+        "name": "Lifetime battery discharged"
+      },
+      "mix_solar_generation_today": {
+        "name": "Solar energy today"
+      },
+      "mix_solar_generation_lifetime": {
+        "name": "Lifetime solar energy"
+      },
+      "mix_battery_discharge_w": {
+        "name": "Battery discharging W"
+      },
+      "mix_battery_voltage": {
+        "name": "Battery voltage"
+      },
+      "mix_pv1_voltage": {
+        "name": "PV1 voltage"
+      },
+      "mix_pv2_voltage": {
+        "name": "PV2 voltage"
+      },
+      "mix_load_consumption_today": {
+        "name": "Load consumption today"
+      },
+      "mix_load_consumption_lifetime": {
+        "name": "Lifetime load consumption"
+      },
+      "mix_export_to_grid_today": {
+        "name": "Export to grid today"
+      },
+      "mix_export_to_grid_lifetime": {
+        "name": "Lifetime export to grid"
+      },
+      "mix_battery_charge": {
+        "name": "Battery charging"
+      },
+      "mix_load_consumption": {
+        "name": "Load consumption"
+      },
+      "mix_wattage_pv_1": {
+        "name": "PV1 Wattage"
+      },
+      "mix_wattage_pv_2": {
+        "name": "PV2 Wattage"
+      },
+      "mix_wattage_pv_all": {
+        "name": "All PV Wattage"
+      },
+      "mix_export_to_grid": {
+        "name": "Export to grid"
+      },
+      "mix_import_from_grid": {
+        "name": "Import from grid"
+      },
+      "mix_battery_discharge_kw": {
+        "name": "Battery discharging kW"
+      },
+      "mix_grid_voltage": {
+        "name": "Grid voltage"
+      },
+      "mix_system_production_today": {
+        "name": "System production today (self-consumption + export)"
+      },
+      "mix_load_consumption_solar_today": {
+        "name": "Load consumption today (solar)"
+      },
+      "mix_self_consumption_today": {
+        "name": "Self consumption today (solar + battery)"
+      },
+      "mix_load_consumption_battery_today": {
+        "name": "Load consumption today (battery)"
+      },
+      "mix_import_from_grid_today": {
+        "name": "Import from grid today (load)"
+      },
+      "mix_last_update": {
+        "name": "Last Data Update"
+      },
+      "mix_import_from_grid_today_combined": {
+        "name": "Import from grid today (load + charging)"
+      },
+      "storage_storage_production_today": {
+        "name": "Storage production today"
+      },
+      "storage_storage_production_lifetime": {
+        "name": "Lifetime Storage production"
+      },
+      "storage_grid_discharge_today": {
+        "name": "Grid discharged today"
+      },
+      "storage_load_consumption_today": {
+        "name": "Load consumption today"
+      },
+      "storage_load_consumption_lifetime": {
+        "name": "Lifetime load consumption"
+      },
+      "storage_grid_charged_today": {
+        "name": "Grid charged today"
+      },
+      "storage_charge_storage_lifetime": {
+        "name": "Lifetime stored charged"
+      },
+      "storage_solar_production": {
+        "name": "Solar power production"
+      },
+      "storage_battery_percentage": {
+        "name": "Battery percentage"
+      },
+      "storage_power_flow": {
+        "name": "Storage charging/ discharging(-ve)"
+      },
+      "storage_load_consumption_solar_storage": {
+        "name": "Load consumption (Solar + Storage)"
+      },
+      "storage_charge_today": {
+        "name": "Charge today"
+      },
+      "storage_import_from_grid": {
+        "name": "Import from grid"
+      },
+      "storage_import_from_grid_today": {
+        "name": "Import from grid today"
+      },
+      "storage_import_from_grid_total": {
+        "name": "Import from grid total"
+      },
+      "storage_load_consumption": {
+        "name": "Load consumption"
+      },
+      "storage_grid_voltage": {
+        "name": "AC input voltage"
+      },
+      "storage_pv_charging_voltage": {
+        "name": "PV charging voltage"
+      },
+      "storage_ac_input_frequency_out": {
+        "name": "AC input frequency"
+      },
+      "storage_output_voltage": {
+        "name": "Output voltage"
+      },
+      "storage_ac_output_frequency": {
+        "name": "Ac output frequency"
+      },
+      "storage_current_pv": {
+        "name": "Solar charge current"
+      },
+      "storage_current_1": {
+        "name": "Solar current to storage"
+      },
+      "storage_grid_amperage_input": {
+        "name": "Grid charge current"
+      },
+      "storage_grid_out_current": {
+        "name": "Grid out current"
+      },
+      "storage_battery_voltage": {
+        "name": "Battery voltage"
+      },
+      "storage_load_percentage": {
+        "name": "Load percentage"
+      },
+      "tlx_energy_today": {
+        "name": "Energy today"
+      },
+      "tlx_energy_total": {
+        "name": "Lifetime energy output"
+      },
+      "tlx_energy_total_input_1": {
+        "name": "Lifetime total energy input 1"
+      },
+      "tlx_energy_today_input_1": {
+        "name": "Energy Today Input 1"
+      },
+      "tlx_voltage_input_1": {
+        "name": "Input 1 voltage"
+      },
+      "tlx_amperage_input_1": {
+        "name": "Input 1 Amperage"
+      },
+      "tlx_wattage_input_1": {
+        "name": "Input 1 Wattage"
+      },
+      "tlx_energy_total_input_2": {
+        "name": "Lifetime total energy input 2"
+      },
+      "tlx_energy_today_input_2": {
+        "name": "Energy Today Input 2"
+      },
+      "tlx_voltage_input_2": {
+        "name": "Input 2 voltage"
+      },
+      "tlx_amperage_input_2": {
+        "name": "Input 2 Amperage"
+      },
+      "tlx_wattage_input_2": {
+        "name": "Input 2 Wattage"
+      },
+      "tlx_energy_total_input_3": {
+        "name": "Lifetime total energy input 3"
+      },
+      "tlx_energy_today_input_3": {
+        "name": "Energy Today Input 3"
+      },
+      "tlx_voltage_input_3": {
+        "name": "Input 3 voltage"
+      },
+      "tlx_amperage_input_3": {
+        "name": "Input 3 Amperage"
+      },
+      "tlx_wattage_input_3": {
+        "name": "Input 3 Wattage"
+      },
+      "tlx_energy_total_input_4": {
+        "name": "Lifetime total energy input 4"
+      },
+      "tlx_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"
+      },
+      "tlx_wattage_input_4": {
+        "name": "Input 4 Wattage"
+      },
+      "tlx_solar_generation_total": {
+        "name": "Lifetime total solar energy"
+      },
+      "tlx_internal_wattage": {
+        "name": "Internal wattage"
+      },
+      "tlx_reactive_voltage": {
+        "name": "Reactive voltage"
+      },
+      "tlx_frequency": {
+        "name": "AC frequency"
+      },
+      "tlx_current_wattage": {
+        "name": "Output power"
+      },
+      "tlx_temperature_1": {
+        "name": "Temperature 1"
+      },
+      "tlx_temperature_2": {
+        "name": "Temperature 2"
+      },
+      "tlx_temperature_3": {
+        "name": "Temperature 3"
+      },
+      "tlx_temperature_4": {
+        "name": "Temperature 4"
+      },
+      "tlx_temperature_5": {
+        "name": "Temperature 5"
+      },
+      "tlx_all_batteries_discharge_today": {
+        "name": "All batteries discharged today"
+      },
+      "tlx_all_batteries_discharge_total": {
+        "name": "Lifetime total all batteries discharged"
+      },
+      "tlx_battery_1_discharge_w": {
+        "name": "Battery 1 discharging W"
+      },
+      "tlx_battery_1_discharge_total": {
+        "name": "Lifetime total battery 1 discharged"
+      },
+      "tlx_battery_2_discharge_w": {
+        "name": "Battery 2 discharging W"
+      },
+      "tlx_battery_2_discharge_total": {
+        "name": "Lifetime total battery 2 discharged"
+      },
+      "tlx_all_batteries_charge_today": {
+        "name": "All batteries charged today"
+      },
+      "tlx_all_batteries_charge_total": {
+        "name": "Lifetime total all batteries charged"
+      },
+      "tlx_battery_1_charge_w": {
+        "name": "Battery 1 charging W"
+      },
+      "tlx_battery_1_charge_total": {
+        "name": "Lifetime total battery 1 charged"
+      },
+      "tlx_battery_2_charge_w": {
+        "name": "Battery 2 charging W"
+      },
+      "tlx_battery_2_charge_total": {
+        "name": "Lifetime total battery 2 charged"
+      },
+      "tlx_export_to_grid_today": {
+        "name": "Export to grid today"
+      },
+      "tlx_export_to_grid_total": {
+        "name": "Lifetime total export to grid"
+      },
+      "tlx_load_consumption_today": {
+        "name": "Load consumption today"
+      },
+      "mix_load_consumption_total": {
+        "name": "Lifetime total load consumption"
+      },
+      "tlx_statement_of_charge": {
+        "name": "Statement of charge (SoC)"
+      },
+      "total_money_today": {
+        "name": "Total money today"
+      },
+      "total_money_total": {
+        "name": "Money lifetime"
+      },
+      "total_energy_today": {
+        "name": "Energy Today"
+      },
+      "total_output_power": {
+        "name": "Output Power"
+      },
+      "total_energy_output": {
+        "name": "Lifetime energy output"
+      },
+      "total_maximum_output": {
+        "name": "Maximum power"
+      }
+    }
+  }
 }
diff --git a/homeassistant/components/gtfs/sensor.py b/homeassistant/components/gtfs/sensor.py
index 9fac4d01926..6f8daf2918d 100644
--- a/homeassistant/components/gtfs/sensor.py
+++ b/homeassistant/components/gtfs/sensor.py
@@ -341,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),
         {
@@ -643,15 +643,14 @@ class GTFSDepartureSensor(SensorEntity):
             # Define the state as a UTC timestamp with ISO 8601 format
             if not self._departure:
                 self._state = None
+            elif self._agency:
+                self._state = self._departure["departure_time"].replace(
+                    tzinfo=dt_util.get_time_zone(self._agency.agency_timezone)
+                )
             else:
-                if self._agency:
-                    self._state = self._departure["departure_time"].replace(
-                        tzinfo=dt_util.get_time_zone(self._agency.agency_timezone)
-                    )
-                else:
-                    self._state = self._departure["departure_time"].replace(
-                        tzinfo=dt_util.UTC
-                    )
+                self._state = self._departure["departure_time"].replace(
+                    tzinfo=dt_util.UTC
+                )
 
             # Assign attributes, icon and name
             self.update_attributes()
diff --git a/homeassistant/components/guardian/binary_sensor.py b/homeassistant/components/guardian/binary_sensor.py
index f9e8819a6af..7114d33f93a 100644
--- a/homeassistant/components/guardian/binary_sensor.py
+++ b/homeassistant/components/guardian/binary_sensor.py
@@ -49,12 +49,12 @@ class ValveControllerBinarySensorDescription(
 PAIRED_SENSOR_DESCRIPTIONS = (
     BinarySensorEntityDescription(
         key=SENSOR_KIND_LEAK_DETECTED,
-        name="Leak detected",
+        translation_key="leak",
         device_class=BinarySensorDeviceClass.MOISTURE,
     ),
     BinarySensorEntityDescription(
         key=SENSOR_KIND_MOVED,
-        name="Recently moved",
+        translation_key="moved",
         device_class=BinarySensorDeviceClass.MOVING,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -63,7 +63,7 @@ PAIRED_SENSOR_DESCRIPTIONS = (
 VALVE_CONTROLLER_DESCRIPTIONS = (
     ValveControllerBinarySensorDescription(
         key=SENSOR_KIND_LEAK_DETECTED,
-        name="Leak detected",
+        translation_key="leak",
         device_class=BinarySensorDeviceClass.MOISTURE,
         api_category=API_SYSTEM_ONBOARD_SENSOR_STATUS,
     ),
diff --git a/homeassistant/components/guardian/button.py b/homeassistant/components/guardian/button.py
index 7680707641c..c6363c9bcec 100644
--- a/homeassistant/components/guardian/button.py
+++ b/homeassistant/components/guardian/button.py
@@ -56,15 +56,15 @@ async def _async_valve_reset(client: Client) -> None:
 BUTTON_DESCRIPTIONS = (
     ValveControllerButtonDescription(
         key=BUTTON_KIND_REBOOT,
-        name="Reboot",
         push_action=_async_reboot,
+        device_class=ButtonDeviceClass.RESTART,
         # Buttons don't actually need a coordinator; we give them one so they can
         # properly inherit from GuardianEntity:
         api_category=API_SYSTEM_DIAGNOSTICS,
     ),
     ValveControllerButtonDescription(
         key=BUTTON_KIND_RESET_VALVE_DIAGNOSTICS,
-        name="Reset valve diagnostics",
+        translation_key="reset_diagnostics",
         push_action=_async_valve_reset,
         # Buttons don't actually need a coordinator; we give them one so they can
         # properly inherit from GuardianEntity:
diff --git a/homeassistant/components/guardian/sensor.py b/homeassistant/components/guardian/sensor.py
index c46f6e221b2..c5fc77cc8f9 100644
--- a/homeassistant/components/guardian/sensor.py
+++ b/homeassistant/components/guardian/sensor.py
@@ -49,14 +49,12 @@ class ValveControllerSensorDescription(
 PAIRED_SENSOR_DESCRIPTIONS = (
     SensorEntityDescription(
         key=SENSOR_KIND_BATTERY,
-        name="Battery",
         device_class=SensorDeviceClass.VOLTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
     ),
     SensorEntityDescription(
         key=SENSOR_KIND_TEMPERATURE,
-        name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
         state_class=SensorStateClass.MEASUREMENT,
@@ -65,7 +63,6 @@ PAIRED_SENSOR_DESCRIPTIONS = (
 VALVE_CONTROLLER_DESCRIPTIONS = (
     ValveControllerSensorDescription(
         key=SENSOR_KIND_TEMPERATURE,
-        name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
         state_class=SensorStateClass.MEASUREMENT,
@@ -73,7 +70,7 @@ VALVE_CONTROLLER_DESCRIPTIONS = (
     ),
     ValveControllerSensorDescription(
         key=SENSOR_KIND_UPTIME,
-        name="Uptime",
+        translation_key="uptime",
         icon="mdi:timer",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfTime.MINUTES,
diff --git a/homeassistant/components/guardian/strings.json b/homeassistant/components/guardian/strings.json
index 683f13c8d36..dc3e6f4c17d 100644
--- a/homeassistant/components/guardian/strings.json
+++ b/homeassistant/components/guardian/strings.json
@@ -30,5 +30,33 @@
         }
       }
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "leak": {
+        "name": "Leak detected"
+      },
+      "moved": {
+        "name": "Recently moved"
+      }
+    },
+    "button": {
+      "reset_diagnostics": {
+        "name": "Reset valve diagnostics"
+      }
+    },
+    "sensor": {
+      "uptime": {
+        "name": "Uptime"
+      }
+    },
+    "switch": {
+      "onboard_access_point": {
+        "name": "Onboard access point"
+      },
+      "valve_controller": {
+        "name": "Valve controller"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/guardian/switch.py b/homeassistant/components/guardian/switch.py
index fe6ff937b84..4e2be5ae179 100644
--- a/homeassistant/components/guardian/switch.py
+++ b/homeassistant/components/guardian/switch.py
@@ -67,7 +67,7 @@ async def _async_open_valve(client: Client) -> None:
 VALVE_CONTROLLER_DESCRIPTIONS = (
     ValveControllerSwitchDescription(
         key=SWITCH_KIND_ONBOARD_AP,
-        name="Onboard AP",
+        translation_key="onboard_access_point",
         icon="mdi:wifi",
         entity_category=EntityCategory.CONFIG,
         api_category=API_WIFI_STATUS,
@@ -76,7 +76,7 @@ VALVE_CONTROLLER_DESCRIPTIONS = (
     ),
     ValveControllerSwitchDescription(
         key=SWITCH_KIND_VALVE,
-        name="Valve controller",
+        translation_key="valve_controller",
         icon="mdi:water",
         api_category=API_VALVE_STATUS,
         off_action=_async_close_valve,
diff --git a/homeassistant/components/harmony/remote.py b/homeassistant/components/harmony/remote.py
index 1482c8aaa4d..c1e85c86787 100644
--- a/homeassistant/components/harmony/remote.py
+++ b/homeassistant/components/harmony/remote.py
@@ -216,9 +216,8 @@ class HarmonyRemote(HarmonyEntity, RemoteEntity, RestoreEntity):
         if not activity or activity == PREVIOUS_ACTIVE_ACTIVITY:
             if self._last_activity:
                 activity = self._last_activity
-            else:
-                if all_activities := self._data.activity_names:
-                    activity = all_activities[0]
+            elif all_activities := self._data.activity_names:
+                activity = all_activities[0]
 
         if activity:
             await self._data.async_start_activity(activity)
diff --git a/homeassistant/components/hassio/__init__.py b/homeassistant/components/hassio/__init__.py
index 2ae4faa7878..8c7f86700e7 100644
--- a/homeassistant/components/hassio/__init__.py
+++ b/homeassistant/components/hassio/__init__.py
@@ -159,7 +159,9 @@ SCHEMA_ADDON_STDIN = SCHEMA_ADDON.extend(
 
 SCHEMA_BACKUP_FULL = vol.Schema(
     {
-        vol.Optional(ATTR_NAME): cv.string,
+        vol.Optional(
+            ATTR_NAME, default=lambda: utcnow().strftime("%Y-%m-%d %H:%M:%S")
+        ): cv.string,
         vol.Optional(ATTR_PASSWORD): cv.string,
         vol.Optional(ATTR_COMPRESSED): cv.boolean,
         vol.Optional(ATTR_LOCATION): vol.All(
diff --git a/homeassistant/components/hassio/issues.py b/homeassistant/components/hassio/issues.py
index 8f7f06a3931..0bbd89aab86 100644
--- a/homeassistant/components/hassio/issues.py
+++ b/homeassistant/components/hassio/issues.py
@@ -274,12 +274,13 @@ class SupervisorIssues:
             data["suggestions"] = (
                 await self._client.get_suggestions_for_issue(data["uuid"])
             )[ATTR_SUGGESTIONS]
-            self.add_issue(Issue.from_dict(data))
         except HassioAPIError:
             _LOGGER.error(
                 "Could not get suggestions for supervisor issue %s, skipping it",
                 data["uuid"],
             )
+            return
+        self.add_issue(Issue.from_dict(data))
 
     def remove_issue(self, issue: Issue) -> None:
         """Remove an issue from the list. Delete a repair if necessary."""
diff --git a/homeassistant/components/hassio/websocket_api.py b/homeassistant/components/hassio/websocket_api.py
index 8a9a145f2d6..c8fefe65e1f 100644
--- a/homeassistant/components/hassio/websocket_api.py
+++ b/homeassistant/components/hassio/websocket_api.py
@@ -41,9 +41,14 @@ SCHEMA_WEBSOCKET_EVENT = vol.Schema(
 
 # Endpoints needed for ingress can't require admin because addons can set `panel_admin: false`
 # pylint: disable=implicit-str-concat
+# fmt: off
 WS_NO_ADMIN_ENDPOINTS = re.compile(
-    r"^(?:" r"|/ingress/(session|validate_session)" r"|/addons/[^/]+/info" r")$"
+    r"^(?:"
+    r"|/ingress/(session|validate_session)"
+    r"|/addons/[^/]+/info"
+    r")$" # noqa: ISC001
 )
+# fmt: on
 # pylint: enable=implicit-str-concat
 
 _LOGGER: logging.Logger = logging.getLogger(__package__)
diff --git a/homeassistant/components/here_travel_time/manifest.json b/homeassistant/components/here_travel_time/manifest.json
index f024b55d009..19c5c4d73d9 100644
--- a/homeassistant/components/here_travel_time/manifest.json
+++ b/homeassistant/components/here_travel_time/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/here_travel_time",
   "iot_class": "cloud_polling",
   "loggers": ["here_routing", "here_transit", "homeassistant.helpers.location"],
-  "requirements": ["here_routing==0.2.0", "here_transit==1.2.0"]
+  "requirements": ["here-routing==0.2.0", "here-transit==1.2.0"]
 }
diff --git a/homeassistant/components/here_travel_time/sensor.py b/homeassistant/components/here_travel_time/sensor.py
index 91abfbd7652..537f782ad09 100644
--- a/homeassistant/components/here_travel_time/sensor.py
+++ b/homeassistant/components/here_travel_time/sensor.py
@@ -52,21 +52,21 @@ def sensor_descriptions(travel_mode: str) -> tuple[SensorEntityDescription, ...]
     """Construct SensorEntityDescriptions."""
     return (
         SensorEntityDescription(
-            name="Duration",
+            translation_key="duration",
             icon=ICONS.get(travel_mode, ICON_CAR),
             key=ATTR_DURATION,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfTime.MINUTES,
         ),
         SensorEntityDescription(
-            name="Duration in traffic",
+            translation_key="duration_in_traffic",
             icon=ICONS.get(travel_mode, ICON_CAR),
             key=ATTR_DURATION_IN_TRAFFIC,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfTime.MINUTES,
         ),
         SensorEntityDescription(
-            name="Distance",
+            translation_key="distance",
             icon=ICONS.get(travel_mode, ICON_CAR),
             key=ATTR_DISTANCE,
             state_class=SensorStateClass.MEASUREMENT,
@@ -110,6 +110,8 @@ class HERETravelTimeSensor(
 ):
     """Representation of a HERE travel time sensor."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         unique_id_prefix: str,
@@ -128,7 +130,6 @@ class HERETravelTimeSensor(
             name=name,
             manufacturer="HERE Technologies",
         )
-        self._attr_has_entity_name = True
 
     async def _async_restore_state(self) -> None:
         """Restore state."""
@@ -174,7 +175,7 @@ class OriginSensor(HERETravelTimeSensor):
     ) -> None:
         """Initialize the sensor."""
         sensor_description = SensorEntityDescription(
-            name="Origin",
+            translation_key="origin",
             icon="mdi:store-marker",
             key=ATTR_ORIGIN_NAME,
         )
@@ -202,7 +203,7 @@ class DestinationSensor(HERETravelTimeSensor):
     ) -> None:
         """Initialize the sensor."""
         sensor_description = SensorEntityDescription(
-            name="Destination",
+            translation_key="destination",
             icon="mdi:store-marker",
             key=ATTR_DESTINATION_NAME,
         )
diff --git a/homeassistant/components/here_travel_time/strings.json b/homeassistant/components/here_travel_time/strings.json
index dab135efc82..2c031dc0a02 100644
--- a/homeassistant/components/here_travel_time/strings.json
+++ b/homeassistant/components/here_travel_time/strings.json
@@ -85,5 +85,24 @@
         }
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "duration": {
+        "name": "Duration"
+      },
+      "duration_in_traffic": {
+        "name": "Duration in traffic"
+      },
+      "distance": {
+        "name": "Distance"
+      },
+      "origin": {
+        "name": "Origin"
+      },
+      "destination": {
+        "name": "Destination"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/hikvision/manifest.json b/homeassistant/components/hikvision/manifest.json
index 1e175a2a0df..e37e149ccda 100644
--- a/homeassistant/components/hikvision/manifest.json
+++ b/homeassistant/components/hikvision/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/hikvision",
   "iot_class": "local_push",
   "loggers": ["pyhik"],
-  "requirements": ["pyhik==0.3.2"]
+  "requirements": ["pyHik==0.3.2"]
 }
diff --git a/homeassistant/components/home_connect/sensor.py b/homeassistant/components/home_connect/sensor.py
index 38a45ccf709..efd2a9b34dd 100644
--- a/homeassistant/components/home_connect/sensor.py
+++ b/homeassistant/components/home_connect/sensor.py
@@ -62,28 +62,27 @@ class HomeConnectSensor(HomeConnectEntity, SensorEntity):
         status = self.device.appliance.status
         if self._key not in status:
             self._state = None
-        else:
-            if self.device_class == SensorDeviceClass.TIMESTAMP:
-                if ATTR_VALUE not in status[self._key]:
-                    self._state = None
-                elif (
-                    self._state is not None
-                    and self._sign == 1
-                    and self._state < dt_util.utcnow()
-                ):
-                    # if the date is supposed to be in the future but we're
-                    # already past it, set state to None.
-                    self._state = None
-                else:
-                    seconds = self._sign * float(status[self._key][ATTR_VALUE])
-                    self._state = dt_util.utcnow() + timedelta(seconds=seconds)
+        elif self.device_class == SensorDeviceClass.TIMESTAMP:
+            if ATTR_VALUE not in status[self._key]:
+                self._state = None
+            elif (
+                self._state is not None
+                and self._sign == 1
+                and self._state < dt_util.utcnow()
+            ):
+                # if the date is supposed to be in the future but we're
+                # already past it, set state to None.
+                self._state = None
             else:
-                self._state = status[self._key].get(ATTR_VALUE)
-                if self._key == BSH_OPERATION_STATE:
-                    # 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._state = self._state.split(".")[-1]
+                seconds = self._sign * float(status[self._key][ATTR_VALUE])
+                self._state = dt_util.utcnow() + timedelta(seconds=seconds)
+        else:
+            self._state = status[self._key].get(ATTR_VALUE)
+            if self._key == BSH_OPERATION_STATE:
+                # 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._state = self._state.split(".")[-1]
         _LOGGER.debug("Updated, new state: %s", self._state)
 
     @property
diff --git a/homeassistant/components/homeassistant/strings.json b/homeassistant/components/homeassistant/strings.json
index 55a40e7ba9d..0a41f9c7a99 100644
--- a/homeassistant/components/homeassistant/strings.json
+++ b/homeassistant/components/homeassistant/strings.json
@@ -12,9 +12,13 @@
       "title": "Support for Python {current_python_version} is being removed",
       "description": "Support for running Home Assistant in the current used Python version {current_python_version} is deprecated and will be removed in Home Assistant {breaks_in_ha_version}. Please upgrade Python to {required_python_version} to prevent your Home Assistant instance from breaking."
     },
-    "integration_key_no_support": {
-      "title": "This integration does not support YAML configuration",
-      "description": "The {domain} integration does not support configuration via YAML file. You may not notice any obvious issues with the integration, but the configuration settings defined in YAML are not actually applied. \n\nTo resolve this: 1. Please remove this integration from your YAML configuration file.\n\n2. Restart Home Assistant."
+    "config_entry_only": {
+      "title": "The {domain} integration does not support YAML configuration",
+      "description": "The {domain} integration does not support configuration via YAML file. You may not notice any obvious issues with the integration, but any configuration settings defined in YAML are not actually applied.\n\nTo resolve this:\n\n1. If you've not already done so, [set up the integration]({add_integration}).\n\n2. Remove `{domain}:` from your YAML configuration file.\n\n3. Restart Home Assistant."
+    },
+    "platform_only": {
+      "title": "The {domain} integration does not support YAML configuration under its own key",
+      "description": "The {domain} integration does not support configuration under its own key, it must be configured under its supported platforms.\n\nTo resolve this:\n\n1. Remove `{domain}:` from your YAML configuration file.\n\n2. Restart Home Assistant."
     }
   },
   "system_health": {
diff --git a/homeassistant/components/homeassistant_sky_connect/__init__.py b/homeassistant/components/homeassistant_sky_connect/__init__.py
index 0f7ec704715..5f17069f5d5 100644
--- a/homeassistant/components/homeassistant_sky_connect/__init__.py
+++ b/homeassistant/components/homeassistant_sky_connect/__init__.py
@@ -32,6 +32,7 @@ async def _async_usb_scan_done(hass: HomeAssistant, entry: ConfigEntry) -> None:
         return
 
     usb_dev = entry.data["device"]
+    # The call to get_serial_by_id can be removed in HA Core 2024.1
     dev_path = await hass.async_add_executor_job(usb.get_serial_by_id, usb_dev)
 
     if not await multi_pan_addon_using_device(hass, dev_path):
diff --git a/homeassistant/components/homeassistant_sky_connect/config_flow.py b/homeassistant/components/homeassistant_sky_connect/config_flow.py
index 7bc514d5615..5ac44f3f290 100644
--- a/homeassistant/components/homeassistant_sky_connect/config_flow.py
+++ b/homeassistant/components/homeassistant_sky_connect/config_flow.py
@@ -58,6 +58,7 @@ class HomeAssistantSkyConnectOptionsFlow(silabs_multiprotocol_addon.OptionsFlowH
     ) -> silabs_multiprotocol_addon.SerialPortSettings:
         """Return the radio serial port settings."""
         usb_dev = self.config_entry.data["device"]
+        # The call to get_serial_by_id can be removed in HA Core 2024.1
         dev_path = await self.hass.async_add_executor_job(usb.get_serial_by_id, usb_dev)
         return silabs_multiprotocol_addon.SerialPortSettings(
             device=dev_path,
diff --git a/homeassistant/components/homekit/__init__.py b/homeassistant/components/homekit/__init__.py
index 2b56a056821..514c218b101 100644
--- a/homeassistant/components/homekit/__init__.py
+++ b/homeassistant/components/homekit/__init__.py
@@ -28,7 +28,6 @@ from homeassistant.components.device_automation.trigger import (
 )
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.components.humidifier import DOMAIN as HUMIDIFIER_DOMAIN
-from homeassistant.components.network import MDNS_TARGET_IP
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import (
@@ -168,7 +167,9 @@ BRIDGE_SCHEMA = vol.All(
             ),
             vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
             vol.Optional(CONF_IP_ADDRESS): vol.All(ipaddress.ip_address, cv.string),
-            vol.Optional(CONF_ADVERTISE_IP): vol.All(ipaddress.ip_address, cv.string),
+            vol.Optional(CONF_ADVERTISE_IP): vol.All(
+                cv.ensure_list, [ipaddress.ip_address], [cv.string]
+            ),
             vol.Optional(CONF_FILTER, default={}): BASE_FILTER_SCHEMA,
             vol.Optional(CONF_ENTITY_CONFIG, default={}): validate_entity_config,
             vol.Optional(CONF_DEVICES): cv.ensure_list,
@@ -303,9 +304,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     # ip_address and advertise_ip are yaml only
     ip_address = conf.get(CONF_IP_ADDRESS, [None])
-    advertise_ip = conf.get(
-        CONF_ADVERTISE_IP, await network.async_get_source_ip(hass, MDNS_TARGET_IP)
-    )
+    advertise_ips: list[str] = conf.get(
+        CONF_ADVERTISE_IP
+    ) or await network.async_get_announce_addresses(hass)
+
     # exclude_accessory_mode is only used for config flow
     # to indicate that the config entry was setup after
     # we started creating config entries for entities that
@@ -331,7 +333,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         exclude_accessory_mode,
         entity_config,
         homekit_mode,
-        advertise_ip,
+        advertise_ips,
         entry.entry_id,
         entry.title,
         devices=devices,
@@ -508,7 +510,7 @@ class HomeKit:
         exclude_accessory_mode: bool,
         entity_config: dict,
         homekit_mode: str,
-        advertise_ip: str | None,
+        advertise_ips: list[str],
         entry_id: str,
         entry_title: str,
         devices: list[str] | None = None,
@@ -521,7 +523,7 @@ class HomeKit:
         self._filter = entity_filter
         self._config = entity_config
         self._exclude_accessory_mode = exclude_accessory_mode
-        self._advertise_ip = advertise_ip
+        self._advertise_ips = advertise_ips
         self._entry_id = entry_id
         self._entry_title = entry_title
         self._homekit_mode = homekit_mode
@@ -547,7 +549,7 @@ class HomeKit:
             address=self._ip_address,
             port=self._port,
             persist_file=persist_file,
-            advertised_address=self._advertise_ip,
+            advertised_address=self._advertise_ips,
             async_zeroconf_instance=async_zeroconf_instance,
             zeroconf_server=f"{uuid}-hap.local.",
             loader=get_loader(),
diff --git a/homeassistant/components/homekit/accessories.py b/homeassistant/components/homekit/accessories.py
index a2e3f8487c6..00168ef3898 100644
--- a/homeassistant/components/homekit/accessories.py
+++ b/homeassistant/components/homekit/accessories.py
@@ -281,7 +281,7 @@ class HomeAccessory(Accessory):  # type: ignore[misc]
             display_name=cleanup_name_for_homekit(name),
             aid=aid,
             iid_manager=HomeIIDManager(driver.iid_storage),
-            *args,
+            *args,  # noqa: B026
             **kwargs,
         )
         self.config = config or {}
diff --git a/homeassistant/components/homekit/type_triggers.py b/homeassistant/components/homekit/type_triggers.py
index eb2cd5d34ad..ee737e01ff4 100644
--- a/homeassistant/components/homekit/type_triggers.py
+++ b/homeassistant/components/homekit/type_triggers.py
@@ -47,10 +47,12 @@ class DeviceTriggerAccessory(HomeAccessory):
             type_: str = trigger["type"]
             subtype: str | None = trigger.get("subtype")
             unique_id = f'{type_}-{subtype or ""}'
-            if (entity_id := trigger.get("entity_id")) and (
-                entry := ent_reg.async_get(entity_id)
+            entity_id: str | None = None
+            if (entity_id_or_uuid := trigger.get("entity_id")) and (
+                entry := ent_reg.async_get(entity_id_or_uuid)
             ):
                 unique_id += f"-entity_unique_id:{get_system_unique_id(entry)}"
+                entity_id = entry.entity_id
             trigger_name_parts = []
             if entity_id and (state := self.hass.states.get(entity_id)):
                 trigger_name_parts.append(state.name)
diff --git a/homeassistant/components/homekit_controller/__init__.py b/homeassistant/components/homekit_controller/__init__.py
index ecd8113a2bb..ed9b8ca4622 100644
--- a/homeassistant/components/homekit_controller/__init__.py
+++ b/homeassistant/components/homekit_controller/__init__.py
@@ -16,16 +16,18 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_IDENTIFIERS, EVENT_HOMEASSISTANT_STOP
 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.typing import ConfigType
 
 from .config_flow import normalize_hkid
 from .connection import HKDevice
-from .const import KNOWN_DEVICES
+from .const import DOMAIN, KNOWN_DEVICES
 from .utils import async_get_controller
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up a HomeKit connection on a config entry."""
diff --git a/homeassistant/components/homekit_controller/connection.py b/homeassistant/components/homekit_controller/connection.py
index db85dbda3d5..b937e7f2e0b 100644
--- a/homeassistant/components/homekit_controller/connection.py
+++ b/homeassistant/components/homekit_controller/connection.py
@@ -272,7 +272,7 @@ class HKDevice:
                     self.hass,
                     self.async_update_available_state,
                     timedelta(seconds=BLE_AVAILABILITY_CHECK_INTERVAL),
-                    name=f"HomeKit Controller {self.unique_id} BLE availability "
+                    name=f"HomeKit Device {self.unique_id} BLE availability "
                     "check poll",
                 )
             )
@@ -291,7 +291,7 @@ class HKDevice:
                 self.hass,
                 self.async_request_update,
                 self.pairing.poll_interval,
-                name=f"HomeKit Controller {self.unique_id} availability check poll",
+                name=f"HomeKit Device {self.unique_id} availability check poll",
             )
         )
 
@@ -714,7 +714,7 @@ class HKDevice:
             if not self._polling_lock_warned:
                 _LOGGER.warning(
                     (
-                        "HomeKit controller update skipped as previous poll still in"
+                        "HomeKit device update skipped as previous poll still in"
                         " flight: %s"
                     ),
                     self.unique_id,
@@ -725,7 +725,7 @@ class HKDevice:
         if self._polling_lock_warned:
             _LOGGER.info(
                 (
-                    "HomeKit controller no longer detecting back pressure - not"
+                    "HomeKit device no longer detecting back pressure - not"
                     " skipping poll: %s"
                 ),
                 self.unique_id,
@@ -733,7 +733,7 @@ class HKDevice:
             self._polling_lock_warned = False
 
         async with self._polling_lock:
-            _LOGGER.debug("Starting HomeKit controller update: %s", self.unique_id)
+            _LOGGER.debug("Starting HomeKit device update: %s", self.unique_id)
 
             try:
                 new_values_dict = await self.get_characteristics(
@@ -755,7 +755,7 @@ class HKDevice:
             self._poll_failures = 0
             self.process_new_events(new_values_dict)
 
-            _LOGGER.debug("Finished HomeKit controller update: %s", self.unique_id)
+            _LOGGER.debug("Finished HomeKit device update: %s", self.unique_id)
 
     def process_new_events(
         self, new_values_dict: dict[tuple[int, int], dict[str, Any]]
diff --git a/homeassistant/components/homekit_controller/humidifier.py b/homeassistant/components/homekit_controller/humidifier.py
index e396b3c9c97..cd2cf4022e7 100644
--- a/homeassistant/components/homekit_controller/humidifier.py
+++ b/homeassistant/components/homekit_controller/humidifier.py
@@ -73,6 +73,11 @@ class HomeKitHumidifier(HomeKitEntity, HumidifierEntity):
             CharacteristicsTypes.RELATIVE_HUMIDITY_HUMIDIFIER_THRESHOLD
         )
 
+    @property
+    def current_humidity(self) -> int | None:
+        """Return the current humidity."""
+        return self.service.value(CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT)
+
     @property
     def mode(self) -> str | None:
         """Return the current mode, e.g., home, auto, baby.
@@ -177,6 +182,11 @@ class HomeKitDehumidifier(HomeKitEntity, HumidifierEntity):
             CharacteristicsTypes.RELATIVE_HUMIDITY_DEHUMIDIFIER_THRESHOLD
         )
 
+    @property
+    def current_humidity(self) -> int | None:
+        """Return the current humidity."""
+        return self.service.value(CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT)
+
     @property
     def mode(self) -> str | None:
         """Return the current mode, e.g., home, auto, baby.
diff --git a/homeassistant/components/homekit_controller/manifest.json b/homeassistant/components/homekit_controller/manifest.json
index 19167e762e9..d0a88bf8249 100644
--- a/homeassistant/components/homekit_controller/manifest.json
+++ b/homeassistant/components/homekit_controller/manifest.json
@@ -1,6 +1,6 @@
 {
   "domain": "homekit_controller",
-  "name": "HomeKit Controller",
+  "name": "HomeKit Device",
   "after_dependencies": ["thread"],
   "bluetooth": [
     {
diff --git a/homeassistant/components/homekit_controller/strings.json b/homeassistant/components/homekit_controller/strings.json
index 2291f66d88a..7420ef7f3f9 100644
--- a/homeassistant/components/homekit_controller/strings.json
+++ b/homeassistant/components/homekit_controller/strings.json
@@ -1,18 +1,18 @@
 {
-  "title": "HomeKit Controller",
+  "title": "HomeKit Device",
   "config": {
     "flow_title": "{name} ({category})",
     "step": {
       "user": {
         "title": "Device selection",
-        "description": "HomeKit Controller communicates over the local area network using a secure encrypted connection without a separate HomeKit controller or iCloud. Select the device you want to pair with:",
+        "description": "HomeKit Device communicates over the local area network using a secure encrypted connection without a separate HomeKit Controller or iCloud. Select the device you want to pair with:",
         "data": {
           "device": "Device"
         }
       },
       "pair": {
         "title": "Pair with a device via HomeKit Accessory Protocol",
-        "description": "HomeKit Controller communicates with {name} ({category}) over the local area network using a secure encrypted connection without a separate HomeKit controller or iCloud. Enter your HomeKit pairing code (in the format XXX-XX-XXX) to use this accessory. This code is usually found on the device itself or in the packaging.",
+        "description": "HomeKit Device communicates with {name} ({category}) over the local area network using a secure encrypted connection without a separate HomeKit Controller or iCloud. Enter your HomeKit pairing code (in the format XXX-XX-XXX) to use this accessory. This code is usually found on the device itself or in the packaging.",
         "data": {
           "pairing_code": "Pairing Code",
           "allow_insecure_setup_codes": "Allow pairing with insecure setup codes."
diff --git a/homeassistant/components/homematicip_cloud/generic_entity.py b/homeassistant/components/homematicip_cloud/generic_entity.py
index a5296675292..7a6e7c18e13 100644
--- a/homeassistant/components/homematicip_cloud/generic_entity.py
+++ b/homeassistant/components/homematicip_cloud/generic_entity.py
@@ -164,7 +164,7 @@ class HomematicipGenericEntity(Entity):
         else:
             # Remove from entity registry.
             # Only relevant for entities that do not belong to a device.
-            if entity_id := self.registry_entry.entity_id:
+            if entity_id := self.registry_entry.entity_id:  # noqa: PLR5501
                 entity_registry = er.async_get(self.hass)
                 if entity_id in entity_registry.entities:
                     entity_registry.async_remove(entity_id)
@@ -185,9 +185,8 @@ class HomematicipGenericEntity(Entity):
         if hasattr(self._device, "functionalChannels"):
             if self._is_multi_channel:
                 name = self._device.functionalChannels[self._channel].label
-            else:
-                if len(self._device.functionalChannels) > 1:
-                    name = self._device.functionalChannels[1].label
+            elif len(self._device.functionalChannels) > 1:
+                name = self._device.functionalChannels[1].label
 
         # Use device label, if name is not defined by channel label.
         if not name:
diff --git a/homeassistant/components/homematicip_cloud/switch.py b/homeassistant/components/homematicip_cloud/switch.py
index 770687ef50d..65919033801 100644
--- a/homeassistant/components/homematicip_cloud/switch.py
+++ b/homeassistant/components/homematicip_cloud/switch.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 from typing import Any
 
 from homematicip.aio.device import (
+    AsyncBrandSwitch2,
     AsyncBrandSwitchMeasuring,
     AsyncDinRailSwitch,
     AsyncDinRailSwitch4,
@@ -77,6 +78,9 @@ async def async_setup_entry(
         elif isinstance(device, AsyncPrintedCircuitBoardSwitch2):
             for channel in range(1, 3):
                 entities.append(HomematicipMultiSwitch(hap, device, channel=channel))
+        elif isinstance(device, AsyncBrandSwitch2):
+            for channel in range(1, 3):
+                entities.append(HomematicipMultiSwitch(hap, device, channel=channel))
 
     for group in hap.home.groups:
         if isinstance(group, (AsyncExtendedLinkedSwitchingGroup, AsyncSwitchingGroup)):
diff --git a/homeassistant/components/homewizard/button.py b/homeassistant/components/homewizard/button.py
index 665406499e1..96fe1b157f8 100644
--- a/homeassistant/components/homewizard/button.py
+++ b/homeassistant/components/homewizard/button.py
@@ -1,6 +1,6 @@
 """Support for HomeWizard buttons."""
 
-from homeassistant.components.button import ButtonEntity
+from homeassistant.components.button import ButtonDeviceClass, ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
@@ -25,8 +25,7 @@ class HomeWizardIdentifyButton(HomeWizardEntity, ButtonEntity):
     """Representation of a identify button."""
 
     _attr_entity_category = EntityCategory.DIAGNOSTIC
-    _attr_icon = "mdi:magnify"
-    _attr_name = "Identify"
+    _attr_device_class = ButtonDeviceClass.IDENTIFY
 
     def __init__(
         self,
diff --git a/homeassistant/components/homewizard/number.py b/homeassistant/components/homewizard/number.py
index 0451aed9739..d51d180edb1 100644
--- a/homeassistant/components/homewizard/number.py
+++ b/homeassistant/components/homewizard/number.py
@@ -29,7 +29,7 @@ class HWEnergyNumberEntity(HomeWizardEntity, NumberEntity):
 
     _attr_entity_category = EntityCategory.CONFIG
     _attr_icon = "mdi:lightbulb-on"
-    _attr_name = "Status light brightness"
+    _attr_translation_key = "status_light_brightness"
     _attr_native_unit_of_measurement = PERCENTAGE
 
     def __init__(
@@ -55,4 +55,5 @@ class HWEnergyNumberEntity(HomeWizardEntity, NumberEntity):
             or self.coordinator.data.state.brightness is None
         ):
             return None
-        return round(self.coordinator.data.state.brightness * (100 / 255))
+        brightness: float = self.coordinator.data.state.brightness
+        return round(brightness * (100 / 255))
diff --git a/homeassistant/components/homewizard/sensor.py b/homeassistant/components/homewizard/sensor.py
index 6462c281346..d8cc72ce45e 100644
--- a/homeassistant/components/homewizard/sensor.py
+++ b/homeassistant/components/homewizard/sensor.py
@@ -38,6 +38,7 @@ PARALLEL_UPDATES = 1
 class HomeWizardEntityDescriptionMixin:
     """Mixin values for HomeWizard entities."""
 
+    has_fn: Callable[[Data], bool]
     value_fn: Callable[[Data], float | int | str | None]
 
 
@@ -47,40 +48,47 @@ class HomeWizardSensorEntityDescription(
 ):
     """Class describing HomeWizard sensor entities."""
 
+    enabled_fn: Callable[[Data], bool] = lambda data: True
+
 
 SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
     HomeWizardSensorEntityDescription(
         key="smr_version",
-        name="DSMR version",
+        translation_key="dsmr_version",
         icon="mdi:counter",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.smr_version is not None,
         value_fn=lambda data: data.smr_version,
     ),
     HomeWizardSensorEntityDescription(
         key="meter_model",
-        name="Smart meter model",
+        translation_key="meter_model",
         icon="mdi:gauge",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.meter_model is not None,
         value_fn=lambda data: data.meter_model,
     ),
     HomeWizardSensorEntityDescription(
         key="unique_meter_id",
-        name="Smart meter identifier",
+        translation_key="unique_meter_id",
         icon="mdi:alphabetical-variant",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.unique_meter_id is not None,
         value_fn=lambda data: data.unique_meter_id,
     ),
     HomeWizardSensorEntityDescription(
         key="wifi_ssid",
-        name="Wi-Fi SSID",
+        translation_key="wifi_ssid",
         icon="mdi:wifi",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.wifi_ssid is not None,
         value_fn=lambda data: data.wifi_ssid,
     ),
     HomeWizardSensorEntityDescription(
         key="active_tariff",
-        name="Active tariff",
+        translation_key="active_tariff",
         icon="mdi:calendar-clock",
+        has_fn=lambda data: data.active_tariff is not None,
         value_fn=lambda data: (
             None if data.active_tariff is None else str(data.active_tariff)
         ),
@@ -89,290 +97,331 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
     ),
     HomeWizardSensorEntityDescription(
         key="wifi_strength",
-        name="Wi-Fi strength",
+        translation_key="wifi_strength",
         icon="mdi:wifi",
         native_unit_of_measurement=PERCENTAGE,
         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,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_kwh",
-        name="Total power import",
+        translation_key="total_power_import_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_import_kwh,
+        has_fn=lambda data: data.total_power_import_kwh is not None,
+        value_fn=lambda data: data.total_power_import_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_t1_kwh",
-        name="Total power import T1",
+        translation_key="total_power_import_t1_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_import_t1_kwh,
+        has_fn=lambda data: data.total_power_import_t1_kwh is not None,
+        value_fn=lambda data: data.total_power_import_t1_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_t2_kwh",
-        name="Total power import T2",
+        translation_key="total_power_import_t2_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_import_t2_kwh,
+        has_fn=lambda data: data.total_power_import_t2_kwh is not None,
+        value_fn=lambda data: data.total_power_import_t2_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_t3_kwh",
-        name="Total power import T3",
+        translation_key="total_power_import_t3_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_import_t3_kwh,
+        has_fn=lambda data: data.total_power_import_t3_kwh is not None,
+        value_fn=lambda data: data.total_power_import_t3_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_t4_kwh",
-        name="Total power import T4",
+        translation_key="total_power_import_t4_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_import_t4_kwh,
+        has_fn=lambda data: data.total_power_import_t4_kwh is not None,
+        value_fn=lambda data: data.total_power_import_t4_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_kwh",
-        name="Total power export",
+        translation_key="total_power_export_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_export_kwh,
+        has_fn=lambda data: data.total_power_export_kwh is not None,
+        enabled_fn=lambda data: data.total_power_export_kwh != 0,
+        value_fn=lambda data: data.total_power_export_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_t1_kwh",
-        name="Total power export T1",
+        translation_key="total_power_export_t1_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_export_t1_kwh,
+        has_fn=lambda data: data.total_power_export_t1_kwh is not None,
+        enabled_fn=lambda data: data.total_power_export_t1_kwh != 0,
+        value_fn=lambda data: data.total_power_export_t1_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_t2_kwh",
-        name="Total power export T2",
+        translation_key="total_power_export_t2_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_export_t2_kwh,
+        has_fn=lambda data: data.total_power_export_t2_kwh is not None,
+        enabled_fn=lambda data: data.total_power_export_t2_kwh != 0,
+        value_fn=lambda data: data.total_power_export_t2_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_t3_kwh",
-        name="Total power export T3",
+        translation_key="total_power_export_t3_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_export_t3_kwh,
+        has_fn=lambda data: data.total_power_export_t3_kwh is not None,
+        enabled_fn=lambda data: data.total_power_export_t3_kwh != 0,
+        value_fn=lambda data: data.total_power_export_t3_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_t4_kwh",
-        name="Total power export T4",
+        translation_key="total_power_export_t4_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_export_t4_kwh,
+        has_fn=lambda data: data.total_power_export_t4_kwh is not None,
+        enabled_fn=lambda data: data.total_power_export_t4_kwh != 0,
+        value_fn=lambda data: data.total_power_export_t4_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_w",
-        name="Active power",
+        translation_key="active_power_w",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
+        has_fn=lambda data: data.active_power_w is not None,
         value_fn=lambda data: data.active_power_w,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_l1_w",
-        name="Active power L1",
+        translation_key="active_power_l1_w",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
+        has_fn=lambda data: data.active_power_l1_w is not None,
         value_fn=lambda data: data.active_power_l1_w,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_l2_w",
-        name="Active power L2",
+        translation_key="active_power_l2_w",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
+        has_fn=lambda data: data.active_power_l2_w is not None,
         value_fn=lambda data: data.active_power_l2_w,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_l3_w",
-        name="Active power L3",
+        translation_key="active_power_l3_w",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
+        has_fn=lambda data: data.active_power_l3_w is not None,
         value_fn=lambda data: data.active_power_l3_w,
     ),
     HomeWizardSensorEntityDescription(
         key="active_voltage_l1_v",
-        name="Active voltage L1",
+        translation_key="active_voltage_l1_v",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_voltage_l1_v is not None,
         value_fn=lambda data: data.active_voltage_l1_v,
     ),
     HomeWizardSensorEntityDescription(
         key="active_voltage_l2_v",
-        name="Active voltage L2",
+        translation_key="active_voltage_l2_v",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_voltage_l2_v is not None,
         value_fn=lambda data: data.active_voltage_l2_v,
     ),
     HomeWizardSensorEntityDescription(
         key="active_voltage_l3_v",
-        name="Active voltage L3",
+        translation_key="active_voltage_l3_v",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_voltage_l3_v is not None,
         value_fn=lambda data: data.active_voltage_l3_v,
     ),
     HomeWizardSensorEntityDescription(
         key="active_current_l1_a",
-        name="Active current L1",
+        translation_key="active_current_l1_a",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_current_l1_a is not None,
         value_fn=lambda data: data.active_current_l1_a,
     ),
     HomeWizardSensorEntityDescription(
         key="active_current_l2_a",
-        name="Active current L2",
+        translation_key="active_current_l2_a",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_current_l2_a is not None,
         value_fn=lambda data: data.active_current_l2_a,
     ),
     HomeWizardSensorEntityDescription(
         key="active_current_l3_a",
-        name="Active current L3",
+        translation_key="active_current_l3_a",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_current_l3_a is not None,
         value_fn=lambda data: data.active_current_l3_a,
     ),
     HomeWizardSensorEntityDescription(
         key="active_frequency_hz",
-        name="Active frequency",
+        translation_key="active_frequency_hz",
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_frequency_hz is not None,
         value_fn=lambda data: data.active_frequency_hz,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_sag_l1_count",
-        name="Voltage sags detected L1",
+        translation_key="voltage_sag_l1_count",
         icon="mdi:alert",
         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,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_sag_l2_count",
-        name="Voltage sags detected L2",
+        translation_key="voltage_sag_l2_count",
         icon="mdi:alert",
         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,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_sag_l3_count",
-        name="Voltage sags detected L3",
+        translation_key="voltage_sag_l3_count",
         icon="mdi:alert",
         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,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_swell_l1_count",
-        name="Voltage swells detected L1",
+        translation_key="voltage_swell_l1_count",
         icon="mdi:alert",
         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,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_swell_l2_count",
-        name="Voltage swells detected L2",
+        translation_key="voltage_swell_l2_count",
         icon="mdi:alert",
         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,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_swell_l3_count",
-        name="Voltage swells detected L3",
+        translation_key="voltage_swell_l3_count",
         icon="mdi:alert",
         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,
     ),
     HomeWizardSensorEntityDescription(
         key="any_power_fail_count",
-        name="Power failures detected",
+        translation_key="any_power_fail_count",
         icon="mdi:transmission-tower-off",
         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,
     ),
     HomeWizardSensorEntityDescription(
         key="long_power_fail_count",
-        name="Long power failures detected",
+        translation_key="long_power_fail_count",
         icon="mdi:transmission-tower-off",
         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,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_average_w",
-        name="Active average demand",
+        translation_key="active_power_average_w",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
+        has_fn=lambda data: data.active_power_average_w is not None,
         value_fn=lambda data: data.active_power_average_w,
     ),
     HomeWizardSensorEntityDescription(
         key="monthly_power_peak_w",
-        name="Peak demand current month",
+        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,
     ),
     HomeWizardSensorEntityDescription(
         key="total_gas_m3",
-        name="Total gas",
+        translation_key="total_gas_m3",
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         device_class=SensorDeviceClass.GAS,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_gas_m3,
+        has_fn=lambda data: data.total_gas_m3 is not None,
+        value_fn=lambda data: data.total_gas_m3 or None,
     ),
     HomeWizardSensorEntityDescription(
         key="gas_unique_id",
-        name="Gas meter identifier",
+        translation_key="gas_unique_id",
         icon="mdi:alphabetical-variant",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.gas_unique_id is not None,
         value_fn=lambda data: data.gas_unique_id,
     ),
     HomeWizardSensorEntityDescription(
         key="active_liter_lpm",
-        name="Active water usage",
+        translation_key="active_liter_lpm",
         native_unit_of_measurement="l/min",
         icon="mdi:water",
         state_class=SensorStateClass.MEASUREMENT,
+        has_fn=lambda data: data.active_liter_lpm is not None,
         value_fn=lambda data: data.active_liter_lpm,
     ),
     HomeWizardSensorEntityDescription(
         key="total_liter_m3",
-        name="Total water usage",
+        translation_key="total_liter_m3",
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         icon="mdi:gauge",
         device_class=SensorDeviceClass.WATER,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_liter_m3,
+        has_fn=lambda data: data.total_liter_m3 is not None,
+        value_fn=lambda data: data.total_liter_m3 or None,
     ),
 )
 
@@ -386,7 +435,7 @@ async def async_setup_entry(
     async_add_entities(
         HomeWizardSensorEntity(coordinator, entry, description)
         for description in SENSORS
-        if description.value_fn(coordinator.data.data) is not None
+        if description.has_fn(coordinator.data.data)
     )
 
 
@@ -405,20 +454,7 @@ class HomeWizardSensorEntity(HomeWizardEntity, SensorEntity):
         super().__init__(coordinator)
         self.entity_description = description
         self._attr_unique_id = f"{entry.unique_id}_{description.key}"
-
-        # Special case for export, not everyone has solar panels
-        # The chance that 'export' is non-zero when you have solar panels is nil
-        if (
-            description.key
-            in [
-                "total_power_export_kwh",
-                "total_power_export_t1_kwh",
-                "total_power_export_t2_kwh",
-                "total_power_export_t3_kwh",
-                "total_power_export_t4_kwh",
-            ]
-            and self.native_value == 0
-        ):
+        if not description.enabled_fn(self.coordinator.data.data):
             self._attr_entity_registry_enabled_default = False
 
     @property
diff --git a/homeassistant/components/homewizard/strings.json b/homeassistant/components/homewizard/strings.json
index 53eeafe99e1..7bb4b16c710 100644
--- a/homeassistant/components/homewizard/strings.json
+++ b/homeassistant/components/homewizard/strings.json
@@ -27,5 +27,145 @@
       "unknown_error": "[%key:common::config_flow::error::unknown%]",
       "reauth_successful": "Enabling API was successful"
     }
+  },
+  "entity": {
+    "number": {
+      "status_light_brightness": {
+        "name": "Status light brightness"
+      }
+    },
+    "sensor": {
+      "dsmr_version": {
+        "name": "DSMR version"
+      },
+      "meter_model": {
+        "name": "Smart meter model"
+      },
+      "unique_meter_id": {
+        "name": "Smart meter identifier"
+      },
+      "wifi_ssid": {
+        "name": "Wi-Fi SSID"
+      },
+      "active_tariff": {
+        "name": "Active tariff"
+      },
+      "wifi_strength": {
+        "name": "Wi-Fi strength"
+      },
+      "total_power_import_kwh": {
+        "name": "Total power import"
+      },
+      "total_power_import_t1_kwh": {
+        "name": "Total power import tariff 1"
+      },
+      "total_power_import_t2_kwh": {
+        "name": "Total power import tariff 2"
+      },
+      "total_power_import_t3_kwh": {
+        "name": "Total power import tariff 3"
+      },
+      "total_power_import_t4_kwh": {
+        "name": "Total power import tariff 4"
+      },
+      "total_power_export_kwh": {
+        "name": "Total power export"
+      },
+      "total_power_export_t1_kwh": {
+        "name": "Total power export tariff 1"
+      },
+      "total_power_export_t2_kwh": {
+        "name": "Total power export tariff 2"
+      },
+      "total_power_export_t3_kwh": {
+        "name": "Total power export tariff 3"
+      },
+      "total_power_export_t4_kwh": {
+        "name": "Total power export tariff 4"
+      },
+      "active_power_w": {
+        "name": "Active power"
+      },
+      "active_power_l1_w": {
+        "name": "Active power phase 1"
+      },
+      "active_power_l2_w": {
+        "name": "Active power phase 2"
+      },
+      "active_power_l3_w": {
+        "name": "Active power phase 3"
+      },
+      "active_voltage_l1_v": {
+        "name": "Active voltage phase 1"
+      },
+      "active_voltage_l2_v": {
+        "name": "Active voltage phase 2"
+      },
+      "active_voltage_l3_v": {
+        "name": "Active voltage phase 3"
+      },
+      "active_current_l1_a": {
+        "name": "Active current phase 1"
+      },
+      "active_current_l2_a": {
+        "name": "Active current phase 2"
+      },
+      "active_current_l3_a": {
+        "name": "Active current phase 3"
+      },
+      "active_frequency_hz": {
+        "name": "Active frequency"
+      },
+      "voltage_sag_l1_count": {
+        "name": "Voltage sags detected phase 1"
+      },
+      "voltage_sag_l2_count": {
+        "name": "Voltage sags detected phase 2"
+      },
+      "voltage_sag_l3_count": {
+        "name": "Voltage sags detected phase 3"
+      },
+      "voltage_swell_l1_count": {
+        "name": "Voltage swells detected phase 1"
+      },
+      "voltage_swell_l2_count": {
+        "name": "Voltage swells detected phase 2"
+      },
+      "voltage_swell_l3_count": {
+        "name": "Voltage swells detected phase 3"
+      },
+      "any_power_fail_count": {
+        "name": "Power failures detected"
+      },
+      "long_power_fail_count": {
+        "name": "Long power failures detected"
+      },
+      "active_power_average_w": {
+        "name": "Active average demand"
+      },
+      "monthly_power_peak_w": {
+        "name": "Peak demand current month"
+      },
+      "total_gas_m3": {
+        "name": "Total gas"
+      },
+      "gas_unique_id": {
+        "name": "Gas meter identifier"
+      },
+      "active_liter_lpm": {
+        "name": "Active water usage"
+      },
+      "total_liter_m3": {
+        "name": "Total water usage"
+      }
+    },
+    "switch": {
+      "switch_lock": {
+        "name": "Switch lock"
+      },
+      "cloud_connection": {
+        "name": "Cloud connection"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/homewizard/switch.py b/homeassistant/components/homewizard/switch.py
index 1edb9e1e605..cddcabc841e 100644
--- a/homeassistant/components/homewizard/switch.py
+++ b/homeassistant/components/homewizard/switch.py
@@ -45,6 +45,7 @@ class HomeWizardSwitchEntityDescription(
 SWITCHES = [
     HomeWizardSwitchEntityDescription(
         key="power_on",
+        name=None,
         device_class=SwitchDeviceClass.OUTLET,
         create_fn=lambda coordinator: coordinator.supports_state(),
         available_fn=lambda data: data.state is not None and not data.state.switch_lock,
@@ -53,7 +54,7 @@ SWITCHES = [
     ),
     HomeWizardSwitchEntityDescription(
         key="switch_lock",
-        name="Switch lock",
+        translation_key="switch_lock",
         entity_category=EntityCategory.CONFIG,
         icon="mdi:lock",
         icon_off="mdi:lock-open",
@@ -64,7 +65,7 @@ SWITCHES = [
     ),
     HomeWizardSwitchEntityDescription(
         key="cloud_connection",
-        name="Cloud connection",
+        translation_key="cloud_connection",
         entity_category=EntityCategory.CONFIG,
         icon="mdi:cloud",
         icon_off="mdi:cloud-off-outline",
diff --git a/homeassistant/components/honeywell/climate.py b/homeassistant/components/honeywell/climate.py
index dd33da56297..db31baa53a6 100644
--- a/homeassistant/components/honeywell/climate.py
+++ b/homeassistant/components/honeywell/climate.py
@@ -101,6 +101,7 @@ class HoneywellUSThermostat(ClimateEntity):
     """Representation of a Honeywell US Thermostat."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/honeywell/manifest.json b/homeassistant/components/honeywell/manifest.json
index 8f3b66ddeac..16b07e91446 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.14"]
+  "requirements": ["AIOSomecomfort==0.0.14"]
 }
diff --git a/homeassistant/components/honeywell/sensor.py b/homeassistant/components/honeywell/sensor.py
index 4d6ea4d9528..ae4ede2a079 100644
--- a/homeassistant/components/honeywell/sensor.py
+++ b/homeassistant/components/honeywell/sensor.py
@@ -48,7 +48,7 @@ class HoneywellSensorEntityDescription(
 SENSOR_TYPES: tuple[HoneywellSensorEntityDescription, ...] = (
     HoneywellSensorEntityDescription(
         key=TEMPERATURE_STATUS_KEY,
-        name="Outdoor temperature",
+        translation_key="outdoor_temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda device: device.outdoor_temperature,
@@ -56,7 +56,7 @@ SENSOR_TYPES: tuple[HoneywellSensorEntityDescription, ...] = (
     ),
     HoneywellSensorEntityDescription(
         key=HUMIDITY_STATUS_KEY,
-        name="Outdoor humidity",
+        translation_key="outdoor_humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda device: device.outdoor_humidity,
diff --git a/homeassistant/components/honeywell/strings.json b/homeassistant/components/honeywell/strings.json
index 73986920b8a..b0cd2a52c1b 100644
--- a/homeassistant/components/honeywell/strings.json
+++ b/homeassistant/components/honeywell/strings.json
@@ -31,5 +31,15 @@
         }
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "outdoor_temperature": {
+        "name": "Outdoor temperature"
+      },
+      "outdoor_humidity": {
+        "name": "Outdoor humidity"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/http/manifest.json b/homeassistant/components/http/manifest.json
index bce425adbdb..dec1b9485b6 100644
--- a/homeassistant/components/http/manifest.json
+++ b/homeassistant/components/http/manifest.json
@@ -6,5 +6,5 @@
   "integration_type": "system",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["aiohttp_cors==0.7.0"]
+  "requirements": ["aiohttp-cors==0.7.0"]
 }
diff --git a/homeassistant/components/huawei_lte/config_flow.py b/homeassistant/components/huawei_lte/config_flow.py
index f6c3b69ddeb..6d7b0b9bb11 100644
--- a/homeassistant/components/huawei_lte/config_flow.py
+++ b/homeassistant/components/huawei_lte/config_flow.py
@@ -8,7 +8,6 @@ from urllib.parse import urlparse
 
 from huawei_lte_api.Client import Client
 from huawei_lte_api.Connection import Connection
-from huawei_lte_api.Session import GetResponseType
 from huawei_lte_api.exceptions import (
     LoginErrorPasswordWrongException,
     LoginErrorUsernamePasswordOverrunException,
@@ -16,6 +15,7 @@ from huawei_lte_api.exceptions import (
     LoginErrorUsernameWrongException,
     ResponseErrorException,
 )
+from huawei_lte_api.Session import GetResponseType
 from requests.exceptions import Timeout
 from url_normalize import url_normalize
 import voluptuous as vol
diff --git a/homeassistant/components/huawei_lte/sensor.py b/homeassistant/components/huawei_lte/sensor.py
index f63cc4aac39..133b569c751 100644
--- a/homeassistant/components/huawei_lte/sensor.py
+++ b/homeassistant/components/huawei_lte/sensor.py
@@ -117,6 +117,10 @@ class HuaweiSensorGroup:
 class HuaweiSensorEntityDescription(SensorEntityDescription):
     """Class describing Huawei LTE sensor entities."""
 
+    # HuaweiLteSensor does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     format_fn: Callable[[str], tuple[StateType, str | None]] = format_default
     icon_fn: Callable[[StateType], str] | None = None
     device_class_fn: Callable[[StateType], SensorDeviceClass | None] | None = None
diff --git a/homeassistant/components/huisbaasje/sensor.py b/homeassistant/components/huisbaasje/sensor.py
index 369c6eba075..8bc86d423a1 100644
--- a/homeassistant/components/huisbaasje/sensor.py
+++ b/homeassistant/components/huisbaasje/sensor.py
@@ -58,7 +58,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
 
 SENSORS_INFO = [
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Current Power",
+        translation_key="current_power",
         sensor_type=SENSOR_TYPE_RATE,
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -67,7 +67,7 @@ SENSORS_INFO = [
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Current Power In Peak",
+        translation_key="current_power_peak",
         sensor_type=SENSOR_TYPE_RATE,
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -76,7 +76,7 @@ SENSORS_INFO = [
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Current Power In Off Peak",
+        translation_key="current_power_off_peak",
         sensor_type=SENSOR_TYPE_RATE,
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -85,7 +85,7 @@ SENSORS_INFO = [
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Current Power Out Peak",
+        translation_key="current_power_out_peak",
         sensor_type=SENSOR_TYPE_RATE,
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -94,7 +94,7 @@ SENSORS_INFO = [
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Current Power Out Off Peak",
+        translation_key="current_power_out_off_peak",
         sensor_type=SENSOR_TYPE_RATE,
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -103,7 +103,7 @@ SENSORS_INFO = [
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy Consumption Peak Today",
+        translation_key="energy_consumption_peak_today",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         key=SOURCE_TYPE_ELECTRICITY_IN,
@@ -113,7 +113,7 @@ SENSORS_INFO = [
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy Consumption Off Peak Today",
+        translation_key="energy_consumption_off_peak_today",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         key=SOURCE_TYPE_ELECTRICITY_IN_LOW,
@@ -123,7 +123,7 @@ SENSORS_INFO = [
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy Production Peak Today",
+        translation_key="energy_production_peak_today",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         key=SOURCE_TYPE_ELECTRICITY_OUT,
@@ -133,7 +133,7 @@ SENSORS_INFO = [
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy Production Off Peak Today",
+        translation_key="energy_production_off_peak_today",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         key=SOURCE_TYPE_ELECTRICITY_OUT_LOW,
@@ -143,7 +143,7 @@ SENSORS_INFO = [
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy Today",
+        translation_key="energy_today",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.MEASUREMENT,
@@ -153,7 +153,7 @@ SENSORS_INFO = [
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy This Week",
+        translation_key="energy_week",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.MEASUREMENT,
@@ -163,7 +163,7 @@ SENSORS_INFO = [
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy This Month",
+        translation_key="energy_month",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.MEASUREMENT,
@@ -173,7 +173,7 @@ SENSORS_INFO = [
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy This Year",
+        translation_key="energy_year",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.MEASUREMENT,
@@ -183,7 +183,7 @@ SENSORS_INFO = [
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Current Gas",
+        translation_key="current_gas",
         native_unit_of_measurement=UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR,
         sensor_type=SENSOR_TYPE_RATE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -192,7 +192,7 @@ SENSORS_INFO = [
         precision=1,
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Gas Today",
+        translation_key="gas_today",
         device_class=SensorDeviceClass.GAS,
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         key=SOURCE_TYPE_GAS,
@@ -202,7 +202,7 @@ SENSORS_INFO = [
         precision=1,
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Gas This Week",
+        translation_key="gas_week",
         device_class=SensorDeviceClass.GAS,
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         key=SOURCE_TYPE_GAS,
@@ -212,7 +212,7 @@ SENSORS_INFO = [
         precision=1,
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Gas This Month",
+        translation_key="gas_month",
         device_class=SensorDeviceClass.GAS,
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         key=SOURCE_TYPE_GAS,
@@ -222,7 +222,7 @@ SENSORS_INFO = [
         precision=1,
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Gas This Year",
+        translation_key="gas_year",
         device_class=SensorDeviceClass.GAS,
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         key=SOURCE_TYPE_GAS,
@@ -257,6 +257,7 @@ class HuisbaasjeSensor(
     """Defines a Huisbaasje sensor."""
 
     entity_description: HuisbaasjeSensorEntityDescription
+    _attr_has_entity_name = True
 
     def __init__(
         self,
diff --git a/homeassistant/components/huisbaasje/strings.json b/homeassistant/components/huisbaasje/strings.json
index 169b9a0e901..de112f7519f 100644
--- a/homeassistant/components/huisbaasje/strings.json
+++ b/homeassistant/components/huisbaasje/strings.json
@@ -16,5 +16,63 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "current_power": {
+        "name": "Current power"
+      },
+      "current_power_peak": {
+        "name": "Current power in peak"
+      },
+      "current_power_off_peak": {
+        "name": "Current power in off peak"
+      },
+      "current_power_out_peak": {
+        "name": "Current power out peak"
+      },
+      "current_power_out_off_peak": {
+        "name": "Current power out off peak"
+      },
+      "energy_consumption_peak_today": {
+        "name": "Energy consumption peak today"
+      },
+      "energy_consumption_off_peak_today": {
+        "name": "Energy consumption off peak today"
+      },
+      "energy_production_peak_today": {
+        "name": "Energy production peak today"
+      },
+      "energy_production_off_peak_today": {
+        "name": "Energy production off peak today"
+      },
+      "energy_today": {
+        "name": "Energy today"
+      },
+      "energy_week": {
+        "name": "Energy this week"
+      },
+      "energy_month": {
+        "name": "Energy this month"
+      },
+      "energy_year": {
+        "name": "Energy this year"
+      },
+      "current_gas": {
+        "name": "Current gas"
+      },
+      "gas_today": {
+        "name": "Gas today"
+      },
+      "gas_week": {
+        "name": "Gas this week"
+      },
+      "gas_month": {
+        "name": "Gas this month"
+      },
+      "gas_year": {
+        "name": "Gas this year"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/humidifier/__init__.py b/homeassistant/components/humidifier/__init__.py
index 0bc7e242d55..79effa6f0c2 100644
--- a/homeassistant/components/humidifier/__init__.py
+++ b/homeassistant/components/humidifier/__init__.py
@@ -29,7 +29,9 @@ from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
 
 from .const import (  # noqa: F401
+    ATTR_ACTION,
     ATTR_AVAILABLE_MODES,
+    ATTR_CURRENT_HUMIDITY,
     ATTR_HUMIDITY,
     ATTR_MAX_HUMIDITY,
     ATTR_MIN_HUMIDITY,
@@ -44,6 +46,7 @@ from .const import (  # noqa: F401
     SERVICE_SET_HUMIDITY,
     SERVICE_SET_MODE,
     SUPPORT_MODES,
+    HumidifierAction,
     HumidifierEntityFeature,
 )
 
@@ -132,7 +135,9 @@ class HumidifierEntity(ToggleEntity):
     """Base class for humidifier entities."""
 
     entity_description: HumidifierEntityDescription
+    _attr_action: HumidifierAction | None = None
     _attr_available_modes: list[str] | None
+    _attr_current_humidity: int | None = None
     _attr_device_class: HumidifierDeviceClass | None
     _attr_max_humidity: int = DEFAULT_MAX_HUMIDITY
     _attr_min_humidity: int = DEFAULT_MIN_HUMIDITY
@@ -168,6 +173,12 @@ class HumidifierEntity(ToggleEntity):
         """Return the optional state attributes."""
         data: dict[str, int | str | None] = {}
 
+        if self.action is not None:
+            data[ATTR_ACTION] = self.action if self.is_on else HumidifierAction.OFF
+
+        if self.current_humidity is not None:
+            data[ATTR_CURRENT_HUMIDITY] = self.current_humidity
+
         if self.target_humidity is not None:
             data[ATTR_HUMIDITY] = self.target_humidity
 
@@ -176,6 +187,16 @@ class HumidifierEntity(ToggleEntity):
 
         return data
 
+    @property
+    def action(self) -> HumidifierAction | None:
+        """Return the current action."""
+        return self._attr_action
+
+    @property
+    def current_humidity(self) -> int | None:
+        """Return the current humidity."""
+        return self._attr_current_humidity
+
     @property
     def target_humidity(self) -> int | None:
         """Return the humidity we try to reach."""
diff --git a/homeassistant/components/humidifier/const.py b/homeassistant/components/humidifier/const.py
index 1f802f7fa36..35601cf2b1f 100644
--- a/homeassistant/components/humidifier/const.py
+++ b/homeassistant/components/humidifier/const.py
@@ -1,6 +1,8 @@
 """Provides the constants needed for component."""
 from enum import IntFlag
 
+from homeassistant.backports.enum import StrEnum
+
 MODE_NORMAL = "normal"
 MODE_ECO = "eco"
 MODE_AWAY = "away"
@@ -11,7 +13,19 @@ MODE_SLEEP = "sleep"
 MODE_AUTO = "auto"
 MODE_BABY = "baby"
 
+
+class HumidifierAction(StrEnum):
+    """Actions for humidifier devices."""
+
+    HUMIDIFYING = "humidifying"
+    DRYING = "drying"
+    IDLE = "idle"
+    OFF = "off"
+
+
+ATTR_ACTION = "action"
 ATTR_AVAILABLE_MODES = "available_modes"
+ATTR_CURRENT_HUMIDITY = "current_humidity"
 ATTR_HUMIDITY = "humidity"
 ATTR_MAX_HUMIDITY = "max_humidity"
 ATTR_MIN_HUMIDITY = "min_humidity"
diff --git a/homeassistant/components/humidifier/device_action.py b/homeassistant/components/humidifier/device_action.py
index 1c027ba22e6..f1f25101e93 100644
--- a/homeassistant/components/humidifier/device_action.py
+++ b/homeassistant/components/humidifier/device_action.py
@@ -3,7 +3,11 @@ from __future__ import annotations
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import toggle_entity
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+    async_validate_entity_schema,
+    toggle_entity,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_MODE,
@@ -26,7 +30,7 @@ from . import DOMAIN, const
 SET_HUMIDITY_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): "set_humidity",
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(const.ATTR_HUMIDITY): vol.Coerce(int),
     }
 )
@@ -34,14 +38,21 @@ SET_HUMIDITY_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
 SET_MODE_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): "set_mode",
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(ATTR_MODE): cv.string,
     }
 )
 
 ONOFF_SCHEMA = toggle_entity.ACTION_SCHEMA.extend({vol.Required(CONF_DOMAIN): DOMAIN})
 
-ACTION_SCHEMA = vol.Any(SET_HUMIDITY_SCHEMA, SET_MODE_SCHEMA, ONOFF_SCHEMA)
+_ACTION_SCHEMA = vol.Any(SET_HUMIDITY_SCHEMA, SET_MODE_SCHEMA, ONOFF_SCHEMA)
+
+
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
 
 
 async def async_get_actions(
@@ -61,7 +72,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
         actions.append({**base_action, CONF_TYPE: "set_humidity"})
 
@@ -108,9 +119,11 @@ async def async_get_action_capabilities(
         fields[vol.Required(const.ATTR_HUMIDITY)] = vol.Coerce(int)
     elif action_type == "set_mode":
         try:
+            entry = async_get_entity_registry_entry_or_raise(
+                hass, config[CONF_ENTITY_ID]
+            )
             available_modes = (
-                get_capability(hass, config[ATTR_ENTITY_ID], const.ATTR_AVAILABLE_MODES)
-                or []
+                get_capability(hass, entry.entity_id, const.ATTR_AVAILABLE_MODES) or []
             )
         except HomeAssistantError:
             available_modes = []
diff --git a/homeassistant/components/humidifier/device_condition.py b/homeassistant/components/humidifier/device_condition.py
index 05812e35a36..c2c0378a746 100644
--- a/homeassistant/components/humidifier/device_condition.py
+++ b/homeassistant/components/humidifier/device_condition.py
@@ -3,7 +3,10 @@ from __future__ import annotations
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import toggle_entity
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+    toggle_entity,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_MODE,
@@ -32,7 +35,7 @@ TOGGLE_CONDITION = toggle_entity.CONDITION_SCHEMA.extend(
 
 MODE_CONDITION = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): "is_mode",
         vol.Required(ATTR_MODE): str,
     }
@@ -61,7 +64,7 @@ async def async_get_conditions(
                     CONF_CONDITION: "device",
                     CONF_DEVICE_ID: device_id,
                     CONF_DOMAIN: DOMAIN,
-                    CONF_ENTITY_ID: entry.entity_id,
+                    CONF_ENTITY_ID: entry.id,
                     CONF_TYPE: "is_mode",
                 }
             )
@@ -79,11 +82,15 @@ def async_condition_from_config(
     else:
         return toggle_entity.async_condition_from_config(hass, config)
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
+
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        state = hass.states.get(config[ATTR_ENTITY_ID])
         return (
-            state is not None and state.attributes.get(attribute) == config[attribute]
+            entity_id is not None
+            and (state := hass.states.get(entity_id)) is not None
+            and state.attributes.get(attribute) == config[attribute]
         )
 
     return test_is_state
@@ -99,9 +106,11 @@ async def async_get_condition_capabilities(
 
     if condition_type == "is_mode":
         try:
+            entry = async_get_entity_registry_entry_or_raise(
+                hass, config[CONF_ENTITY_ID]
+            )
             modes = (
-                get_capability(hass, config[ATTR_ENTITY_ID], const.ATTR_AVAILABLE_MODES)
-                or []
+                get_capability(hass, entry.entity_id, const.ATTR_AVAILABLE_MODES) or []
             )
         except HomeAssistantError:
             modes = []
diff --git a/homeassistant/components/humidifier/device_trigger.py b/homeassistant/components/humidifier/device_trigger.py
index 5fbb248a8bc..0d689a35318 100644
--- a/homeassistant/components/humidifier/device_trigger.py
+++ b/homeassistant/components/humidifier/device_trigger.py
@@ -26,14 +26,27 @@ from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
 
-from . import DOMAIN
+from . import ATTR_CURRENT_HUMIDITY, DOMAIN
 
 # mypy: disallow-any-generics
 
+CURRENT_TRIGGER_SCHEMA = vol.All(
+    DEVICE_TRIGGER_BASE_SCHEMA.extend(
+        {
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
+            vol.Required(CONF_TYPE): "current_humidity_changed",
+            vol.Optional(CONF_BELOW): vol.Any(vol.Coerce(float)),
+            vol.Optional(CONF_ABOVE): vol.Any(vol.Coerce(float)),
+            vol.Optional(CONF_FOR): cv.positive_time_period_dict,
+        }
+    ),
+    cv.has_at_least_one_key(CONF_BELOW, CONF_ABOVE),
+)
+
 HUMIDIFIER_TRIGGER_SCHEMA = vol.All(
     DEVICE_TRIGGER_BASE_SCHEMA.extend(
         {
-            vol.Required(CONF_ENTITY_ID): cv.entity_id,
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_TYPE): "target_humidity_changed",
             vol.Optional(CONF_BELOW): vol.Any(vol.Coerce(int)),
             vol.Optional(CONF_ABOVE): vol.Any(vol.Coerce(int)),
@@ -45,6 +58,7 @@ HUMIDIFIER_TRIGGER_SCHEMA = vol.All(
 
 TRIGGER_SCHEMA = vol.All(
     vol.Any(
+        CURRENT_TRIGGER_SCHEMA,
         HUMIDIFIER_TRIGGER_SCHEMA,
         toggle_entity.TRIGGER_SCHEMA,
     ),
@@ -64,15 +78,31 @@ async def async_get_triggers(
         if entry.domain != DOMAIN:
             continue
 
+        state = hass.states.get(entry.entity_id)
+
+        # Add triggers for each entity that belongs to this integration
+        base_trigger = {
+            CONF_PLATFORM: "device",
+            CONF_DEVICE_ID: device_id,
+            CONF_DOMAIN: DOMAIN,
+            CONF_ENTITY_ID: entry.id,
+        }
+
         triggers.append(
             {
-                CONF_PLATFORM: "device",
-                CONF_DEVICE_ID: device_id,
-                CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                **base_trigger,
                 CONF_TYPE: "target_humidity_changed",
             }
         )
+
+        if state and ATTR_CURRENT_HUMIDITY in state.attributes:
+            triggers.append(
+                {
+                    **base_trigger,
+                    CONF_TYPE: "current_humidity_changed",
+                }
+            )
+
     return triggers
 
 
@@ -83,7 +113,10 @@ async def async_attach_trigger(
     trigger_info: TriggerInfo,
 ) -> CALLBACK_TYPE:
     """Attach a trigger."""
-    if config[CONF_TYPE] == "target_humidity_changed":
+    if (trigger_type := config[CONF_TYPE]) in {
+        "current_humidity_changed",
+        "target_humidity_changed",
+    }:
         numeric_state_config = {
             numeric_state_trigger.CONF_PLATFORM: "numeric_state",
             numeric_state_trigger.CONF_ENTITY_ID: config[CONF_ENTITY_ID],
@@ -91,6 +124,14 @@ async def async_attach_trigger(
                 "{{ state.attributes.humidity }}"
             ),
         }
+        if trigger_type == "target_humidity_changed":
+            numeric_state_config[
+                numeric_state_trigger.CONF_VALUE_TEMPLATE
+            ] = "{{ state.attributes.humidity }}"
+        else:  # trigger_type == "current_humidity_changed"
+            numeric_state_config[
+                numeric_state_trigger.CONF_VALUE_TEMPLATE
+            ] = "{{ state.attributes.current_humidity }}"
 
         if CONF_ABOVE in config:
             numeric_state_config[CONF_ABOVE] = config[CONF_ABOVE]
@@ -115,7 +156,7 @@ async def async_get_trigger_capabilities(
     hass: HomeAssistant, config: ConfigType
 ) -> dict[str, vol.Schema]:
     """List trigger capabilities."""
-    if config[CONF_TYPE] == "target_humidity_changed":
+    if config[CONF_TYPE] in {"current_humidity_changed", "target_humidity_changed"}:
         return {
             "extra_fields": vol.Schema(
                 {
diff --git a/homeassistant/components/humidifier/strings.json b/homeassistant/components/humidifier/strings.json
index 015b3c08e9a..3b4c0bf2dab 100644
--- a/homeassistant/components/humidifier/strings.json
+++ b/homeassistant/components/humidifier/strings.json
@@ -28,9 +28,21 @@
         "on": "[%key:common::state::on%]"
       },
       "state_attributes": {
+        "action": {
+          "name": "Action",
+          "state": {
+            "humidifying": "Humidifying",
+            "drying": "Drying",
+            "idle": "Idle",
+            "off": "Off"
+          }
+        },
         "available_modes": {
           "name": "Available modes"
         },
+        "current_humidity": {
+          "name": "Current humidity"
+        },
         "humidity": {
           "name": "Target humidity"
         },
diff --git a/homeassistant/components/hunterdouglas_powerview/sensor.py b/homeassistant/components/hunterdouglas_powerview/sensor.py
index 85192e0b7e4..b36457324e1 100644
--- a/homeassistant/components/hunterdouglas_powerview/sensor.py
+++ b/homeassistant/components/hunterdouglas_powerview/sensor.py
@@ -70,7 +70,7 @@ SENSORS: Final = [
     PowerviewSensorDescription(
         key="signal",
         name="Signal",
-        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        icon="mdi:signal",
         native_unit_of_measurement=PERCENTAGE,
         native_value_fn=lambda shade: round(
             shade.raw_data[ATTR_SIGNAL_STRENGTH] / ATTR_SIGNAL_STRENGTH_MAX * 100
diff --git a/homeassistant/components/hvv_departures/sensor.py b/homeassistant/components/hvv_departures/sensor.py
index 0669289c1bb..c58ae6e3931 100644
--- a/homeassistant/components/hvv_departures/sensor.py
+++ b/homeassistant/components/hvv_departures/sensor.py
@@ -58,16 +58,16 @@ class HVVDepartureSensor(SensorEntity):
     _attr_attribution = ATTRIBUTION
     _attr_device_class = SensorDeviceClass.TIMESTAMP
     _attr_icon = ICON
+    _attr_translation_key = "departures"
+    _attr_has_entity_name = True
+    _attr_available = False
 
     def __init__(self, hass, config_entry, session, hub):
         """Initialize."""
         self.config_entry = config_entry
         self.station_name = self.config_entry.data[CONF_STATION]["name"]
-        self._attr_extra_state_attributes = {}
-        self._attr_available = False
-        self._attr_has_entity_name = True
-        self._attr_name = "Departures"
         self._last_error = None
+        self._attr_extra_state_attributes = {}
 
         self.gti = hub.gti
 
diff --git a/homeassistant/components/hvv_departures/strings.json b/homeassistant/components/hvv_departures/strings.json
index 90b53bc0e64..8f9c06f53fb 100644
--- a/homeassistant/components/hvv_departures/strings.json
+++ b/homeassistant/components/hvv_departures/strings.json
@@ -43,5 +43,12 @@
         }
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "departures": {
+        "name": "Departures"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/hydrawise/manifest.json b/homeassistant/components/hydrawise/manifest.json
index 2489317a6a2..fc88c08b27a 100644
--- a/homeassistant/components/hydrawise/manifest.json
+++ b/homeassistant/components/hydrawise/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/hydrawise",
   "iot_class": "cloud_polling",
   "loggers": ["hydrawiser"],
-  "requirements": ["hydrawiser==0.2"]
+  "requirements": ["Hydrawiser==0.2"]
 }
diff --git a/homeassistant/components/hyperion/__init__.py b/homeassistant/components/hyperion/__init__.py
index 6c2842c190e..ea038b3b408 100644
--- a/homeassistant/components/hyperion/__init__.py
+++ b/homeassistant/components/hyperion/__init__.py
@@ -19,7 +19,6 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.typing import ConfigType
 
 from .const import (
     CONF_INSTANCE_CLIENTS,
@@ -104,12 +103,6 @@ async def async_create_connect_hyperion_client(
     return hyperion_client
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up Hyperion component."""
-    hass.data[DOMAIN] = {}
-    return True
-
-
 @callback
 def listen_for_instance_updates(
     hass: HomeAssistant,
@@ -191,6 +184,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     # We need 1 root client (to manage instances being removed/added) and then 1 client
     # per Hyperion server instance which is shared for all entities associated with
     # that instance.
+    hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][entry.entry_id] = {
         CONF_ROOT_CLIENT: hyperion_client,
         CONF_INSTANCE_CLIENTS: {},
diff --git a/homeassistant/components/hyperion/config_flow.py b/homeassistant/components/hyperion/config_flow.py
index 97e97cd835d..52c4647f11c 100644
--- a/homeassistant/components/hyperion/config_flow.py
+++ b/homeassistant/components/hyperion/config_flow.py
@@ -447,7 +447,7 @@ class HyperionOptionsFlow(OptionsFlow):
     ) -> FlowResult:
         """Manage the options."""
 
-        effects = {source: source for source in const.KEY_COMPONENTID_EXTERNAL_SOURCES}
+        effects = {}
         async with self._create_client() as hyperion_client:
             if not hyperion_client:
                 return self.async_abort(reason="cannot_connect")
diff --git a/homeassistant/components/hyperion/const.py b/homeassistant/components/hyperion/const.py
index e7e4e7f70a4..4585b8bedaa 100644
--- a/homeassistant/components/hyperion/const.py
+++ b/homeassistant/components/hyperion/const.py
@@ -21,8 +21,6 @@ HYPERION_MODEL_NAME = f"{HYPERION_MANUFACTURER_NAME}-NG"
 HYPERION_RELEASES_URL = "https://github.com/hyperion-project/hyperion.ng/releases"
 HYPERION_VERSION_WARN_CUTOFF = "2.0.0-alpha.9"
 
-NAME_SUFFIX_HYPERION_LIGHT = ""
-NAME_SUFFIX_HYPERION_PRIORITY_LIGHT = "Priority"
 NAME_SUFFIX_HYPERION_COMPONENT_SWITCH = "Component"
 NAME_SUFFIX_HYPERION_CAMERA = ""
 
@@ -32,5 +30,4 @@ SIGNAL_ENTITY_REMOVE = f"{DOMAIN}_entity_remove_signal.{{}}"
 
 TYPE_HYPERION_CAMERA = "hyperion_camera"
 TYPE_HYPERION_LIGHT = "hyperion_light"
-TYPE_HYPERION_PRIORITY_LIGHT = "hyperion_priority_light"
 TYPE_HYPERION_COMPONENT_SWITCH_BASE = "hyperion_component_switch"
diff --git a/homeassistant/components/hyperion/light.py b/homeassistant/components/hyperion/light.py
index ba1dbfbafc2..e14c395315e 100644
--- a/homeassistant/components/hyperion/light.py
+++ b/homeassistant/components/hyperion/light.py
@@ -41,24 +41,19 @@ from .const import (
     DOMAIN,
     HYPERION_MANUFACTURER_NAME,
     HYPERION_MODEL_NAME,
-    NAME_SUFFIX_HYPERION_LIGHT,
-    NAME_SUFFIX_HYPERION_PRIORITY_LIGHT,
     SIGNAL_ENTITY_REMOVE,
     TYPE_HYPERION_LIGHT,
-    TYPE_HYPERION_PRIORITY_LIGHT,
 )
 
 _LOGGER = logging.getLogger(__name__)
 
-COLOR_BLACK = color_util.COLORS["black"]
-
 CONF_DEFAULT_COLOR = "default_color"
 CONF_HDMI_PRIORITY = "hdmi_priority"
 CONF_EFFECT_LIST = "effect_list"
 
 # As we want to preserve brightness control for effects (e.g. to reduce the
-# brightness for V4L), we need to persist the effect that is in flight, so
-# subsequent calls to turn_on will know the keep the effect enabled.
+# brightness), we need to persist the effect that is in flight, so
+# subsequent calls to turn_on will know to keep the effect enabled.
 # Unfortunately the Home Assistant UI does not easily expose a way to remove a
 # selected effect (there is no 'No Effect' option by default). Instead, we
 # create a new fake effect ("Solid") that is always selected by default for
@@ -75,7 +70,6 @@ DEFAULT_EFFECT_LIST: list[str] = []
 
 ICON_LIGHTBULB = "mdi:lightbulb"
 ICON_EFFECT = "mdi:lava-lamp"
-ICON_EXTERNAL_SOURCE = "mdi:television-ambient-light"
 
 
 async def async_setup_entry(
@@ -102,7 +96,6 @@ async def async_setup_entry(
         async_add_entities(
             [
                 HyperionLight(*args),
-                HyperionPriorityLight(*args),
             ]
         )
 
@@ -110,19 +103,18 @@ async def async_setup_entry(
     def instance_remove(instance_num: int) -> None:
         """Remove entities for an old Hyperion instance."""
         assert server_id
-        for light_type in LIGHT_TYPES:
-            async_dispatcher_send(
-                hass,
-                SIGNAL_ENTITY_REMOVE.format(
-                    get_hyperion_unique_id(server_id, instance_num, light_type)
-                ),
-            )
+        async_dispatcher_send(
+            hass,
+            SIGNAL_ENTITY_REMOVE.format(
+                get_hyperion_unique_id(server_id, instance_num, TYPE_HYPERION_LIGHT)
+            ),
+        )
 
     listen_for_instance_updates(hass, config_entry, instance_add, instance_remove)
 
 
-class HyperionBaseLight(LightEntity):
-    """A Hyperion light base class."""
+class HyperionLight(LightEntity):
+    """A Hyperion light that acts as a client for the configured priority."""
 
     _attr_color_mode = ColorMode.HS
     _attr_should_poll = False
@@ -151,11 +143,6 @@ class HyperionBaseLight(LightEntity):
         self._effect: str = KEY_EFFECT_SOLID
 
         self._static_effect_list: list[str] = [KEY_EFFECT_SOLID]
-        if self._support_external_effects:
-            self._static_effect_list += [
-                const.KEY_COMPONENTID_TO_NAME[component]
-                for component in const.KEY_COMPONENTID_EXTERNAL_SOURCES
-            ]
         self._effect_list: list[str] = self._static_effect_list[:]
 
         self._client_callbacks: Mapping[str, Callable[[dict[str, Any]], None]] = {
@@ -168,11 +155,11 @@ class HyperionBaseLight(LightEntity):
 
     def _compute_unique_id(self, server_id: str, instance_num: int) -> str:
         """Compute a unique id for this instance."""
-        raise NotImplementedError
+        return get_hyperion_unique_id(server_id, instance_num, TYPE_HYPERION_LIGHT)
 
     def _compute_name(self, instance_name: str) -> str:
         """Compute the name of the light."""
-        raise NotImplementedError
+        return f"{instance_name}".strip()
 
     @property
     def entity_registry_enabled_default(self) -> bool:
@@ -198,12 +185,6 @@ class HyperionBaseLight(LightEntity):
     def icon(self) -> str:
         """Return state specific icon."""
         if self.is_on:
-            if (
-                self.effect in const.KEY_COMPONENTID_FROM_NAME
-                and const.KEY_COMPONENTID_FROM_NAME[self.effect]
-                in const.KEY_COMPONENTID_EXTERNAL_SOURCES
-            ):
-                return ICON_EXTERNAL_SOURCE
             if self.effect != KEY_EFFECT_SOLID:
                 return ICON_EFFECT
         return ICON_LIGHTBULB
@@ -247,6 +228,11 @@ class HyperionBaseLight(LightEntity):
         }
         return self._options.get(key, defaults[key])
 
+    @property
+    def is_on(self) -> bool:
+        """Return true if light is on. Light is considered on when there is a source at the configured HA priority."""
+        return self._get_priority_entry_that_dictates_state() is not None
+
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on the light."""
         # == Get key parameters ==
@@ -279,55 +265,8 @@ class HyperionBaseLight(LightEntity):
                 ):
                     return
 
-        # == Set an external source
-        if (
-            effect
-            and self._support_external_effects
-            and (
-                effect in const.KEY_COMPONENTID_EXTERNAL_SOURCES
-                or effect in const.KEY_COMPONENTID_FROM_NAME
-            )
-        ):
-            if effect in const.KEY_COMPONENTID_FROM_NAME:
-                component = const.KEY_COMPONENTID_FROM_NAME[effect]
-            else:
-                _LOGGER.warning(
-                    (
-                        "Use of Hyperion effect '%s' is deprecated and will be removed "
-                        "in a future release. Please use '%s' instead"
-                    ),
-                    effect,
-                    const.KEY_COMPONENTID_TO_NAME[effect],
-                )
-                component = effect
-
-            # Clear any color/effect.
-            if not await self._client.async_send_clear(
-                **{const.KEY_PRIORITY: self._get_option(CONF_PRIORITY)}
-            ):
-                return
-
-            # Turn off all external sources, except the intended.
-            for key in const.KEY_COMPONENTID_EXTERNAL_SOURCES:
-                if not await self._client.async_send_set_component(
-                    **{
-                        const.KEY_COMPONENTSTATE: {
-                            const.KEY_COMPONENT: key,
-                            const.KEY_STATE: component == key,
-                        }
-                    }
-                ):
-                    return
-
         # == Set an effect
-        elif effect and effect != KEY_EFFECT_SOLID:
-            # This call should not be necessary, but without it there is no priorities-update issued:
-            # https://github.com/hyperion-project/hyperion.ng/issues/992
-            if not await self._client.async_send_clear(
-                **{const.KEY_PRIORITY: self._get_option(CONF_PRIORITY)}
-            ):
-                return
-
+        if effect and effect != KEY_EFFECT_SOLID:
             if not await self._client.async_send_set_effect(
                 **{
                     const.KEY_PRIORITY: self._get_option(CONF_PRIORITY),
@@ -336,16 +275,23 @@ class HyperionBaseLight(LightEntity):
                 }
             ):
                 return
+
         # == Set a color
-        else:
-            if not await self._client.async_send_set_color(
-                **{
-                    const.KEY_PRIORITY: self._get_option(CONF_PRIORITY),
-                    const.KEY_COLOR: rgb_color,
-                    const.KEY_ORIGIN: DEFAULT_ORIGIN,
-                }
-            ):
-                return
+        elif not await self._client.async_send_set_color(
+            **{
+                const.KEY_PRIORITY: self._get_option(CONF_PRIORITY),
+                const.KEY_COLOR: rgb_color,
+                const.KEY_ORIGIN: DEFAULT_ORIGIN,
+            }
+        ):
+            return
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn off the light i.e. clear the configured priority."""
+        if not await self._client.async_send_clear(
+            **{const.KEY_PRIORITY: self._get_option(CONF_PRIORITY)}
+        ):
+            return
 
     def _set_internal_state(
         self,
@@ -384,24 +330,15 @@ class HyperionBaseLight(LightEntity):
     def _update_priorities(self, _: dict[str, Any] | None = None) -> None:
         """Update Hyperion priorities."""
         priority = self._get_priority_entry_that_dictates_state()
-        if priority and self._allow_priority_update(priority):
-            componentid = priority.get(const.KEY_COMPONENTID)
-            if (
-                self._support_external_effects
-                and componentid in const.KEY_COMPONENTID_EXTERNAL_SOURCES
-                and componentid in const.KEY_COMPONENTID_TO_NAME
-            ):
-                self._set_internal_state(
-                    rgb_color=DEFAULT_COLOR,
-                    effect=const.KEY_COMPONENTID_TO_NAME[componentid],
-                )
-            elif componentid == const.KEY_COMPONENTID_EFFECT:
+        if priority:
+            component_id = priority.get(const.KEY_COMPONENTID)
+            if component_id == const.KEY_COMPONENTID_EFFECT:
                 # Owner is the effect name.
                 # See: https://docs.hyperion-project.org/en/json/ServerInfo.html#priorities
                 self._set_internal_state(
                     rgb_color=DEFAULT_COLOR, effect=priority[const.KEY_OWNER]
                 )
-            elif componentid == const.KEY_COMPONENTID_COLOR:
+            elif component_id == const.KEY_COMPONENTID_COLOR:
                 self._set_internal_state(
                     rgb_color=priority[const.KEY_VALUE][const.KEY_RGB],
                     effect=KEY_EFFECT_SOLID,
@@ -470,172 +407,10 @@ class HyperionBaseLight(LightEntity):
         """Cleanup prior to hass removal."""
         self._client.remove_callbacks(self._client_callbacks)
 
-    @property
-    def _support_external_effects(self) -> bool:
-        """Whether or not to support setting external effects from the light entity."""
-        return True
-
     def _get_priority_entry_that_dictates_state(self) -> dict[str, Any] | None:
         """Get the relevant Hyperion priority entry to consider."""
-        # Return the visible priority (whether or not it is the HA priority).
-
-        # Explicit type specifier to ensure this works when the underlying (typed)
-        # library is installed along with the tests. Casts would trigger a
-        # redundant-cast warning in this case.
-        priority: dict[str, Any] | None = self._client.visible_priority
-        return priority
-
-    def _allow_priority_update(self, priority: dict[str, Any] | None = None) -> bool:
-        """Determine whether to allow a priority to update internal state."""
-        return True
-
-
-class HyperionLight(HyperionBaseLight):
-    """A Hyperion light that acts in absolute (vs priority) manner.
-
-    Light state is the absolute Hyperion component state (e.g. LED device on/off) rather
-    than color based at a particular priority, and the 'winning' priority determines
-    shown state rather than exclusively the HA priority.
-    """
-
-    def _compute_unique_id(self, server_id: str, instance_num: int) -> str:
-        """Compute a unique id for this instance."""
-        return get_hyperion_unique_id(server_id, instance_num, TYPE_HYPERION_LIGHT)
-
-    def _compute_name(self, instance_name: str) -> str:
-        """Compute the name of the light."""
-        return f"{instance_name} {NAME_SUFFIX_HYPERION_LIGHT}".strip()
-
-    @property
-    def is_on(self) -> bool:
-        """Return true if light is on."""
-        return (
-            bool(self._client.is_on())
-            and self._get_priority_entry_that_dictates_state() is not None
-        )
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on the light."""
-        # == Turn device on ==
-        # Turn on both ALL (Hyperion itself) and LEDDEVICE. It would be
-        # preferable to enable LEDDEVICE after the settings (e.g. brightness,
-        # color, effect), but this is not possible due to:
-        # https://github.com/hyperion-project/hyperion.ng/issues/967
-        if not bool(self._client.is_on()):
-            for component in (
-                const.KEY_COMPONENTID_ALL,
-                const.KEY_COMPONENTID_LEDDEVICE,
-            ):
-                if not await self._client.async_send_set_component(
-                    **{
-                        const.KEY_COMPONENTSTATE: {
-                            const.KEY_COMPONENT: component,
-                            const.KEY_STATE: True,
-                        }
-                    }
-                ):
-                    return
-
-        # Turn on the relevant Hyperion priority as usual.
-        await super().async_turn_on(**kwargs)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off the light."""
-        if not await self._client.async_send_set_component(
-            **{
-                const.KEY_COMPONENTSTATE: {
-                    const.KEY_COMPONENT: const.KEY_COMPONENTID_LEDDEVICE,
-                    const.KEY_STATE: False,
-                }
-            }
-        ):
-            return
-
-
-class HyperionPriorityLight(HyperionBaseLight):
-    """A Hyperion light that only acts on a single Hyperion priority."""
-
-    def _compute_unique_id(self, server_id: str, instance_num: int) -> str:
-        """Compute a unique id for this instance."""
-        return get_hyperion_unique_id(
-            server_id, instance_num, TYPE_HYPERION_PRIORITY_LIGHT
-        )
-
-    def _compute_name(self, instance_name: str) -> str:
-        """Compute the name of the light."""
-        return f"{instance_name} {NAME_SUFFIX_HYPERION_PRIORITY_LIGHT}".strip()
-
-    @property
-    def entity_registry_enabled_default(self) -> bool:
-        """Whether or not the entity is enabled by default."""
-        return False
-
-    @property
-    def is_on(self) -> bool:
-        """Return true if light is on."""
-        priority = self._get_priority_entry_that_dictates_state()
-        return (
-            priority is not None
-            and not HyperionPriorityLight._is_priority_entry_black(priority)
-        )
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off the light."""
-        if not await self._client.async_send_clear(
-            **{const.KEY_PRIORITY: self._get_option(CONF_PRIORITY)}
-        ):
-            return
-        await self._client.async_send_set_color(
-            **{
-                const.KEY_PRIORITY: self._get_option(CONF_PRIORITY),
-                const.KEY_COLOR: COLOR_BLACK,
-                const.KEY_ORIGIN: DEFAULT_ORIGIN,
-            }
-        )
-
-    @property
-    def _support_external_effects(self) -> bool:
-        """Whether or not to support setting external effects from the light entity."""
-        return False
-
-    def _get_priority_entry_that_dictates_state(self) -> dict[str, Any] | None:
-        """Get the relevant Hyperion priority entry to consider."""
-        # Return the active priority (if any) at the configured HA priority.
-        for candidate in self._client.priorities or []:
-            if const.KEY_PRIORITY not in candidate:
-                continue
-            if candidate[const.KEY_PRIORITY] == self._get_option(
-                CONF_PRIORITY
-            ) and candidate.get(const.KEY_ACTIVE, False):
-                # Explicit type specifier to ensure this works when the underlying
-                # (typed) library is installed along with the tests. Casts would trigger
-                # a redundant-cast warning in this case.
-                output: dict[str, Any] = candidate
-                return output
+        # Return whether or not the HA priority is among the active priorities.
+        for priority in self._client.priorities or []:
+            if priority.get(const.KEY_PRIORITY) == self._get_option(CONF_PRIORITY):
+                return priority
         return None
-
-    @classmethod
-    def _is_priority_entry_black(cls, priority: dict[str, Any] | None) -> bool:
-        """Determine if a given priority entry is the color black."""
-        if (
-            priority
-            and priority.get(const.KEY_COMPONENTID) == const.KEY_COMPONENTID_COLOR
-        ):
-            rgb_color = priority.get(const.KEY_VALUE, {}).get(const.KEY_RGB)
-            if rgb_color is not None and tuple(rgb_color) == COLOR_BLACK:
-                return True
-        return False
-
-    def _allow_priority_update(self, priority: dict[str, Any] | None = None) -> bool:
-        """Determine whether to allow a Hyperion priority to update entity attributes."""
-        # Black is treated as 'off' (and Home Assistant does not support selecting black
-        # from the color selector). Do not set our internal attributes if the priority is
-        # 'off' (i.e. if black is active). Do this to ensure it seamlessly turns back on
-        # at the correct prior color on the next 'on' call.
-        return not HyperionPriorityLight._is_priority_entry_black(priority)
-
-
-LIGHT_TYPES = {
-    TYPE_HYPERION_LIGHT: HyperionLight,
-    TYPE_HYPERION_PRIORITY_LIGHT: HyperionPriorityLight,
-}
diff --git a/homeassistant/components/iaqualink/__init__.py b/homeassistant/components/iaqualink/__init__.py
index e0b381d2362..5735e1ab421 100644
--- a/homeassistant/components/iaqualink/__init__.py
+++ b/homeassistant/components/iaqualink/__init__.py
@@ -6,7 +6,7 @@ from collections.abc import Awaitable, Callable, Coroutine
 from datetime import datetime
 from functools import wraps
 import logging
-from typing import Any, Concatenate, ParamSpec, TypeVar
+from typing import Any, Concatenate, ParamSpec, TypeVar, cast
 
 import httpx
 from iaqualink.client import AqualinkClient
@@ -243,6 +243,8 @@ class AqualinkEntity(Entity):
             identifiers={(DOMAIN, self.unique_id)},
             manufacturer=self.dev.manufacturer,
             model=self.dev.model,
-            name=self.name,
+            # Instead of setting the device name to the entity name, iaqualink
+            # should be updated to set has_entity_name = True
+            name=cast(str | None, self.name),
             via_device=(DOMAIN, self.dev.system.serial),
         )
diff --git a/homeassistant/components/ibeacon/device_tracker.py b/homeassistant/components/ibeacon/device_tracker.py
index 4c9337e54ce..8e194ac27b1 100644
--- a/homeassistant/components/ibeacon/device_tracker.py
+++ b/homeassistant/components/ibeacon/device_tracker.py
@@ -48,6 +48,8 @@ async def async_setup_entry(
 class IBeaconTrackerEntity(IBeaconEntity, BaseTrackerEntity):
     """An iBeacon Tracker entity."""
 
+    _attr_name = None
+
     def __init__(
         self,
         coordinator: IBeaconCoordinator,
diff --git a/homeassistant/components/ibeacon/manifest.json b/homeassistant/components/ibeacon/manifest.json
index a805277cb71..6f00f63b090 100644
--- a/homeassistant/components/ibeacon/manifest.json
+++ b/homeassistant/components/ibeacon/manifest.json
@@ -13,5 +13,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ibeacon",
   "iot_class": "local_push",
   "loggers": ["bleak"],
-  "requirements": ["ibeacon_ble==1.0.1"]
+  "requirements": ["ibeacon-ble==1.0.1"]
 }
diff --git a/homeassistant/components/ibeacon/sensor.py b/homeassistant/components/ibeacon/sensor.py
index c0b9e92decc..b3895ce23b4 100644
--- a/homeassistant/components/ibeacon/sensor.py
+++ b/homeassistant/components/ibeacon/sensor.py
@@ -38,7 +38,6 @@ class IBeaconSensorEntityDescription(SensorEntityDescription, IBeaconRequiredKey
 SENSOR_DESCRIPTIONS = (
     IBeaconSensorEntityDescription(
         key="rssi",
-        name="Signal Strength",
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
         entity_registry_enabled_default=False,
@@ -47,7 +46,7 @@ SENSOR_DESCRIPTIONS = (
     ),
     IBeaconSensorEntityDescription(
         key="power",
-        name="Power",
+        translation_key="power",
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
         entity_registry_enabled_default=False,
@@ -56,7 +55,7 @@ SENSOR_DESCRIPTIONS = (
     ),
     IBeaconSensorEntityDescription(
         key="estimated_distance",
-        name="Estimated Distance",
+        translation_key="estimated_distance",
         icon="mdi:signal-distance-variant",
         native_unit_of_measurement=UnitOfLength.METERS,
         value_fn=lambda ibeacon_advertisement: ibeacon_advertisement.distance,
@@ -65,7 +64,7 @@ SENSOR_DESCRIPTIONS = (
     ),
     IBeaconSensorEntityDescription(
         key="vendor",
-        name="Vendor",
+        translation_key="vendor",
         entity_registry_enabled_default=False,
         value_fn=lambda ibeacon_advertisement: ibeacon_advertisement.vendor,
     ),
diff --git a/homeassistant/components/ibeacon/strings.json b/homeassistant/components/ibeacon/strings.json
index b91ba459bd7..be3f7020cbe 100644
--- a/homeassistant/components/ibeacon/strings.json
+++ b/homeassistant/components/ibeacon/strings.json
@@ -19,5 +19,18 @@
         }
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "power": {
+        "name": "Power"
+      },
+      "estimated_distance": {
+        "name": "Estimated distance"
+      },
+      "vendor": {
+        "name": "Vendor"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/icloud/config_flow.py b/homeassistant/components/icloud/config_flow.py
index 6cdde2249c8..4be5487f755 100644
--- a/homeassistant/components/icloud/config_flow.py
+++ b/homeassistant/components/icloud/config_flow.py
@@ -263,13 +263,12 @@ class IcloudFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                     self.api.validate_2fa_code, self._verification_code
                 ):
                     raise PyiCloudException("The code you entered is not valid.")
-            else:
-                if not await self.hass.async_add_executor_job(
-                    self.api.validate_verification_code,
-                    self._trusted_device,
-                    self._verification_code,
-                ):
-                    raise PyiCloudException("The code you entered is not valid.")
+            elif not await self.hass.async_add_executor_job(
+                self.api.validate_verification_code,
+                self._trusted_device,
+                self._verification_code,
+            ):
+                raise PyiCloudException("The code you entered is not valid.")
         except PyiCloudException as error:
             # Reset to the initial 2FA state to allow the user to retry
             _LOGGER.error("Failed to verify verification code: %s", error)
diff --git a/homeassistant/components/ign_sismologia/manifest.json b/homeassistant/components/ign_sismologia/manifest.json
index 0fc69a7ba19..6eeea6b4a02 100644
--- a/homeassistant/components/ign_sismologia/manifest.json
+++ b/homeassistant/components/ign_sismologia/manifest.json
@@ -6,5 +6,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["georss_ign_sismologia_client"],
-  "requirements": ["georss_ign_sismologia_client==0.6"]
+  "requirements": ["georss-ign-sismologia-client==0.6"]
 }
diff --git a/homeassistant/components/ihc/light.py b/homeassistant/components/ihc/light.py
index 089317ca7d7..b469cb54aee 100644
--- a/homeassistant/components/ihc/light.py
+++ b/homeassistant/components/ihc/light.py
@@ -96,29 +96,26 @@ class IhcLight(IHCDevice, LightEntity):
         """Turn the light on."""
         if ATTR_BRIGHTNESS in kwargs:
             brightness = kwargs[ATTR_BRIGHTNESS]
-        else:
-            if (brightness := self._brightness) == 0:
-                brightness = 255
+        elif (brightness := self._brightness) == 0:
+            brightness = 255
 
         if self._dimmable:
             await async_set_int(
                 self.hass, self.ihc_controller, self.ihc_id, int(brightness * 100 / 255)
             )
+        elif self._ihc_on_id:
+            await async_pulse(self.hass, self.ihc_controller, self._ihc_on_id)
         else:
-            if self._ihc_on_id:
-                await async_pulse(self.hass, self.ihc_controller, self._ihc_on_id)
-            else:
-                await async_set_bool(self.hass, self.ihc_controller, self.ihc_id, True)
+            await async_set_bool(self.hass, self.ihc_controller, self.ihc_id, True)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the light off."""
         if self._dimmable:
             await async_set_int(self.hass, self.ihc_controller, self.ihc_id, 0)
+        elif self._ihc_off_id:
+            await async_pulse(self.hass, self.ihc_controller, self._ihc_off_id)
         else:
-            if self._ihc_off_id:
-                await async_pulse(self.hass, self.ihc_controller, self._ihc_off_id)
-            else:
-                await async_set_bool(self.hass, self.ihc_controller, self.ihc_id, False)
+            await async_set_bool(self.hass, self.ihc_controller, self.ihc_id, False)
 
     def on_ihc_change(self, ihc_id, value):
         """Handle IHC notifications."""
diff --git a/homeassistant/components/image/__init__.py b/homeassistant/components/image/__init__.py
new file mode 100644
index 00000000000..8daea2cdd46
--- /dev/null
+++ b/homeassistant/components/image/__init__.py
@@ -0,0 +1,275 @@
+"""The image integration."""
+from __future__ import annotations
+
+import asyncio
+import collections
+from contextlib import suppress
+from dataclasses import dataclass
+from datetime import datetime, timedelta
+import logging
+from random import SystemRandom
+from typing import Final, final
+
+from aiohttp import hdrs, web
+import async_timeout
+import httpx
+
+from homeassistant.components.http import KEY_AUTHENTICATED, HomeAssistantView
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP
+from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.config_validation import (  # noqa: F401
+    PLATFORM_SCHEMA,
+    PLATFORM_SCHEMA_BASE,
+)
+from homeassistant.helpers.entity import Entity, EntityDescription
+from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.httpx_client import get_async_client
+from homeassistant.helpers.typing import UNDEFINED, ConfigType, UndefinedType
+
+from .const import DOMAIN, IMAGE_TIMEOUT  # noqa: F401
+
+_LOGGER = logging.getLogger(__name__)
+
+SCAN_INTERVAL: Final = timedelta(seconds=30)
+ENTITY_ID_FORMAT: Final = DOMAIN + ".{}"
+
+DEFAULT_CONTENT_TYPE: Final = "image/jpeg"
+ENTITY_IMAGE_URL: Final = "/api/image_proxy/{0}?token={1}"
+
+TOKEN_CHANGE_INTERVAL: Final = timedelta(minutes=5)
+_RND: Final = SystemRandom()
+
+GET_IMAGE_TIMEOUT: Final = 10
+
+
+@dataclass
+class ImageEntityDescription(EntityDescription):
+    """A class that describes image entities."""
+
+
+@dataclass
+class Image:
+    """Represent an image."""
+
+    content_type: str
+    content: bytes
+
+
+class ImageContentTypeError(HomeAssistantError):
+    """Error with the content type while loading an image."""
+
+
+def valid_image_content_type(content_type: str | None) -> str:
+    """Validate the assigned content type is one of an image."""
+    if content_type is None or content_type.split("/", 1)[0] != "image":
+        raise ImageContentTypeError
+    return content_type
+
+
+async def _async_get_image(image_entity: ImageEntity, timeout: int) -> Image:
+    """Fetch image from an image entity."""
+    with suppress(asyncio.CancelledError, asyncio.TimeoutError, ImageContentTypeError):
+        async with async_timeout.timeout(timeout):
+            if image_bytes := await image_entity.async_image():
+                content_type = valid_image_content_type(image_entity.content_type)
+                image = Image(content_type, image_bytes)
+                return image
+
+    raise HomeAssistantError("Unable to get image")
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the image component."""
+    component = hass.data[DOMAIN] = EntityComponent[ImageEntity](
+        _LOGGER, DOMAIN, hass, SCAN_INTERVAL
+    )
+
+    hass.http.register_view(ImageView(component))
+
+    await component.async_setup(config)
+
+    @callback
+    def update_tokens(time: datetime) -> None:
+        """Update tokens of the entities."""
+        for entity in component.entities:
+            entity.async_update_token()
+            entity.async_write_ha_state()
+
+    unsub = async_track_time_interval(
+        hass, update_tokens, TOKEN_CHANGE_INTERVAL, name="Image update tokens"
+    )
+
+    @callback
+    def unsub_track_time_interval(_event: Event) -> None:
+        """Unsubscribe track time interval timer."""
+        unsub()
+
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, unsub_track_time_interval)
+
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up a config entry."""
+    component: EntityComponent[ImageEntity] = hass.data[DOMAIN]
+    return await component.async_setup_entry(entry)
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    component: EntityComponent[ImageEntity] = hass.data[DOMAIN]
+    return await component.async_unload_entry(entry)
+
+
+class ImageEntity(Entity):
+    """The base class for image entities."""
+
+    # Entity Properties
+    _attr_content_type: str = DEFAULT_CONTENT_TYPE
+    _attr_image_last_updated: datetime | None = None
+    _attr_image_url: str | None | UndefinedType = UNDEFINED
+    _attr_should_poll: bool = False  # No need to poll image entities
+    _attr_state: None = None  # State is determined by last_updated
+    _cached_image: Image | None = None
+
+    def __init__(self, hass: HomeAssistant, verify_ssl: bool = False) -> None:
+        """Initialize an image entity."""
+        self._client = get_async_client(hass, verify_ssl=verify_ssl)
+        self.access_tokens: collections.deque = collections.deque([], 2)
+        self.async_update_token()
+
+    @property
+    def content_type(self) -> str:
+        """Image content type."""
+        return self._attr_content_type
+
+    @property
+    def entity_picture(self) -> str | None:
+        """Return a link to the image as entity picture."""
+        if self._attr_entity_picture is not None:
+            return self._attr_entity_picture
+        return ENTITY_IMAGE_URL.format(self.entity_id, self.access_tokens[-1])
+
+    @property
+    def image_last_updated(self) -> datetime | None:
+        """The time when the image was last updated."""
+        return self._attr_image_last_updated
+
+    @property
+    def image_url(self) -> str | None | UndefinedType:
+        """Return URL of image."""
+        return self._attr_image_url
+
+    def image(self) -> bytes | None:
+        """Return bytes of image."""
+        raise NotImplementedError()
+
+    async def _async_load_image_from_url(self, url: str) -> Image | None:
+        """Load an image by url."""
+        try:
+            response = await self._client.get(
+                url, timeout=GET_IMAGE_TIMEOUT, follow_redirects=True
+            )
+            response.raise_for_status()
+            content_type = response.headers.get("content-type")
+            return Image(
+                content=response.content,
+                content_type=valid_image_content_type(content_type),
+            )
+        except httpx.TimeoutException:
+            _LOGGER.error("%s: Timeout getting image from %s", self.entity_id, url)
+            return None
+        except (httpx.RequestError, httpx.HTTPStatusError) as err:
+            _LOGGER.error(
+                "%s: Error getting new image from %s: %s",
+                self.entity_id,
+                url,
+                err,
+            )
+            return None
+        except ImageContentTypeError:
+            _LOGGER.error(
+                "%s: Image from %s has invalid content type: %s",
+                self.entity_id,
+                url,
+                content_type,
+            )
+            return None
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+
+        if self._cached_image:
+            return self._cached_image.content
+        if (url := self.image_url) is not UNDEFINED:
+            if not url or (image := await self._async_load_image_from_url(url)) is None:
+                return None
+            self._cached_image = image
+            self._attr_content_type = image.content_type
+            return image.content
+        return await self.hass.async_add_executor_job(self.image)
+
+    @property
+    @final
+    def state(self) -> str | None:
+        """Return the state."""
+        if self.image_last_updated is None:
+            return None
+        return self.image_last_updated.isoformat()
+
+    @final
+    @property
+    def state_attributes(self) -> dict[str, str | None]:
+        """Return the state attributes."""
+        return {"access_token": self.access_tokens[-1]}
+
+    @callback
+    def async_update_token(self) -> None:
+        """Update the used token."""
+        self.access_tokens.append(hex(_RND.getrandbits(256))[2:])
+
+
+class ImageView(HomeAssistantView):
+    """View to serve an image."""
+
+    name = "api:image:image"
+    requires_auth = False
+    url = "/api/image_proxy/{entity_id}"
+
+    def __init__(self, component: EntityComponent[ImageEntity]) -> None:
+        """Initialize an image view."""
+        self.component = component
+
+    async def get(self, request: web.Request, entity_id: str) -> web.StreamResponse:
+        """Start a GET request."""
+        if (image_entity := self.component.get_entity(entity_id)) is None:
+            raise web.HTTPNotFound()
+
+        authenticated = (
+            request[KEY_AUTHENTICATED]
+            or request.query.get("token") in image_entity.access_tokens
+        )
+
+        if not authenticated:
+            # Attempt with invalid bearer token, raise unauthorized
+            # so ban middleware can handle it.
+            if hdrs.AUTHORIZATION in request.headers:
+                raise web.HTTPUnauthorized()
+            # Invalid sigAuth or image entity access token
+            raise web.HTTPForbidden()
+
+        return await self.handle(request, image_entity)
+
+    async def handle(
+        self, request: web.Request, image_entity: ImageEntity
+    ) -> web.StreamResponse:
+        """Serve image."""
+        try:
+            image = await _async_get_image(image_entity, IMAGE_TIMEOUT)
+        except (HomeAssistantError, ValueError) as ex:
+            raise web.HTTPInternalServerError() from ex
+
+        return web.Response(body=image.content, content_type=image.content_type)
diff --git a/homeassistant/components/image/const.py b/homeassistant/components/image/const.py
new file mode 100644
index 00000000000..d262bb460f7
--- /dev/null
+++ b/homeassistant/components/image/const.py
@@ -0,0 +1,6 @@
+"""Constants for the image integration."""
+from typing import Final
+
+DOMAIN: Final = "image"
+
+IMAGE_TIMEOUT: Final = 10
diff --git a/homeassistant/components/image/manifest.json b/homeassistant/components/image/manifest.json
new file mode 100644
index 00000000000..0335710a30b
--- /dev/null
+++ b/homeassistant/components/image/manifest.json
@@ -0,0 +1,9 @@
+{
+  "domain": "image",
+  "name": "Image",
+  "codeowners": ["@home-assistant/core"],
+  "dependencies": ["http"],
+  "documentation": "https://www.home-assistant.io/integrations/image",
+  "integration_type": "entity",
+  "quality_scale": "internal"
+}
diff --git a/homeassistant/components/image/recorder.py b/homeassistant/components/image/recorder.py
new file mode 100644
index 00000000000..5c141220881
--- /dev/null
+++ b/homeassistant/components/image/recorder.py
@@ -0,0 +1,10 @@
+"""Integration platform for recorder."""
+from __future__ import annotations
+
+from homeassistant.core import HomeAssistant, callback
+
+
+@callback
+def exclude_attributes(hass: HomeAssistant) -> set[str]:
+    """Exclude access_token and entity_picture from being recorded in the database."""
+    return {"access_token", "entity_picture"}
diff --git a/homeassistant/components/image/strings.json b/homeassistant/components/image/strings.json
new file mode 100644
index 00000000000..ea7ecd16956
--- /dev/null
+++ b/homeassistant/components/image/strings.json
@@ -0,0 +1,8 @@
+{
+  "title": "Image",
+  "entity_component": {
+    "_": {
+      "name": "[%key:component::image::title%]"
+    }
+  }
+}
diff --git a/homeassistant/components/image_upload/__init__.py b/homeassistant/components/image_upload/__init__.py
index 766be89f0d4..569df9c65e4 100644
--- a/homeassistant/components/image_upload/__init__.py
+++ b/homeassistant/components/image_upload/__init__.py
@@ -8,9 +8,9 @@ import secrets
 import shutil
 from typing import Any
 
-from PIL import Image, ImageOps, UnidentifiedImageError
 from aiohttp import hdrs, web
 from aiohttp.web_request import FileField
+from PIL import Image, ImageOps, UnidentifiedImageError
 import voluptuous as vol
 
 from homeassistant.components.http.static import CACHE_HEADERS
diff --git a/homeassistant/components/image_upload/manifest.json b/homeassistant/components/image_upload/manifest.json
index 947c3cb67d5..48c57fb5d03 100644
--- a/homeassistant/components/image_upload/manifest.json
+++ b/homeassistant/components/image_upload/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/image_upload",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["pillow==9.5.0"]
+  "requirements": ["Pillow==9.5.0"]
 }
diff --git a/homeassistant/components/imap/config_flow.py b/homeassistant/components/imap/config_flow.py
index 6a737df7476..00be545fb67 100644
--- a/homeassistant/components/imap/config_flow.py
+++ b/homeassistant/components/imap/config_flow.py
@@ -19,18 +19,15 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import AbortFlow, FlowResult
-from homeassistant.exceptions import TemplateError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.selector import (
     BooleanSelector,
     SelectSelector,
     SelectSelectorConfig,
     SelectSelectorMode,
-    TextSelector,
-    TextSelectorConfig,
-    TextSelectorType,
+    TemplateSelector,
+    TemplateSelectorConfig,
 )
-from homeassistant.helpers.template import Template
 from homeassistant.util.ssl import SSLCipherList
 
 from .const import (
@@ -57,9 +54,7 @@ CIPHER_SELECTOR = SelectSelector(
         translation_key=CONF_SSL_CIPHER_LIST,
     )
 )
-TEMPLATE_SELECTOR = TextSelector(
-    TextSelectorConfig(type=TextSelectorType.TEXT, multiline=True)
-)
+TEMPLATE_SELECTOR = TemplateSelector(TemplateSelectorConfig())
 
 CONFIG_SCHEMA = vol.Schema(
     {
@@ -125,11 +120,6 @@ async def validate_input(
                 errors[CONF_CHARSET] = "invalid_charset"
             else:
                 errors[CONF_SEARCH] = "invalid_search"
-    if template := user_input.get(CONF_CUSTOM_EVENT_DATA_TEMPLATE):
-        try:
-            Template(template, hass=hass).ensure_valid()
-        except TemplateError:
-            errors[CONF_CUSTOM_EVENT_DATA_TEMPLATE] = "invalid_template"
 
     return errors
 
diff --git a/homeassistant/components/imap/manifest.json b/homeassistant/components/imap/manifest.json
index 39dfc6c0d48..3c35d00f714 100644
--- a/homeassistant/components/imap/manifest.json
+++ b/homeassistant/components/imap/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "imap",
   "name": "IMAP",
-  "codeowners": ["@engrbm87", "@jbouwh"],
+  "codeowners": ["@jbouwh"],
   "config_flow": true,
   "dependencies": ["repairs"],
   "documentation": "https://www.home-assistant.io/integrations/imap",
diff --git a/homeassistant/components/imap/sensor.py b/homeassistant/components/imap/sensor.py
index 776abc174a2..cd6da667ccb 100644
--- a/homeassistant/components/imap/sensor.py
+++ b/homeassistant/components/imap/sensor.py
@@ -1,7 +1,11 @@
 """IMAP sensor support."""
 from __future__ import annotations
 
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import (
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_USERNAME
 from homeassistant.core import HomeAssistant
@@ -13,6 +17,12 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from . import ImapPollingDataUpdateCoordinator, ImapPushDataUpdateCoordinator
 from .const import DOMAIN
 
+IMAP_MAIL_COUNT_DESCRIPTION = SensorEntityDescription(
+    key="imap_mail_count",
+    state_class=SensorStateClass.MEASUREMENT,
+    suggested_display_precision=0,
+)
+
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
@@ -22,8 +32,7 @@ async def async_setup_entry(
     coordinator: ImapPushDataUpdateCoordinator | ImapPollingDataUpdateCoordinator = (
         hass.data[DOMAIN][entry.entry_id]
     )
-
-    async_add_entities([ImapSensor(coordinator)])
+    async_add_entities([ImapSensor(coordinator, IMAP_MAIL_COUNT_DESCRIPTION)])
 
 
 class ImapSensor(
@@ -34,13 +43,16 @@ class ImapSensor(
 
     _attr_icon = "mdi:email-outline"
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
         coordinator: ImapPushDataUpdateCoordinator | ImapPollingDataUpdateCoordinator,
+        description: SensorEntityDescription,
     ) -> None:
         """Initialize the sensor."""
         super().__init__(coordinator)
+        self.entity_description = description
         self._attr_unique_id = f"{coordinator.config_entry.entry_id}"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, coordinator.config_entry.entry_id)},
diff --git a/homeassistant/components/imap/strings.json b/homeassistant/components/imap/strings.json
index 1e237f72b44..6fad8895931 100644
--- a/homeassistant/components/imap/strings.json
+++ b/homeassistant/components/imap/strings.json
@@ -52,8 +52,7 @@
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "invalid_charset": "[%key:component::imap::config::error::invalid_charset%]",
       "invalid_folder": "[%key:component::imap::config::error::invalid_folder%]",
-      "invalid_search": "[%key:component::imap::config::error::invalid_search%]",
-      "invalid_template": "Invalid template"
+      "invalid_search": "[%key:component::imap::config::error::invalid_search%]"
     }
   },
   "selector": {
diff --git a/homeassistant/components/imap_email_content/__init__.py b/homeassistant/components/imap_email_content/__init__.py
index 1a148f4591b..f2041b947df 100644
--- a/homeassistant/components/imap_email_content/__init__.py
+++ b/homeassistant/components/imap_email_content/__init__.py
@@ -2,10 +2,15 @@
 
 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
+
 PLATFORMS = [Platform.SENSOR]
 
+CONFIG_SCHEMA = cv.deprecated(DOMAIN, raise_if_present=False)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up imap_email_content."""
diff --git a/homeassistant/components/incomfort/sensor.py b/homeassistant/components/incomfort/sensor.py
index b1b391aaaab..9e8cabbe253 100644
--- a/homeassistant/components/incomfort/sensor.py
+++ b/homeassistant/components/incomfort/sensor.py
@@ -28,6 +28,9 @@ class IncomfortSensorEntityDescription(SensorEntityDescription):
     """Describes Incomfort sensor entity."""
 
     extra_key: str | None = None
+    # IncomfortSensor does not support UNDEFINED or None,
+    # restrict the type to str
+    name: str = ""
 
 
 SENSOR_TYPES: tuple[IncomfortSensorEntityDescription, ...] = (
diff --git a/homeassistant/components/influxdb/__init__.py b/homeassistant/components/influxdb/__init__.py
index 8fde1c2d8be..f879ab37e8f 100644
--- a/homeassistant/components/influxdb/__init__.py
+++ b/homeassistant/components/influxdb/__init__.py
@@ -145,12 +145,11 @@ def validate_version_specific_config(conf: dict) -> dict:
                 f" {CONF_API_VERSION} is {DEFAULT_API_VERSION}"
             )
 
-    else:
-        if CONF_TOKEN in conf:
-            raise vol.Invalid(
-                f"{CONF_TOKEN} and {CONF_BUCKET} are only allowed when"
-                f" {CONF_API_VERSION} is {API_VERSION_2}"
-            )
+    elif CONF_TOKEN in conf:
+        raise vol.Invalid(
+            f"{CONF_TOKEN} and {CONF_BUCKET} are only allowed when"
+            f" {CONF_API_VERSION} is {API_VERSION_2}"
+        )
 
     return conf
 
diff --git a/homeassistant/components/influxdb/sensor.py b/homeassistant/components/influxdb/sensor.py
index 67aaae225a8..b4f643e876f 100644
--- a/homeassistant/components/influxdb/sensor.py
+++ b/homeassistant/components/influxdb/sensor.py
@@ -339,7 +339,7 @@ class InfluxQLSensorData:
             return
 
         self.query = (
-            f"select {self.group}({self.field}) as {INFLUX_CONF_VALUE} from"
+            f"select {self.group}({self.field}) as {INFLUX_CONF_VALUE} from"  # noqa: S608
             f" {self.measurement} where {where_clause}"
         )
 
diff --git a/homeassistant/components/input_datetime/__init__.py b/homeassistant/components/input_datetime/__init__.py
index 769b2d794d0..8762769194f 100644
--- a/homeassistant/components/input_datetime/__init__.py
+++ b/homeassistant/components/input_datetime/__init__.py
@@ -292,13 +292,12 @@ class InputDatetime(collection.CollectionEntity, RestoreEntity):
             else:
                 current_datetime = py_datetime.datetime.combine(date, DEFAULT_TIME)
 
+        elif (time := dt_util.parse_time(old_state.state)) is None:
+            current_datetime = dt_util.parse_datetime(default_value)
         else:
-            if (time := dt_util.parse_time(old_state.state)) is None:
-                current_datetime = dt_util.parse_datetime(default_value)
-            else:
-                current_datetime = py_datetime.datetime.combine(
-                    py_datetime.date.today(), time
-                )
+            current_datetime = py_datetime.datetime.combine(
+                py_datetime.date.today(), time
+            )
 
         self._current_datetime = current_datetime.replace(
             tzinfo=dt_util.DEFAULT_TIME_ZONE
diff --git a/homeassistant/components/insteon/__init__.py b/homeassistant/components/insteon/__init__.py
index 1667f5fb779..a074ad4600b 100644
--- a/homeassistant/components/insteon/__init__.py
+++ b/homeassistant/components/insteon/__init__.py
@@ -9,13 +9,12 @@ from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import CONF_PLATFORM, EVENT_HOMEASSISTANT_STOP
 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 . import api
 from .const import (
     CONF_CAT,
-    CONF_DEV_PATH,
     CONF_DIM_STEPS,
     CONF_HOUSECODE,
     CONF_OVERRIDE,
@@ -25,7 +24,6 @@ from .const import (
     DOMAIN,
     INSTEON_PLATFORMS,
 )
-from .schemas import convert_yaml_to_config_flow
 from .utils import (
     add_insteon_events,
     async_register_services,
@@ -36,6 +34,8 @@ from .utils import (
 _LOGGER = logging.getLogger(__name__)
 OPTIONS = "options"
 
+CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
+
 
 async def async_get_device_config(hass, config_entry):
     """Initiate the connection and services."""
@@ -77,26 +77,6 @@ async def close_insteon_connection(*args):
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Insteon platform."""
-    hass.data[DOMAIN] = {}
-    if DOMAIN not in config:
-        return True
-
-    conf = dict(config[DOMAIN])
-    hass.data[DOMAIN][CONF_DEV_PATH] = conf.pop(CONF_DEV_PATH, None)
-
-    if not conf:
-        return True
-
-    data, options = convert_yaml_to_config_flow(conf)
-
-    if options:
-        hass.data[DOMAIN][OPTIONS] = options
-    # Create a config entry with the connection data
-    hass.async_create_task(
-        hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_IMPORT}, data=data
-        )
-    )
     return True
 
 
diff --git a/homeassistant/components/insteon/config_flow.py b/homeassistant/components/insteon/config_flow.py
index 15ce7c849e6..f5bafd935a0 100644
--- a/homeassistant/components/insteon/config_flow.py
+++ b/homeassistant/components/insteon/config_flow.py
@@ -163,25 +163,14 @@ class InsteonFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             step_id=step_id, data_schema=data_schema, errors=errors
         )
 
-    async def async_step_import(self, import_info):
-        """Import a yaml entry as a config entry."""
-        if self._async_current_entries():
-            return self.async_abort(reason="single_instance_allowed")
-        if not await _async_connect(**import_info):
-            return self.async_abort(reason="cannot_connect")
-        return self.async_create_entry(title="", data=import_info)
-
     async def async_step_usb(self, discovery_info: usb.UsbServiceInfo) -> FlowResult:
         """Handle USB discovery."""
         if self._async_current_entries():
             return self.async_abort(reason="single_instance_allowed")
 
-        dev_path = await self.hass.async_add_executor_job(
-            usb.get_serial_by_id, discovery_info.device
-        )
-        self._device_path = dev_path
+        self._device_path = discovery_info.device
         self._device_name = usb.human_readable_device_name(
-            dev_path,
+            discovery_info.device,
             discovery_info.serial_number,
             discovery_info.manufacturer,
             discovery_info.description,
diff --git a/homeassistant/components/insteon/schemas.py b/homeassistant/components/insteon/schemas.py
index 84b586e7649..e6b22a8cbb9 100644
--- a/homeassistant/components/insteon/schemas.py
+++ b/homeassistant/components/insteon/schemas.py
@@ -22,26 +22,13 @@ import homeassistant.helpers.config_validation as cv
 
 from .const import (
     CONF_CAT,
-    CONF_DEV_PATH,
     CONF_DIM_STEPS,
-    CONF_FIRMWARE,
     CONF_HOUSECODE,
-    CONF_HUB_PASSWORD,
-    CONF_HUB_USERNAME,
-    CONF_HUB_VERSION,
-    CONF_IP_PORT,
     CONF_OVERRIDE,
-    CONF_PLM_HUB_MSG,
-    CONF_PRODUCT_KEY,
     CONF_SUBCAT,
     CONF_UNITCODE,
     CONF_X10,
-    CONF_X10_ALL_LIGHTS_OFF,
-    CONF_X10_ALL_LIGHTS_ON,
-    CONF_X10_ALL_UNITS_OFF,
-    DOMAIN,
     HOUSECODES,
-    INSTEON_ADDR_REGEX,
     PORT_HUB_V1,
     PORT_HUB_V2,
     SRV_ALL_LINK_GROUP,
@@ -53,88 +40,6 @@ from .const import (
     X10_PLATFORMS,
 )
 
-
-def set_default_port(schema: dict) -> dict:
-    """Set the default port based on the Hub version."""
-    # If the ip_port is found do nothing
-    # If it is not found the set the default
-    if not schema.get(CONF_IP_PORT):
-        hub_version = schema.get(CONF_HUB_VERSION)
-        # Found hub_version but not ip_port
-        schema[CONF_IP_PORT] = PORT_HUB_V1 if hub_version == 1 else PORT_HUB_V2
-    return schema
-
-
-def insteon_address(value: str) -> str:
-    """Validate an Insteon address."""
-    if not INSTEON_ADDR_REGEX.match(value):
-        raise vol.Invalid("Invalid Insteon Address")
-    return str(value).replace(".", "").lower()
-
-
-CONF_DEVICE_OVERRIDE_SCHEMA = vol.All(
-    vol.Schema(
-        {
-            vol.Required(CONF_ADDRESS): cv.string,
-            vol.Optional(CONF_CAT): cv.byte,
-            vol.Optional(CONF_SUBCAT): cv.byte,
-            vol.Optional(CONF_FIRMWARE): cv.byte,
-            vol.Optional(CONF_PRODUCT_KEY): cv.byte,
-            vol.Optional(CONF_PLATFORM): cv.string,
-        }
-    ),
-)
-
-
-CONF_X10_SCHEMA = vol.All(
-    vol.Schema(
-        {
-            vol.Required(CONF_HOUSECODE): cv.string,
-            vol.Required(CONF_UNITCODE): vol.Range(min=1, max=16),
-            vol.Required(CONF_PLATFORM): cv.string,
-            vol.Optional(CONF_DIM_STEPS): vol.Range(min=2, max=255),
-        }
-    )
-)
-
-
-CONFIG_SCHEMA = vol.Schema(
-    {
-        DOMAIN: vol.All(
-            cv.deprecated(CONF_X10_ALL_UNITS_OFF),
-            cv.deprecated(CONF_X10_ALL_LIGHTS_ON),
-            cv.deprecated(CONF_X10_ALL_LIGHTS_OFF),
-            vol.Schema(
-                {
-                    vol.Exclusive(
-                        CONF_PORT, "plm_or_hub", msg=CONF_PLM_HUB_MSG
-                    ): cv.string,
-                    vol.Exclusive(
-                        CONF_HOST, "plm_or_hub", msg=CONF_PLM_HUB_MSG
-                    ): cv.string,
-                    vol.Optional(CONF_IP_PORT): cv.port,
-                    vol.Optional(CONF_HUB_USERNAME): cv.string,
-                    vol.Optional(CONF_HUB_PASSWORD): cv.string,
-                    vol.Optional(CONF_HUB_VERSION, default=2): vol.In([1, 2]),
-                    vol.Optional(CONF_OVERRIDE): vol.All(
-                        cv.ensure_list_csv, [CONF_DEVICE_OVERRIDE_SCHEMA]
-                    ),
-                    vol.Optional(CONF_X10): vol.All(
-                        cv.ensure_list_csv, [CONF_X10_SCHEMA]
-                    ),
-                    vol.Optional(CONF_DEV_PATH): cv.string,
-                },
-                extra=vol.ALLOW_EXTRA,
-                required=True,
-            ),
-            cv.has_at_least_one_key(CONF_PORT, CONF_HOST),
-            set_default_port,
-        )
-    },
-    extra=vol.ALLOW_EXTRA,
-)
-
-
 ADD_ALL_LINK_SCHEMA = vol.Schema(
     {
         vol.Required(SRV_ALL_LINK_GROUP): vol.Range(min=0, max=255),
@@ -170,18 +75,6 @@ TRIGGER_SCENE_SCHEMA = vol.Schema(
 ADD_DEFAULT_LINKS_SCHEMA = vol.Schema({vol.Required(CONF_ENTITY_ID): cv.entity_id})
 
 
-SCENE_ENTITY_SCHEMA = vol.Schema(
-    [
-        {
-            vol.Required(CONF_ADDRESS): str,
-            vol.Required("data1"): int,
-            vol.Required("data2"): int,
-            vol.Required("data3"): int,
-        }
-    ]
-)
-
-
 def normalize_byte_entry_to_int(entry: int | bytes | str):
     """Format a hex entry value."""
     if isinstance(entry, int):
@@ -338,32 +231,3 @@ def build_remove_x10_schema(data):
         unitcode = device[CONF_UNITCODE]
         selection.append(f"Housecode: {housecode}, Unitcode: {unitcode}")
     return vol.Schema({vol.Required(CONF_DEVICE): vol.In(selection)})
-
-
-def convert_yaml_to_config_flow(yaml_config):
-    """Convert the YAML based configuration to a config flow configuration."""
-    config = {}
-    if yaml_config.get(CONF_HOST):
-        hub_version = yaml_config.get(CONF_HUB_VERSION, 2)
-        default_port = PORT_HUB_V2 if hub_version == 2 else PORT_HUB_V1
-        config[CONF_HOST] = yaml_config.get(CONF_HOST)
-        config[CONF_PORT] = yaml_config.get(CONF_PORT, default_port)
-        config[CONF_HUB_VERSION] = hub_version
-        if hub_version == 2:
-            config[CONF_USERNAME] = yaml_config[CONF_USERNAME]
-            config[CONF_PASSWORD] = yaml_config[CONF_PASSWORD]
-    else:
-        config[CONF_DEVICE] = yaml_config[CONF_PORT]
-
-    options = {}
-    for old_override in yaml_config.get(CONF_OVERRIDE, []):
-        override = {}
-        override[CONF_ADDRESS] = str(Address(old_override[CONF_ADDRESS]))
-        override[CONF_CAT] = normalize_byte_entry_to_int(old_override[CONF_CAT])
-        override[CONF_SUBCAT] = normalize_byte_entry_to_int(old_override[CONF_SUBCAT])
-        options = add_device_override(options, override)
-
-    for x10_device in yaml_config.get(CONF_X10, []):
-        options = add_x10_device(options, x10_device)
-
-    return config, options
diff --git a/homeassistant/components/integration/sensor.py b/homeassistant/components/integration/sensor.py
index b28b426d3af..af4248e5e3b 100644
--- a/homeassistant/components/integration/sensor.py
+++ b/homeassistant/components/integration/sensor.py
@@ -28,7 +28,12 @@ from homeassistant.const import (
     UnitOfTime,
 )
 from homeassistant.core import Event, HomeAssistant, State, callback
-from homeassistant.helpers import config_validation as cv, entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -140,6 +145,28 @@ async def async_setup_entry(
         registry, config_entry.options[CONF_SOURCE_SENSOR]
     )
 
+    source_entity = er.EntityRegistry.async_get(registry, source_entity_id)
+    dev_reg = dr.async_get(hass)
+    # Resolve source entity device
+    if (
+        (source_entity is not None)
+        and (source_entity.device_id is not None)
+        and (
+            (
+                device := dev_reg.async_get(
+                    device_id=source_entity.device_id,
+                )
+            )
+            is not None
+        )
+    ):
+        device_info = DeviceInfo(
+            identifiers=device.identifiers,
+            connections=device.connections,
+        )
+    else:
+        device_info = None
+
     unit_prefix = config_entry.options[CONF_UNIT_PREFIX]
     if unit_prefix == "none":
         unit_prefix = None
@@ -152,6 +179,7 @@ async def async_setup_entry(
         unique_id=config_entry.entry_id,
         unit_prefix=unit_prefix,
         unit_time=config_entry.options[CONF_UNIT_TIME],
+        device_info=device_info,
     )
 
     async_add_entities([integral])
@@ -194,6 +222,7 @@ class IntegrationSensor(RestoreSensor):
         unique_id: str | None,
         unit_prefix: str | None,
         unit_time: UnitOfTime,
+        device_info: DeviceInfo | None = None,
     ) -> None:
         """Initialize the integration sensor."""
         self._attr_unique_id = unique_id
@@ -211,6 +240,7 @@ class IntegrationSensor(RestoreSensor):
         self._attr_icon = "mdi:chart-histogram"
         self._source_entity: str = source_entity
         self._last_valid_state: Decimal | None = None
+        self._attr_device_info = device_info
 
     def _unit(self, source_unit: str) -> str:
         """Derive unit from the source sensor, SI prefix and time unit."""
diff --git a/homeassistant/components/intellifire/climate.py b/homeassistant/components/intellifire/climate.py
index 649234d7568..5d305db8feb 100644
--- a/homeassistant/components/intellifire/climate.py
+++ b/homeassistant/components/intellifire/climate.py
@@ -66,7 +66,7 @@ class IntellifireClimate(IntellifireEntity, ClimateEntity):
             self.last_temp = coordinator.data.thermostat_setpoint_c
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return current hvac mode."""
         if self.coordinator.read_api.data.thermostat_on:
             return HVACMode.HEAT
diff --git a/homeassistant/components/intent/__init__.py b/homeassistant/components/intent/__init__.py
index 1f390d35370..b2c77fed3af 100644
--- a/homeassistant/components/intent/__init__.py
+++ b/homeassistant/components/intent/__init__.py
@@ -70,18 +70,22 @@ class OnOffIntentHandler(intent.ServiceIntentHandler):
         if state.domain == COVER_DOMAIN:
             # on = open
             # off = close
-            await hass.services.async_call(
-                COVER_DOMAIN,
-                SERVICE_OPEN_COVER
-                if self.service == SERVICE_TURN_ON
-                else SERVICE_CLOSE_COVER,
-                {ATTR_ENTITY_ID: state.entity_id},
-                context=intent_obj.context,
-                blocking=True,
-                limit=self.service_timeout,
+            await self._run_then_background(
+                hass.async_create_task(
+                    hass.services.async_call(
+                        COVER_DOMAIN,
+                        SERVICE_OPEN_COVER
+                        if self.service == SERVICE_TURN_ON
+                        else SERVICE_CLOSE_COVER,
+                        {ATTR_ENTITY_ID: state.entity_id},
+                        context=intent_obj.context,
+                        blocking=True,
+                    )
+                )
             )
+            return
 
-        elif not hass.services.has_service(state.domain, self.service):
+        if not hass.services.has_service(state.domain, self.service):
             raise intent.IntentHandleError(
                 f"Service {self.service} does not support entity {state.entity_id}"
             )
diff --git a/homeassistant/components/intent_script/__init__.py b/homeassistant/components/intent_script/__init__.py
index 2ec898bfb0e..55c4947fe4a 100644
--- a/homeassistant/components/intent_script/__init__.py
+++ b/homeassistant/components/intent_script/__init__.py
@@ -5,9 +5,16 @@ import logging
 
 import voluptuous as vol
 
-from homeassistant.const import CONF_TYPE
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv, intent, script, template
+from homeassistant.const import CONF_TYPE, SERVICE_RELOAD
+from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.helpers import (
+    config_validation as cv,
+    intent,
+    script,
+    service,
+    template,
+)
+from homeassistant.helpers.reload import async_integration_yaml_config
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
@@ -55,10 +62,27 @@ CONFIG_SCHEMA = vol.Schema(
 )
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the intent script component."""
-    intents = config[DOMAIN]
+async def async_reload(hass: HomeAssistant, servie_call: ServiceCall) -> None:
+    """Handle start Intent Script service call."""
+    new_config = await async_integration_yaml_config(hass, DOMAIN)
+    existing_intents = hass.data[DOMAIN]
+
+    for intent_type in existing_intents:
+        intent.async_remove(hass, intent_type)
+
+    if not new_config or DOMAIN not in new_config:
+        hass.data[DOMAIN] = {}
+        return
+
+    new_intents = new_config[DOMAIN]
+
+    async_load_intents(hass, new_intents)
+
+
+def async_load_intents(hass: HomeAssistant, intents: dict):
+    """Load YAML intents into the intent system."""
     template.attach(hass, intents)
+    hass.data[DOMAIN] = intents
 
     for intent_type, conf in intents.items():
         if CONF_ACTION in conf:
@@ -67,6 +91,23 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             )
         intent.async_register(hass, ScriptIntentHandler(intent_type, conf))
 
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the intent script component."""
+    intents = config[DOMAIN]
+
+    async_load_intents(hass, intents)
+
+    async def _handle_reload(servie_call: ServiceCall) -> None:
+        return await async_reload(hass, servie_call)
+
+    service.async_register_admin_service(
+        hass,
+        DOMAIN,
+        SERVICE_RELOAD,
+        _handle_reload,
+    )
+
     return True
 
 
diff --git a/homeassistant/components/intent_script/services.yaml b/homeassistant/components/intent_script/services.yaml
new file mode 100644
index 00000000000..bb981dbc69c
--- /dev/null
+++ b/homeassistant/components/intent_script/services.yaml
@@ -0,0 +1,3 @@
+reload:
+  name: Reload
+  description: Reload the intent_script configuration.
diff --git a/homeassistant/components/ipma/__init__.py b/homeassistant/components/ipma/__init__.py
index 866e79cbe40..dd46593998e 100644
--- a/homeassistant/components/ipma/__init__.py
+++ b/homeassistant/components/ipma/__init__.py
@@ -18,7 +18,7 @@ from .const import DATA_API, DATA_LOCATION, DOMAIN
 
 DEFAULT_NAME = "ipma"
 
-PLATFORMS = [Platform.WEATHER]
+PLATFORMS = [Platform.WEATHER, Platform.SENSOR]
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/ipma/config_flow.py b/homeassistant/components/ipma/config_flow.py
index 81ab8f98014..eb361d3f9d5 100644
--- a/homeassistant/components/ipma/config_flow.py
+++ b/homeassistant/components/ipma/config_flow.py
@@ -5,8 +5,7 @@ from homeassistant import config_entries
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_MODE, CONF_NAME
 import homeassistant.helpers.config_validation as cv
 
-from .const import DOMAIN, HOME_LOCATION_NAME
-from .weather import FORECAST_MODE
+from .const import DOMAIN, FORECAST_MODE, HOME_LOCATION_NAME
 
 
 class IpmaFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
diff --git a/homeassistant/components/ipma/const.py b/homeassistant/components/ipma/const.py
index 515fb501fbd..2d715011e43 100644
--- a/homeassistant/components/ipma/const.py
+++ b/homeassistant/components/ipma/const.py
@@ -1,5 +1,24 @@
 """Constants for IPMA component."""
-from homeassistant.components.weather import DOMAIN as WEATHER_DOMAIN
+from datetime import timedelta
+
+from homeassistant.components.weather import (
+    ATTR_CONDITION_CLEAR_NIGHT,
+    ATTR_CONDITION_CLOUDY,
+    ATTR_CONDITION_EXCEPTIONAL,
+    ATTR_CONDITION_FOG,
+    ATTR_CONDITION_HAIL,
+    ATTR_CONDITION_LIGHTNING,
+    ATTR_CONDITION_LIGHTNING_RAINY,
+    ATTR_CONDITION_PARTLYCLOUDY,
+    ATTR_CONDITION_POURING,
+    ATTR_CONDITION_RAINY,
+    ATTR_CONDITION_SNOWY,
+    ATTR_CONDITION_SNOWY_RAINY,
+    ATTR_CONDITION_SUNNY,
+    ATTR_CONDITION_WINDY,
+    ATTR_CONDITION_WINDY_VARIANT,
+    DOMAIN as WEATHER_DOMAIN,
+)
 
 DOMAIN = "ipma"
 
@@ -9,3 +28,27 @@ DATA_API = "api"
 DATA_LOCATION = "location"
 
 ENTITY_ID_SENSOR_FORMAT_HOME = f"{WEATHER_DOMAIN}.ipma_{HOME_LOCATION_NAME}"
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=30)
+
+CONDITION_CLASSES = {
+    ATTR_CONDITION_CLOUDY: [4, 5, 24, 25, 27],
+    ATTR_CONDITION_FOG: [16, 17, 26],
+    ATTR_CONDITION_HAIL: [21, 22],
+    ATTR_CONDITION_LIGHTNING: [19],
+    ATTR_CONDITION_LIGHTNING_RAINY: [20, 23],
+    ATTR_CONDITION_PARTLYCLOUDY: [2, 3],
+    ATTR_CONDITION_POURING: [8, 11],
+    ATTR_CONDITION_RAINY: [6, 7, 9, 10, 12, 13, 14, 15],
+    ATTR_CONDITION_SNOWY: [18],
+    ATTR_CONDITION_SNOWY_RAINY: [],
+    ATTR_CONDITION_SUNNY: [1],
+    ATTR_CONDITION_WINDY: [],
+    ATTR_CONDITION_WINDY_VARIANT: [],
+    ATTR_CONDITION_EXCEPTIONAL: [],
+    ATTR_CONDITION_CLEAR_NIGHT: [-1],
+}
+
+FORECAST_MODE = ["hourly", "daily"]
+
+ATTRIBUTION = "Instituto Português do Mar e Atmosfera"
diff --git a/homeassistant/components/ipma/entity.py b/homeassistant/components/ipma/entity.py
new file mode 100644
index 00000000000..bc8136b6206
--- /dev/null
+++ b/homeassistant/components/ipma/entity.py
@@ -0,0 +1,26 @@
+"""Base Entity for IPMA."""
+from __future__ import annotations
+
+from homeassistant.helpers.device_registry import DeviceEntryType
+from homeassistant.helpers.entity import DeviceInfo, Entity
+
+from .const import DOMAIN
+
+
+class IPMADevice(Entity):
+    """Common IPMA Device Information."""
+
+    def __init__(self, location) -> None:
+        """Initialize device information."""
+        self._location = location
+        self._attr_device_info = DeviceInfo(
+            entry_type=DeviceEntryType.SERVICE,
+            identifiers={
+                (
+                    DOMAIN,
+                    f"{self._location.station_latitude}, {self._location.station_longitude}",
+                )
+            },
+            manufacturer=DOMAIN,
+            name=self._location.name,
+        )
diff --git a/homeassistant/components/ipma/sensor.py b/homeassistant/components/ipma/sensor.py
new file mode 100644
index 00000000000..f02f8b7d9d0
--- /dev/null
+++ b/homeassistant/components/ipma/sensor.py
@@ -0,0 +1,89 @@
+"""Support for IPMA sensors."""
+from __future__ import annotations
+
+from collections.abc import Callable, Coroutine
+from dataclasses import dataclass
+import logging
+
+import async_timeout
+from pyipma.api import IPMA_API
+from pyipma.location import Location
+
+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.util import Throttle
+
+from .const import DATA_API, DATA_LOCATION, DOMAIN, MIN_TIME_BETWEEN_UPDATES
+from .entity import IPMADevice
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@dataclass
+class IPMARequiredKeysMixin:
+    """Mixin for required keys."""
+
+    value_fn: Callable[[Location, IPMA_API], Coroutine[Location, IPMA_API, int | None]]
+
+
+@dataclass
+class IPMASensorEntityDescription(SensorEntityDescription, IPMARequiredKeysMixin):
+    """Describes IPMA sensor entity."""
+
+
+async def async_retrive_rcm(location: Location, api: IPMA_API) -> int | None:
+    """Retrieve RCM."""
+    fire_risk = await location.fire_risk(api)
+    if fire_risk:
+        return fire_risk.rcm
+    return None
+
+
+SENSOR_TYPES: tuple[IPMASensorEntityDescription, ...] = (
+    IPMASensorEntityDescription(
+        key="rcm",
+        translation_key="fire_risk",
+        value_fn=async_retrive_rcm,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the IPMA sensor platform."""
+    api = hass.data[DOMAIN][entry.entry_id][DATA_API]
+    location = hass.data[DOMAIN][entry.entry_id][DATA_LOCATION]
+
+    entities = [IPMASensor(api, location, description) for description in SENSOR_TYPES]
+
+    async_add_entities(entities, True)
+
+
+class IPMASensor(SensorEntity, IPMADevice):
+    """Representation of an IPMA sensor."""
+
+    entity_description: IPMASensorEntityDescription
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        api: IPMA_API,
+        location: Location,
+        description: IPMASensorEntityDescription,
+    ) -> None:
+        """Initialize the IPMA Sensor."""
+        IPMADevice.__init__(self, location)
+        self.entity_description = description
+        self._api = api
+        self._attr_unique_id = f"{self._location.station_latitude}, {self._location.station_longitude}, {self.entity_description.key}"
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    async def async_update(self) -> None:
+        """Update Fire risk."""
+        async with async_timeout.timeout(10):
+            self._attr_native_value = await self.entity_description.value_fn(
+                self._location, self._api
+            )
diff --git a/homeassistant/components/ipma/strings.json b/homeassistant/components/ipma/strings.json
index 0dd013135dc..b9f50c66f9e 100644
--- a/homeassistant/components/ipma/strings.json
+++ b/homeassistant/components/ipma/strings.json
@@ -18,5 +18,12 @@
     "info": {
       "api_endpoint_reachable": "IPMA API endpoint reachable"
     }
+  },
+  "entity": {
+    "sensor": {
+      "fire_risk": {
+        "name": "Fire risk"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/ipma/weather.py b/homeassistant/components/ipma/weather.py
index bfd1b820c7a..811eddf91bf 100644
--- a/homeassistant/components/ipma/weather.py
+++ b/homeassistant/components/ipma/weather.py
@@ -1,7 +1,6 @@
 """Support for IPMA weather service."""
 from __future__ import annotations
 
-from datetime import timedelta
 import logging
 
 import async_timeout
@@ -10,21 +9,6 @@ from pyipma.forecast import Forecast
 from pyipma.location import Location
 
 from homeassistant.components.weather import (
-    ATTR_CONDITION_CLEAR_NIGHT,
-    ATTR_CONDITION_CLOUDY,
-    ATTR_CONDITION_EXCEPTIONAL,
-    ATTR_CONDITION_FOG,
-    ATTR_CONDITION_HAIL,
-    ATTR_CONDITION_LIGHTNING,
-    ATTR_CONDITION_LIGHTNING_RAINY,
-    ATTR_CONDITION_PARTLYCLOUDY,
-    ATTR_CONDITION_POURING,
-    ATTR_CONDITION_RAINY,
-    ATTR_CONDITION_SNOWY,
-    ATTR_CONDITION_SNOWY_RAINY,
-    ATTR_CONDITION_SUNNY,
-    ATTR_CONDITION_WINDY,
-    ATTR_CONDITION_WINDY_VARIANT,
     ATTR_FORECAST_CONDITION,
     ATTR_FORECAST_NATIVE_TEMP,
     ATTR_FORECAST_NATIVE_TEMP_LOW,
@@ -48,34 +32,18 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.sun import is_up
 from homeassistant.util import Throttle
 
-from .const import DATA_API, DATA_LOCATION, DOMAIN
+from .const import (
+    ATTRIBUTION,
+    CONDITION_CLASSES,
+    DATA_API,
+    DATA_LOCATION,
+    DOMAIN,
+    MIN_TIME_BETWEEN_UPDATES,
+)
+from .entity import IPMADevice
 
 _LOGGER = logging.getLogger(__name__)
 
-ATTRIBUTION = "Instituto Português do Mar e Atmosfera"
-
-MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=30)
-
-CONDITION_CLASSES = {
-    ATTR_CONDITION_CLOUDY: [4, 5, 24, 25, 27],
-    ATTR_CONDITION_FOG: [16, 17, 26],
-    ATTR_CONDITION_HAIL: [21, 22],
-    ATTR_CONDITION_LIGHTNING: [19],
-    ATTR_CONDITION_LIGHTNING_RAINY: [20, 23],
-    ATTR_CONDITION_PARTLYCLOUDY: [2, 3],
-    ATTR_CONDITION_POURING: [8, 11],
-    ATTR_CONDITION_RAINY: [6, 7, 9, 10, 12, 13, 14, 15],
-    ATTR_CONDITION_SNOWY: [18],
-    ATTR_CONDITION_SNOWY_RAINY: [],
-    ATTR_CONDITION_SUNNY: [1],
-    ATTR_CONDITION_WINDY: [],
-    ATTR_CONDITION_WINDY_VARIANT: [],
-    ATTR_CONDITION_EXCEPTIONAL: [],
-    ATTR_CONDITION_CLEAR_NIGHT: [-1],
-}
-
-FORECAST_MODE = ["hourly", "daily"]
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -110,7 +78,7 @@ async def async_setup_entry(
     async_add_entities([IPMAWeather(location, api, config_entry.data)], True)
 
 
-class IPMAWeather(WeatherEntity):
+class IPMAWeather(WeatherEntity, IPMADevice):
     """Representation of a weather condition."""
 
     _attr_native_pressure_unit = UnitOfPressure.HPA
@@ -121,13 +89,14 @@ class IPMAWeather(WeatherEntity):
 
     def __init__(self, location: Location, api: IPMA_API, config) -> None:
         """Initialise the platform with a data instance and station name."""
+        IPMADevice.__init__(self, location)
         self._api = api
-        self._location_name = config.get(CONF_NAME, location.name)
+        self._attr_name = config.get(CONF_NAME, location.name)
         self._mode = config.get(CONF_MODE)
         self._period = 1 if config.get(CONF_MODE) == "hourly" else 24
-        self._location = location
         self._observation = None
         self._forecast: list[Forecast] = []
+        self._attr_unique_id = f"{self._location.station_latitude}, {self._location.station_longitude}, {self._mode}"
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     async def async_update(self) -> None:
@@ -153,19 +122,6 @@ class IPMAWeather(WeatherEntity):
                 self._observation,
             )
 
-    @property
-    def unique_id(self) -> str:
-        """Return a unique id."""
-        return (
-            f"{self._location.station_latitude}, {self._location.station_longitude},"
-            f" {self._mode}"
-        )
-
-    @property
-    def name(self):
-        """Return the name of the station."""
-        return self._location_name
-
     def _condition_conversion(self, identifier, forecast_dt):
         """Convert from IPMA weather_type id to HA."""
         if identifier == 1 and not is_up(self.hass, forecast_dt):
diff --git a/homeassistant/components/ipp/manifest.json b/homeassistant/components/ipp/manifest.json
index e93f9832722..59b8b4b070e 100644
--- a/homeassistant/components/ipp/manifest.json
+++ b/homeassistant/components/ipp/manifest.json
@@ -8,6 +8,6 @@
   "iot_class": "local_polling",
   "loggers": ["deepmerge", "pyipp"],
   "quality_scale": "platinum",
-  "requirements": ["pyipp==0.13.0"],
+  "requirements": ["pyipp==0.14.0"],
   "zeroconf": ["_ipps._tcp.local.", "_ipp._tcp.local."]
 }
diff --git a/homeassistant/components/islamic_prayer_times/manifest.json b/homeassistant/components/islamic_prayer_times/manifest.json
index 7e68ba9b24d..c87cb2d28ac 100644
--- a/homeassistant/components/islamic_prayer_times/manifest.json
+++ b/homeassistant/components/islamic_prayer_times/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/islamic_prayer_times",
   "iot_class": "cloud_polling",
   "loggers": ["prayer_times_calculator"],
-  "requirements": ["prayer_times_calculator==0.0.6"]
+  "requirements": ["prayer-times-calculator==0.0.6"]
 }
diff --git a/homeassistant/components/isy994/const.py b/homeassistant/components/isy994/const.py
index 686ffdb72f3..70f0f49d7a1 100644
--- a/homeassistant/components/isy994/const.py
+++ b/homeassistant/components/isy994/const.py
@@ -15,15 +15,18 @@ from homeassistant.components.climate import (
     HVACMode,
 )
 from homeassistant.const import (
+    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_MILLION,
     CURRENCY_CENT,
     CURRENCY_DOLLAR,
     DEGREE,
     LIGHT_LUX,
     PERCENTAGE,
+    POWER_VOLT_AMPERE_REACTIVE,
     REVOLUTIONS_PER_MINUTE,
     SERVICE_LOCK,
     SERVICE_UNLOCK,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     STATE_CLOSED,
     STATE_CLOSING,
     STATE_LOCKED,
@@ -36,6 +39,7 @@ from homeassistant.const import (
     STATE_UNLOCKED,
     UV_INDEX,
     Platform,
+    UnitOfApparentPower,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
@@ -399,7 +403,7 @@ UOM_FRIENDLY_NAME = {
     "92": f"{DEGREE} South",
     UOM_8_BIT_RANGE: "",  # Range 0-255, no unit.
     UOM_DOUBLE_TEMP: UOM_DOUBLE_TEMP,
-    "102": "kWs",
+    "102": "kWs",  # Kilowatt Seconds
     "103": CURRENCY_DOLLAR,
     "104": CURRENCY_CENT,
     "105": UnitOfLength.INCHES,
@@ -417,6 +421,29 @@ UOM_FRIENDLY_NAME = {
     "118": UnitOfPressure.HPA,
     "119": UnitOfEnergy.WATT_HOUR,
     "120": UnitOfVolumetricFlux.INCHES_PER_DAY,
+    "122": CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,  # Microgram per cubic meter
+    "123": f"bq/{UnitOfVolume.CUBIC_METERS}",  # Becquerel per cubic meter
+    "124": f"pCi/{UnitOfVolume.LITERS}",  # Picocuries per liter
+    "125": "pH",
+    "126": "bpm",  # Beats per Minute
+    "127": UnitOfPressure.MMHG,
+    "128": "J",
+    "129": "BMI",  # Body Mass Index
+    "130": f"{UnitOfVolume.LITERS}/{UnitOfTime.HOURS}",
+    "131": SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+    "132": "bpm",  # Breaths per minute
+    "133": UnitOfFrequency.KILOHERTZ,
+    "134": f"{UnitOfLength.METERS}/{UnitOfTime.SECONDS}²",
+    "135": UnitOfApparentPower.VOLT_AMPERE,  # Volt-Amp
+    "136": POWER_VOLT_AMPERE_REACTIVE,  # VAR = Volt-Amp Reactive
+    "137": "",  # NTP DateTime - Number of seconds since 1900
+    "138": UnitOfPressure.PSI,
+    "139": DEGREE,  # Degree 0-360
+    "140": f"{UnitOfMass.MILLIGRAMS}/{UnitOfVolume.LITERS}",
+    "141": "N",  # Netwon
+    "142": f"{UnitOfVolume.GALLONS}/{UnitOfTime.SECONDS}",
+    "143": "gpm",  # Gallon per Minute
+    "144": "gph",  # Gallon per Hour
 }
 
 UOM_TO_STATES = {
diff --git a/homeassistant/components/isy994/select.py b/homeassistant/components/isy994/select.py
index d2b10ef7419..60e2111848d 100644
--- a/homeassistant/components/isy994/select.py
+++ b/homeassistant/components/isy994/select.py
@@ -76,10 +76,9 @@ async def async_setup_entry(
             options = RAMP_RATE_OPTIONS
         elif control == CMD_BACKLIGHT:
             options = BACKLIGHT_INDEX
-        else:
-            if uom := node.aux_properties[control].uom == UOM_INDEX:
-                if options_dict := UOM_TO_STATES.get(uom):
-                    options = list(options_dict.values())
+        elif uom := node.aux_properties[control].uom == UOM_INDEX:
+            if options_dict := UOM_TO_STATES.get(uom):
+                options = list(options_dict.values())
 
         description = SelectEntityDescription(
             key=f"{node.address}_{control}",
diff --git a/homeassistant/components/isy994/switch.py b/homeassistant/components/isy994/switch.py
index a150c052678..62ae375736d 100644
--- a/homeassistant/components/isy994/switch.py
+++ b/homeassistant/components/isy994/switch.py
@@ -1,6 +1,7 @@
 """Support for ISY switches."""
 from __future__ import annotations
 
+from dataclasses import dataclass
 from typing import Any
 
 from pyisy.constants import (
@@ -22,7 +23,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity import DeviceInfo, EntityDescription
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN
@@ -30,6 +31,15 @@ from .entity import ISYAuxControlEntity, ISYNodeEntity, ISYProgramEntity
 from .models import IsyData
 
 
+@dataclass
+class ISYSwitchEntityDescription(SwitchEntityDescription):
+    """Describes IST switch."""
+
+    # ISYEnableSwitchEntity does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
+
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
@@ -53,7 +63,7 @@ async def async_setup_entry(
     for node, control in isy_data.aux_properties[Platform.SWITCH]:
         # Currently only used for enable switches, will need to be updated for
         # NS support by making sure control == TAG_ENABLED
-        description = SwitchEntityDescription(
+        description = ISYSwitchEntityDescription(
             key=control,
             device_class=SwitchDeviceClass.SWITCH,
             name=control.title(),
@@ -135,7 +145,7 @@ class ISYEnableSwitchEntity(ISYAuxControlEntity, SwitchEntity):
         node: Node,
         control: str,
         unique_id: str,
-        description: EntityDescription,
+        description: ISYSwitchEntityDescription,
         device_info: DeviceInfo | None,
     ) -> None:
         """Initialize the ISY Aux Control Number entity."""
diff --git a/homeassistant/components/jellyfin/media_player.py b/homeassistant/components/jellyfin/media_player.py
index 2025e1a2a6c..bcd8e975823 100644
--- a/homeassistant/components/jellyfin/media_player.py
+++ b/homeassistant/components/jellyfin/media_player.py
@@ -90,6 +90,7 @@ class JellyfinMediaPlayer(JellyfinEntity, MediaPlayerEntity):
                 sw_version=self.app_version,
                 via_device=(DOMAIN, coordinator.server_id),
             )
+            self._attr_name = None
         else:
             self._attr_device_info = None
             self._attr_has_entity_name = False
diff --git a/homeassistant/components/jellyfin/media_source.py b/homeassistant/components/jellyfin/media_source.py
index b2e7e1468fd..f9c73443d00 100644
--- a/homeassistant/components/jellyfin/media_source.py
+++ b/homeassistant/components/jellyfin/media_source.py
@@ -189,7 +189,7 @@ class JellyfinSource(MediaSource):
     async def _build_artists(self, library_id: str) -> list[BrowseMediaSource]:
         """Return all artists in the music library."""
         artists = await self._get_children(library_id, ITEM_TYPE_ARTIST)
-        artists = sorted(artists, key=lambda k: k[ITEM_KEY_NAME])  # type: ignore[no-any-return]
+        artists = sorted(artists, key=lambda k: k[ITEM_KEY_NAME])
         return [await self._build_artist(artist, False) for artist in artists]
 
     async def _build_artist(
@@ -220,7 +220,7 @@ class JellyfinSource(MediaSource):
     async def _build_albums(self, parent_id: str) -> list[BrowseMediaSource]:
         """Return all albums of a single artist as browsable media sources."""
         albums = await self._get_children(parent_id, ITEM_TYPE_ALBUM)
-        albums = sorted(albums, key=lambda k: k[ITEM_KEY_NAME])  # type: ignore[no-any-return]
+        albums = sorted(albums, key=lambda k: k[ITEM_KEY_NAME])
         return [await self._build_album(album, False) for album in albums]
 
     async def _build_album(
@@ -310,7 +310,7 @@ class JellyfinSource(MediaSource):
     async def _build_movies(self, library_id: str) -> list[BrowseMediaSource]:
         """Return all movies in the movie library."""
         movies = await self._get_children(library_id, ITEM_TYPE_MOVIE)
-        movies = sorted(movies, key=lambda k: k[ITEM_KEY_NAME])  # type: ignore[no-any-return]
+        movies = sorted(movies, key=lambda k: k[ITEM_KEY_NAME])
         return [
             self._build_movie(movie)
             for movie in movies
@@ -363,7 +363,7 @@ class JellyfinSource(MediaSource):
     async def _build_tvshow(self, library_id: str) -> list[BrowseMediaSource]:
         """Return all series in the tv library."""
         series = await self._get_children(library_id, ITEM_TYPE_SERIES)
-        series = sorted(series, key=lambda k: k[ITEM_KEY_NAME])  # type: ignore[no-any-return]
+        series = sorted(series, key=lambda k: k[ITEM_KEY_NAME])
         return [await self._build_series(serie, False) for serie in series]
 
     async def _build_series(
@@ -394,7 +394,7 @@ class JellyfinSource(MediaSource):
     async def _build_seasons(self, series_id: str) -> list[BrowseMediaSource]:
         """Return all seasons in the series."""
         seasons = await self._get_children(series_id, ITEM_TYPE_SEASON)
-        seasons = sorted(seasons, key=lambda k: k[ITEM_KEY_NAME])  # type: ignore[no-any-return]
+        seasons = sorted(seasons, key=lambda k: k[ITEM_KEY_NAME])
         return [await self._build_season(season, False) for season in seasons]
 
     async def _build_season(
@@ -425,7 +425,7 @@ class JellyfinSource(MediaSource):
     async def _build_episodes(self, season_id: str) -> list[BrowseMediaSource]:
         """Return all episode in the season."""
         episodes = await self._get_children(season_id, ITEM_TYPE_EPISODE)
-        episodes = sorted(episodes, key=lambda k: k[ITEM_KEY_NAME])  # type: ignore[no-any-return]
+        episodes = sorted(episodes, key=lambda k: k[ITEM_KEY_NAME])
         return [
             self._build_episode(episode)
             for episode in episodes
diff --git a/homeassistant/components/jellyfin/sensor.py b/homeassistant/components/jellyfin/sensor.py
index 1957adfc6eb..cd0e9ab21a2 100644
--- a/homeassistant/components/jellyfin/sensor.py
+++ b/homeassistant/components/jellyfin/sensor.py
@@ -42,6 +42,7 @@ def _count_now_playing(data: JellyfinDataT) -> int:
 SENSOR_TYPES: dict[str, JellyfinSensorEntityDescription] = {
     "sessions": JellyfinSensorEntityDescription(
         key="watching",
+        name=None,
         icon="mdi:television-play",
         native_unit_of_measurement="Watching",
         value_fn=_count_now_playing,
diff --git a/homeassistant/components/jvc_projector/remote.py b/homeassistant/components/jvc_projector/remote.py
index e33eef74c48..45f797a5aaa 100644
--- a/homeassistant/components/jvc_projector/remote.py
+++ b/homeassistant/components/jvc_projector/remote.py
@@ -52,6 +52,8 @@ async def async_setup_entry(
 class JvcProjectorRemote(JvcProjectorEntity, RemoteEntity):
     """Representation of a JVC Projector device."""
 
+    _attr_name = None
+
     @property
     def is_on(self) -> bool:
         """Return True if entity is on."""
diff --git a/homeassistant/components/kaleidescape/entity.py b/homeassistant/components/kaleidescape/entity.py
index 9a5e62bca94..cab55c20c02 100644
--- a/homeassistant/components/kaleidescape/entity.py
+++ b/homeassistant/components/kaleidescape/entity.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, cast
 
 from homeassistant.core import callback
 from homeassistant.helpers.entity import DeviceInfo, Entity
@@ -28,7 +28,9 @@ class KaleidescapeEntity(Entity):
         self._attr_name = f"{KALEIDESCAPE_NAME} {device.system.friendly_name}"
         self._attr_device_info = DeviceInfo(
             identifiers={(KALEIDESCAPE_DOMAIN, self._device.serial_number)},
-            name=self.name,
+            # Instead of setting the device name to the entity name, kaleidescape
+            # should be updated to set has_entity_name = True
+            name=cast(str | None, self.name),
             model=self._device.system.type,
             manufacturer=KALEIDESCAPE_NAME,
             sw_version=f"{self._device.system.kos_version}",
diff --git a/homeassistant/components/keenetic_ndms2/manifest.json b/homeassistant/components/keenetic_ndms2/manifest.json
index 41a1d0f2a2f..0751b40acd2 100644
--- a/homeassistant/components/keenetic_ndms2/manifest.json
+++ b/homeassistant/components/keenetic_ndms2/manifest.json
@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/keenetic_ndms2",
   "iot_class": "local_polling",
   "loggers": ["ndms2_client"],
-  "requirements": ["ndms2_client==0.1.2"],
+  "requirements": ["ndms2-client==0.1.2"],
   "ssdp": [
     {
       "deviceType": "urn:schemas-upnp-org:device:InternetGatewayDevice:1",
diff --git a/homeassistant/components/keyboard_remote/__init__.py b/homeassistant/components/keyboard_remote/__init__.py
index e3d280c2944..df3b6f0e427 100644
--- a/homeassistant/components/keyboard_remote/__init__.py
+++ b/homeassistant/components/keyboard_remote/__init__.py
@@ -203,22 +203,29 @@ class KeyboardRemote:
         try:
             async for event in self.inotify:
                 descriptor = f"{DEVINPUT}/{event.name}"
-                _LOGGER.debug("got events for %s: %s", descriptor, event.mask)
+                _LOGGER.debug(
+                    "got event for %s: %s",
+                    descriptor,
+                    event.mask,
+                )
 
                 descriptor_active = descriptor in self.active_handlers_by_descriptor
 
                 if (event.mask & Mask.DELETE) and descriptor_active:
+                    _LOGGER.debug("removing: %s", descriptor)
                     handler = self.active_handlers_by_descriptor[descriptor]
                     del self.active_handlers_by_descriptor[descriptor]
                     await handler.async_device_stop_monitoring()
                 elif (
                     (event.mask & Mask.CREATE) or (event.mask & Mask.ATTRIB)
                 ) and not descriptor_active:
+                    _LOGGER.debug("checking new: %s", descriptor)
                     dev, handler = await self.hass.async_add_executor_job(
                         self.get_device_handler, descriptor
                     )
                     if handler is None:
                         continue
+                    _LOGGER.debug("adding: %s", descriptor)
                     self.active_handlers_by_descriptor[descriptor] = handler
                     await handler.async_device_start_monitoring(dev)
         except asyncio.CancelledError:
@@ -244,8 +251,10 @@ class KeyboardRemote:
             self.emulate_key_hold_repeat = dev_block[EMULATE_KEY_HOLD_REPEAT]
             self.monitor_task = None
             self.dev = None
+            self.config_descriptor = dev_block.get(DEVICE_DESCRIPTOR)
+            self.descriptor = None
 
-        async def async_device_keyrepeat(self, path, name, code, delay, repeat):
+        async def async_device_keyrepeat(self, code, delay, repeat):
             """Emulate keyboard delay/repeat behaviour by sending key events on a timer."""
 
             await asyncio.sleep(delay)
@@ -255,8 +264,8 @@ class KeyboardRemote:
                     {
                         KEY_CODE: code,
                         TYPE: "key_hold",
-                        DEVICE_DESCRIPTOR: path,
-                        DEVICE_NAME: name,
+                        DEVICE_DESCRIPTOR: self.descriptor,
+                        DEVICE_NAME: self.dev.name,
                     },
                 )
                 await asyncio.sleep(repeat)
@@ -266,12 +275,21 @@ class KeyboardRemote:
             _LOGGER.debug("Keyboard async_device_start_monitoring, %s", dev.name)
             if self.monitor_task is None:
                 self.dev = dev
+                # set the descriptor to the one provided to the config if any, falling back to the device path if not set
+                if self.config_descriptor:
+                    self.descriptor = self.config_descriptor
+                else:
+                    self.descriptor = self.dev.path
+
                 self.monitor_task = self.hass.async_create_task(
-                    self.async_monitor_input(dev)
+                    self.async_device_monitor_input()
                 )
                 self.hass.bus.async_fire(
                     KEYBOARD_REMOTE_CONNECTED,
-                    {DEVICE_DESCRIPTOR: dev.path, DEVICE_NAME: dev.name},
+                    {
+                        DEVICE_DESCRIPTOR: self.descriptor,
+                        DEVICE_NAME: dev.name,
+                    },
                 )
                 _LOGGER.debug("Keyboard (re-)connected, %s", dev.name)
 
@@ -291,12 +309,16 @@ class KeyboardRemote:
                 self.monitor_task = None
                 self.hass.bus.async_fire(
                     KEYBOARD_REMOTE_DISCONNECTED,
-                    {DEVICE_DESCRIPTOR: self.dev.path, DEVICE_NAME: self.dev.name},
+                    {
+                        DEVICE_DESCRIPTOR: self.descriptor,
+                        DEVICE_NAME: self.dev.name,
+                    },
                 )
                 _LOGGER.debug("Keyboard disconnected, %s", self.dev.name)
                 self.dev = None
+                self.descriptor = self.config_descriptor
 
-        async def async_monitor_input(self, dev):
+        async def async_device_monitor_input(self):
             """Event monitoring loop.
 
             Monitor one device for new events using evdev with asyncio,
@@ -307,19 +329,22 @@ class KeyboardRemote:
 
             try:
                 _LOGGER.debug("Start device monitoring")
-                await self.hass.async_add_executor_job(dev.grab)
-                async for event in dev.async_read_loop():
+                await self.hass.async_add_executor_job(self.dev.grab)
+                async for event in self.dev.async_read_loop():
                     # pylint: disable=no-member
                     if event.type is ecodes.EV_KEY:
                         if event.value in self.key_values:
-                            _LOGGER.debug(categorize(event))
+                            _LOGGER.debug(
+                                "device: %s: %s", self.dev.name, categorize(event)
+                            )
+
                             self.hass.bus.async_fire(
                                 KEYBOARD_REMOTE_COMMAND_RECEIVED,
                                 {
                                     KEY_CODE: event.code,
                                     TYPE: KEY_VALUE_NAME[event.value],
-                                    DEVICE_DESCRIPTOR: dev.path,
-                                    DEVICE_NAME: dev.name,
+                                    DEVICE_DESCRIPTOR: self.descriptor,
+                                    DEVICE_NAME: self.dev.name,
                                 },
                             )
 
@@ -329,8 +354,6 @@ class KeyboardRemote:
                         ):
                             repeat_tasks[event.code] = self.hass.async_create_task(
                                 self.async_device_keyrepeat(
-                                    dev.path,
-                                    dev.name,
                                     event.code,
                                     self.emulate_key_hold_delay,
                                     self.emulate_key_hold_repeat,
diff --git a/homeassistant/components/keyboard_remote/manifest.json b/homeassistant/components/keyboard_remote/manifest.json
index 2b298901ca9..bb84b32defc 100644
--- a/homeassistant/components/keyboard_remote/manifest.json
+++ b/homeassistant/components/keyboard_remote/manifest.json
@@ -3,6 +3,7 @@
   "name": "Keyboard Remote",
   "codeowners": ["@bendavid", "@lanrat"],
   "documentation": "https://www.home-assistant.io/integrations/keyboard_remote",
+  "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["aionotify", "evdev"],
   "requirements": ["evdev==1.6.1", "asyncinotify==4.0.2"]
diff --git a/homeassistant/components/kitchen_sink/__init__.py b/homeassistant/components/kitchen_sink/__init__.py
index 39143c8b84b..7857e6b3149 100644
--- a/homeassistant/components/kitchen_sink/__init__.py
+++ b/homeassistant/components/kitchen_sink/__init__.py
@@ -26,7 +26,7 @@ import homeassistant.util.dt as dt_util
 DOMAIN = "kitchen_sink"
 
 
-COMPONENTS_WITH_DEMO_PLATFORM = [Platform.SENSOR, Platform.LOCK]
+COMPONENTS_WITH_DEMO_PLATFORM = [Platform.SENSOR, Platform.LOCK, Platform.IMAGE]
 
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
diff --git a/homeassistant/components/kitchen_sink/image.py b/homeassistant/components/kitchen_sink/image.py
new file mode 100644
index 00000000000..4fe20f08de9
--- /dev/null
+++ b/homeassistant/components/kitchen_sink/image.py
@@ -0,0 +1,68 @@
+"""Demo image platform."""
+from __future__ import annotations
+
+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.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util import dt as dt_util
+
+
+async def async_setup_platform(
+    hass: HomeAssistant,
+    config: ConfigType,
+    async_add_entities: AddEntitiesCallback,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> None:
+    """Set up image entities."""
+    async_add_entities(
+        [
+            DemoImage(
+                hass,
+                "kitchen_sink_image_001",
+                "QR Code",
+                "image/png",
+                "qr_code.png",
+            ),
+        ]
+    )
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the Everything but the Kitchen Sink config entry."""
+    await async_setup_platform(hass, {}, async_add_entities)
+
+
+class DemoImage(ImageEntity):
+    """Representation of an image entity."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        unique_id: str,
+        name: str,
+        content_type: str,
+        image: str,
+    ) -> None:
+        """Initialize the image entity."""
+        super().__init__(hass)
+        self._attr_content_type = content_type
+        self._attr_name = name
+        self._attr_unique_id = unique_id
+        self._image_filename = image
+
+    async def async_added_to_hass(self):
+        """Set the update time."""
+        self._attr_image_last_updated = dt_util.utcnow()
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+        image_path = Path(__file__).parent / self._image_filename
+        return await self.hass.async_add_executor_job(image_path.read_bytes)
diff --git a/homeassistant/components/kitchen_sink/lock.py b/homeassistant/components/kitchen_sink/lock.py
index 343190acb63..b25941cf1a3 100644
--- a/homeassistant/components/kitchen_sink/lock.py
+++ b/homeassistant/components/kitchen_sink/lock.py
@@ -5,7 +5,7 @@ from typing import Any
 
 from homeassistant.components.lock import LockEntity, LockEntityFeature
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_LOCKED, STATE_UNLOCKED, STATE_UNLOCKING
+from homeassistant.const import STATE_LOCKED, STATE_UNLOCKED
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -17,7 +17,7 @@ async def async_setup_platform(
     async_add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo sensors."""
+    """Set up the Demo locks."""
     async_add_entities(
         [
             DemoLock(
@@ -70,6 +70,8 @@ class DemoLock(LockEntity):
         self._attr_unique_id = unique_id
         self._attr_supported_features = features
         self._state = state
+        self._attr_is_locking = False
+        self._attr_is_unlocking = False
 
     @property
     def is_locked(self) -> bool:
@@ -78,12 +80,18 @@ class DemoLock(LockEntity):
 
     async def async_lock(self, **kwargs: Any) -> None:
         """Lock the device."""
+        self._attr_is_locking = True
+        self.async_write_ha_state()
+        self._attr_is_locking = False
         self._state = STATE_LOCKED
         self.async_write_ha_state()
 
     async def async_unlock(self, **kwargs: Any) -> None:
         """Unlock the device."""
-        self._state = STATE_UNLOCKING
+        self._attr_is_unlocking = True
+        self.async_write_ha_state()
+        self._attr_is_unlocking = False
+        self._state = STATE_UNLOCKED
         self.async_write_ha_state()
 
     async def async_open(self, **kwargs: Any) -> None:
diff --git a/homeassistant/components/kitchen_sink/qr_code.png b/homeassistant/components/kitchen_sink/qr_code.png
new file mode 100644
index 00000000000..d8350728b63
Binary files /dev/null and b/homeassistant/components/kitchen_sink/qr_code.png differ
diff --git a/homeassistant/components/kitchen_sink/sensor.py b/homeassistant/components/kitchen_sink/sensor.py
index 6692f53810b..6912c940482 100644
--- a/homeassistant/components/kitchen_sink/sensor.py
+++ b/homeassistant/components/kitchen_sink/sensor.py
@@ -7,7 +7,7 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_BATTERY_LEVEL, UnitOfPower
+from homeassistant.const import UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -31,7 +31,6 @@ async def async_setup_entry(
                 None,
                 SensorStateClass.MEASUREMENT,
                 UnitOfPower.WATT,  # Not a volume unit
-                None,
             ),
             DemoSensor(
                 "statistics_issue_2",
@@ -40,7 +39,6 @@ async def async_setup_entry(
                 None,
                 SensorStateClass.MEASUREMENT,
                 "dogs",  # Can't be converted to cats
-                None,
             ),
             DemoSensor(
                 "statistics_issue_3",
@@ -49,7 +47,6 @@ async def async_setup_entry(
                 None,
                 None,  # Wrong state class
                 UnitOfPower.WATT,
-                None,
             ),
         ]
     )
@@ -68,9 +65,6 @@ class DemoSensor(SensorEntity):
         device_class: SensorDeviceClass | None,
         state_class: SensorStateClass | None,
         unit_of_measurement: str | None,
-        battery: StateType,
-        options: list[str] | None = None,
-        translation_key: str | None = None,
     ) -> None:
         """Initialize the sensor."""
         self._attr_device_class = device_class
@@ -79,13 +73,8 @@ class DemoSensor(SensorEntity):
         self._attr_native_value = state
         self._attr_state_class = state_class
         self._attr_unique_id = unique_id
-        self._attr_options = options
-        self._attr_translation_key = translation_key
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
             name=name,
         )
-
-        if battery:
-            self._attr_extra_state_attributes = {ATTR_BATTERY_LEVEL: battery}
diff --git a/homeassistant/components/knx/__init__.py b/homeassistant/components/knx/__init__.py
index 8a8e87b893f..e8c237114b5 100644
--- a/homeassistant/components/knx/__init__.py
+++ b/homeassistant/components/knx/__init__.py
@@ -30,6 +30,7 @@ from homeassistant.const import (
     CONF_PORT,
     CONF_TYPE,
     EVENT_HOMEASSISTANT_STOP,
+    SERVICE_RELOAD,
     Platform,
 )
 from homeassistant.core import Event, HomeAssistant, ServiceCall
@@ -90,6 +91,7 @@ from .schema import (
     SensorSchema,
     SwitchSchema,
     TextSchema,
+    TimeSchema,
     WeatherSchema,
     ga_validator,
     sensor_type_validator,
@@ -143,6 +145,7 @@ CONFIG_SCHEMA = vol.Schema(
                     **SensorSchema.platform_node(),
                     **SwitchSchema.platform_node(),
                     **TextSchema.platform_node(),
+                    **TimeSchema.platform_node(),
                     **WeatherSchema.platform_node(),
                 }
             ),
@@ -310,6 +313,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         schema=SERVICE_KNX_EXPOSURE_REGISTER_SCHEMA,
     )
 
+    async def _reload_integration(call: ServiceCall) -> None:
+        """Reload the integration."""
+        await hass.config_entries.async_reload(entry.entry_id)
+        hass.bus.async_fire(f"event_{DOMAIN}_reloaded", context=call.context)
+
+    async_register_admin_service(hass, DOMAIN, SERVICE_RELOAD, _reload_integration)
+
     await register_panel(hass)
 
     return True
@@ -683,6 +693,7 @@ class KNXModule:
                 payload=GroupValueResponse(payload)
                 if attr_response
                 else GroupValueWrite(payload),
+                source_address=self.xknx.current_address,
             )
             await self.xknx.telegrams.put(telegram)
 
@@ -692,5 +703,6 @@ class KNXModule:
             telegram = Telegram(
                 destination_address=parse_device_group_address(address),
                 payload=GroupValueRead(),
+                source_address=self.xknx.current_address,
             )
             await self.xknx.telegrams.put(telegram)
diff --git a/homeassistant/components/knx/const.py b/homeassistant/components/knx/const.py
index 5546a2d6fd9..a9f5341fbfd 100644
--- a/homeassistant/components/knx/const.py
+++ b/homeassistant/components/knx/const.py
@@ -114,24 +114,11 @@ class KNXConfigEntryData(TypedDict, total=False):
     telegram_log_size: int  # not required
 
 
-class KNXBusMonitorMessage(TypedDict):
-    """KNX bus monitor message."""
-
-    destination_address: str
-    destination_text: str | None
-    payload: str
-    type: str
-    value: str | None
-    source_address: str
-    source_text: str | None
-    direction: str
-    timestamp: str
-
-
 class ColorTempModes(Enum):
     """Color temperature modes for config validation."""
 
     ABSOLUTE = "DPT-7.600"
+    ABSOLUTE_FLOAT = "DPT-9"
     RELATIVE = "DPT-5.001"
 
 
@@ -149,6 +136,7 @@ SUPPORTED_PLATFORMS: Final = [
     Platform.SENSOR,
     Platform.SWITCH,
     Platform.TEXT,
+    Platform.TIME,
     Platform.WEATHER,
 ]
 
diff --git a/homeassistant/components/knx/light.py b/homeassistant/components/knx/light.py
index f5ef8f61b84..07747f094c3 100644
--- a/homeassistant/components/knx/light.py
+++ b/homeassistant/components/knx/light.py
@@ -4,7 +4,11 @@ from __future__ import annotations
 from typing import Any, cast
 
 from xknx import XKNX
-from xknx.devices.light import Light as XknxLight, XYYColor
+from xknx.devices.light import (
+    ColorTemperatureType,
+    Light as XknxLight,
+    XYYColor,
+)
 
 from homeassistant import config_entries
 from homeassistant.components.light import (
@@ -56,16 +60,20 @@ def _create_light(xknx: XKNX, config: ConfigType) -> XknxLight:
     group_address_tunable_white_state = None
     group_address_color_temp = None
     group_address_color_temp_state = None
-    if config[LightSchema.CONF_COLOR_TEMP_MODE] == ColorTempModes.ABSOLUTE:
-        group_address_color_temp = config.get(LightSchema.CONF_COLOR_TEMP_ADDRESS)
-        group_address_color_temp_state = config.get(
-            LightSchema.CONF_COLOR_TEMP_STATE_ADDRESS
-        )
-    elif config[LightSchema.CONF_COLOR_TEMP_MODE] == ColorTempModes.RELATIVE:
+    color_temperature_type = ColorTemperatureType.UINT_2_BYTE
+    if config[LightSchema.CONF_COLOR_TEMP_MODE] == ColorTempModes.RELATIVE:
         group_address_tunable_white = config.get(LightSchema.CONF_COLOR_TEMP_ADDRESS)
         group_address_tunable_white_state = config.get(
             LightSchema.CONF_COLOR_TEMP_STATE_ADDRESS
         )
+    else:
+        # absolute uint or float
+        group_address_color_temp = config.get(LightSchema.CONF_COLOR_TEMP_ADDRESS)
+        group_address_color_temp_state = config.get(
+            LightSchema.CONF_COLOR_TEMP_STATE_ADDRESS
+        )
+        if config[LightSchema.CONF_COLOR_TEMP_MODE] == ColorTempModes.ABSOLUTE_FLOAT:
+            color_temperature_type = ColorTemperatureType.FLOAT_2_BYTE
 
     return XknxLight(
         xknx,
@@ -140,6 +148,7 @@ def _create_light(xknx: XKNX, config: ConfigType) -> XknxLight:
         group_address_brightness_white_state=individual_color_addresses(
             LightSchema.CONF_WHITE, LightSchema.CONF_BRIGHTNESS_STATE_ADDRESS
         ),
+        color_temperature_type=color_temperature_type,
         min_kelvin=config[LightSchema.CONF_MIN_KELVIN],
         max_kelvin=config[LightSchema.CONF_MAX_KELVIN],
     )
@@ -239,7 +248,7 @@ class KNXLight(KnxEntity, LightEntity):
         """Return the color temperature in Kelvin."""
         if self._device.supports_color_temperature:
             if kelvin := self._device.current_color_temperature:
-                return kelvin
+                return int(kelvin)
         if self._device.supports_tunable_white:
             relative_ct = self._device.current_tunable_white
             if relative_ct is not None:
diff --git a/homeassistant/components/knx/manifest.json b/homeassistant/components/knx/manifest.json
index 1f0a6d3cc5e..30e239a65a9 100644
--- a/homeassistant/components/knx/manifest.json
+++ b/homeassistant/components/knx/manifest.json
@@ -11,8 +11,8 @@
   "loggers": ["xknx", "xknxproject"],
   "quality_scale": "platinum",
   "requirements": [
-    "xknx==2.10.0",
-    "xknxproject==3.1.1",
-    "knx-frontend==2023.6.9.195839"
+    "xknx==2.11.1",
+    "xknxproject==3.2.0",
+    "knx-frontend==2023.6.23.191712"
   ]
 }
diff --git a/homeassistant/components/knx/schema.py b/homeassistant/components/knx/schema.py
index 0f627b724cb..86bf790a077 100644
--- a/homeassistant/components/knx/schema.py
+++ b/homeassistant/components/knx/schema.py
@@ -936,6 +936,25 @@ class TextSchema(KNXPlatformSchema):
     )
 
 
+class TimeSchema(KNXPlatformSchema):
+    """Voluptuous schema for KNX time."""
+
+    PLATFORM = Platform.TIME
+
+    DEFAULT_NAME = "KNX Time"
+
+    ENTITY_SCHEMA = vol.Schema(
+        {
+            vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+            vol.Optional(CONF_RESPOND_TO_READ, default=False): cv.boolean,
+            vol.Optional(CONF_SYNC_STATE, default=True): sync_state_validator,
+            vol.Required(KNX_ADDRESS): ga_list_validator,
+            vol.Optional(CONF_STATE_ADDRESS): ga_list_validator,
+            vol.Optional(CONF_ENTITY_CATEGORY): ENTITY_CATEGORIES_SCHEMA,
+        }
+    )
+
+
 class WeatherSchema(KNXPlatformSchema):
     """Voluptuous schema for KNX weather station."""
 
diff --git a/homeassistant/components/knx/sensor.py b/homeassistant/components/knx/sensor.py
index ea5ba2f63a6..4400c304193 100644
--- a/homeassistant/components/knx/sensor.py
+++ b/homeassistant/components/knx/sensor.py
@@ -71,7 +71,7 @@ SYSTEM_ENTITY_DESCRIPTIONS = (
         device_class=SensorDeviceClass.ENUM,
         options=[opt.value for opt in XknxConnectionType],
         should_poll=False,
-        value_fn=lambda knx: knx.xknx.connection_manager.connection_type.value,  # type: ignore[no-any-return]
+        value_fn=lambda knx: knx.xknx.connection_manager.connection_type.value,
     ),
     KNXSystemEntityDescription(
         key="telegrams_incoming",
diff --git a/homeassistant/components/knx/services.yaml b/homeassistant/components/knx/services.yaml
index d95a1573872..0ad497a30a2 100644
--- a/homeassistant/components/knx/services.yaml
+++ b/homeassistant/components/knx/services.yaml
@@ -106,3 +106,6 @@ exposure_register:
       default: false
       selector:
         boolean:
+reload:
+  name: Reload
+  description: Reload the KNX integration.
diff --git a/homeassistant/components/knx/telegrams.py b/homeassistant/components/knx/telegrams.py
index 5b429b0bdc1..09307794066 100644
--- a/homeassistant/components/knx/telegrams.py
+++ b/homeassistant/components/knx/telegrams.py
@@ -20,9 +20,13 @@ from .project import KNXProject
 class TelegramDict(TypedDict):
     """Represent a Telegram as a dict."""
 
+    # this has to be in sync with the frontend implementation
     destination: str
     destination_name: str
     direction: str
+    dpt_main: int | None
+    dpt_sub: int | None
+    dpt_name: str | None
     payload: int | tuple[int, ...] | None
     source: str
     source_name: str
@@ -57,7 +61,7 @@ class Telegrams:
     async def _xknx_telegram_cb(self, telegram: Telegram) -> None:
         """Handle incoming and outgoing telegrams from xknx."""
         telegram_dict = self.telegram_to_dict(telegram)
-        self.recent_telegrams.appendleft(telegram_dict)
+        self.recent_telegrams.append(telegram_dict)
         for job in self._jobs:
             self.hass.async_run_hass_job(job, telegram_dict)
 
@@ -80,6 +84,9 @@ class Telegrams:
     def telegram_to_dict(self, telegram: Telegram) -> TelegramDict:
         """Convert a Telegram to a dict."""
         dst_name = ""
+        dpt_main = None
+        dpt_sub = None
+        dpt_name = None
         payload_data: int | tuple[int, ...] | None = None
         src_name = ""
         transcoder = None
@@ -104,6 +111,9 @@ class Telegrams:
             if transcoder is not None:
                 try:
                     value = transcoder.from_knx(telegram.payload.value)
+                    dpt_main = transcoder.dpt_main_number
+                    dpt_sub = transcoder.dpt_sub_number
+                    dpt_name = transcoder.value_type
                     unit = transcoder.unit
                 except XKNXException:
                     value = "Error decoding value"
@@ -112,6 +122,9 @@ class Telegrams:
             destination=f"{telegram.destination_address}",
             destination_name=dst_name,
             direction=telegram.direction.value,
+            dpt_main=dpt_main,
+            dpt_sub=dpt_sub,
+            dpt_name=dpt_name,
             payload=payload_data,
             source=f"{telegram.source_address}",
             source_name=src_name,
diff --git a/homeassistant/components/knx/time.py b/homeassistant/components/knx/time.py
new file mode 100644
index 00000000000..af8ee48b806
--- /dev/null
+++ b/homeassistant/components/knx/time.py
@@ -0,0 +1,104 @@
+"""Support for KNX/IP time."""
+from __future__ import annotations
+
+from datetime import time as dt_time
+import time as time_time
+from typing import Final
+
+from xknx import XKNX
+from xknx.devices import DateTime as XknxDateTime
+
+from homeassistant import config_entries
+from homeassistant.components.time import TimeEntity
+from homeassistant.const import (
+    CONF_ENTITY_CATEGORY,
+    CONF_NAME,
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
+    Platform,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.restore_state import RestoreEntity
+from homeassistant.helpers.typing import ConfigType
+
+from .const import (
+    CONF_RESPOND_TO_READ,
+    CONF_STATE_ADDRESS,
+    CONF_SYNC_STATE,
+    DATA_KNX_CONFIG,
+    DOMAIN,
+    KNX_ADDRESS,
+)
+from .knx_entity import KnxEntity
+
+_TIME_TRANSLATION_FORMAT: Final = "%H:%M:%S"
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: config_entries.ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up entities for KNX platform."""
+    xknx: XKNX = hass.data[DOMAIN].xknx
+    config: list[ConfigType] = hass.data[DATA_KNX_CONFIG][Platform.TIME]
+
+    async_add_entities(KNXTime(xknx, entity_config) for entity_config in config)
+
+
+def _create_xknx_device(xknx: XKNX, config: ConfigType) -> XknxDateTime:
+    """Return a XKNX DateTime object to be used within XKNX."""
+    return XknxDateTime(
+        xknx,
+        name=config[CONF_NAME],
+        broadcast_type="TIME",
+        localtime=False,
+        group_address=config[KNX_ADDRESS],
+        group_address_state=config.get(CONF_STATE_ADDRESS),
+        respond_to_read=config[CONF_RESPOND_TO_READ],
+        sync_state=config[CONF_SYNC_STATE],
+    )
+
+
+class KNXTime(KnxEntity, TimeEntity, RestoreEntity):
+    """Representation of a KNX time."""
+
+    _device: XknxDateTime
+
+    def __init__(self, xknx: XKNX, config: ConfigType) -> None:
+        """Initialize a KNX time."""
+        super().__init__(_create_xknx_device(xknx, config))
+        self._attr_entity_category = config.get(CONF_ENTITY_CATEGORY)
+        self._attr_unique_id = str(self._device.remote_value.group_address)
+
+    async def async_added_to_hass(self) -> None:
+        """Restore last state."""
+        await super().async_added_to_hass()
+        if (
+            not self._device.remote_value.readable
+            and (last_state := await self.async_get_last_state()) is not None
+            and last_state.state not in (STATE_UNKNOWN, STATE_UNAVAILABLE)
+        ):
+            self._device.remote_value.value = time_time.strptime(
+                last_state.state, _TIME_TRANSLATION_FORMAT
+            )
+
+    @property
+    def native_value(self) -> dt_time | None:
+        """Return the latest value."""
+        if (time_struct := self._device.remote_value.value) is None:
+            return None
+        return dt_time(
+            hour=time_struct.tm_hour,
+            minute=time_struct.tm_min,
+            second=min(time_struct.tm_sec, 59),  # account for leap seconds
+        )
+
+    async def async_set_value(self, value: dt_time) -> None:
+        """Change the value."""
+        time_struct = time_time.strptime(
+            value.strftime(_TIME_TRANSLATION_FORMAT),
+            _TIME_TRANSLATION_FORMAT,
+        )
+        await self._device.set(time_struct)
diff --git a/homeassistant/components/knx/websocket.py b/homeassistant/components/knx/websocket.py
index a9da5036857..ad29fd19928 100644
--- a/homeassistant/components/knx/websocket.py
+++ b/homeassistant/components/knx/websocket.py
@@ -3,15 +3,14 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Final
 
-from knx_frontend import entrypoint_js, is_dev_build, locate_dir
+import knx_frontend as knx_panel
 import voluptuous as vol
-from xknx.telegram import TelegramDirection
 from xknxproject.exceptions import XknxProjectException
 
 from homeassistant.components import panel_custom, websocket_api
 from homeassistant.core import HomeAssistant, callback
 
-from .const import DOMAIN, KNXBusMonitorMessage
+from .const import DOMAIN
 from .telegrams import TelegramDict
 
 if TYPE_CHECKING:
@@ -30,19 +29,18 @@ async def register_panel(hass: HomeAssistant) -> None:
     websocket_api.async_register_command(hass, ws_subscribe_telegram)
 
     if DOMAIN not in hass.data.get("frontend_panels", {}):
-        path = locate_dir()
         hass.http.register_static_path(
             URL_BASE,
-            path,
-            cache_headers=not is_dev_build,
+            path=knx_panel.locate_dir(),
+            cache_headers=knx_panel.is_prod_build,
         )
         await panel_custom.async_register_panel(
             hass=hass,
             frontend_url_path=DOMAIN,
-            webcomponent_name="knx-frontend",
+            webcomponent_name=knx_panel.webcomponent_name,
             sidebar_title=DOMAIN.upper(),
             sidebar_icon="mdi:bus-electric",
-            module_url=f"{URL_BASE}/{entrypoint_js()}",
+            module_url=f"{URL_BASE}/{knx_panel.entrypoint_js}",
             embed_iframe=True,
             require_admin=True,
         )
@@ -145,10 +143,7 @@ def ws_group_monitor_info(
 ) -> None:
     """Handle get info command of group monitor."""
     knx: KNXModule = hass.data[DOMAIN]
-    recent_telegrams = [
-        _telegram_dict_to_group_monitor(telegram)
-        for telegram in knx.telegrams.recent_telegrams
-    ]
+    recent_telegrams = [*knx.telegrams.recent_telegrams]
     connection.send_result(
         msg["id"],
         {
@@ -178,7 +173,7 @@ def ws_subscribe_telegram(
         """Forward telegram to websocket subscription."""
         connection.send_event(
             msg["id"],
-            _telegram_dict_to_group_monitor(telegram),
+            telegram,
         )
 
     connection.subscriptions[msg["id"]] = knx.telegrams.async_listen_telegram(
@@ -186,38 +181,3 @@ def ws_subscribe_telegram(
         name="KNX GroupMonitor subscription",
     )
     connection.send_result(msg["id"])
-
-
-def _telegram_dict_to_group_monitor(telegram: TelegramDict) -> KNXBusMonitorMessage:
-    """Convert a TelegramDict to a KNXBusMonitorMessage object."""
-    direction = (
-        "group_monitor_incoming"
-        if telegram["direction"] == TelegramDirection.INCOMING.value
-        else "group_monitor_outgoing"
-    )
-
-    _payload = telegram["payload"]
-    if isinstance(_payload, tuple):
-        payload = f"0x{bytes(_payload).hex()}"
-    elif isinstance(_payload, int):
-        payload = f"{_payload:d}"
-    else:
-        payload = ""
-
-    timestamp = telegram["timestamp"].strftime("%H:%M:%S.%f")[:-3]
-
-    if (value := telegram["value"]) is not None:
-        unit = telegram["unit"]
-        value = f"{value}{' ' + unit if unit else ''}"
-
-    return KNXBusMonitorMessage(
-        destination_address=telegram["destination"],
-        destination_text=telegram["destination_name"],
-        direction=direction,
-        payload=payload,
-        source_address=telegram["source"],
-        source_text=telegram["source_name"],
-        timestamp=timestamp,
-        type=telegram["telegramtype"],
-        value=value,
-    )
diff --git a/homeassistant/components/kodi/device_trigger.py b/homeassistant/components/kodi/device_trigger.py
index c15c415bd9c..3f931d1e264 100644
--- a/homeassistant/components/kodi/device_trigger.py
+++ b/homeassistant/components/kodi/device_trigger.py
@@ -23,7 +23,7 @@ TRIGGER_TYPES = {"turn_on", "turn_off"}
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
     }
 )
@@ -44,7 +44,7 @@ async def async_get_triggers(
                     CONF_PLATFORM: "device",
                     CONF_DEVICE_ID: device_id,
                     CONF_DOMAIN: DOMAIN,
-                    CONF_ENTITY_ID: entry.entity_id,
+                    CONF_ENTITY_ID: entry.id,
                     CONF_TYPE: "turn_on",
                 }
             )
@@ -53,7 +53,7 @@ async def async_get_triggers(
                     CONF_PLATFORM: "device",
                     CONF_DEVICE_ID: device_id,
                     CONF_DOMAIN: DOMAIN,
-                    CONF_ENTITY_ID: entry.entity_id,
+                    CONF_ENTITY_ID: entry.id,
                     CONF_TYPE: "turn_off",
                 }
             )
@@ -69,15 +69,24 @@ def _attach_trigger(
     event_type,
     trigger_info: TriggerInfo,
 ):
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
     trigger_data = trigger_info["trigger_data"]
     job = HassJob(action)
 
     @callback
     def _handle_event(event: Event):
-        if event.data[ATTR_ENTITY_ID] == config[CONF_ENTITY_ID]:
+        if event.data[ATTR_ENTITY_ID] == entity_id:
             hass.async_run_hass_job(
                 job,
-                {"trigger": {**trigger_data, **config, "description": event_type}},
+                {
+                    "trigger": {
+                        **trigger_data,
+                        **config,
+                        "description": event_type,
+                        "entity_id": entity_id,
+                    }
+                },
                 event.context,
             )
 
diff --git a/homeassistant/components/kodi/media_player.py b/homeassistant/components/kodi/media_player.py
index 86788db6ae6..af4e5700805 100644
--- a/homeassistant/components/kodi/media_player.py
+++ b/homeassistant/components/kodi/media_player.py
@@ -259,6 +259,8 @@ def cmd(
 class KodiEntity(MediaPlayerEntity):
     """Representation of a XBMC/Kodi device."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_supported_features = (
         MediaPlayerEntityFeature.BROWSE_MEDIA
         | MediaPlayerEntityFeature.NEXT_TRACK
@@ -290,7 +292,11 @@ class KodiEntity(MediaPlayerEntity):
         self._media_position = None
         self._connect_error = False
 
-        self._attr_name = name
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, uid)},
+            manufacturer="Kodi",
+            name=name,
+        )
 
     def _reset_state(self, players=None):
         self._players = players
@@ -368,15 +374,6 @@ class KodiEntity(MediaPlayerEntity):
         """Return the unique id of the device."""
         return self._unique_id
 
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device info for this device."""
-        return DeviceInfo(
-            identifiers={(DOMAIN, self.unique_id)},
-            manufacturer="Kodi",
-            name=self.name,
-        )
-
     @property
     def state(self) -> MediaPlayerState:
         """Return the state of the device."""
diff --git a/homeassistant/components/lacrosse/sensor.py b/homeassistant/components/lacrosse/sensor.py
index fb2c60b32c9..7355a60f5f0 100644
--- a/homeassistant/components/lacrosse/sensor.py
+++ b/homeassistant/components/lacrosse/sensor.py
@@ -93,7 +93,7 @@ def setup_platform(
         _LOGGER.warning("Unable to open serial port: %s", exc)
         return
 
-    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, lambda event: lacrosse.close())  # type: ignore[no-any-return]
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, lambda event: lacrosse.close())
 
     if CONF_JEELINK_LED in config:
         lacrosse.led_mode_state(config.get(CONF_JEELINK_LED))
diff --git a/homeassistant/components/lastfm/sensor.py b/homeassistant/components/lastfm/sensor.py
index 08179df5b7e..b4776b19c50 100644
--- a/homeassistant/components/lastfm/sensor.py
+++ b/homeassistant/components/lastfm/sensor.py
@@ -53,7 +53,7 @@ async def async_setup_platform(
         hass,
         DOMAIN,
         "deprecated_yaml",
-        breaks_in_ha_version="2023.8.0",
+        breaks_in_ha_version="2023.12.0",
         is_fixable=False,
         severity=IssueSeverity.WARNING,
         translation_key="deprecated_yaml",
diff --git a/homeassistant/components/laundrify/manifest.json b/homeassistant/components/laundrify/manifest.json
index b9469f79e65..8dca67058b7 100644
--- a/homeassistant/components/laundrify/manifest.json
+++ b/homeassistant/components/laundrify/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/laundrify",
   "iot_class": "cloud_polling",
-  "requirements": ["laundrify_aio==1.1.2"]
+  "requirements": ["laundrify-aio==1.1.2"]
 }
diff --git a/homeassistant/components/lcn/strings.json b/homeassistant/components/lcn/strings.json
index c0e46250c1e..bee6c0f0e29 100644
--- a/homeassistant/components/lcn/strings.json
+++ b/homeassistant/components/lcn/strings.json
@@ -1,11 +1,11 @@
 {
   "device_automation": {
     "trigger_type": {
-      "transmitter": "transmitter code received",
-      "transponder": "transponder code received",
-      "fingerprint": "fingerprint code received",
-      "codelock": "code lock code received",
-      "send_keys": "send keys received"
+      "transmitter": "Transmitter code received",
+      "transponder": "Transponder code received",
+      "fingerprint": "Fingerprint code received",
+      "codelock": "Code lock code received",
+      "send_keys": "Send keys received"
     }
   }
 }
diff --git a/homeassistant/components/ld2410_ble/manifest.json b/homeassistant/components/ld2410_ble/manifest.json
index 4716519ac18..6eaf2885d89 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==0.4.0", "ld2410-ble==0.1.1"]
+  "requirements": ["bluetooth-data-tools==1.3.0", "ld2410-ble==0.1.1"]
 }
diff --git a/homeassistant/components/led_ble/manifest.json b/homeassistant/components/led_ble/manifest.json
index a19680ffa5c..cdc270f2e99 100644
--- a/homeassistant/components/led_ble/manifest.json
+++ b/homeassistant/components/led_ble/manifest.json
@@ -32,5 +32,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/led_ble/",
   "iot_class": "local_polling",
-  "requirements": ["bluetooth-data-tools==0.4.0", "led-ble==1.0.0"]
+  "requirements": ["bluetooth-data-tools==1.3.0", "led-ble==1.0.0"]
 }
diff --git a/homeassistant/components/lg_netcast/media_player.py b/homeassistant/components/lg_netcast/media_player.py
index c7a5281bf61..2b59e628705 100644
--- a/homeassistant/components/lg_netcast/media_player.py
+++ b/homeassistant/components/lg_netcast/media_player.py
@@ -40,6 +40,7 @@ SUPPORT_LGTV = (
     | MediaPlayerEntityFeature.SELECT_SOURCE
     | MediaPlayerEntityFeature.PLAY
     | MediaPlayerEntityFeature.PLAY_MEDIA
+    | MediaPlayerEntityFeature.STOP
 )
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
@@ -240,6 +241,10 @@ class LgTVDevice(MediaPlayerEntity):
         """Send media pause command to media player."""
         self.send_command(LG_COMMAND.PAUSE)
 
+    def media_stop(self) -> None:
+        """Send media stop command to media player."""
+        self.send_command(LG_COMMAND.STOP)
+
     def media_next_track(self) -> None:
         """Send next track command."""
         self.send_command(LG_COMMAND.FAST_FORWARD)
diff --git a/homeassistant/components/lidarr/sensor.py b/homeassistant/components/lidarr/sensor.py
index 96ab2e5f7a2..1a2930c8051 100644
--- a/homeassistant/components/lidarr/sensor.py
+++ b/homeassistant/components/lidarr/sensor.py
@@ -70,7 +70,7 @@ class LidarrSensorEntityDescription(
 SENSOR_TYPES: dict[str, LidarrSensorEntityDescription[Any]] = {
     "disk_space": LidarrSensorEntityDescription(
         key="disk_space",
-        name="Disk space",
+        translation_key="disk_space",
         native_unit_of_measurement=UnitOfInformation.GIGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         icon="mdi:harddisk",
@@ -80,7 +80,7 @@ SENSOR_TYPES: dict[str, LidarrSensorEntityDescription[Any]] = {
     ),
     "queue": LidarrSensorEntityDescription[LidarrQueue](
         key="queue",
-        name="Queue",
+        translation_key="queue",
         native_unit_of_measurement="Albums",
         icon="mdi:download",
         value_fn=lambda data, _: data.totalRecords,
@@ -89,7 +89,7 @@ SENSOR_TYPES: dict[str, LidarrSensorEntityDescription[Any]] = {
     ),
     "wanted": LidarrSensorEntityDescription[LidarrQueue](
         key="wanted",
-        name="Wanted",
+        translation_key="wanted",
         native_unit_of_measurement="Albums",
         icon="mdi:music",
         value_fn=lambda data, _: data.totalRecords,
diff --git a/homeassistant/components/lidarr/strings.json b/homeassistant/components/lidarr/strings.json
index ffa91c23f2a..bbe4b19db25 100644
--- a/homeassistant/components/lidarr/strings.json
+++ b/homeassistant/components/lidarr/strings.json
@@ -28,5 +28,18 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "disk_space": {
+        "name": "Disk space"
+      },
+      "queue": {
+        "name": "Queue"
+      },
+      "wanted": {
+        "name": "Wanted"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/lifx/button.py b/homeassistant/components/lifx/button.py
index b5f5373b3e8..00d216351a0 100644
--- a/homeassistant/components/lifx/button.py
+++ b/homeassistant/components/lifx/button.py
@@ -24,7 +24,7 @@ RESTART_BUTTON_DESCRIPTION = ButtonEntityDescription(
 
 IDENTIFY_BUTTON_DESCRIPTION = ButtonEntityDescription(
     key=IDENTIFY,
-    name="Identify",
+    device_class=ButtonDeviceClass.IDENTIFY,
     entity_category=EntityCategory.CONFIG,
 )
 
diff --git a/homeassistant/components/lifx/manifest.json b/homeassistant/components/lifx/manifest.json
index e867bb65eb0..d6b253bd478 100644
--- a/homeassistant/components/lifx/manifest.json
+++ b/homeassistant/components/lifx/manifest.json
@@ -42,7 +42,7 @@
   "quality_scale": "platinum",
   "requirements": [
     "aiolifx==0.8.10",
-    "aiolifx_effects==0.3.2",
-    "aiolifx_themes==0.4.5"
+    "aiolifx-effects==0.3.2",
+    "aiolifx-themes==0.4.5"
   ]
 }
diff --git a/homeassistant/components/light/device_action.py b/homeassistant/components/light/device_action.py
index 2b4c32cb3b1..2b49c963438 100644
--- a/homeassistant/components/light/device_action.py
+++ b/homeassistant/components/light/device_action.py
@@ -3,7 +3,11 @@ from __future__ import annotations
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import toggle_entity
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+    async_validate_entity_schema,
+    toggle_entity,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -37,9 +41,9 @@ TYPE_BRIGHTNESS_INCREASE = "brightness_increase"
 TYPE_BRIGHTNESS_DECREASE = "brightness_decrease"
 TYPE_FLASH = "flash"
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
-        vol.Required(ATTR_ENTITY_ID): cv.entity_id,
+        vol.Required(ATTR_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_DOMAIN): DOMAIN,
         vol.Required(CONF_TYPE): vol.In(
             toggle_entity.DEVICE_ACTION_TYPES
@@ -51,6 +55,13 @@ ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_call_action_from_config(
     hass: HomeAssistant,
     config: ConfigType,
@@ -102,7 +113,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         if brightness_supported(supported_color_modes):
@@ -127,13 +138,11 @@ async def async_get_action_capabilities(
         return {}
 
     try:
-        supported_color_modes = get_supported_color_modes(hass, config[ATTR_ENTITY_ID])
+        entry = async_get_entity_registry_entry_or_raise(hass, config[CONF_ENTITY_ID])
+        supported_color_modes = get_supported_color_modes(hass, entry.entity_id)
+        supported_features = get_supported_features(hass, entry.entity_id)
     except HomeAssistantError:
         supported_color_modes = None
-
-    try:
-        supported_features = get_supported_features(hass, config[ATTR_ENTITY_ID])
-    except HomeAssistantError:
         supported_features = 0
 
     extra_fields = {}
diff --git a/homeassistant/components/litterrobot/__init__.py b/homeassistant/components/litterrobot/__init__.py
index 45483f99e5b..c7eda2f118b 100644
--- a/homeassistant/components/litterrobot/__init__.py
+++ b/homeassistant/components/litterrobot/__init__.py
@@ -18,7 +18,7 @@ PLATFORMS_BY_TYPE = {
         Platform.SWITCH,
     ),
     LitterRobot: (Platform.VACUUM,),
-    LitterRobot3: (Platform.BUTTON,),
+    LitterRobot3: (Platform.BUTTON, Platform.TIME),
     LitterRobot4: (Platform.UPDATE,),
     FeederRobot: (Platform.BUTTON,),
 }
diff --git a/homeassistant/components/litterrobot/binary_sensor.py b/homeassistant/components/litterrobot/binary_sensor.py
index 107935be7b8..5308a3b4f83 100644
--- a/homeassistant/components/litterrobot/binary_sensor.py
+++ b/homeassistant/components/litterrobot/binary_sensor.py
@@ -51,7 +51,7 @@ BINARY_SENSOR_MAP: dict[type[Robot], tuple[RobotBinarySensorEntityDescription, .
     LitterRobot: (
         RobotBinarySensorEntityDescription[LitterRobot](
             key="sleeping",
-            name="Sleeping",
+            translation_key="sleeping",
             icon="mdi:sleep",
             entity_category=EntityCategory.DIAGNOSTIC,
             entity_registry_enabled_default=False,
@@ -59,7 +59,7 @@ BINARY_SENSOR_MAP: dict[type[Robot], tuple[RobotBinarySensorEntityDescription, .
         ),
         RobotBinarySensorEntityDescription[LitterRobot](
             key="sleep_mode",
-            name="Sleep mode",
+            translation_key="sleep_mode",
             icon="mdi:sleep",
             entity_category=EntityCategory.DIAGNOSTIC,
             entity_registry_enabled_default=False,
@@ -69,7 +69,7 @@ BINARY_SENSOR_MAP: dict[type[Robot], tuple[RobotBinarySensorEntityDescription, .
     Robot: (
         RobotBinarySensorEntityDescription[Robot](
             key="power_status",
-            name="Power status",
+            translation_key="power_status",
             device_class=BinarySensorDeviceClass.PLUG,
             entity_category=EntityCategory.DIAGNOSTIC,
             entity_registry_enabled_default=False,
diff --git a/homeassistant/components/litterrobot/button.py b/homeassistant/components/litterrobot/button.py
index 1d208ca48e1..06c4fe75888 100644
--- a/homeassistant/components/litterrobot/button.py
+++ b/homeassistant/components/litterrobot/button.py
@@ -60,14 +60,14 @@ class RobotButtonEntityDescription(ButtonEntityDescription, RequiredKeysMixin[_R
 
 LITTER_ROBOT_BUTTON = RobotButtonEntityDescription[LitterRobot3](
     key="reset_waste_drawer",
-    name="Reset waste drawer",
+    translation_key="reset_waste_drawer",
     icon="mdi:delete-variant",
     entity_category=EntityCategory.CONFIG,
     press_fn=lambda robot: robot.reset_waste_drawer(),
 )
 FEEDER_ROBOT_BUTTON = RobotButtonEntityDescription[FeederRobot](
     key="give_snack",
-    name="Give snack",
+    translation_key="give_snack",
     icon="mdi:candy-outline",
     press_fn=lambda robot: robot.give_snack(),
 )
diff --git a/homeassistant/components/litterrobot/select.py b/homeassistant/components/litterrobot/select.py
index feac85ecac4..6fabd6ea526 100644
--- a/homeassistant/components/litterrobot/select.py
+++ b/homeassistant/components/litterrobot/select.py
@@ -50,7 +50,7 @@ class RobotSelectEntityDescription(
 ROBOT_SELECT_MAP: dict[type[Robot], RobotSelectEntityDescription] = {
     LitterRobot: RobotSelectEntityDescription[LitterRobot, int](
         key="cycle_delay",
-        name="Clean cycle wait time minutes",
+        translation_key="cycle_delay",
         icon="mdi:timer-outline",
         unit_of_measurement=UnitOfTime.MINUTES,
         current_fn=lambda robot: robot.clean_cycle_wait_time_minutes,
@@ -59,7 +59,6 @@ ROBOT_SELECT_MAP: dict[type[Robot], RobotSelectEntityDescription] = {
     ),
     LitterRobot4: RobotSelectEntityDescription[LitterRobot4, str](
         key="panel_brightness",
-        name="Panel brightness",
         translation_key="brightness_level",
         current_fn=lambda robot: bri.name.lower()
         if (bri := robot.panel_brightness) is not None
@@ -72,7 +71,7 @@ ROBOT_SELECT_MAP: dict[type[Robot], RobotSelectEntityDescription] = {
     ),
     FeederRobot: RobotSelectEntityDescription[FeederRobot, float](
         key="meal_insert_size",
-        name="Meal insert size",
+        translation_key="meal_insert_size",
         icon="mdi:scale",
         unit_of_measurement="cups",
         current_fn=lambda robot: robot.meal_insert_size,
diff --git a/homeassistant/components/litterrobot/sensor.py b/homeassistant/components/litterrobot/sensor.py
index e7aed366fa3..ba601a0ba54 100644
--- a/homeassistant/components/litterrobot/sensor.py
+++ b/homeassistant/components/litterrobot/sensor.py
@@ -69,32 +69,31 @@ ROBOT_SENSOR_MAP: dict[type[Robot], list[RobotSensorEntityDescription]] = {
     LitterRobot: [
         RobotSensorEntityDescription[LitterRobot](
             key="waste_drawer_level",
-            name="Waste drawer",
+            translation_key="waste_drawer",
             native_unit_of_measurement=PERCENTAGE,
             icon_fn=lambda state: icon_for_gauge_level(state, 10),
             state_class=SensorStateClass.MEASUREMENT,
         ),
         RobotSensorEntityDescription[LitterRobot](
             key="sleep_mode_start_time",
-            name="Sleep mode start time",
+            translation_key="sleep_mode_start_time",
             device_class=SensorDeviceClass.TIMESTAMP,
             should_report=lambda robot: robot.sleep_mode_enabled,
         ),
         RobotSensorEntityDescription[LitterRobot](
             key="sleep_mode_end_time",
-            name="Sleep mode end time",
+            translation_key="sleep_mode_end_time",
             device_class=SensorDeviceClass.TIMESTAMP,
             should_report=lambda robot: robot.sleep_mode_enabled,
         ),
         RobotSensorEntityDescription[LitterRobot](
             key="last_seen",
-            name="Last seen",
+            translation_key="last_seen",
             device_class=SensorDeviceClass.TIMESTAMP,
             entity_category=EntityCategory.DIAGNOSTIC,
         ),
         RobotSensorEntityDescription[LitterRobot](
             key="status_code",
-            name="Status code",
             translation_key="status_code",
             entity_category=EntityCategory.DIAGNOSTIC,
             device_class=SensorDeviceClass.ENUM,
@@ -130,14 +129,14 @@ ROBOT_SENSOR_MAP: dict[type[Robot], list[RobotSensorEntityDescription]] = {
     LitterRobot4: [
         RobotSensorEntityDescription[LitterRobot4](
             key="litter_level",
-            name="Litter level",
+            translation_key="litter_level",
             native_unit_of_measurement=PERCENTAGE,
             icon_fn=lambda state: icon_for_gauge_level(state, 10),
             state_class=SensorStateClass.MEASUREMENT,
         ),
         RobotSensorEntityDescription[LitterRobot4](
             key="pet_weight",
-            name="Pet weight",
+            translation_key="pet_weight",
             native_unit_of_measurement=UnitOfMass.POUNDS,
             device_class=SensorDeviceClass.WEIGHT,
             state_class=SensorStateClass.MEASUREMENT,
@@ -146,7 +145,7 @@ ROBOT_SENSOR_MAP: dict[type[Robot], list[RobotSensorEntityDescription]] = {
     FeederRobot: [
         RobotSensorEntityDescription[FeederRobot](
             key="food_level",
-            name="Food level",
+            translation_key="food_level",
             native_unit_of_measurement=PERCENTAGE,
             icon_fn=lambda state: icon_for_gauge_level(state, 10),
             state_class=SensorStateClass.MEASUREMENT,
diff --git a/homeassistant/components/litterrobot/strings.json b/homeassistant/components/litterrobot/strings.json
index b4aa8f0016d..00a8a6122db 100644
--- a/homeassistant/components/litterrobot/strings.json
+++ b/homeassistant/components/litterrobot/strings.json
@@ -32,8 +32,46 @@
     }
   },
   "entity": {
+    "binary_sensor": {
+      "sleeping": {
+        "name": "Sleeping"
+      },
+      "sleep_mode": {
+        "name": "Sleep mode"
+      },
+      "power_status": {
+        "name": "Power status"
+      }
+    },
+    "button": {
+      "reset_waste_drawer": {
+        "name": "Reset waste drawer"
+      },
+      "give_snack": {
+        "name": "Give snack"
+      }
+    },
     "sensor": {
+      "food_level": {
+        "name": "Food level"
+      },
+      "last_seen": {
+        "name": "Last seen"
+      },
+      "litter_level": {
+        "name": "Litter level"
+      },
+      "pet_weight": {
+        "name": "Pet weight"
+      },
+      "sleep_mode_end_time": {
+        "name": "Sleep mode end time"
+      },
+      "sleep_mode_start_time": {
+        "name": "Sleep mode start time"
+      },
       "status_code": {
+        "name": "Status code",
         "state": {
           "br": "Bonnet Removed",
           "ccc": "Clean Cycle Complete",
@@ -61,16 +99,49 @@
           "sdf": "Drawer Full At Startup",
           "spf": "Pinch Detect At Startup"
         }
+      },
+      "waste_drawer": {
+        "name": "Waste drawer"
       }
     },
     "select": {
+      "cycle_delay": {
+        "name": "Clean cycle wait time minutes"
+      },
+      "meal_insert_size": {
+        "name": "Meal insert size"
+      },
       "brightness_level": {
+        "name": "Panel brightness",
         "state": {
           "low": "Low",
           "medium": "Medium",
           "high": "High"
         }
       }
+    },
+    "switch": {
+      "night_light_mode": {
+        "name": "Night light mode"
+      },
+      "panel_lockout": {
+        "name": "Panel lockout"
+      }
+    },
+    "time": {
+      "sleep_mode_start_time": {
+        "name": "Sleep mode start time"
+      }
+    },
+    "vacuum": {
+      "litter_box": {
+        "name": "Litter box"
+      }
+    },
+    "update": {
+      "firmware": {
+        "name": "Firmware"
+      }
     }
   }
 }
diff --git a/homeassistant/components/litterrobot/switch.py b/homeassistant/components/litterrobot/switch.py
index eb2297e506e..6b4e5b56b48 100644
--- a/homeassistant/components/litterrobot/switch.py
+++ b/homeassistant/components/litterrobot/switch.py
@@ -36,13 +36,13 @@ class RobotSwitchEntityDescription(SwitchEntityDescription, RequiredKeysMixin[_R
 ROBOT_SWITCHES = [
     RobotSwitchEntityDescription[LitterRobot | FeederRobot](
         key="night_light_mode_enabled",
-        name="Night light mode",
+        translation_key="night_light_mode",
         icons=("mdi:lightbulb-on", "mdi:lightbulb-off"),
         set_fn=lambda robot, value: robot.set_night_light(value),
     ),
     RobotSwitchEntityDescription[LitterRobot | FeederRobot](
         key="panel_lock_enabled",
-        name="Panel lockout",
+        translation_key="panel_lockout",
         icons=("mdi:lock", "mdi:lock-open"),
         set_fn=lambda robot, value: robot.set_panel_lockout(value),
     ),
diff --git a/homeassistant/components/litterrobot/time.py b/homeassistant/components/litterrobot/time.py
new file mode 100644
index 00000000000..f352b7cee70
--- /dev/null
+++ b/homeassistant/components/litterrobot/time.py
@@ -0,0 +1,82 @@
+"""Support for Litter-Robot time."""
+from __future__ import annotations
+
+from collections.abc import Callable, Coroutine
+from dataclasses import dataclass
+from datetime import datetime, time
+from typing import Any, Generic
+
+from pylitterbot import LitterRobot3
+
+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
+import homeassistant.util.dt as dt_util
+
+from .const import DOMAIN
+from .entity import LitterRobotEntity, _RobotT
+from .hub import LitterRobotHub
+
+
+@dataclass
+class RequiredKeysMixin(Generic[_RobotT]):
+    """A class that describes robot time entity required keys."""
+
+    value_fn: Callable[[_RobotT], time | None]
+    set_fn: Callable[[_RobotT, time], Coroutine[Any, Any, bool]]
+
+
+@dataclass
+class RobotTimeEntityDescription(TimeEntityDescription, RequiredKeysMixin[_RobotT]):
+    """A class that describes robot time entities."""
+
+
+def _as_local_time(start: datetime | None) -> time | None:
+    """Return a datetime as local time."""
+    return dt_util.as_local(start).time() if start else None
+
+
+LITTER_ROBOT_3_SLEEP_START = RobotTimeEntityDescription[LitterRobot3](
+    key="sleep_mode_start_time",
+    translation_key="sleep_mode_start_time",
+    entity_category=EntityCategory.CONFIG,
+    value_fn=lambda robot: _as_local_time(robot.sleep_mode_start_time),
+    set_fn=lambda robot, value: robot.set_sleep_mode(
+        robot.sleep_mode_enabled, value.replace(tzinfo=dt_util.DEFAULT_TIME_ZONE)
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up Litter-Robot cleaner using config entry."""
+    hub: LitterRobotHub = hass.data[DOMAIN][entry.entry_id]
+    async_add_entities(
+        [
+            LitterRobotTimeEntity(
+                robot=robot, hub=hub, description=LITTER_ROBOT_3_SLEEP_START
+            )
+            for robot in hub.litter_robots()
+            if isinstance(robot, LitterRobot3)
+        ]
+    )
+
+
+class LitterRobotTimeEntity(LitterRobotEntity[_RobotT], TimeEntity):
+    """Litter-Robot time entity."""
+
+    entity_description: RobotTimeEntityDescription[_RobotT]
+
+    @property
+    def native_value(self) -> time | None:
+        """Return the value reported by the time."""
+        return self.entity_description.value_fn(self.robot)
+
+    async def async_set_value(self, value: time) -> None:
+        """Update the current value."""
+        await self.entity_description.set_fn(self.robot, value)
diff --git a/homeassistant/components/litterrobot/update.py b/homeassistant/components/litterrobot/update.py
index 33ca6cd0376..9b8391c5bae 100644
--- a/homeassistant/components/litterrobot/update.py
+++ b/homeassistant/components/litterrobot/update.py
@@ -24,7 +24,7 @@ SCAN_INTERVAL = timedelta(days=1)
 
 FIRMWARE_UPDATE_ENTITY = UpdateEntityDescription(
     key="firmware",
-    name="Firmware",
+    translation_key="firmware",
     device_class=UpdateDeviceClass.FIRMWARE,
 )
 
diff --git a/homeassistant/components/litterrobot/vacuum.py b/homeassistant/components/litterrobot/vacuum.py
index b56724f15c8..d1352c1e45f 100644
--- a/homeassistant/components/litterrobot/vacuum.py
+++ b/homeassistant/components/litterrobot/vacuum.py
@@ -42,7 +42,9 @@ LITTER_BOX_STATUS_STATE_MAP = {
     LitterBoxStatus.OFF: STATE_OFF,
 }
 
-LITTER_BOX_ENTITY = StateVacuumEntityDescription("litter_box", name="Litter box")
+LITTER_BOX_ENTITY = StateVacuumEntityDescription(
+    "litter_box", translation_key="litter_box"
+)
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/locative/__init__.py b/homeassistant/components/locative/__init__.py
index 5a796b976ff..cca322f3baa 100644
--- a/homeassistant/components/locative/__init__.py
+++ b/homeassistant/components/locative/__init__.py
@@ -21,7 +21,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_entry_flow
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -61,12 +60,6 @@ WEBHOOK_SCHEMA = vol.All(
 )
 
 
-async def async_setup(hass: HomeAssistant, hass_config: ConfigType) -> bool:
-    """Set up the Locative component."""
-    hass.data[DOMAIN] = {"devices": set(), "unsub_device_tracker": {}}
-    return True
-
-
 async def handle_webhook(hass, webhook_id, request):
     """Handle incoming webhook from Locative."""
     try:
@@ -117,6 +110,8 @@ async def handle_webhook(hass, webhook_id, request):
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Configure based on config entry."""
+    if DOMAIN not in hass.data:
+        hass.data[DOMAIN] = {"devices": set(), "unsub_device_tracker": {}}
     webhook.async_register(
         hass, DOMAIN, "Locative", entry.data[CONF_WEBHOOK_ID], handle_webhook
     )
diff --git a/homeassistant/components/lock/device_action.py b/homeassistant/components/lock/device_action.py
index 01e7b21d4b6..fba95a932de 100644
--- a/homeassistant/components/lock/device_action.py
+++ b/homeassistant/components/lock/device_action.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -23,14 +24,21 @@ from . import DOMAIN, LockEntityFeature
 
 ACTION_TYPES = {"lock", "unlock", "open"}
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -49,7 +57,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         actions.append({**base_action, CONF_TYPE: "lock"})
diff --git a/homeassistant/components/lock/device_condition.py b/homeassistant/components/lock/device_condition.py
index c439fe99d14..5ba93554aec 100644
--- a/homeassistant/components/lock/device_condition.py
+++ b/homeassistant/components/lock/device_condition.py
@@ -39,7 +39,7 @@ CONDITION_TYPES = {
 
 CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
     }
 )
@@ -62,7 +62,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions += [{**base_condition, CONF_TYPE: cond} for cond in CONDITION_TYPES]
@@ -86,8 +86,11 @@ def async_condition_from_config(
     else:
         state = STATE_UNLOCKED
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
+
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        return condition.state(hass, config[ATTR_ENTITY_ID], state)
+        return condition.state(hass, entity_id, state)
 
     return test_is_state
diff --git a/homeassistant/components/lock/device_trigger.py b/homeassistant/components/lock/device_trigger.py
index ec996d4f0b2..c6b86eaca4a 100644
--- a/homeassistant/components/lock/device_trigger.py
+++ b/homeassistant/components/lock/device_trigger.py
@@ -29,7 +29,7 @@ TRIGGER_TYPES = {"locked", "unlocked", "locking", "unlocking", "jammed"}
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -54,7 +54,7 @@ async def async_get_triggers(
                 CONF_PLATFORM: "device",
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: trigger,
             }
             for trigger in TRIGGER_TYPES
diff --git a/homeassistant/components/logger/__init__.py b/homeassistant/components/logger/__init__.py
index b1086d7f780..cd2761510d3 100644
--- a/homeassistant/components/logger/__init__.py
+++ b/homeassistant/components/logger/__init__.py
@@ -14,6 +14,7 @@ from . import websocket_api
 from .const import (
     ATTR_LEVEL,
     DOMAIN,
+    EVENT_LOGGING_CHANGED,  # noqa: F401
     LOGGER_DEFAULT,
     LOGGER_FILTERS,
     LOGGER_LOGS,
@@ -21,7 +22,6 @@ from .const import (
     SERVICE_SET_DEFAULT_LEVEL,
     SERVICE_SET_LEVEL,
 )
-from .const import EVENT_LOGGING_CHANGED  # noqa: F401
 from .helpers import (
     LoggerDomainConfig,
     LoggerSettings,
diff --git a/homeassistant/components/logi_circle/manifest.json b/homeassistant/components/logi_circle/manifest.json
index 2f08fe6f135..f4f65b22505 100644
--- a/homeassistant/components/logi_circle/manifest.json
+++ b/homeassistant/components/logi_circle/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/logi_circle",
   "iot_class": "cloud_polling",
   "loggers": ["logi_circle"],
-  "requirements": ["logi_circle==0.2.3"]
+  "requirements": ["logi-circle==0.2.3"]
 }
diff --git a/homeassistant/components/loqed/__init__.py b/homeassistant/components/loqed/__init__.py
new file mode 100644
index 00000000000..1248c75612f
--- /dev/null
+++ b/homeassistant/components/loqed/__init__.py
@@ -0,0 +1,55 @@
+"""The loqed integration."""
+from __future__ import annotations
+
+import logging
+import re
+
+from loqedAPI import loqed
+
+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 DOMAIN
+from .coordinator import LoqedDataCoordinator
+
+PLATFORMS: list[str] = [Platform.LOCK]
+
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up loqed from a config entry."""
+    websession = async_get_clientsession(hass)
+    host = entry.data["bridge_ip"]
+    apiclient = loqed.APIClient(websession, f"http://{host}")
+    api = loqed.LoqedAPI(apiclient)
+
+    lock = await api.async_get_lock(
+        entry.data["lock_key_key"],
+        entry.data["bridge_key"],
+        int(entry.data["lock_key_local_id"]),
+        re.sub(r"LOQED-([a-f0-9]+)\.local", r"\1", entry.data["bridge_mdns_hostname"]),
+    )
+    coordinator = LoqedDataCoordinator(hass, api, lock, entry)
+    await coordinator.ensure_webhooks()
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = 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: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    coordinator: LoqedDataCoordinator = hass.data[DOMAIN][entry.entry_id]
+
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    await coordinator.remove_webhooks()
+
+    return unload_ok
diff --git a/homeassistant/components/loqed/config_flow.py b/homeassistant/components/loqed/config_flow.py
new file mode 100644
index 00000000000..5eecc0b3f59
--- /dev/null
+++ b/homeassistant/components/loqed/config_flow.py
@@ -0,0 +1,169 @@
+"""Config flow for loqed integration."""
+from __future__ import annotations
+
+import logging
+import re
+from typing import Any
+
+import aiohttp
+from loqedAPI import cloud_loqed, loqed
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.components import webhook
+from homeassistant.components.zeroconf import ZeroconfServiceInfo
+from homeassistant.const import CONF_API_TOKEN, CONF_HOST, CONF_NAME, CONF_WEBHOOK_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Loqed."""
+
+    VERSION = 1
+    DOMAIN = DOMAIN
+    _host: str | None = None
+
+    async def validate_input(
+        self, hass: HomeAssistant, data: dict[str, Any]
+    ) -> dict[str, Any]:
+        """Validate the user input allows us to connect."""
+
+        # 1. Checking loqed-connection
+        try:
+            session = async_get_clientsession(hass)
+            cloud_api_client = cloud_loqed.CloudAPIClient(
+                session,
+                data[CONF_API_TOKEN],
+            )
+            cloud_client = cloud_loqed.LoqedCloudAPI(cloud_api_client)
+            lock_data = await cloud_client.async_get_locks()
+        except aiohttp.ClientError as err:
+            _LOGGER.error("HTTP Connection error to loqed API")
+            raise CannotConnect from err
+
+        try:
+            selected_lock = next(
+                lock
+                for lock in lock_data["data"]
+                if lock["bridge_ip"] == self._host or lock["name"] == data.get("name")
+            )
+
+            apiclient = loqed.APIClient(session, f"http://{selected_lock['bridge_ip']}")
+            api = loqed.LoqedAPI(apiclient)
+            lock = await api.async_get_lock(
+                selected_lock["backend_key"],
+                selected_lock["bridge_key"],
+                selected_lock["local_id"],
+                selected_lock["bridge_ip"],
+            )
+
+            # checking getWebooks to check the bridgeKey
+            await lock.getWebhooks()
+            return {
+                "lock_key_key": selected_lock["key_secret"],
+                "bridge_key": selected_lock["bridge_key"],
+                "lock_key_local_id": selected_lock["local_id"],
+                "bridge_mdns_hostname": selected_lock["bridge_hostname"],
+                "bridge_ip": selected_lock["bridge_ip"],
+                "name": selected_lock["name"],
+                "id": selected_lock["id"],
+            }
+        except StopIteration:
+            raise InvalidAuth from StopIteration
+        except aiohttp.ClientError:
+            _LOGGER.error("HTTP Connection error to loqed lock")
+            raise CannotConnect from aiohttp.ClientError
+
+    async def async_step_zeroconf(
+        self, discovery_info: ZeroconfServiceInfo
+    ) -> FlowResult:
+        """Handle zeroconf discovery."""
+        host = discovery_info.host
+        self._host = host
+
+        session = async_get_clientsession(self.hass)
+        apiclient = loqed.APIClient(session, f"http://{host}")
+        api = loqed.LoqedAPI(apiclient)
+        lock_data = await api.async_get_lock_details()
+
+        # Check if already exists
+        await self.async_set_unique_id(lock_data["bridge_mac_wifi"])
+        self._abort_if_unique_id_configured({CONF_HOST: host})
+
+        return await self.async_step_user()
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Show userform to user."""
+        user_data_schema = (
+            vol.Schema(
+                {
+                    vol.Required(CONF_API_TOKEN): str,
+                }
+            )
+            if self._host
+            else vol.Schema(
+                {
+                    vol.Required(CONF_NAME): str,
+                    vol.Required(CONF_API_TOKEN): str,
+                }
+            )
+        )
+
+        if user_input is None:
+            return self.async_show_form(
+                step_id="user",
+                data_schema=user_data_schema,
+                description_placeholders={
+                    "config_url": "https://integrations.production.loqed.com/personal-access-tokens",
+                },
+            )
+
+        errors = {}
+
+        try:
+            info = await self.validate_input(self.hass, user_input)
+        except CannotConnect:
+            errors["base"] = "cannot_connect"
+        except InvalidAuth:
+            errors["base"] = "invalid_auth"
+        else:
+            await self.async_set_unique_id(
+                re.sub(
+                    r"LOQED-([a-f0-9]+)\.local", r"\1", info["bridge_mdns_hostname"]
+                ),
+                raise_on_progress=False,
+            )
+            self._abort_if_unique_id_configured()
+
+            return self.async_create_entry(
+                title="LOQED Touch Smart Lock",
+                data=(
+                    user_input | {CONF_WEBHOOK_ID: webhook.async_generate_id()} | info
+                ),
+            )
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=user_data_schema,
+            errors=errors,
+            description_placeholders={
+                "config_url": "https://integrations.production.loqed.com/personal-access-tokens",
+            },
+        )
+
+
+class CannotConnect(HomeAssistantError):
+    """Error to indicate we cannot connect."""
+
+
+class InvalidAuth(HomeAssistantError):
+    """Error to indicate there is invalid auth."""
diff --git a/homeassistant/components/loqed/const.py b/homeassistant/components/loqed/const.py
new file mode 100644
index 00000000000..6b1c0311a2d
--- /dev/null
+++ b/homeassistant/components/loqed/const.py
@@ -0,0 +1,4 @@
+"""Constants for the loqed integration."""
+
+
+DOMAIN = "loqed"
diff --git a/homeassistant/components/loqed/coordinator.py b/homeassistant/components/loqed/coordinator.py
new file mode 100644
index 00000000000..507debc02ab
--- /dev/null
+++ b/homeassistant/components/loqed/coordinator.py
@@ -0,0 +1,151 @@
+"""Provides the coordinator for a LOQED lock."""
+import logging
+from typing import TypedDict
+
+from aiohttp.web import Request
+import async_timeout
+from loqedAPI import loqed
+
+from homeassistant.components import webhook
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_NAME, CONF_WEBHOOK_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class BatteryMessage(TypedDict):
+    """Properties in a battery update message."""
+
+    mac_wifi: str
+    mac_ble: str
+    battery_type: str
+    battery_percentage: int
+
+
+class StateReachedMessage(TypedDict):
+    """Properties in a battery update message."""
+
+    requested_state: str
+    requested_state_numeric: int
+    event_type: str
+    key_local_id: int
+    mac_wifi: str
+    mac_ble: str
+
+
+class TransitionMessage(TypedDict):
+    """Properties in a battery update message."""
+
+    go_to_state: str
+    go_to_state_numeric: int
+    event_type: str
+    key_local_id: int
+    mac_wifi: str
+    mac_ble: str
+
+
+class StatusMessage(TypedDict):
+    """Properties returned by the status endpoint of the bridhge."""
+
+    battery_percentage: int
+    battery_type: str
+    battery_type_numeric: int
+    battery_voltage: float
+    bolt_state: str
+    bolt_state_numeric: int
+    bridge_mac_wifi: str
+    bridge_mac_ble: str
+    lock_online: int
+    webhooks_number: int
+    ip_address: str
+    up_timestamp: int
+    wifi_strength: int
+    ble_strength: int
+
+
+class LoqedDataCoordinator(DataUpdateCoordinator[StatusMessage]):
+    """Data update coordinator for the loqed platform."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        api: loqed.LoqedAPI,
+        lock: loqed.Lock,
+        entry: ConfigEntry,
+    ) -> None:
+        """Initialize the Loqed Data Update coordinator."""
+        super().__init__(hass, _LOGGER, name="Loqed sensors")
+        self._api = api
+        self._entry = entry
+        self.lock = lock
+        self.device_name = self._entry.data[CONF_NAME]
+
+    async def _async_update_data(self) -> StatusMessage:
+        """Fetch data from API endpoint."""
+        async with async_timeout.timeout(10):
+            return await self._api.async_get_lock_details()
+
+    async def _handle_webhook(
+        self, hass: HomeAssistant, webhook_id: str, request: Request
+    ) -> None:
+        """Handle incoming Loqed messages."""
+        _LOGGER.debug("Callback received: %s", request.headers)
+        received_ts = request.headers["TIMESTAMP"]
+        received_hash = request.headers["HASH"]
+        body = await request.text()
+
+        _LOGGER.debug("Callback body: %s", body)
+
+        event_data = await self.lock.receiveWebhook(body, received_hash, received_ts)
+        if "error" in event_data:
+            _LOGGER.warning("Incorrect callback received:: %s", event_data)
+            return
+
+        self.async_update_listeners()
+
+    async def ensure_webhooks(self) -> None:
+        """Register webhook on LOQED bridge."""
+        webhook_id = self._entry.data[CONF_WEBHOOK_ID]
+
+        webhook.async_register(
+            self.hass, DOMAIN, "Loqed", webhook_id, self._handle_webhook
+        )
+        webhook_url = webhook.async_generate_url(self.hass, webhook_id)
+        _LOGGER.debug("Webhook URL: %s", webhook_url)
+
+        webhooks = await self.lock.getWebhooks()
+
+        webhook_index = next(
+            (x["id"] for x in webhooks if x["url"] == webhook_url), None
+        )
+
+        if not webhook_index:
+            await self.lock.registerWebhook(webhook_url)
+            webhooks = await self.lock.getWebhooks()
+            webhook_index = next(x["id"] for x in webhooks if x["url"] == webhook_url)
+
+            _LOGGER.info("Webhook got index %s", webhook_index)
+
+    async def remove_webhooks(self) -> None:
+        """Remove webhook from LOQED bridge."""
+        webhook_id = self._entry.data[CONF_WEBHOOK_ID]
+        webhook_url = webhook.async_generate_url(self.hass, webhook_id)
+
+        webhook.async_unregister(
+            self.hass,
+            webhook_id,
+        )
+        _LOGGER.info("Webhook URL: %s", webhook_url)
+
+        webhooks = await self.lock.getWebhooks()
+
+        webhook_index = next(
+            (x["id"] for x in webhooks if x["url"] == webhook_url), None
+        )
+
+        if webhook_index:
+            await self.lock.deleteWebhook(webhook_index)
diff --git a/homeassistant/components/loqed/entity.py b/homeassistant/components/loqed/entity.py
new file mode 100644
index 00000000000..978fe844d61
--- /dev/null
+++ b/homeassistant/components/loqed/entity.py
@@ -0,0 +1,29 @@
+"""Base entity for the LOQED integration."""
+from __future__ import annotations
+
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import LoqedDataCoordinator
+
+
+class LoqedEntity(CoordinatorEntity[LoqedDataCoordinator]):
+    """Defines a LOQED entity."""
+
+    _attr_has_entity_name = True
+
+    def __init__(self, coordinator: LoqedDataCoordinator) -> None:
+        """Initialize the LOQED entity."""
+        super().__init__(coordinator=coordinator)
+
+        lock_id = coordinator.lock.id
+
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, lock_id)},
+            manufacturer="LOQED",
+            name=coordinator.device_name,
+            model="Touch Smart Lock",
+            connections={(CONNECTION_NETWORK_MAC, lock_id)},
+        )
diff --git a/homeassistant/components/loqed/lock.py b/homeassistant/components/loqed/lock.py
new file mode 100644
index 00000000000..d34df19e2d1
--- /dev/null
+++ b/homeassistant/components/loqed/lock.py
@@ -0,0 +1,85 @@
+"""LOQED lock integration for Home Assistant."""
+from __future__ import annotations
+
+import logging
+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 . import LoqedDataCoordinator
+from .const import DOMAIN
+from .entity import LoqedEntity
+
+WEBHOOK_API_ENDPOINT = "/api/loqed/webhook"
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the Loqed lock platform."""
+    coordinator = hass.data[DOMAIN][entry.entry_id]
+
+    async_add_entities([LoqedLock(coordinator)])
+
+
+class LoqedLock(LoqedEntity, LockEntity):
+    """Representation of a loqed lock."""
+
+    _attr_supported_features = LockEntityFeature.OPEN
+
+    def __init__(self, coordinator: LoqedDataCoordinator) -> None:
+        """Initialize the lock."""
+        super().__init__(coordinator)
+        self._lock = coordinator.lock
+        self._attr_unique_id = self._lock.id
+        self._attr_name = None
+
+    @property
+    def changed_by(self) -> str:
+        """Return internal ID of last used key."""
+        return f"KeyID {self._lock.last_key_id}"
+
+    @property
+    def is_locking(self) -> bool | None:
+        """Return true if lock is locking."""
+        return self._lock.bolt_state == "locking"
+
+    @property
+    def is_unlocking(self) -> bool | None:
+        """Return true if lock is unlocking."""
+        return self._lock.bolt_state == "unlocking"
+
+    @property
+    def is_jammed(self) -> bool | None:
+        """Return true if lock is jammed."""
+        return self._lock.bolt_state == "motor_stall"
+
+    @property
+    def is_locked(self) -> bool | None:
+        """Return true if lock is locked."""
+        return self._lock.bolt_state in ["night_lock_remote", "night_lock"]
+
+    async def async_lock(self, **kwargs: Any) -> None:
+        """Lock the lock."""
+        await self._lock.lock()
+
+    async def async_unlock(self, **kwargs: Any) -> None:
+        """Unlock the lock."""
+        await self._lock.unlock()
+
+    async def async_open(self, **kwargs: Any) -> None:
+        """Open the door latch."""
+        await self._lock.open()
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        _LOGGER.debug(self.coordinator.data)
+        if "bolt_state" in self.coordinator.data:
+            self._lock.updateState(self.coordinator.data["bolt_state"]).close()
+            self.async_write_ha_state()
diff --git a/homeassistant/components/loqed/manifest.json b/homeassistant/components/loqed/manifest.json
new file mode 100644
index 00000000000..1000d8f804d
--- /dev/null
+++ b/homeassistant/components/loqed/manifest.json
@@ -0,0 +1,16 @@
+{
+  "domain": "loqed",
+  "name": "LOQED Touch Smart Lock",
+  "codeowners": ["@mikewoudenberg"],
+  "config_flow": true,
+  "dependencies": ["webhook"],
+  "documentation": "https://www.home-assistant.io/integrations/loqed",
+  "iot_class": "local_push",
+  "requirements": ["loqedAPI==2.1.7"],
+  "zeroconf": [
+    {
+      "type": "_http._tcp.local.",
+      "name": "loqed*"
+    }
+  ]
+}
diff --git a/homeassistant/components/loqed/strings.json b/homeassistant/components/loqed/strings.json
new file mode 100644
index 00000000000..6f3316b283f
--- /dev/null
+++ b/homeassistant/components/loqed/strings.json
@@ -0,0 +1,21 @@
+{
+  "config": {
+    "flow_title": "LOQED Touch Smartlock setup",
+    "step": {
+      "user": {
+        "description": "Login at {config_url} and: \n* Create an API-key by clicking 'Create' \n* Copy the created access token.",
+        "data": {
+          "name": "Name of your lock in the LOQED app.",
+          "api_key": "[%key:common::config_flow::data::api_key%]"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    }
+  }
+}
diff --git a/homeassistant/components/luftdaten/sensor.py b/homeassistant/components/luftdaten/sensor.py
index 262a6701f56..cca467ce756 100644
--- a/homeassistant/components/luftdaten/sensor.py
+++ b/homeassistant/components/luftdaten/sensor.py
@@ -32,21 +32,18 @@ from .const import ATTR_SENSOR_ID, CONF_SENSOR_ID, DOMAIN
 SENSORS: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="temperature",
-        translation_key="temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="humidity",
-        translation_key="humidity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="pressure",
-        translation_key="pressure",
         native_unit_of_measurement=UnitOfPressure.PA,
         device_class=SensorDeviceClass.PRESSURE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -60,14 +57,12 @@ SENSORS: tuple[SensorEntityDescription, ...] = (
     ),
     SensorEntityDescription(
         key="P1",
-        translation_key="pm10",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM10,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="P2",
-        translation_key="pm25",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
diff --git a/homeassistant/components/luftdaten/strings.json b/homeassistant/components/luftdaten/strings.json
index d54bc6d0bdc..e990142923f 100644
--- a/homeassistant/components/luftdaten/strings.json
+++ b/homeassistant/components/luftdaten/strings.json
@@ -16,22 +16,7 @@
   },
   "entity": {
     "sensor": {
-      "humidity": {
-        "name": "[%key:component::sensor::entity_component::humidity::name%]"
-      },
-      "pressure": {
-        "name": "[%key:component::sensor::entity_component::pressure::name%]"
-      },
-      "pressure_at_sealevel": { "name": "Pressure at sealevel" },
-      "pm10": {
-        "name": "[%key:component::sensor::entity_component::pm10::name%]"
-      },
-      "pm25": {
-        "name": "[%key:component::sensor::entity_component::pm25::name%]"
-      },
-      "temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      }
+      "pressure_at_sealevel": { "name": "Pressure at sealevel" }
     }
   }
 }
diff --git a/homeassistant/components/lutron/__init__.py b/homeassistant/components/lutron/__init__.py
index d8ccce8a6bc..c15f0ea075e 100644
--- a/homeassistant/components/lutron/__init__.py
+++ b/homeassistant/components/lutron/__init__.py
@@ -37,6 +37,7 @@ LUTRON_DEVICES = "lutron_devices"
 # Attribute on events that indicates what action was taken with the button.
 ATTR_ACTION = "action"
 ATTR_FULL_ID = "full_id"
+ATTR_UUID = "uuid"
 
 CONFIG_SCHEMA = vol.Schema(
     {
@@ -170,6 +171,7 @@ class LutronButton:
         self._button = button
         self._event = "lutron_event"
         self._full_id = slugify(f"{area_name} {name}")
+        self._uuid = button.uuid
 
         button.subscribe(self.button_callback, None)
 
@@ -188,5 +190,10 @@ class LutronButton:
             action = "single"
 
         if action:
-            data = {ATTR_ID: self._id, ATTR_ACTION: action, ATTR_FULL_ID: self._full_id}
+            data = {
+                ATTR_ID: self._id,
+                ATTR_ACTION: action,
+                ATTR_FULL_ID: self._full_id,
+                ATTR_UUID: self._uuid,
+            }
             self._hass.bus.fire(self._event, data)
diff --git a/homeassistant/components/lyric/__init__.py b/homeassistant/components/lyric/__init__.py
index f34366f24d0..c2423a7c47f 100644
--- a/homeassistant/components/lyric/__init__.py
+++ b/homeassistant/components/lyric/__init__.py
@@ -23,8 +23,6 @@ from homeassistant.helpers import (
     device_registry as dr,
 )
 from homeassistant.helpers.entity import DeviceInfo
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -38,29 +36,13 @@ from .api import (
 )
 from .const import DOMAIN
 
-CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [Platform.CLIMATE, Platform.SENSOR]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Honeywell Lyric integration."""
-    if DOMAIN in config:
-        async_create_issue(
-            hass,
-            DOMAIN,
-            "removed_yaml",
-            breaks_in_ha_version="2022.8.0",
-            is_fixable=False,
-            severity=IssueSeverity.WARNING,
-            translation_key="removed_yaml",
-        )
-
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Honeywell Lyric from a config entry."""
     implementation = (
diff --git a/homeassistant/components/mailbox/__init__.py b/homeassistant/components/mailbox/__init__.py
index 29f023d0de2..75cea546b71 100644
--- a/homeassistant/components/mailbox/__init__.py
+++ b/homeassistant/components/mailbox/__init__.py
@@ -16,7 +16,11 @@ from homeassistant.components import frontend
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_per_platform, discovery
+from homeassistant.helpers import (
+    config_per_platform,
+    config_validation as cv,
+    discovery,
+)
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -32,6 +36,8 @@ CONTENT_TYPE_NONE: Final = "none"
 
 SCAN_INTERVAL = timedelta(seconds=30)
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Track states and offer events for mailboxes."""
diff --git a/homeassistant/components/matter/adapter.py b/homeassistant/components/matter/adapter.py
index 9f16dae8334..8e76706b7fd 100644
--- a/homeassistant/components/matter/adapter.py
+++ b/homeassistant/components/matter/adapter.py
@@ -52,15 +52,68 @@ class MatterAdapter:
 
     async def setup_nodes(self) -> None:
         """Set up all existing nodes and subscribe to new nodes."""
-        for node in await self.matter_client.get_nodes():
+        for node in self.matter_client.get_nodes():
             self._setup_node(node)
 
         def node_added_callback(event: EventType, node: MatterNode) -> None:
             """Handle node added event."""
             self._setup_node(node)
 
+        def endpoint_added_callback(event: EventType, data: dict[str, int]) -> None:
+            """Handle endpoint added event."""
+            node = self.matter_client.get_node(data["node_id"])
+            self._setup_endpoint(node.endpoints[data["endpoint_id"]])
+
+        def endpoint_removed_callback(event: EventType, data: dict[str, int]) -> None:
+            """Handle endpoint removed event."""
+            server_info = cast(ServerInfoMessage, self.matter_client.server_info)
+            try:
+                node = self.matter_client.get_node(data["node_id"])
+            except KeyError:
+                return  # race condition
+            device_registry = dr.async_get(self.hass)
+            endpoint = node.endpoints.get(data["endpoint_id"])
+            if not endpoint:
+                return  # race condition
+            node_device_id = get_device_id(
+                server_info,
+                node.endpoints[data["endpoint_id"]],
+            )
+            identifier = (DOMAIN, f"{ID_TYPE_DEVICE_ID}_{node_device_id}")
+            if device := device_registry.async_get_device({identifier}):
+                device_registry.async_remove_device(device.id)
+
+        def node_removed_callback(event: EventType, node_id: int) -> None:
+            """Handle node removed event."""
+            try:
+                node = self.matter_client.get_node(node_id)
+            except KeyError:
+                return  # race condition
+            for endpoint_id in node.endpoints:
+                endpoint_removed_callback(
+                    EventType.ENDPOINT_REMOVED,
+                    {"node_id": node_id, "endpoint_id": endpoint_id},
+                )
+
         self.config_entry.async_on_unload(
-            self.matter_client.subscribe(node_added_callback, EventType.NODE_ADDED)
+            self.matter_client.subscribe_events(
+                endpoint_added_callback, EventType.ENDPOINT_ADDED
+            )
+        )
+        self.config_entry.async_on_unload(
+            self.matter_client.subscribe_events(
+                endpoint_removed_callback, EventType.ENDPOINT_REMOVED
+            )
+        )
+        self.config_entry.async_on_unload(
+            self.matter_client.subscribe_events(
+                node_removed_callback, EventType.NODE_REMOVED
+            )
+        )
+        self.config_entry.async_on_unload(
+            self.matter_client.subscribe_events(
+                node_added_callback, EventType.NODE_ADDED
+            )
         )
 
     def _setup_node(self, node: MatterNode) -> None:
diff --git a/homeassistant/components/matter/binary_sensor.py b/homeassistant/components/matter/binary_sensor.py
index bd65b3a0925..7c94c07c8cd 100644
--- a/homeassistant/components/matter/binary_sensor.py
+++ b/homeassistant/components/matter/binary_sensor.py
@@ -65,7 +65,6 @@ DISCOVERY_SCHEMAS = [
         entity_description=MatterBinarySensorEntityDescription(
             key="HueMotionSensor",
             device_class=BinarySensorDeviceClass.MOTION,
-            name="Motion",
             measurement_to_ha=lambda x: (x & 1 == 1) if x is not None else None,
         ),
         entity_class=MatterBinarySensor,
@@ -78,7 +77,6 @@ DISCOVERY_SCHEMAS = [
         entity_description=MatterBinarySensorEntityDescription(
             key="ContactSensor",
             device_class=BinarySensorDeviceClass.DOOR,
-            name="Contact",
             # value is inverted on matter to what we expect
             measurement_to_ha=lambda x: not x,
         ),
@@ -90,7 +88,6 @@ DISCOVERY_SCHEMAS = [
         entity_description=MatterBinarySensorEntityDescription(
             key="OccupancySensor",
             device_class=BinarySensorDeviceClass.OCCUPANCY,
-            name="Occupancy",
             # The first bit = if occupied
             measurement_to_ha=lambda x: (x & 1 == 1) if x is not None else None,
         ),
@@ -102,7 +99,6 @@ DISCOVERY_SCHEMAS = [
         entity_description=MatterBinarySensorEntityDescription(
             key="BatteryChargeLevel",
             device_class=BinarySensorDeviceClass.BATTERY,
-            name="Battery Status",
             measurement_to_ha=lambda x: x
             != clusters.PowerSource.Enums.BatChargeLevelEnum.kOk,
         ),
diff --git a/homeassistant/components/matter/climate.py b/homeassistant/components/matter/climate.py
new file mode 100644
index 00000000000..6da88533edc
--- /dev/null
+++ b/homeassistant/components/matter/climate.py
@@ -0,0 +1,313 @@
+"""Matter climate platform."""
+from __future__ import annotations
+
+from enum import IntEnum
+from typing import TYPE_CHECKING, 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.climate import (
+    ATTR_HVAC_MODE,
+    ATTR_TARGET_TEMP_HIGH,
+    ATTR_TARGET_TEMP_LOW,
+    DEFAULT_MAX_TEMP,
+    DEFAULT_MIN_TEMP,
+    ClimateEntity,
+    ClimateEntityDescription,
+    ClimateEntityFeature,
+    HVACAction,
+    HVACMode,
+)
+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 .entity import MatterEntity
+from .helpers import get_matter
+from .models import MatterDiscoverySchema
+
+if TYPE_CHECKING:
+    from matter_server.client import MatterClient
+    from matter_server.client.models.node import MatterEndpoint
+
+    from .discovery import MatterEntityInfo
+
+TEMPERATURE_SCALING_FACTOR = 100
+HVAC_SYSTEM_MODE_MAP = {
+    HVACMode.OFF: 0,
+    HVACMode.HEAT_COOL: 1,
+    HVACMode.COOL: 3,
+    HVACMode.HEAT: 4,
+}
+SystemModeEnum = clusters.Thermostat.Enums.ThermostatSystemMode
+ControlSequenceEnum = clusters.Thermostat.Enums.ThermostatControlSequence
+ThermostatFeature = clusters.Thermostat.Bitmaps.ThermostatFeature
+
+
+class ThermostatRunningState(IntEnum):
+    """Thermostat Running State, Matter spec Thermostat 7.33."""
+
+    Heat = 1  # 1 << 0 = 1
+    Cool = 2  # 1 << 1 = 2
+    Fan = 4  # 1 << 2 = 4
+    HeatStage2 = 8  # 1 << 3 = 8
+    CoolStage2 = 16  # 1 << 4 = 16
+    FanStage2 = 32  # 1 << 5 = 32
+    FanStage3 = 64  # 1 << 6 = 64
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up Matter climate platform from Config Entry."""
+    matter = get_matter(hass)
+    matter.register_platform_handler(Platform.CLIMATE, async_add_entities)
+
+
+class MatterClimate(MatterEntity, ClimateEntity):
+    """Representation of a Matter climate entity."""
+
+    _attr_temperature_unit: str = UnitOfTemperature.CELSIUS
+    _attr_supported_features: ClimateEntityFeature = (
+        ClimateEntityFeature.TARGET_TEMPERATURE
+        | ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
+    )
+    _attr_hvac_mode: HVACMode = HVACMode.OFF
+
+    def __init__(
+        self,
+        matter_client: MatterClient,
+        endpoint: MatterEndpoint,
+        entity_info: MatterEntityInfo,
+    ) -> None:
+        """Initialize the Matter climate entity."""
+        super().__init__(matter_client, endpoint, entity_info)
+
+        # set hvac_modes based on feature map
+        self._attr_hvac_modes: list[HVACMode] = [HVACMode.OFF]
+        feature_map = int(
+            self.get_matter_attribute_value(clusters.Thermostat.Attributes.FeatureMap)
+        )
+        if feature_map & ThermostatFeature.kHeating:
+            self._attr_hvac_modes.append(HVACMode.HEAT)
+        if feature_map & ThermostatFeature.kCooling:
+            self._attr_hvac_modes.append(HVACMode.COOL)
+        if feature_map & ThermostatFeature.kAutoMode:
+            self._attr_hvac_modes.append(HVACMode.HEAT_COOL)
+
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set new target temperature."""
+        target_hvac_mode: HVACMode | None = kwargs.get(ATTR_HVAC_MODE)
+        if target_hvac_mode is not None:
+            await self.async_set_hvac_mode(target_hvac_mode)
+
+        current_mode = target_hvac_mode or self.hvac_mode
+        command = None
+        if current_mode in (HVACMode.HEAT, HVACMode.COOL):
+            # when current mode is either heat or cool, the temperature arg must be provided.
+            temperature: float | None = kwargs.get(ATTR_TEMPERATURE)
+            if temperature is None:
+                raise ValueError("Temperature must be provided")
+            if self.target_temperature is None:
+                raise ValueError("Current target_temperature should not be None")
+            command = self._create_optional_setpoint_command(
+                clusters.Thermostat.Enums.SetpointAdjustMode.kCool
+                if current_mode == HVACMode.COOL
+                else clusters.Thermostat.Enums.SetpointAdjustMode.kHeat,
+                temperature,
+                self.target_temperature,
+            )
+        elif current_mode == HVACMode.HEAT_COOL:
+            temperature_low: float | None = kwargs.get(ATTR_TARGET_TEMP_LOW)
+            temperature_high: float | None = kwargs.get(ATTR_TARGET_TEMP_HIGH)
+            if temperature_low is None or temperature_high is None:
+                raise ValueError(
+                    "temperature_low and temperature_high must be provided"
+                )
+            if (
+                self.target_temperature_low is None
+                or self.target_temperature_high is None
+            ):
+                raise ValueError(
+                    "current target_temperature_low and target_temperature_high should not be None"
+                )
+            # due to ha send both high and low temperature, we need to check which one is changed
+            command = self._create_optional_setpoint_command(
+                clusters.Thermostat.Enums.SetpointAdjustMode.kHeat,
+                temperature_low,
+                self.target_temperature_low,
+            )
+            if command is None:
+                command = self._create_optional_setpoint_command(
+                    clusters.Thermostat.Enums.SetpointAdjustMode.kCool,
+                    temperature_high,
+                    self.target_temperature_high,
+                )
+        if 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_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,
+            value=system_mode_value,
+        )
+        # 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
+        self._endpoint.set_attribute_value(system_mode_path, system_mode_value)
+        self._update_from_device()
+
+    @callback
+    def _update_from_device(self) -> None:
+        """Update from device."""
+        self._attr_current_temperature = self._get_temperature_in_degrees(
+            clusters.Thermostat.Attributes.LocalTemperature
+        )
+        # update hvac_mode from SystemMode
+        system_mode_value = int(
+            self.get_matter_attribute_value(clusters.Thermostat.Attributes.SystemMode)
+        )
+        match system_mode_value:
+            case SystemModeEnum.kAuto:
+                self._attr_hvac_mode = HVACMode.HEAT_COOL
+            case SystemModeEnum.kDry:
+                self._attr_hvac_mode = HVACMode.DRY
+            case SystemModeEnum.kFanOnly:
+                self._attr_hvac_mode = HVACMode.FAN_ONLY
+            case SystemModeEnum.kCool | SystemModeEnum.kPrecooling:
+                self._attr_hvac_mode = HVACMode.COOL
+            case SystemModeEnum.kHeat | SystemModeEnum.kEmergencyHeat:
+                self._attr_hvac_mode = HVACMode.HEAT
+            case _:
+                self._attr_hvac_mode = HVACMode.OFF
+        # running state is an optional attribute
+        # which we map to hvac_action if it exists (its value is not None)
+        self._attr_hvac_action = None
+        if running_state_value := self.get_matter_attribute_value(
+            clusters.Thermostat.Attributes.ThermostatRunningState
+        ):
+            match running_state_value:
+                case ThermostatRunningState.Heat | ThermostatRunningState.HeatStage2:
+                    self._attr_hvac_action = HVACAction.HEATING
+                case ThermostatRunningState.Cool | ThermostatRunningState.CoolStage2:
+                    self._attr_hvac_action = HVACAction.COOLING
+                case (
+                    ThermostatRunningState.Fan
+                    | ThermostatRunningState.FanStage2
+                    | ThermostatRunningState.FanStage3
+                ):
+                    self._attr_hvac_action = HVACAction.FAN
+                case _:
+                    self._attr_hvac_action = HVACAction.OFF
+        # update target_temperature
+        if self._attr_hvac_mode == HVACMode.HEAT_COOL:
+            self._attr_target_temperature = None
+        elif self._attr_hvac_mode == HVACMode.COOL:
+            self._attr_target_temperature = self._get_temperature_in_degrees(
+                clusters.Thermostat.Attributes.OccupiedCoolingSetpoint
+            )
+        else:
+            self._attr_target_temperature = self._get_temperature_in_degrees(
+                clusters.Thermostat.Attributes.OccupiedHeatingSetpoint
+            )
+        # update target temperature high/low
+        if self._attr_hvac_mode == HVACMode.HEAT_COOL:
+            self._attr_target_temperature_high = self._get_temperature_in_degrees(
+                clusters.Thermostat.Attributes.OccupiedCoolingSetpoint
+            )
+            self._attr_target_temperature_low = self._get_temperature_in_degrees(
+                clusters.Thermostat.Attributes.OccupiedHeatingSetpoint
+            )
+        else:
+            self._attr_target_temperature_high = None
+            self._attr_target_temperature_low = None
+        # update min_temp
+        if self._attr_hvac_mode == HVACMode.COOL:
+            attribute = clusters.Thermostat.Attributes.AbsMinCoolSetpointLimit
+        else:
+            attribute = clusters.Thermostat.Attributes.AbsMinHeatSetpointLimit
+        if (value := self._get_temperature_in_degrees(attribute)) is not None:
+            self._attr_min_temp = value
+        else:
+            self._attr_min_temp = DEFAULT_MIN_TEMP
+        # update max_temp
+        if self._attr_hvac_mode in (HVACMode.COOL, HVACMode.HEAT_COOL):
+            attribute = clusters.Thermostat.Attributes.AbsMaxHeatSetpointLimit
+        else:
+            attribute = clusters.Thermostat.Attributes.AbsMaxCoolSetpointLimit
+        if (value := self._get_temperature_in_degrees(attribute)) is not None:
+            self._attr_max_temp = value
+        else:
+            self._attr_max_temp = DEFAULT_MAX_TEMP
+
+    def _get_temperature_in_degrees(
+        self, attribute: type[clusters.ClusterAttributeDescriptor]
+    ) -> float | None:
+        """Return the scaled temperature value for the given attribute."""
+        if value := self.get_matter_attribute_value(attribute):
+            return float(value) / TEMPERATURE_SCALING_FACTOR
+        return None
+
+    @staticmethod
+    def _create_optional_setpoint_command(
+        mode: clusters.Thermostat.Enums.SetpointAdjustMode,
+        target_temp: float,
+        current_target_temp: float,
+    ) -> clusters.Thermostat.Commands.SetpointRaiseLower | None:
+        """Create a setpoint command if the target temperature is different from the current one."""
+
+        temp_diff = int((target_temp - current_target_temp) * 10)
+
+        if temp_diff == 0:
+            return None
+
+        return clusters.Thermostat.Commands.SetpointRaiseLower(
+            mode,
+            temp_diff,
+        )
+
+
+# Discovery schema(s) to map Matter Attributes to HA entities
+DISCOVERY_SCHEMAS = [
+    MatterDiscoverySchema(
+        platform=Platform.CLIMATE,
+        entity_description=ClimateEntityDescription(
+            key="MatterThermostat",
+            name=None,
+        ),
+        entity_class=MatterClimate,
+        required_attributes=(clusters.Thermostat.Attributes.LocalTemperature,),
+        optional_attributes=(
+            clusters.Thermostat.Attributes.FeatureMap,
+            clusters.Thermostat.Attributes.ControlSequenceOfOperation,
+            clusters.Thermostat.Attributes.Occupancy,
+            clusters.Thermostat.Attributes.OccupiedCoolingSetpoint,
+            clusters.Thermostat.Attributes.OccupiedHeatingSetpoint,
+            clusters.Thermostat.Attributes.SystemMode,
+            clusters.Thermostat.Attributes.ThermostatRunningMode,
+            clusters.Thermostat.Attributes.ThermostatRunningState,
+            clusters.Thermostat.Attributes.TemperatureSetpointHold,
+            clusters.Thermostat.Attributes.UnoccupiedCoolingSetpoint,
+            clusters.Thermostat.Attributes.UnoccupiedHeatingSetpoint,
+        ),
+        device_type=(device_types.Thermostat,),
+    ),
+]
diff --git a/homeassistant/components/matter/cover.py b/homeassistant/components/matter/cover.py
index 61c5d4cd2ff..590f325cf22 100644
--- a/homeassistant/components/matter/cover.py
+++ b/homeassistant/components/matter/cover.py
@@ -199,7 +199,7 @@ class MatterCover(MatterEntity, CoverEntity):
 DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.COVER,
-        entity_description=CoverEntityDescription(key="MatterCover"),
+        entity_description=CoverEntityDescription(key="MatterCover", name=None),
         entity_class=MatterCover,
         required_attributes=(
             clusters.WindowCovering.Attributes.OperationalStatus,
@@ -212,7 +212,9 @@ DISCOVERY_SCHEMAS = [
     ),
     MatterDiscoverySchema(
         platform=Platform.COVER,
-        entity_description=CoverEntityDescription(key="MatterCoverPositionAwareLift"),
+        entity_description=CoverEntityDescription(
+            key="MatterCoverPositionAwareLift", name=None
+        ),
         entity_class=MatterCover,
         required_attributes=(
             clusters.WindowCovering.Attributes.OperationalStatus,
@@ -225,7 +227,9 @@ DISCOVERY_SCHEMAS = [
     ),
     MatterDiscoverySchema(
         platform=Platform.COVER,
-        entity_description=CoverEntityDescription(key="MatterCoverPositionAwareTilt"),
+        entity_description=CoverEntityDescription(
+            key="MatterCoverPositionAwareTilt", name=None
+        ),
         entity_class=MatterCover,
         required_attributes=(
             clusters.WindowCovering.Attributes.OperationalStatus,
@@ -239,7 +243,7 @@ DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.COVER,
         entity_description=CoverEntityDescription(
-            key="MatterCoverPositionAwareLiftAndTilt"
+            key="MatterCoverPositionAwareLiftAndTilt", name=None
         ),
         entity_class=MatterCover,
         required_attributes=(
diff --git a/homeassistant/components/matter/discovery.py b/homeassistant/components/matter/discovery.py
index 28f5b6b7f90..0b4bacf00ca 100644
--- a/homeassistant/components/matter/discovery.py
+++ b/homeassistant/components/matter/discovery.py
@@ -10,6 +10,7 @@ from homeassistant.const import Platform
 from homeassistant.core import callback
 
 from .binary_sensor import DISCOVERY_SCHEMAS as BINARY_SENSOR_SCHEMAS
+from .climate import DISCOVERY_SCHEMAS as CLIMATE_SENSOR_SCHEMAS
 from .cover import DISCOVERY_SCHEMAS as COVER_SCHEMAS
 from .light import DISCOVERY_SCHEMAS as LIGHT_SCHEMAS
 from .lock import DISCOVERY_SCHEMAS as LOCK_SCHEMAS
@@ -19,6 +20,7 @@ from .switch import DISCOVERY_SCHEMAS as SWITCH_SCHEMAS
 
 DISCOVERY_SCHEMAS: dict[Platform, list[MatterDiscoverySchema]] = {
     Platform.BINARY_SENSOR: BINARY_SENSOR_SCHEMAS,
+    Platform.CLIMATE: CLIMATE_SENSOR_SCHEMAS,
     Platform.COVER: COVER_SCHEMAS,
     Platform.LIGHT: LIGHT_SCHEMAS,
     Platform.LOCK: LOCK_SCHEMAS,
diff --git a/homeassistant/components/matter/entity.py b/homeassistant/components/matter/entity.py
index bf0a74ef845..0457cfaa810 100644
--- a/homeassistant/components/matter/entity.py
+++ b/homeassistant/components/matter/entity.py
@@ -75,20 +75,25 @@ class MatterEntity(Entity):
         await super().async_added_to_hass()
 
         # Subscribe to attribute updates.
+        sub_paths: list[str] = []
         for attr_cls in self._entity_info.attributes_to_watch:
             attr_path = self.get_matter_attribute_path(attr_cls)
             self._attributes_map[attr_cls] = attr_path
+            sub_paths.append(attr_path)
             self._unsubscribes.append(
-                self.matter_client.subscribe(
+                self.matter_client.subscribe_events(
                     callback=self._on_matter_event,
                     event_filter=EventType.ATTRIBUTE_UPDATED,
                     node_filter=self._endpoint.node.node_id,
                     attr_path_filter=attr_path,
                 )
             )
+        await self.matter_client.subscribe_attribute(
+            self._endpoint.node.node_id, sub_paths
+        )
         # subscribe to node (availability changes)
         self._unsubscribes.append(
-            self.matter_client.subscribe(
+            self.matter_client.subscribe_events(
                 callback=self._on_matter_event,
                 event_filter=EventType.NODE_UPDATED,
                 node_filter=self._endpoint.node.node_id,
diff --git a/homeassistant/components/matter/helpers.py b/homeassistant/components/matter/helpers.py
index 4b609950256..0274c80edf8 100644
--- a/homeassistant/components/matter/helpers.py
+++ b/homeassistant/components/matter/helpers.py
@@ -95,7 +95,7 @@ async def get_node_from_device_entry(
     node = next(
         (
             node
-            for node in await matter_client.get_nodes()
+            for node in matter_client.get_nodes()
             for endpoint in node.endpoints.values()
             if get_device_id(server_info, endpoint) == device_id
         ),
diff --git a/homeassistant/components/matter/light.py b/homeassistant/components/matter/light.py
index ae2b7a68c3a..facdb6752d3 100644
--- a/homeassistant/components/matter/light.py
+++ b/homeassistant/components/matter/light.py
@@ -220,7 +220,7 @@ class MatterLight(MatterEntity, LightEntity):
         return round(
             renormalize(
                 level_control.currentLevel,
-                (level_control.minLevel, level_control.maxLevel),
+                (level_control.minLevel or 0, level_control.maxLevel or 254),
                 (0, 255),
             )
         )
@@ -299,6 +299,8 @@ class MatterLight(MatterEntity, LightEntity):
             # colormode(s)
             if self._entity_info.endpoint.has_attribute(
                 None, clusters.ColorControl.Attributes.ColorMode
+            ) and self._entity_info.endpoint.has_attribute(
+                None, clusters.ColorControl.Attributes.ColorCapabilities
             ):
                 capabilities = self.get_matter_attribute_value(
                     clusters.ColorControl.Attributes.ColorCapabilities
@@ -356,7 +358,7 @@ class MatterLight(MatterEntity, LightEntity):
 DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.LIGHT,
-        entity_description=LightEntityDescription(key="MatterLight"),
+        entity_description=LightEntityDescription(key="MatterLight", name=None),
         entity_class=MatterLight,
         required_attributes=(clusters.OnOff.Attributes.OnOff,),
         optional_attributes=(
@@ -375,4 +377,90 @@ DISCOVERY_SCHEMAS = [
             device_types.OnOffLight,
         ),
     ),
+    # Additional schema to match (HS Color) lights with incorrect/missing device type
+    MatterDiscoverySchema(
+        platform=Platform.LIGHT,
+        entity_description=LightEntityDescription(
+            key="MatterHSColorLightFallback", name=None
+        ),
+        entity_class=MatterLight,
+        required_attributes=(
+            clusters.OnOff.Attributes.OnOff,
+            clusters.LevelControl.Attributes.CurrentLevel,
+            clusters.ColorControl.Attributes.CurrentHue,
+            clusters.ColorControl.Attributes.CurrentSaturation,
+        ),
+        optional_attributes=(
+            clusters.ColorControl.Attributes.ColorTemperatureMireds,
+            clusters.ColorControl.Attributes.ColorMode,
+            clusters.ColorControl.Attributes.CurrentX,
+            clusters.ColorControl.Attributes.CurrentY,
+        ),
+    ),
+    # Additional schema to match (XY Color) lights with incorrect/missing device type
+    MatterDiscoverySchema(
+        platform=Platform.LIGHT,
+        entity_description=LightEntityDescription(
+            key="MatterXYColorLightFallback", name=None
+        ),
+        entity_class=MatterLight,
+        required_attributes=(
+            clusters.OnOff.Attributes.OnOff,
+            clusters.LevelControl.Attributes.CurrentLevel,
+            clusters.ColorControl.Attributes.CurrentX,
+            clusters.ColorControl.Attributes.CurrentY,
+        ),
+        optional_attributes=(
+            clusters.ColorControl.Attributes.ColorTemperatureMireds,
+            clusters.ColorControl.Attributes.ColorMode,
+            clusters.ColorControl.Attributes.CurrentHue,
+            clusters.ColorControl.Attributes.CurrentSaturation,
+        ),
+    ),
+    # Additional schema to match (color temperature) lights with incorrect/missing device type
+    MatterDiscoverySchema(
+        platform=Platform.LIGHT,
+        entity_description=LightEntityDescription(
+            key="MatterColorTemperatureLightFallback", name=None
+        ),
+        entity_class=MatterLight,
+        required_attributes=(
+            clusters.OnOff.Attributes.OnOff,
+            clusters.LevelControl.Attributes.CurrentLevel,
+            clusters.ColorControl.Attributes.ColorTemperatureMireds,
+        ),
+        optional_attributes=(clusters.ColorControl.Attributes.ColorMode,),
+    ),
+    # Additional schema to match generic dimmable lights with incorrect/missing device type
+    MatterDiscoverySchema(
+        platform=Platform.LIGHT,
+        entity_description=LightEntityDescription(
+            key="MatterDimmableLightFallback", name=None
+        ),
+        entity_class=MatterLight,
+        required_attributes=(
+            clusters.OnOff.Attributes.OnOff,
+            clusters.LevelControl.Attributes.CurrentLevel,
+        ),
+        optional_attributes=(
+            clusters.ColorControl.Attributes.ColorMode,
+            clusters.ColorControl.Attributes.CurrentHue,
+            clusters.ColorControl.Attributes.CurrentSaturation,
+            clusters.ColorControl.Attributes.CurrentX,
+            clusters.ColorControl.Attributes.CurrentY,
+            clusters.ColorControl.Attributes.ColorTemperatureMireds,
+        ),
+        # important: make sure to rule out all device types that are also based on the
+        # onoff and levelcontrol clusters !
+        not_device_type=(
+            device_types.Fan,
+            device_types.GenericSwitch,
+            device_types.OnOffPlugInUnit,
+            device_types.HeatingCoolingUnit,
+            device_types.Pump,
+            device_types.CastingVideoClient,
+            device_types.VideoRemoteControl,
+            device_types.Speaker,
+        ),
+    ),
 ]
diff --git a/homeassistant/components/matter/lock.py b/homeassistant/components/matter/lock.py
index c529ee12c5f..a5f625f9e73 100644
--- a/homeassistant/components/matter/lock.py
+++ b/homeassistant/components/matter/lock.py
@@ -8,7 +8,7 @@ from chip.clusters import Objects as clusters
 
 from homeassistant.components.lock import LockEntity, LockEntityDescription
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import Platform
+from homeassistant.const import ATTR_CODE, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -33,6 +33,26 @@ class MatterLock(MatterEntity, LockEntity):
 
     features: int | None = None
 
+    @property
+    def code_format(self) -> str | None:
+        """Regex for code format or None if no code is required."""
+        if self.get_matter_attribute_value(
+            clusters.DoorLock.Attributes.RequirePINforRemoteOperation
+        ):
+            min_pincode_length = int(
+                self.get_matter_attribute_value(
+                    clusters.DoorLock.Attributes.MinPINCodeLength
+                )
+            )
+            max_pincode_length = int(
+                self.get_matter_attribute_value(
+                    clusters.DoorLock.Attributes.MaxPINCodeLength
+                )
+            )
+            return f"^\\d{{{min_pincode_length},{max_pincode_length}}}$"
+
+        return None
+
     @property
     def supports_door_position_sensor(self) -> bool:
         """Return True if the lock supports door position sensor."""
@@ -56,11 +76,25 @@ class MatterLock(MatterEntity, LockEntity):
 
     async def async_lock(self, **kwargs: Any) -> None:
         """Lock the lock with pin if needed."""
-        await self.send_device_command(command=clusters.DoorLock.Commands.LockDoor())
+        code: str = kwargs.get(
+            ATTR_CODE,
+            self._lock_option_default_code,
+        )
+        code_bytes = code.encode() if code else None
+        await self.send_device_command(
+            command=clusters.DoorLock.Commands.LockDoor(code_bytes)
+        )
 
     async def async_unlock(self, **kwargs: Any) -> None:
         """Unlock the lock with pin if needed."""
-        await self.send_device_command(command=clusters.DoorLock.Commands.UnlockDoor())
+        code: str = kwargs.get(
+            ATTR_CODE,
+            self._lock_option_default_code,
+        )
+        code_bytes = code.encode() if code else None
+        await self.send_device_command(
+            command=clusters.DoorLock.Commands.UnlockDoor(code_bytes)
+        )
 
     @callback
     def _update_from_device(self) -> None:
@@ -116,24 +150,24 @@ class DoorLockFeature(IntFlag):
     Should be replaced by the library provided one once that is released.
     """
 
-    kPinCredential = 0x1
-    kRfidCredential = 0x2
-    kFingerCredentials = 0x4
-    kLogging = 0x8
-    kWeekDayAccessSchedules = 0x10
-    kDoorPositionSensor = 0x20
-    kFaceCredentials = 0x40
-    kCredentialsOverTheAirAccess = 0x80
-    kUser = 0x100
-    kNotification = 0x200
-    kYearDayAccessSchedules = 0x400
-    kHolidaySchedules = 0x800
+    kPinCredential = 0x1  # noqa: N815
+    kRfidCredential = 0x2  # noqa: N815
+    kFingerCredentials = 0x4  # noqa: N815
+    kLogging = 0x8  # noqa: N815
+    kWeekDayAccessSchedules = 0x10  # noqa: N815
+    kDoorPositionSensor = 0x20  # noqa: N815
+    kFaceCredentials = 0x40  # noqa: N815
+    kCredentialsOverTheAirAccess = 0x80  # noqa: N815
+    kUser = 0x100  # noqa: N815
+    kNotification = 0x200  # noqa: N815
+    kYearDayAccessSchedules = 0x400  # noqa: N815
+    kHolidaySchedules = 0x800  # noqa: N815
 
 
 DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.LOCK,
-        entity_description=LockEntityDescription(key="MatterLock"),
+        entity_description=LockEntityDescription(key="MatterLock", name=None),
         entity_class=MatterLock,
         required_attributes=(clusters.DoorLock.Attributes.LockState,),
         optional_attributes=(clusters.DoorLock.Attributes.DoorState,),
diff --git a/homeassistant/components/matter/manifest.json b/homeassistant/components/matter/manifest.json
index 707f7e70ee3..85434407a10 100644
--- a/homeassistant/components/matter/manifest.json
+++ b/homeassistant/components/matter/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["websocket_api"],
   "documentation": "https://www.home-assistant.io/integrations/matter",
   "iot_class": "local_push",
-  "requirements": ["python-matter-server==3.5.1"]
+  "requirements": ["python-matter-server==3.6.3"]
 }
diff --git a/homeassistant/components/matter/sensor.py b/homeassistant/components/matter/sensor.py
index 84e68695d63..027dcda65a7 100644
--- a/homeassistant/components/matter/sensor.py
+++ b/homeassistant/components/matter/sensor.py
@@ -68,7 +68,6 @@ DISCOVERY_SCHEMAS = [
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
             key="TemperatureSensor",
-            name="Temperature",
             native_unit_of_measurement=UnitOfTemperature.CELSIUS,
             device_class=SensorDeviceClass.TEMPERATURE,
             measurement_to_ha=lambda x: x / 100,
@@ -80,7 +79,6 @@ DISCOVERY_SCHEMAS = [
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
             key="PressureSensor",
-            name="Pressure",
             native_unit_of_measurement=UnitOfPressure.KPA,
             device_class=SensorDeviceClass.PRESSURE,
             measurement_to_ha=lambda x: x / 10,
@@ -92,9 +90,8 @@ DISCOVERY_SCHEMAS = [
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
             key="FlowSensor",
-            name="Flow",
             native_unit_of_measurement=UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR,
-            device_class=SensorDeviceClass.WATER,  # what is the device class here ?
+            translation_key="flow",
             measurement_to_ha=lambda x: x / 10,
         ),
         entity_class=MatterSensor,
@@ -104,7 +101,6 @@ DISCOVERY_SCHEMAS = [
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
             key="HumiditySensor",
-            name="Humidity",
             native_unit_of_measurement=PERCENTAGE,
             device_class=SensorDeviceClass.HUMIDITY,
             measurement_to_ha=lambda x: x / 100,
@@ -118,7 +114,6 @@ DISCOVERY_SCHEMAS = [
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
             key="LightSensor",
-            name="Illuminance",
             native_unit_of_measurement=LIGHT_LUX,
             device_class=SensorDeviceClass.ILLUMINANCE,
             measurement_to_ha=lambda x: round(pow(10, ((x - 1) / 10000)), 1),
@@ -130,7 +125,6 @@ DISCOVERY_SCHEMAS = [
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
             key="PowerSource",
-            name="Battery",
             native_unit_of_measurement=PERCENTAGE,
             device_class=SensorDeviceClass.BATTERY,
             # value has double precision
diff --git a/homeassistant/components/matter/strings.json b/homeassistant/components/matter/strings.json
index 594998c236f..dc5eb30df51 100644
--- a/homeassistant/components/matter/strings.json
+++ b/homeassistant/components/matter/strings.json
@@ -43,5 +43,12 @@
       "install_addon": "Please wait while the Matter Server add-on installation finishes. This can take several minutes.",
       "start_addon": "Please wait while the Matter Server add-on starts. This add-on is what powers Matter in Home Assistant. This may take some seconds."
     }
+  },
+  "entity": {
+    "sensor": {
+      "flow": {
+        "name": "Flow"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/matter/switch.py b/homeassistant/components/matter/switch.py
index 2eb3c22c1f7..e1fb4464b83 100644
--- a/homeassistant/components/matter/switch.py
+++ b/homeassistant/components/matter/switch.py
@@ -63,7 +63,7 @@ DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.SWITCH,
         entity_description=SwitchEntityDescription(
-            key="MatterPlug", device_class=SwitchDeviceClass.OUTLET
+            key="MatterPlug", device_class=SwitchDeviceClass.OUTLET, name=None
         ),
         entity_class=MatterSwitch,
         required_attributes=(clusters.OnOff.Attributes.OnOff,),
@@ -77,6 +77,7 @@ DISCOVERY_SCHEMAS = [
             device_types.ColorDimmerSwitch,
             device_types.DimmerSwitch,
             device_types.OnOffLightSwitch,
+            device_types.Thermostat,
         ),
     ),
 ]
diff --git a/homeassistant/components/mazda/button.py b/homeassistant/components/mazda/button.py
index 99a1a4ac2ff..1b1e51db035 100644
--- a/homeassistant/components/mazda/button.py
+++ b/homeassistant/components/mazda/button.py
@@ -78,21 +78,25 @@ BUTTON_ENTITIES = [
         key="start_engine",
         name="Start engine",
         icon="mdi:engine",
+        is_supported=lambda data: not data["isElectric"],
     ),
     MazdaButtonEntityDescription(
         key="stop_engine",
         name="Stop engine",
         icon="mdi:engine-off",
+        is_supported=lambda data: not data["isElectric"],
     ),
     MazdaButtonEntityDescription(
         key="turn_on_hazard_lights",
         name="Turn on hazard lights",
         icon="mdi:hazard-lights",
+        is_supported=lambda data: not data["isElectric"],
     ),
     MazdaButtonEntityDescription(
         key="turn_off_hazard_lights",
         name="Turn off hazard lights",
         icon="mdi:hazard-lights",
+        is_supported=lambda data: not data["isElectric"],
     ),
     MazdaButtonEntityDescription(
         key="refresh_vehicle_status",
diff --git a/homeassistant/components/mazda/manifest.json b/homeassistant/components/mazda/manifest.json
index 2c2aafa960e..01f77cb2d38 100644
--- a/homeassistant/components/mazda/manifest.json
+++ b/homeassistant/components/mazda/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["pymazda"],
   "quality_scale": "platinum",
-  "requirements": ["pymazda==0.3.8"]
+  "requirements": ["pymazda==0.3.9"]
 }
diff --git a/homeassistant/components/media_extractor/__init__.py b/homeassistant/components/media_extractor/__init__.py
index a0c542d72a5..a35650f0092 100644
--- a/homeassistant/components/media_extractor/__init__.py
+++ b/homeassistant/components/media_extractor/__init__.py
@@ -2,8 +2,8 @@
 import logging
 
 import voluptuous as vol
-from youtube_dl import YoutubeDL
-from youtube_dl.utils import DownloadError, ExtractorError
+from yt_dlp import YoutubeDL
+from yt_dlp.utils import DownloadError, ExtractorError
 
 from homeassistant.components.media_player import (
     ATTR_MEDIA_CONTENT_ID,
@@ -127,7 +127,7 @@ class MediaExtractor:
                 _LOGGER.error("Could not extract stream for the query: %s", query)
                 raise MEQueryException() from err
 
-            return requested_stream["url"]
+            return requested_stream["webpage_url"]
 
         return stream_selector
 
@@ -147,7 +147,7 @@ class MediaExtractor:
         if entity_id:
             data[ATTR_ENTITY_ID] = entity_id
 
-        self.hass.async_create_task(
+        self.hass.create_task(
             self.hass.services.async_call(MEDIA_PLAYER_DOMAIN, SERVICE_PLAY_MEDIA, data)
         )
 
diff --git a/homeassistant/components/media_extractor/manifest.json b/homeassistant/components/media_extractor/manifest.json
index c358b29062a..ccab196032f 100644
--- a/homeassistant/components/media_extractor/manifest.json
+++ b/homeassistant/components/media_extractor/manifest.json
@@ -5,7 +5,7 @@
   "dependencies": ["media_player"],
   "documentation": "https://www.home-assistant.io/integrations/media_extractor",
   "iot_class": "calculated",
-  "loggers": ["youtube_dl"],
+  "loggers": ["yt_dlp"],
   "quality_scale": "internal",
-  "requirements": ["youtube_dl==2021.12.17"]
+  "requirements": ["yt-dlp==2023.3.4"]
 }
diff --git a/homeassistant/components/media_player/browse_media.py b/homeassistant/components/media_player/browse_media.py
index 2b046868f16..1e9be742c53 100644
--- a/homeassistant/components/media_player/browse_media.py
+++ b/homeassistant/components/media_player/browse_media.py
@@ -42,9 +42,8 @@ def async_process_play_media_url(
     if parsed.is_absolute():
         if not is_hass_url(hass, media_content_id):
             return media_content_id
-    else:
-        if media_content_id[0] != "/":
-            return media_content_id
+    elif media_content_id[0] != "/":
+        return media_content_id
 
     if parsed.query:
         logging.getLogger(__name__).debug(
diff --git a/homeassistant/components/media_player/device_condition.py b/homeassistant/components/media_player/device_condition.py
index 9e3981ed983..5efee0c0b49 100644
--- a/homeassistant/components/media_player/device_condition.py
+++ b/homeassistant/components/media_player/device_condition.py
@@ -39,7 +39,7 @@ CONDITION_TYPES = {
 
 CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
     }
 )
@@ -62,7 +62,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions += [{**base_condition, CONF_TYPE: cond} for cond in CONDITION_TYPES]
@@ -88,8 +88,11 @@ def async_condition_from_config(
     else:  # is_playing
         state = STATE_PLAYING
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
+
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        return condition.state(hass, config[ATTR_ENTITY_ID], state)
+        return condition.state(hass, entity_id, state)
 
     return test_is_state
diff --git a/homeassistant/components/media_player/device_trigger.py b/homeassistant/components/media_player/device_trigger.py
index 58fc0aca84f..e626059841c 100644
--- a/homeassistant/components/media_player/device_trigger.py
+++ b/homeassistant/components/media_player/device_trigger.py
@@ -33,7 +33,7 @@ TRIGGER_TYPES = {"turned_on", "turned_off", "buffering", "idle", "paused", "play
 
 MEDIA_PLAYER_TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -66,7 +66,7 @@ async def async_get_triggers(
                 CONF_PLATFORM: "device",
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: trigger,
             }
             for trigger in TRIGGER_TYPES
diff --git a/homeassistant/components/media_source/__init__.py b/homeassistant/components/media_source/__init__.py
index f3c5c92eaa6..62cf7815613 100644
--- a/homeassistant/components/media_source/__init__.py
+++ b/homeassistant/components/media_source/__init__.py
@@ -193,7 +193,7 @@ async def websocket_resolve_media(
 ) -> None:
     """Resolve media."""
     try:
-        media = await async_resolve_media(hass, msg["media_content_id"])
+        media = await async_resolve_media(hass, msg["media_content_id"], None)
     except Unresolvable as err:
         connection.send_error(msg["id"], "resolve_media_failed", str(err))
         return
diff --git a/homeassistant/components/melnor/switch.py b/homeassistant/components/melnor/switch.py
index a2854479abd..e5f70bc25a0 100644
--- a/homeassistant/components/melnor/switch.py
+++ b/homeassistant/components/melnor/switch.py
@@ -45,6 +45,7 @@ ZONE_ENTITY_DESCRIPTIONS = [
         device_class=SwitchDeviceClass.SWITCH,
         icon="mdi:sprinkler",
         key="manual",
+        name=None,
         on_off_fn=lambda valve, bool: valve.set_is_watering(bool),
         state_fn=lambda valve: valve.is_watering,
     ),
diff --git a/homeassistant/components/met/const.py b/homeassistant/components/met/const.py
index 5b2a756847e..dcc493570ba 100644
--- a/homeassistant/components/met/const.py
+++ b/homeassistant/components/met/const.py
@@ -10,19 +10,24 @@ from homeassistant.components.weather import (
     ATTR_CONDITION_SNOWY,
     ATTR_CONDITION_SNOWY_RAINY,
     ATTR_CONDITION_SUNNY,
+    ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
+    ATTR_FORECAST_HUMIDITY,
     ATTR_FORECAST_NATIVE_PRECIPITATION,
     ATTR_FORECAST_NATIVE_TEMP,
     ATTR_FORECAST_NATIVE_TEMP_LOW,
+    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED,
     ATTR_FORECAST_NATIVE_WIND_SPEED,
     ATTR_FORECAST_PRECIPITATION_PROBABILITY,
     ATTR_FORECAST_TIME,
     ATTR_FORECAST_WIND_BEARING,
+    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,
     DOMAIN as WEATHER_DOMAIN,
 )
@@ -180,6 +185,9 @@ FORECAST_MAP = {
     ATTR_FORECAST_TIME: "datetime",
     ATTR_FORECAST_WIND_BEARING: "wind_bearing",
     ATTR_FORECAST_NATIVE_WIND_SPEED: "wind_speed",
+    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: "wind_gust",
+    ATTR_FORECAST_CLOUD_COVERAGE: "cloudiness",
+    ATTR_FORECAST_HUMIDITY: "humidity",
 }
 
 ATTR_MAP = {
@@ -189,4 +197,6 @@ ATTR_MAP = {
     ATTR_WEATHER_VISIBILITY: "visibility",
     ATTR_WEATHER_WIND_BEARING: "wind_bearing",
     ATTR_WEATHER_WIND_SPEED: "wind_speed",
+    ATTR_WEATHER_WIND_GUST_SPEED: "wind_gust",
+    ATTR_WEATHER_CLOUD_COVERAGE: "cloudiness",
 }
diff --git a/homeassistant/components/met/manifest.json b/homeassistant/components/met/manifest.json
index 32d37e9b4ff..5c476b10665 100644
--- a/homeassistant/components/met/manifest.json
+++ b/homeassistant/components/met/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/met",
   "iot_class": "cloud_polling",
   "loggers": ["metno"],
-  "requirements": ["pyMetno==0.10.0"]
+  "requirements": ["PyMetno==0.10.0"]
 }
diff --git a/homeassistant/components/met/weather.py b/homeassistant/components/met/weather.py
index a6dcb23cc47..05642c12991 100644
--- a/homeassistant/components/met/weather.py
+++ b/homeassistant/components/met/weather.py
@@ -7,10 +7,12 @@ from typing import Any
 from homeassistant.components.weather import (
     ATTR_FORECAST_CONDITION,
     ATTR_FORECAST_TIME,
+    ATTR_WEATHER_CLOUD_COVERAGE,
     ATTR_WEATHER_HUMIDITY,
     ATTR_WEATHER_PRESSURE,
     ATTR_WEATHER_TEMPERATURE,
     ATTR_WEATHER_WIND_BEARING,
+    ATTR_WEATHER_WIND_GUST_SPEED,
     ATTR_WEATHER_WIND_SPEED,
     Forecast,
     WeatherEntity,
@@ -174,6 +176,20 @@ class MetWeather(CoordinatorEntity[MetDataUpdateCoordinator], WeatherEntity):
             ATTR_MAP[ATTR_WEATHER_WIND_BEARING]
         )
 
+    @property
+    def native_wind_gust_speed(self) -> float | None:
+        """Return the wind gust speed in native units."""
+        return self.coordinator.data.current_weather_data.get(
+            ATTR_MAP[ATTR_WEATHER_WIND_GUST_SPEED]
+        )
+
+    @property
+    def cloud_coverage(self) -> float | None:
+        """Return the cloud coverage."""
+        return self.coordinator.data.current_weather_data.get(
+            ATTR_MAP[ATTR_WEATHER_CLOUD_COVERAGE]
+        )
+
     @property
     def forecast(self) -> list[Forecast] | None:
         """Return the forecast array."""
diff --git a/homeassistant/components/met_eireann/manifest.json b/homeassistant/components/met_eireann/manifest.json
index 1e05787158a..72afc6977dd 100644
--- a/homeassistant/components/met_eireann/manifest.json
+++ b/homeassistant/components/met_eireann/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/met_eireann",
   "iot_class": "cloud_polling",
   "loggers": ["meteireann"],
-  "requirements": ["pyMetEireann==2021.8.0"]
+  "requirements": ["PyMetEireann==2021.8.0"]
 }
diff --git a/homeassistant/components/meteo_france/sensor.py b/homeassistant/components/meteo_france/sensor.py
index c87aea05260..8c27f2970a3 100644
--- a/homeassistant/components/meteo_france/sensor.py
+++ b/homeassistant/components/meteo_france/sensor.py
@@ -247,11 +247,7 @@ class MeteoFranceSensor(CoordinatorEntity[DataUpdateCoordinator[_DataT]], Sensor
     @property
     def device_info(self) -> DeviceInfo:
         """Return the device info."""
-        assert (
-            self.platform
-            and self.platform.config_entry
-            and self.platform.config_entry.unique_id
-        )
+        assert self.platform.config_entry and self.platform.config_entry.unique_id
         return DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, self.platform.config_entry.unique_id)},
@@ -275,11 +271,10 @@ class MeteoFranceSensor(CoordinatorEntity[DataUpdateCoordinator[_DataT]], Sensor
                 value = data[0][path[1]]
 
         # General case
+        elif len(path) == 3:
+            value = data[path[1]][path[2]]
         else:
-            if len(path) == 3:
-                value = data[path[1]][path[2]]
-            else:
-                value = data[path[1]]
+            value = data[path[1]]
 
         if self.entity_description.key in ("wind_speed", "wind_gust"):
             # convert API wind speed from m/s to km/h
diff --git a/homeassistant/components/meteo_france/weather.py b/homeassistant/components/meteo_france/weather.py
index e1a530eef97..7709ba0a638 100644
--- a/homeassistant/components/meteo_france/weather.py
+++ b/homeassistant/components/meteo_france/weather.py
@@ -109,11 +109,7 @@ class MeteoFranceWeather(
     @property
     def device_info(self) -> DeviceInfo:
         """Return the device info."""
-        assert (
-            self.platform
-            and self.platform.config_entry
-            and self.platform.config_entry.unique_id
-        )
+        assert self.platform.config_entry and self.platform.config_entry.unique_id
         return DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, self.platform.config_entry.unique_id)},
diff --git a/homeassistant/components/microsoft_face/__init__.py b/homeassistant/components/microsoft_face/__init__.py
index 82a9accac59..f57a9146858 100644
--- a/homeassistant/components/microsoft_face/__init__.py
+++ b/homeassistant/components/microsoft_face/__init__.py
@@ -17,6 +17,7 @@ from homeassistant.exceptions import HomeAssistantError
 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
 from homeassistant.util import slugify
 
@@ -73,12 +74,16 @@ SCHEMA_TRAIN_SERVICE = vol.Schema({vol.Required(ATTR_GROUP): cv.slugify})
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Microsoft Face."""
+    component = EntityComponent[MicrosoftFaceGroupEntity](
+        logging.getLogger(__name__), DOMAIN, hass
+    )
     entities: dict[str, MicrosoftFaceGroupEntity] = {}
     face = MicrosoftFace(
         hass,
         config[DOMAIN].get(CONF_AZURE_REGION),
         config[DOMAIN].get(CONF_API_KEY),
         config[DOMAIN].get(CONF_TIMEOUT),
+        component,
         entities,
     )
 
@@ -99,9 +104,12 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         try:
             await face.call_api("put", f"persongroups/{g_id}", {"name": name})
             face.store[g_id] = {}
+            old_entity = entities.pop(g_id, None)
+            if old_entity:
+                await component.async_remove_entity(old_entity.entity_id)
 
             entities[g_id] = MicrosoftFaceGroupEntity(hass, face, g_id, name)
-            entities[g_id].async_write_ha_state()
+            await component.async_add_entities([entities[g_id]])
         except HomeAssistantError as err:
             _LOGGER.error("Can't create group '%s' with error: %s", g_id, err)
 
@@ -118,7 +126,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             face.store.pop(g_id)
 
             entity = entities.pop(g_id)
-            hass.states.async_remove(entity.entity_id, service.context)
+            await component.async_remove_entity(entity.entity_id)
         except HomeAssistantError as err:
             _LOGGER.error("Can't delete group '%s' with error: %s", g_id, err)
 
@@ -244,7 +252,7 @@ class MicrosoftFaceGroupEntity(Entity):
 class MicrosoftFace:
     """Microsoft Face api for Home Assistant."""
 
-    def __init__(self, hass, server_loc, api_key, timeout, entities):
+    def __init__(self, hass, server_loc, api_key, timeout, component, entities):
         """Initialize Microsoft Face api."""
         self.hass = hass
         self.websession = async_get_clientsession(hass)
@@ -252,6 +260,7 @@ class MicrosoftFace:
         self._api_key = api_key
         self._server_url = f"https://{server_loc}.{FACE_API_URL}"
         self._store = {}
+        self._component: EntityComponent[MicrosoftFaceGroupEntity] = component
         self._entities = entities
 
     @property
@@ -263,25 +272,30 @@ class MicrosoftFace:
         """Load all group/person data into local store."""
         groups = await self.call_api("get", "persongroups")
 
-        tasks = []
+        remove_tasks = []
+        new_entities = []
         for group in groups:
             g_id = group["personGroupId"]
             self._store[g_id] = {}
+            old_entity = self._entities.pop(g_id, None)
+            if old_entity:
+                remove_tasks.append(
+                    self._component.async_remove_entity(old_entity.entity_id)
+                )
+
             self._entities[g_id] = MicrosoftFaceGroupEntity(
                 self.hass, self, g_id, group["name"]
             )
+            new_entities.append(self._entities[g_id])
 
             persons = await self.call_api("get", f"persongroups/{g_id}/persons")
 
             for person in persons:
                 self._store[g_id][person["name"]] = person["personId"]
 
-            tasks.append(
-                asyncio.create_task(self._entities[g_id].async_update_ha_state())
-            )
-
-        if tasks:
-            await asyncio.wait(tasks)
+        if remove_tasks:
+            await asyncio.gather(remove_tasks)
+        await self._component.async_add_entities(new_entities)
 
     async def call_api(self, method, function, data=None, binary=False, params=None):
         """Make an api call."""
diff --git a/homeassistant/components/mill/climate.py b/homeassistant/components/mill/climate.py
index 42b759b3cdf..f1487ed59f1 100644
--- a/homeassistant/components/mill/climate.py
+++ b/homeassistant/components/mill/climate.py
@@ -91,8 +91,10 @@ class MillHeater(CoordinatorEntity[MillDataUpdateCoordinator], ClimateEntity):
     """Representation of a Mill Thermostat device."""
 
     _attr_fan_modes = [FAN_ON, FAN_OFF]
+    _attr_has_entity_name = True
     _attr_max_temp = MAX_TEMP
     _attr_min_temp = MIN_TEMP
+    _attr_name = None
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
     def __init__(
@@ -106,12 +108,11 @@ class MillHeater(CoordinatorEntity[MillDataUpdateCoordinator], ClimateEntity):
 
         self._id = heater.device_id
         self._attr_unique_id = heater.device_id
-        self._attr_name = heater.name
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, heater.device_id)},
             manufacturer=MANUFACTURER,
             model=f"Generation {heater.generation}",
-            name=self.name,
+            name=heater.name,
         )
         if heater.is_gen1:
             self._attr_hvac_modes = [HVACMode.HEAT]
@@ -202,10 +203,12 @@ class MillHeater(CoordinatorEntity[MillDataUpdateCoordinator], ClimateEntity):
 class LocalMillHeater(CoordinatorEntity[MillDataUpdateCoordinator], ClimateEntity):
     """Representation of a Mill Thermostat device."""
 
+    _attr_has_entity_name = True
     _attr_hvac_mode = HVACMode.HEAT
     _attr_hvac_modes = [HVACMode.HEAT]
     _attr_max_temp = MAX_TEMP
     _attr_min_temp = MIN_TEMP
+    _attr_name = None
     _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
     _attr_target_temperature_step = PRECISION_HALVES
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
@@ -213,7 +216,6 @@ class LocalMillHeater(CoordinatorEntity[MillDataUpdateCoordinator], ClimateEntit
     def __init__(self, coordinator: MillDataUpdateCoordinator) -> None:
         """Initialize the thermostat."""
         super().__init__(coordinator)
-        self._attr_name = coordinator.mill_data_connection.name
         if mac := coordinator.mill_data_connection.mac_address:
             self._attr_unique_id = mac
             self._attr_device_info = DeviceInfo(
diff --git a/homeassistant/components/mjpeg/__init__.py b/homeassistant/components/mjpeg/__init__.py
index 27131d9d18f..a5bfc49edf6 100644
--- a/homeassistant/components/mjpeg/__init__.py
+++ b/homeassistant/components/mjpeg/__init__.py
@@ -2,10 +2,11 @@
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .camera import MjpegCamera
-from .const import CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, PLATFORMS
+from .const import CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, DOMAIN, PLATFORMS
 from .util import filter_urllib3_logging
 
 __all__ = [
@@ -15,6 +16,8 @@ __all__ = [
     "filter_urllib3_logging",
 ]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the MJPEG IP Camera integration."""
diff --git a/homeassistant/components/mobile_app/__init__.py b/homeassistant/components/mobile_app/__init__.py
index 70c23da66e2..3d33af38761 100644
--- a/homeassistant/components/mobile_app/__init__.py
+++ b/homeassistant/components/mobile_app/__init__.py
@@ -10,7 +10,11 @@ from homeassistant.components.webhook import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_DEVICE_ID, CONF_WEBHOOK_ID, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, discovery
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    discovery,
+)
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType
 
@@ -36,6 +40,8 @@ from .webhook import handle_webhook
 
 PLATFORMS = [Platform.SENSOR, Platform.BINARY_SENSOR, Platform.DEVICE_TRACKER]
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the mobile app component."""
diff --git a/homeassistant/components/modbus/binary_sensor.py b/homeassistant/components/modbus/binary_sensor.py
index 4f416874f9d..43f43585775 100644
--- a/homeassistant/components/modbus/binary_sensor.py
+++ b/homeassistant/components/modbus/binary_sensor.py
@@ -115,7 +115,10 @@ class ModbusBinarySensor(BasePlatform, RestoreEntity, BinarySensorEntity):
                 self._result = result.bits
             else:
                 self._result = result.registers
-            self._attr_is_on = bool(self._result[0] & 1)
+            if len(self._result) >= 1:
+                self._attr_is_on = bool(self._result[0] & 1)
+            else:
+                self._attr_available = False
 
         self.async_write_ha_state()
         if self._coordinator:
diff --git a/homeassistant/components/modbus/manifest.json b/homeassistant/components/modbus/manifest.json
index bb64a264248..c2e6b9ef467 100644
--- a/homeassistant/components/modbus/manifest.json
+++ b/homeassistant/components/modbus/manifest.json
@@ -6,5 +6,5 @@
   "iot_class": "local_polling",
   "loggers": ["pymodbus"],
   "quality_scale": "gold",
-  "requirements": ["pymodbus==3.1.3"]
+  "requirements": ["pymodbus==3.3.1"]
 }
diff --git a/homeassistant/components/modem_callerid/config_flow.py b/homeassistant/components/modem_callerid/config_flow.py
index 537fe81da11..fac20073fe9 100644
--- a/homeassistant/components/modem_callerid/config_flow.py
+++ b/homeassistant/components/modem_callerid/config_flow.py
@@ -32,9 +32,7 @@ class PhoneModemFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
     async def async_step_usb(self, discovery_info: usb.UsbServiceInfo) -> FlowResult:
         """Handle USB Discovery."""
-        device = discovery_info.device
-
-        dev_path = await self.hass.async_add_executor_job(usb.get_serial_by_id, device)
+        dev_path = discovery_info.device
         unique_id = f"{discovery_info.vid}:{discovery_info.pid}_{discovery_info.serial_number}_{discovery_info.manufacturer}_{discovery_info.description}"
         if (
             await self.validate_device_errors(dev_path=dev_path, unique_id=unique_id)
diff --git a/homeassistant/components/modem_callerid/manifest.json b/homeassistant/components/modem_callerid/manifest.json
index 1ff348fb3b7..34e5be43155 100644
--- a/homeassistant/components/modem_callerid/manifest.json
+++ b/homeassistant/components/modem_callerid/manifest.json
@@ -8,7 +8,7 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["phone_modem"],
-  "requirements": ["phone_modem==0.1.1"],
+  "requirements": ["phone-modem==0.1.1"],
   "usb": [
     {
       "vid": "0572",
diff --git a/homeassistant/components/moon/sensor.py b/homeassistant/components/moon/sensor.py
index f8e1cd24abe..10251fc679d 100644
--- a/homeassistant/components/moon/sensor.py
+++ b/homeassistant/components/moon/sensor.py
@@ -50,14 +50,14 @@ class MoonSensorEntity(SensorEntity):
     _attr_name = "Phase"
     _attr_device_class = SensorDeviceClass.ENUM
     _attr_options = [
-        STATE_FIRST_QUARTER,
-        STATE_FULL_MOON,
-        STATE_LAST_QUARTER,
         STATE_NEW_MOON,
-        STATE_WANING_CRESCENT,
-        STATE_WANING_GIBBOUS,
         STATE_WAXING_CRESCENT,
+        STATE_FIRST_QUARTER,
         STATE_WAXING_GIBBOUS,
+        STATE_FULL_MOON,
+        STATE_WANING_GIBBOUS,
+        STATE_LAST_QUARTER,
+        STATE_WANING_CRESCENT,
     ]
     _attr_translation_key = "phase"
 
diff --git a/homeassistant/components/mopeka/manifest.json b/homeassistant/components/mopeka/manifest.json
index 71104192153..d6b5618bf97 100644
--- a/homeassistant/components/mopeka/manifest.json
+++ b/homeassistant/components/mopeka/manifest.json
@@ -21,5 +21,5 @@
   "documentation": "https://www.home-assistant.io/integrations/mopeka",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["mopeka_iot_ble==0.4.1"]
+  "requirements": ["mopeka-iot-ble==0.4.1"]
 }
diff --git a/homeassistant/components/motion_blinds/const.py b/homeassistant/components/motion_blinds/const.py
index 332a30a5e5f..d241f03a02e 100644
--- a/homeassistant/components/motion_blinds/const.py
+++ b/homeassistant/components/motion_blinds/const.py
@@ -28,4 +28,6 @@ SERVICE_SET_ABSOLUTE_POSITION = "set_absolute_position"
 
 UPDATE_INTERVAL = 600
 UPDATE_INTERVAL_FAST = 60
+UPDATE_DELAY_STOP = 3
 UPDATE_INTERVAL_MOVING = 5
+UPDATE_INTERVAL_MOVING_WIFI = 45
diff --git a/homeassistant/components/motion_blinds/cover.py b/homeassistant/components/motion_blinds/cover.py
index aaf74a96de0..17918133614 100644
--- a/homeassistant/components/motion_blinds/cover.py
+++ b/homeassistant/components/motion_blinds/cover.py
@@ -15,7 +15,7 @@ from homeassistant.components.cover import (
     CoverEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant
 from homeassistant.helpers import (
     config_validation as cv,
     device_registry as dr,
@@ -36,7 +36,9 @@ from .const import (
     KEY_VERSION,
     MANUFACTURER,
     SERVICE_SET_ABSOLUTE_POSITION,
+    UPDATE_DELAY_STOP,
     UPDATE_INTERVAL_MOVING,
+    UPDATE_INTERVAL_MOVING_WIFI,
 )
 from .gateway import device_name
 
@@ -191,13 +193,15 @@ class MotionPositionDevice(CoordinatorEntity, CoverEntity):
 
         self._blind = blind
         self._api_lock = coordinator.api_lock
-        self._requesting_position = False
+        self._requesting_position: CALLBACK_TYPE | None = None
         self._previous_positions = []
 
         if blind.device_type in DEVICE_TYPES_WIFI:
+            self._update_interval_moving = UPDATE_INTERVAL_MOVING_WIFI
             via_device = ()
             connections = {(dr.CONNECTION_NETWORK_MAC, blind.mac)}
         else:
+            self._update_interval_moving = UPDATE_INTERVAL_MOVING
             via_device = (DOMAIN, blind._gateway.mac)
             connections = {}
             sw_version = None
@@ -271,23 +275,29 @@ class MotionPositionDevice(CoordinatorEntity, CoverEntity):
             self.current_cover_position == prev_position
             for prev_position in self._previous_positions
         ):
-            # keep updating the position @UPDATE_INTERVAL_MOVING until the position does not change.
-            async_call_later(
-                self.hass, UPDATE_INTERVAL_MOVING, self.async_scheduled_update_request
+            # keep updating the position @self._update_interval_moving until the position does not change.
+            self._requesting_position = async_call_later(
+                self.hass,
+                self._update_interval_moving,
+                self.async_scheduled_update_request,
             )
         else:
             self._previous_positions = []
-            self._requesting_position = False
+            self._requesting_position = None
+
+    async def async_request_position_till_stop(self, delay=None):
+        """Request the position of the blind every self._update_interval_moving seconds until it stops moving."""
+        if delay is None:
+            delay = self._update_interval_moving
 
-    async def async_request_position_till_stop(self):
-        """Request the position of the blind every UPDATE_INTERVAL_MOVING seconds until it stops moving."""
         self._previous_positions = []
-        if self._requesting_position or self.current_cover_position is None:
+        if self.current_cover_position is None:
             return
+        if self._requesting_position is not None:
+            self._requesting_position()
 
-        self._requesting_position = True
-        async_call_later(
-            self.hass, UPDATE_INTERVAL_MOVING, self.async_scheduled_update_request
+        self._requesting_position = async_call_later(
+            self.hass, delay, self.async_scheduled_update_request
         )
 
     async def async_open_cover(self, **kwargs: Any) -> None:
@@ -334,6 +344,8 @@ class MotionPositionDevice(CoordinatorEntity, CoverEntity):
         async with self._api_lock:
             await self.hass.async_add_executor_job(self._blind.Stop)
 
+        await self.async_request_position_till_stop(delay=UPDATE_DELAY_STOP)
+
 
 class MotionTiltDevice(MotionPositionDevice):
     """Representation of a Motion Blind Device."""
@@ -378,6 +390,8 @@ class MotionTiltDevice(MotionPositionDevice):
         async with self._api_lock:
             await self.hass.async_add_executor_job(self._blind.Stop)
 
+        await self.async_request_position_till_stop(delay=UPDATE_DELAY_STOP)
+
 
 class MotionTiltOnlyDevice(MotionTiltDevice):
     """Representation of a Motion Blind Device."""
@@ -507,3 +521,5 @@ class MotionTDBUDevice(MotionPositionDevice):
         """Stop the cover."""
         async with self._api_lock:
             await self.hass.async_add_executor_job(self._blind.Stop, self._motor_key)
+
+        await self.async_request_position_till_stop(delay=UPDATE_DELAY_STOP)
diff --git a/homeassistant/components/mqtt/abbreviations.py b/homeassistant/components/mqtt/abbreviations.py
index de593385c1f..a5360090bb9 100644
--- a/homeassistant/components/mqtt/abbreviations.py
+++ b/homeassistant/components/mqtt/abbreviations.py
@@ -12,9 +12,6 @@ ABBREVIATIONS = {
     "avty_mode": "availability_mode",
     "avty_t": "availability_topic",
     "avty_tpl": "availability_template",
-    "away_mode_cmd_t": "away_mode_command_topic",
-    "away_mode_stat_tpl": "away_mode_state_template",
-    "away_mode_stat_t": "away_mode_state_topic",
     "b_tpl": "blue_template",
     "bri_cmd_tpl": "brightness_command_template",
     "bri_cmd_t": "brightness_command_topic",
@@ -44,6 +41,7 @@ ABBREVIATIONS = {
     "cod_dis_req": "code_disarm_required",
     "cod_form": "code_format",
     "cod_trig_req": "code_trigger_required",
+    "cont_type": "content_type",
     "curr_hum_t": "current_humidity_topic",
     "curr_hum_tpl": "current_humidity_template",
     "curr_temp_t": "current_temperature_topic",
@@ -80,16 +78,13 @@ ABBREVIATIONS = {
     "fan_mode_stat_t": "fan_mode_state_topic",
     "frc_upd": "force_update",
     "g_tpl": "green_template",
-    "hold_cmd_tpl": "hold_command_template",
-    "hold_cmd_t": "hold_command_topic",
-    "hold_stat_tpl": "hold_state_template",
-    "hold_stat_t": "hold_state_topic",
     "hs_cmd_t": "hs_command_topic",
     "hs_cmd_tpl": "hs_command_template",
     "hs_stat_t": "hs_state_topic",
     "hs_val_tpl": "hs_value_template",
     "ic": "icon",
     "img_e": "image_encoding",
+    "img_t": "image_topic",
     "init": "initial",
     "hum_cmd_t": "target_humidity_command_topic",
     "hum_cmd_tpl": "target_humidity_command_template",
@@ -166,6 +161,7 @@ ABBREVIATIONS = {
     "pos_clsd": "position_closed",
     "pos_open": "position_open",
     "pow_cmd_t": "power_command_topic",
+    "pow_cmd_tpl": "power_command_template",
     "pow_stat_t": "power_state_topic",
     "pow_stat_tpl": "power_state_template",
     "pr_mode_cmd_t": "preset_mode_command_topic",
@@ -243,7 +239,6 @@ ABBREVIATIONS = {
     "tilt_clsd_val": "tilt_closed_value",
     "tilt_cmd_t": "tilt_command_topic",
     "tilt_cmd_tpl": "tilt_command_template",
-    "tilt_inv_stat": "tilt_invert_state",
     "tilt_max": "tilt_max",
     "tilt_min": "tilt_min",
     "tilt_opnd_val": "tilt_opened_value",
@@ -254,13 +249,11 @@ ABBREVIATIONS = {
     "t": "topic",
     "uniq_id": "unique_id",
     "unit_of_meas": "unit_of_measurement",
+    "url_t": "url_topic",
+    "url_tpl": "url_template",
     "val_tpl": "value_template",
     "whit_cmd_t": "white_command_topic",
     "whit_scl": "white_scale",
-    "whit_val_cmd_t": "white_value_command_topic",
-    "whit_val_scl": "white_value_scale",
-    "whit_val_stat_t": "white_value_state_topic",
-    "whit_val_tpl": "white_value_template",
     "xy_cmd_t": "xy_command_topic",
     "xy_cmd_tpl": "xy_command_template",
     "xy_stat_t": "xy_state_topic",
diff --git a/homeassistant/components/mqtt/climate.py b/homeassistant/components/mqtt/climate.py
index f580df9eab1..40ec754aa44 100644
--- a/homeassistant/components/mqtt/climate.py
+++ b/homeassistant/components/mqtt/climate.py
@@ -15,9 +15,7 @@ from homeassistant.components.climate import (
     ATTR_TARGET_TEMP_HIGH,
     ATTR_TARGET_TEMP_LOW,
     DEFAULT_MAX_HUMIDITY,
-    DEFAULT_MAX_TEMP,
     DEFAULT_MIN_HUMIDITY,
-    DEFAULT_MIN_TEMP,
     FAN_AUTO,
     FAN_HIGH,
     FAN_LOW,
@@ -42,19 +40,40 @@ from homeassistant.const import (
     PRECISION_HALVES,
     PRECISION_TENTHS,
     PRECISION_WHOLE,
+    UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util.unit_conversion import TemperatureConverter
 
 from . import subscription
 from .config import DEFAULT_RETAIN, MQTT_BASE_SCHEMA
 from .const import (
+    CONF_ACTION_TEMPLATE,
+    CONF_ACTION_TOPIC,
+    CONF_CURRENT_HUMIDITY_TEMPLATE,
+    CONF_CURRENT_HUMIDITY_TOPIC,
+    CONF_CURRENT_TEMP_TEMPLATE,
+    CONF_CURRENT_TEMP_TOPIC,
     CONF_ENCODING,
+    CONF_MODE_COMMAND_TEMPLATE,
+    CONF_MODE_COMMAND_TOPIC,
+    CONF_MODE_LIST,
+    CONF_MODE_STATE_TEMPLATE,
+    CONF_MODE_STATE_TOPIC,
+    CONF_PRECISION,
     CONF_QOS,
     CONF_RETAIN,
+    CONF_TEMP_COMMAND_TEMPLATE,
+    CONF_TEMP_COMMAND_TOPIC,
+    CONF_TEMP_INITIAL,
+    CONF_TEMP_MAX,
+    CONF_TEMP_MIN,
+    CONF_TEMP_STATE_TEMPLATE,
+    CONF_TEMP_STATE_TOPIC,
     DEFAULT_OPTIMISTIC,
     PAYLOAD_NONE,
 )
@@ -73,33 +92,15 @@ _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_NAME = "MQTT HVAC"
 
-CONF_ACTION_TEMPLATE = "action_template"
-CONF_ACTION_TOPIC = "action_topic"
 CONF_AUX_COMMAND_TOPIC = "aux_command_topic"
 CONF_AUX_STATE_TEMPLATE = "aux_state_template"
 CONF_AUX_STATE_TOPIC = "aux_state_topic"
-# AWAY and HOLD mode topics and templates are no longer supported,
-# support was removed with release 2022.9
-CONF_AWAY_MODE_COMMAND_TOPIC = "away_mode_command_topic"
-CONF_AWAY_MODE_STATE_TEMPLATE = "away_mode_state_template"
-CONF_AWAY_MODE_STATE_TOPIC = "away_mode_state_topic"
 
-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_FAN_MODE_COMMAND_TEMPLATE = "fan_mode_command_template"
 CONF_FAN_MODE_COMMAND_TOPIC = "fan_mode_command_topic"
 CONF_FAN_MODE_LIST = "fan_modes"
 CONF_FAN_MODE_STATE_TEMPLATE = "fan_mode_state_template"
 CONF_FAN_MODE_STATE_TOPIC = "fan_mode_state_topic"
-# AWAY and HOLD mode topics and templates are no longer supported,
-# support was removed with release 2022.9
-CONF_HOLD_COMMAND_TEMPLATE = "hold_command_template"
-CONF_HOLD_COMMAND_TOPIC = "hold_command_topic"
-CONF_HOLD_STATE_TEMPLATE = "hold_state_template"
-CONF_HOLD_STATE_TOPIC = "hold_state_topic"
-CONF_HOLD_LIST = "hold_modes"
 
 CONF_HUMIDITY_COMMAND_TEMPLATE = "target_humidity_command_template"
 CONF_HUMIDITY_COMMAND_TOPIC = "target_humidity_command_topic"
@@ -107,34 +108,26 @@ CONF_HUMIDITY_STATE_TEMPLATE = "target_humidity_state_template"
 CONF_HUMIDITY_STATE_TOPIC = "target_humidity_state_topic"
 CONF_HUMIDITY_MAX = "max_humidity"
 CONF_HUMIDITY_MIN = "min_humidity"
-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_POWER_COMMAND_TOPIC, CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
+# CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
 # are deprecated, support for CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
 # was already removed or never added support was deprecated with release 2023.2
 # and will be removed with release 2023.8
-CONF_POWER_COMMAND_TOPIC = "power_command_topic"
 CONF_POWER_STATE_TEMPLATE = "power_state_template"
 CONF_POWER_STATE_TOPIC = "power_state_topic"
-CONF_PRECISION = "precision"
+
+CONF_POWER_COMMAND_TOPIC = "power_command_topic"
+CONF_POWER_COMMAND_TEMPLATE = "power_command_template"
 CONF_PRESET_MODE_STATE_TOPIC = "preset_mode_state_topic"
 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"
-# Support CONF_SEND_IF_OFF is removed with release 2022.9
-CONF_SEND_IF_OFF = "send_if_off"
 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_COMMAND_TEMPLATE = "temperature_command_template"
-CONF_TEMP_COMMAND_TOPIC = "temperature_command_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"
@@ -143,13 +136,10 @@ CONF_TEMP_LOW_COMMAND_TEMPLATE = "temperature_low_command_template"
 CONF_TEMP_LOW_COMMAND_TOPIC = "temperature_low_command_topic"
 CONF_TEMP_LOW_STATE_TEMPLATE = "temperature_low_state_template"
 CONF_TEMP_LOW_STATE_TOPIC = "temperature_low_state_topic"
-CONF_TEMP_STATE_TEMPLATE = "temperature_state_template"
-CONF_TEMP_STATE_TOPIC = "temperature_state_topic"
-CONF_TEMP_INITIAL = "initial"
-CONF_TEMP_MAX = "max_temp"
-CONF_TEMP_MIN = "min_temp"
 CONF_TEMP_STEP = "temp_step"
 
+DEFAULT_INITIAL_TEMPERATURE = 21.0
+
 MQTT_CLIMATE_ATTRIBUTES_BLOCKED = frozenset(
     {
         climate.ATTR_AUX_HEAT,
@@ -195,6 +185,7 @@ COMMAND_TEMPLATE_KEYS = {
     CONF_FAN_MODE_COMMAND_TEMPLATE,
     CONF_HUMIDITY_COMMAND_TEMPLATE,
     CONF_MODE_COMMAND_TEMPLATE,
+    CONF_POWER_COMMAND_TEMPLATE,
     CONF_PRESET_MODE_COMMAND_TEMPLATE,
     CONF_SWING_MODE_COMMAND_TEMPLATE,
     CONF_TEMP_COMMAND_TEMPLATE,
@@ -312,6 +303,7 @@ _PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
         vol.Optional(CONF_PAYLOAD_ON, default="ON"): cv.string,
         vol.Optional(CONF_PAYLOAD_OFF, default="OFF"): cv.string,
         vol.Optional(CONF_POWER_COMMAND_TOPIC): valid_publish_topic,
+        vol.Optional(CONF_POWER_COMMAND_TEMPLATE): cv.template,
         vol.Optional(CONF_POWER_STATE_TEMPLATE): cv.template,
         vol.Optional(CONF_POWER_STATE_TOPIC): valid_subscribe_topic,
         vol.Optional(CONF_PRECISION): vol.In(
@@ -338,9 +330,9 @@ _PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
         ): cv.ensure_list,
         vol.Optional(CONF_SWING_MODE_STATE_TEMPLATE): cv.template,
         vol.Optional(CONF_SWING_MODE_STATE_TOPIC): valid_subscribe_topic,
-        vol.Optional(CONF_TEMP_INITIAL, default=21): cv.positive_int,
-        vol.Optional(CONF_TEMP_MIN, default=DEFAULT_MIN_TEMP): vol.Coerce(float),
-        vol.Optional(CONF_TEMP_MAX, default=DEFAULT_MAX_TEMP): vol.Coerce(float),
+        vol.Optional(CONF_TEMP_INITIAL): cv.positive_int,
+        vol.Optional(CONF_TEMP_MIN): vol.Coerce(float),
+        vol.Optional(CONF_TEMP_MAX): vol.Coerce(float),
         vol.Optional(CONF_TEMP_STEP, default=1.0): vol.Coerce(float),
         vol.Optional(CONF_TEMP_COMMAND_TEMPLATE): cv.template,
         vol.Optional(CONF_TEMP_COMMAND_TOPIC): valid_publish_topic,
@@ -360,23 +352,10 @@ _PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
 PLATFORM_SCHEMA_MODERN = vol.All(
-    # Support CONF_SEND_IF_OFF is removed with release 2022.9
-    cv.removed(CONF_SEND_IF_OFF),
-    # AWAY and HOLD mode topics and templates are no longer supported,
-    # support was removed with release 2022.9
-    cv.removed(CONF_AWAY_MODE_COMMAND_TOPIC),
-    cv.removed(CONF_AWAY_MODE_STATE_TEMPLATE),
-    cv.removed(CONF_AWAY_MODE_STATE_TOPIC),
-    cv.removed(CONF_HOLD_COMMAND_TEMPLATE),
-    cv.removed(CONF_HOLD_COMMAND_TOPIC),
-    cv.removed(CONF_HOLD_STATE_TEMPLATE),
-    cv.removed(CONF_HOLD_STATE_TOPIC),
-    cv.removed(CONF_HOLD_LIST),
-    # CONF_POWER_COMMAND_TOPIC, CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
+    # CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
     # are deprecated, support for CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
     # was already removed or never added support was deprecated with release 2023.2
     # and will be removed with release 2023.8
-    cv.deprecated(CONF_POWER_COMMAND_TOPIC),
     cv.deprecated(CONF_POWER_STATE_TEMPLATE),
     cv.deprecated(CONF_POWER_STATE_TOPIC),
     _PLATFORM_SCHEMA_BASE,
@@ -389,22 +368,9 @@ _DISCOVERY_SCHEMA_BASE = _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA
 
 DISCOVERY_SCHEMA = vol.All(
     _DISCOVERY_SCHEMA_BASE,
-    # Support CONF_SEND_IF_OFF is removed with release 2022.9
-    cv.removed(CONF_SEND_IF_OFF),
-    # AWAY and HOLD mode topics and templates are no longer supported,
-    # support was removed with release 2022.9
-    cv.removed(CONF_AWAY_MODE_COMMAND_TOPIC),
-    cv.removed(CONF_AWAY_MODE_STATE_TEMPLATE),
-    cv.removed(CONF_AWAY_MODE_STATE_TOPIC),
-    cv.removed(CONF_HOLD_COMMAND_TEMPLATE),
-    cv.removed(CONF_HOLD_COMMAND_TOPIC),
-    cv.removed(CONF_HOLD_STATE_TEMPLATE),
-    cv.removed(CONF_HOLD_STATE_TOPIC),
-    cv.removed(CONF_HOLD_LIST),
-    # CONF_POWER_COMMAND_TOPIC, CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE are deprecated,
+    # CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE are deprecated,
     # support for CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE was already removed or never added
     # support was deprecated with release 2023.2 and will be removed with release 2023.8
-    cv.deprecated(CONF_POWER_COMMAND_TOPIC),
     cv.deprecated(CONF_POWER_STATE_TEMPLATE),
     cv.deprecated(CONF_POWER_STATE_TOPIC),
     valid_preset_mode_configuration,
@@ -443,6 +409,9 @@ class MqttTemperatureControlEntity(MqttEntity, ABC):
     climate and water_heater platforms.
     """
 
+    _attr_target_temperature_low: float | None
+    _attr_target_temperature_high: float | None
+
     _optimistic: bool
     _topic: dict[str, Any]
 
@@ -470,7 +439,7 @@ class MqttTemperatureControlEntity(MqttEntity, ABC):
     ) -> None:
         """Add a subscription."""
         qos: int = self._config[CONF_QOS]
-        if self._topic[topic] is not None:
+        if topic in self._topic and self._topic[topic] is not None:
             topics[topic] = {
                 "topic": self._topic[topic],
                 "msg_callback": msg_callback,
@@ -599,15 +568,8 @@ class MqttTemperatureControlEntity(MqttEntity, ABC):
         return changed
 
     @abstractmethod
-    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
-        """Set hvac mode."""
-
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperatures."""
-        operation_mode: HVACMode | None
-        if (operation_mode := kwargs.get(ATTR_HVAC_MODE)) is not None:
-            await self.async_set_hvac_mode(operation_mode)
-
         changed = await self._set_climate_attribute(
             kwargs.get(ATTR_TEMPERATURE),
             CONF_TEMP_COMMAND_TOPIC,
@@ -637,7 +599,7 @@ class MqttTemperatureControlEntity(MqttEntity, ABC):
         self.async_write_ha_state()
 
 
-class MqttClimate(MqttTemperatureControlEntity, ClimateEntity):  # type: ignore[misc]
+class MqttClimate(MqttTemperatureControlEntity, ClimateEntity):
     """Representation of an MQTT climate device."""
 
     _entity_id_format = climate.ENTITY_ID_FORMAT
@@ -668,28 +630,41 @@ class MqttClimate(MqttTemperatureControlEntity, ClimateEntity):  # type: ignore[
     def _setup_from_config(self, config: ConfigType) -> None:
         """(Re)Setup the entity."""
         self._attr_hvac_modes = config[CONF_MODE_LIST]
-        self._attr_min_temp = config[CONF_TEMP_MIN]
-        self._attr_max_temp = config[CONF_TEMP_MAX]
-        self._attr_min_humidity = config[CONF_HUMIDITY_MIN]
-        self._attr_max_humidity = config[CONF_HUMIDITY_MAX]
-        self._attr_precision = config.get(CONF_PRECISION, super().precision)
-        self._attr_fan_modes = config[CONF_FAN_MODE_LIST]
-        self._attr_swing_modes = config[CONF_SWING_MODE_LIST]
-        self._attr_target_temperature_step = config[CONF_TEMP_STEP]
+        # Make sure the min an max temp is converted to the correct when not set
         self._attr_temperature_unit = config.get(
             CONF_TEMPERATURE_UNIT, self.hass.config.units.temperature_unit
         )
+        if (min_temp := config.get(CONF_TEMP_MIN)) is not None:
+            self._attr_min_temp = min_temp
+        if (max_temp := config.get(CONF_TEMP_MAX)) is not None:
+            self._attr_max_temp = max_temp
+        self._attr_min_humidity = config[CONF_HUMIDITY_MIN]
+        self._attr_max_humidity = config[CONF_HUMIDITY_MAX]
+        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_modes = config[CONF_SWING_MODE_LIST]
+        self._attr_target_temperature_step = config[CONF_TEMP_STEP]
 
         self._topic = {key: config.get(key) for key in TOPIC_KEYS}
 
         self._optimistic = config[CONF_OPTIMISTIC]
 
+        # Set init temp, if it is missing convert the default to the temperature units
+        init_temp: float = config.get(
+            CONF_TEMP_INITIAL,
+            TemperatureConverter.convert(
+                DEFAULT_INITIAL_TEMPERATURE,
+                UnitOfTemperature.CELSIUS,
+                self.temperature_unit,
+            ),
+        )
         if self._topic[CONF_TEMP_STATE_TOPIC] is None or self._optimistic:
-            self._attr_target_temperature = config[CONF_TEMP_INITIAL]
+            self._attr_target_temperature = init_temp
         if self._topic[CONF_TEMP_LOW_STATE_TOPIC] is None or self._optimistic:
-            self._attr_target_temperature_low = config[CONF_TEMP_INITIAL]
+            self._attr_target_temperature_low = init_temp
         if self._topic[CONF_TEMP_HIGH_STATE_TOPIC] is None or self._optimistic:
-            self._attr_target_temperature_high = config[CONF_TEMP_INITIAL]
+            self._attr_target_temperature_high = init_temp
 
         if self._topic[CONF_FAN_MODE_STATE_TOPIC] is None or self._optimistic:
             self._attr_fan_mode = FAN_LOW
@@ -949,6 +924,13 @@ class MqttClimate(MqttTemperatureControlEntity, ClimateEntity):  # type: ignore[
 
         self.prepare_subscribe_topics(topics)
 
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set new target temperatures."""
+        operation_mode: HVACMode | None
+        if (operation_mode := kwargs.get(ATTR_HVAC_MODE)) is not None:
+            await self.async_set_hvac_mode(operation_mode)
+        await super().async_set_temperature(**kwargs)
+
     async def async_set_humidity(self, humidity: int) -> None:
         """Set new target humidity."""
 
@@ -982,13 +964,6 @@ class MqttClimate(MqttTemperatureControlEntity, ClimateEntity):  # type: ignore[
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new operation mode."""
-        if hvac_mode == HVACMode.OFF:
-            await self._publish(
-                CONF_POWER_COMMAND_TOPIC, self._config[CONF_PAYLOAD_OFF]
-            )
-        else:
-            await self._publish(CONF_POWER_COMMAND_TOPIC, self._config[CONF_PAYLOAD_ON])
-
         payload = self._command_templates[CONF_MODE_COMMAND_TEMPLATE](hvac_mode)
         await self._publish(CONF_MODE_COMMAND_TOPIC, payload)
 
@@ -1033,3 +1008,28 @@ class MqttClimate(MqttTemperatureControlEntity, ClimateEntity):  # type: ignore[
     async def async_turn_aux_heat_off(self) -> None:
         """Turn auxiliary heater off."""
         await self._set_aux_heat(False)
+
+    async def async_turn_on(self) -> None:
+        """Turn the entity on."""
+        if CONF_POWER_COMMAND_TOPIC in self._config:
+            mqtt_payload = self._command_templates[CONF_POWER_COMMAND_TEMPLATE](
+                self._config[CONF_PAYLOAD_ON]
+            )
+            await self._publish(CONF_POWER_COMMAND_TOPIC, mqtt_payload)
+            return
+        # Fall back to default behavior without power command topic
+        await super().async_turn_on()
+
+    async def async_turn_off(self) -> None:
+        """Turn the entity off."""
+        if CONF_POWER_COMMAND_TOPIC in self._config:
+            mqtt_payload = self._command_templates[CONF_POWER_COMMAND_TEMPLATE](
+                self._config[CONF_PAYLOAD_OFF]
+            )
+            await self._publish(CONF_POWER_COMMAND_TOPIC, mqtt_payload)
+            if self._optimistic:
+                self._attr_hvac_mode = HVACMode.OFF
+                self.async_write_ha_state()
+            return
+        # Fall back to default behavior without power command topic
+        await super().async_turn_off()
diff --git a/homeassistant/components/mqtt/config_integration.py b/homeassistant/components/mqtt/config_integration.py
index 469f52e1488..ba2e0427ba7 100644
--- a/homeassistant/components/mqtt/config_integration.py
+++ b/homeassistant/components/mqtt/config_integration.py
@@ -24,6 +24,7 @@ from . import (
     device_tracker as device_tracker_platform,
     fan as fan_platform,
     humidifier as humidifier_platform,
+    image as image_platform,
     light as light_platform,
     lock as lock_platform,
     number as number_platform,
@@ -35,6 +36,7 @@ from . import (
     text as text_platform,
     update as update_platform,
     vacuum as vacuum_platform,
+    water_heater as water_heater_platform,
 )
 from .const import (
     CONF_BIRTH_MESSAGE,
@@ -88,6 +90,10 @@ PLATFORM_CONFIG_SCHEMA_BASE = vol.Schema(
             cv.ensure_list,
             [humidifier_platform.PLATFORM_SCHEMA_MODERN],  # type: ignore[has-type]
         ),
+        Platform.IMAGE.value: vol.All(
+            cv.ensure_list,
+            [image_platform.PLATFORM_SCHEMA_MODERN],  # type: ignore[has-type]
+        ),
         Platform.LOCK.value: vol.All(
             cv.ensure_list,
             [lock_platform.PLATFORM_SCHEMA_MODERN],  # type: ignore[has-type]
@@ -132,6 +138,10 @@ PLATFORM_CONFIG_SCHEMA_BASE = vol.Schema(
             cv.ensure_list,
             [vacuum_platform.PLATFORM_SCHEMA_MODERN],  # type: ignore[has-type]
         ),
+        Platform.WATER_HEATER.value: vol.All(
+            cv.ensure_list,
+            [water_heater_platform.PLATFORM_SCHEMA_MODERN],  # type: ignore[has-type]
+        ),
     }
 )
 
diff --git a/homeassistant/components/mqtt/const.py b/homeassistant/components/mqtt/const.py
index c91c54a79a4..d09a2bb8cb6 100644
--- a/homeassistant/components/mqtt/const.py
+++ b/homeassistant/components/mqtt/const.py
@@ -29,6 +29,26 @@ CONF_WS_HEADERS = "ws_headers"
 CONF_WILL_MESSAGE = "will_message"
 CONF_PAYLOAD_RESET = "payload_reset"
 
+CONF_ACTION_TEMPLATE = "action_template"
+CONF_ACTION_TOPIC = "action_topic"
+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_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_PRECISION = "precision"
+CONF_TEMP_COMMAND_TEMPLATE = "temperature_command_template"
+CONF_TEMP_COMMAND_TOPIC = "temperature_command_topic"
+CONF_TEMP_STATE_TEMPLATE = "temperature_state_template"
+CONF_TEMP_STATE_TOPIC = "temperature_state_topic"
+CONF_TEMP_INITIAL = "initial"
+CONF_TEMP_MAX = "max_temp"
+CONF_TEMP_MIN = "min_temp"
+
 CONF_CERTIFICATE = "certificate"
 CONF_CLIENT_KEY = "client_key"
 CONF_CLIENT_CERT = "client_cert"
@@ -95,6 +115,7 @@ PLATFORMS = [
     Platform.COVER,
     Platform.FAN,
     Platform.HUMIDIFIER,
+    Platform.IMAGE,
     Platform.LIGHT,
     Platform.LOCK,
     Platform.NUMBER,
@@ -106,6 +127,7 @@ PLATFORMS = [
     Platform.TEXT,
     Platform.UPDATE,
     Platform.VACUUM,
+    Platform.WATER_HEATER,
 ]
 
 RELOADABLE_PLATFORMS = [
@@ -118,6 +140,7 @@ RELOADABLE_PLATFORMS = [
     Platform.DEVICE_TRACKER,
     Platform.FAN,
     Platform.HUMIDIFIER,
+    Platform.IMAGE,
     Platform.LIGHT,
     Platform.LOCK,
     Platform.NUMBER,
@@ -129,4 +152,5 @@ RELOADABLE_PLATFORMS = [
     Platform.TEXT,
     Platform.UPDATE,
     Platform.VACUUM,
+    Platform.WATER_HEATER,
 ]
diff --git a/homeassistant/components/mqtt/cover.py b/homeassistant/components/mqtt/cover.py
index da2f1b4496d..0b435db0b7a 100644
--- a/homeassistant/components/mqtt/cover.py
+++ b/homeassistant/components/mqtt/cover.py
@@ -200,13 +200,11 @@ _PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
 PLATFORM_SCHEMA_MODERN = vol.All(
-    cv.removed("tilt_invert_state"),
     _PLATFORM_SCHEMA_BASE,
     validate_options,
 )
 
 DISCOVERY_SCHEMA = vol.All(
-    cv.removed("tilt_invert_state"),
     _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
     validate_options,
 )
diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index 0c0032ec8eb..70e5ac9e535 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -54,6 +54,7 @@ SUPPORTED_COMPONENTS = [
     "device_tracker",
     "fan",
     "humidifier",
+    "image",
     "light",
     "lock",
     "number",
@@ -66,6 +67,7 @@ SUPPORTED_COMPONENTS = [
     "text",
     "update",
     "vacuum",
+    "water_heater",
 ]
 
 MQTT_DISCOVERY_UPDATED = "mqtt_discovery_updated_{}"
diff --git a/homeassistant/components/mqtt/humidifier.py b/homeassistant/components/mqtt/humidifier.py
index f00944fc091..392a112bcdb 100644
--- a/homeassistant/components/mqtt/humidifier.py
+++ b/homeassistant/components/mqtt/humidifier.py
@@ -10,10 +10,13 @@ import voluptuous as vol
 
 from homeassistant.components import humidifier
 from homeassistant.components.humidifier import (
+    ATTR_ACTION,
+    ATTR_CURRENT_HUMIDITY,
     ATTR_HUMIDITY,
     ATTR_MODE,
     DEFAULT_MAX_HUMIDITY,
     DEFAULT_MIN_HUMIDITY,
+    HumidifierAction,
     HumidifierDeviceClass,
     HumidifierEntity,
     HumidifierEntityFeature,
@@ -35,8 +38,12 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from . import subscription
 from .config import MQTT_RW_SCHEMA
 from .const import (
+    CONF_ACTION_TEMPLATE,
+    CONF_ACTION_TOPIC,
     CONF_COMMAND_TEMPLATE,
     CONF_COMMAND_TOPIC,
+    CONF_CURRENT_HUMIDITY_TEMPLATE,
+    CONF_CURRENT_HUMIDITY_TOPIC,
     CONF_ENCODING,
     CONF_QOS,
     CONF_RETAIN,
@@ -111,12 +118,16 @@ def valid_humidity_range_configuration(config: ConfigType) -> ConfigType:
 
 _PLATFORM_SCHEMA_BASE = MQTT_RW_SCHEMA.extend(
     {
+        vol.Optional(CONF_ACTION_TEMPLATE): cv.template,
+        vol.Optional(CONF_ACTION_TOPIC): valid_subscribe_topic,
         # CONF_AVAIALABLE_MODES_LIST and CONF_MODE_COMMAND_TOPIC must be used together
         vol.Inclusive(
             CONF_AVAILABLE_MODES_LIST, "available_modes", default=[]
         ): cv.ensure_list,
         vol.Inclusive(CONF_MODE_COMMAND_TOPIC, "available_modes"): valid_publish_topic,
         vol.Optional(CONF_COMMAND_TEMPLATE): cv.template,
+        vol.Optional(CONF_CURRENT_HUMIDITY_TEMPLATE): cv.template,
+        vol.Optional(CONF_CURRENT_HUMIDITY_TOPIC): valid_subscribe_topic,
         vol.Optional(
             CONF_DEVICE_CLASS, default=HumidifierDeviceClass.HUMIDIFIER
         ): vol.In(
@@ -158,6 +169,17 @@ DISCOVERY_SCHEMA = vol.All(
     valid_mode_configuration,
 )
 
+TOPICS = (
+    CONF_ACTION_TOPIC,
+    CONF_STATE_TOPIC,
+    CONF_COMMAND_TOPIC,
+    CONF_CURRENT_HUMIDITY_TOPIC,
+    CONF_TARGET_HUMIDITY_STATE_TOPIC,
+    CONF_TARGET_HUMIDITY_COMMAND_TOPIC,
+    CONF_MODE_STATE_TOPIC,
+    CONF_MODE_COMMAND_TOPIC,
+)
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -219,17 +241,7 @@ class MqttHumidifier(MqttEntity, HumidifierEntity):
         self._attr_min_humidity = config[CONF_TARGET_HUMIDITY_MIN]
         self._attr_max_humidity = config[CONF_TARGET_HUMIDITY_MAX]
 
-        self._topic = {
-            key: config.get(key)
-            for key in (
-                CONF_STATE_TOPIC,
-                CONF_COMMAND_TOPIC,
-                CONF_TARGET_HUMIDITY_STATE_TOPIC,
-                CONF_TARGET_HUMIDITY_COMMAND_TOPIC,
-                CONF_MODE_STATE_TOPIC,
-                CONF_MODE_COMMAND_TOPIC,
-            )
-        }
+        self._topic = {key: config.get(key) for key in TOPICS}
         self._payload = {
             "STATE_ON": config[CONF_PAYLOAD_ON],
             "STATE_OFF": config[CONF_PAYLOAD_OFF],
@@ -242,6 +254,8 @@ class MqttHumidifier(MqttEntity, HumidifierEntity):
             self._attr_available_modes = []
         if self._attr_available_modes:
             self._attr_supported_features = HumidifierEntityFeature.MODES
+        if CONF_MODE_STATE_TOPIC in config:
+            self._attr_mode = None
 
         optimistic: bool = config[CONF_OPTIMISTIC]
         self._optimistic = optimistic or self._topic[CONF_STATE_TOPIC] is None
@@ -263,6 +277,8 @@ class MqttHumidifier(MqttEntity, HumidifierEntity):
 
         self._value_templates = {}
         value_templates: dict[str, Template | None] = {
+            ATTR_ACTION: config.get(CONF_ACTION_TEMPLATE),
+            ATTR_CURRENT_HUMIDITY: config.get(CONF_CURRENT_HUMIDITY_TEMPLATE),
             CONF_STATE: config.get(CONF_STATE_VALUE_TEMPLATE),
             ATTR_HUMIDITY: config.get(CONF_TARGET_HUMIDITY_STATE_TEMPLATE),
             ATTR_MODE: config.get(CONF_MODE_STATE_TEMPLATE),
@@ -273,6 +289,22 @@ class MqttHumidifier(MqttEntity, HumidifierEntity):
                 entity=self,
             ).async_render_with_possible_json_value
 
+    def add_subscription(
+        self,
+        topics: dict[str, dict[str, Any]],
+        topic: str,
+        msg_callback: Callable[[ReceiveMessage], None],
+    ) -> None:
+        """Add a subscription."""
+        qos: int = self._config[CONF_QOS]
+        if topic in self._topic and self._topic[topic] is not None:
+            topics[topic] = {
+                "topic": self._topic[topic],
+                "msg_callback": msg_callback,
+                "qos": qos,
+                "encoding": self._config[CONF_ENCODING] or None,
+            }
+
     def _prepare_subscribe_topics(self) -> None:
         """(Re)Subscribe to topics."""
         topics: dict[str, Any] = {}
@@ -293,13 +325,68 @@ class MqttHumidifier(MqttEntity, HumidifierEntity):
                 self._attr_is_on = None
             get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
 
-        if self._topic[CONF_STATE_TOPIC] is not None:
-            topics[CONF_STATE_TOPIC] = {
-                "topic": self._topic[CONF_STATE_TOPIC],
-                "msg_callback": state_received,
-                "qos": self._config[CONF_QOS],
-                "encoding": self._config[CONF_ENCODING] or None,
-            }
+        self.add_subscription(topics, CONF_STATE_TOPIC, state_received)
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def action_received(msg: ReceiveMessage) -> None:
+            """Handle new received MQTT message."""
+            action_payload = self._value_templates[ATTR_ACTION](msg.payload)
+            if not action_payload or action_payload == PAYLOAD_NONE:
+                _LOGGER.debug("Ignoring empty action from '%s'", msg.topic)
+                return
+            try:
+                self._attr_action = HumidifierAction(str(action_payload))
+            except ValueError:
+                _LOGGER.error(
+                    "'%s' received on topic %s. '%s' is not a valid action",
+                    msg.payload,
+                    msg.topic,
+                    action_payload,
+                )
+                return
+            get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+
+        self.add_subscription(topics, CONF_ACTION_TOPIC, action_received)
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def current_humidity_received(msg: ReceiveMessage) -> None:
+            """Handle new received MQTT message for the current humidity."""
+            rendered_current_humidity_payload = self._value_templates[
+                ATTR_CURRENT_HUMIDITY
+            ](msg.payload)
+            if rendered_current_humidity_payload == self._payload["HUMIDITY_RESET"]:
+                self._attr_current_humidity = None
+                get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+                return
+            if not rendered_current_humidity_payload:
+                _LOGGER.debug("Ignoring empty current humidity from '%s'", msg.topic)
+                return
+            try:
+                current_humidity = round(float(rendered_current_humidity_payload))
+            except ValueError:
+                _LOGGER.warning(
+                    "'%s' received on topic %s. '%s' is not a valid humidity",
+                    msg.payload,
+                    msg.topic,
+                    rendered_current_humidity_payload,
+                )
+                return
+            if current_humidity < 0 or current_humidity > 100:
+                _LOGGER.warning(
+                    "'%s' received on topic %s. '%s' is not a valid humidity",
+                    msg.payload,
+                    msg.topic,
+                    rendered_current_humidity_payload,
+                )
+                return
+            self._attr_current_humidity = current_humidity
+            get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+
+        self.add_subscription(
+            topics, CONF_CURRENT_HUMIDITY_TOPIC, current_humidity_received
+        )
 
         @callback
         @log_messages(self.hass, self.entity_id)
@@ -339,14 +426,9 @@ class MqttHumidifier(MqttEntity, HumidifierEntity):
             self._attr_target_humidity = target_humidity
             get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
 
-        if self._topic[CONF_TARGET_HUMIDITY_STATE_TOPIC] is not None:
-            topics[CONF_TARGET_HUMIDITY_STATE_TOPIC] = {
-                "topic": self._topic[CONF_TARGET_HUMIDITY_STATE_TOPIC],
-                "msg_callback": target_humidity_received,
-                "qos": self._config[CONF_QOS],
-                "encoding": self._config[CONF_ENCODING] or None,
-            }
-            self._attr_target_humidity = None
+        self.add_subscription(
+            topics, CONF_TARGET_HUMIDITY_STATE_TOPIC, target_humidity_received
+        )
 
         @callback
         @log_messages(self.hass, self.entity_id)
@@ -372,14 +454,7 @@ class MqttHumidifier(MqttEntity, HumidifierEntity):
             self._attr_mode = mode
             get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
 
-        if self._topic[CONF_MODE_STATE_TOPIC] is not None:
-            topics[CONF_MODE_STATE_TOPIC] = {
-                "topic": self._topic[CONF_MODE_STATE_TOPIC],
-                "msg_callback": mode_received,
-                "qos": self._config[CONF_QOS],
-                "encoding": self._config[CONF_ENCODING] or None,
-            }
-            self._attr_mode = None
+        self.add_subscription(topics, CONF_MODE_STATE_TOPIC, mode_received)
 
         self._sub_state = subscription.async_prepare_subscribe_topics(
             self.hass, self._sub_state, topics
diff --git a/homeassistant/components/mqtt/image.py b/homeassistant/components/mqtt/image.py
new file mode 100644
index 00000000000..2764539770d
--- /dev/null
+++ b/homeassistant/components/mqtt/image.py
@@ -0,0 +1,223 @@
+"""Support for MQTT images."""
+from __future__ import annotations
+
+from base64 import b64decode
+import binascii
+from collections.abc import Callable
+import functools
+import logging
+from typing import Any
+
+import httpx
+import voluptuous as vol
+
+from homeassistant.components import image
+from homeassistant.components.image import (
+    DEFAULT_CONTENT_TYPE,
+    ImageEntity,
+)
+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.httpx_client import get_async_client
+from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util import dt as dt_util
+
+from . import subscription
+from .config import MQTT_BASE_SCHEMA
+from .const import CONF_ENCODING, CONF_QOS
+from .debug_info import log_messages
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
+from .models import MessageCallbackType, MqttValueTemplate, ReceiveMessage
+from .util import get_mqtt_data, valid_subscribe_topic
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_CONTENT_TYPE = "content_type"
+CONF_IMAGE_ENCODING = "image_encoding"
+CONF_IMAGE_TOPIC = "image_topic"
+CONF_URL_TEMPLATE = "url_template"
+CONF_URL_TOPIC = "url_topic"
+
+DEFAULT_NAME = "MQTT Image"
+
+GET_IMAGE_TIMEOUT = 10
+
+
+def validate_topic_required(config: ConfigType) -> ConfigType:
+    """Ensure at least one subscribe topic is configured."""
+    if CONF_IMAGE_TOPIC not in config and CONF_URL_TOPIC not in config:
+        raise vol.Invalid("Expected one of [`image_topic`, `url_topic`], got none")
+    if CONF_CONTENT_TYPE in config and CONF_URL_TOPIC in config:
+        raise vol.Invalid(
+            "Option `content_type` can not be used together with `url_topic`"
+        )
+    return config
+
+
+PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
+    {
+        vol.Optional(CONF_CONTENT_TYPE): cv.string,
+        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+        vol.Exclusive(CONF_URL_TOPIC, "image_topic"): valid_subscribe_topic,
+        vol.Exclusive(CONF_IMAGE_TOPIC, "image_topic"): valid_subscribe_topic,
+        vol.Optional(CONF_IMAGE_ENCODING): "b64",
+        vol.Optional(CONF_URL_TEMPLATE): cv.template,
+    }
+).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
+
+PLATFORM_SCHEMA_MODERN = vol.All(PLATFORM_SCHEMA_BASE.schema, validate_topic_required)
+
+DISCOVERY_SCHEMA = vol.All(
+    PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA), validate_topic_required
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up MQTT image through YAML and through MQTT discovery."""
+    setup = functools.partial(
+        _async_setup_entity, hass, async_add_entities, config_entry=config_entry
+    )
+    await async_setup_entry_helper(hass, image.DOMAIN, setup, DISCOVERY_SCHEMA)
+
+
+async def _async_setup_entity(
+    hass: HomeAssistant,
+    async_add_entities: AddEntitiesCallback,
+    config: ConfigType,
+    config_entry: ConfigEntry,
+    discovery_data: DiscoveryInfoType | None = None,
+) -> None:
+    """Set up the MQTT Image."""
+    async_add_entities([MqttImage(hass, config, config_entry, discovery_data)])
+
+
+class MqttImage(MqttEntity, ImageEntity):
+    """representation of a MQTT image."""
+
+    _entity_id_format: str = image.ENTITY_ID_FORMAT
+    _last_image: bytes | None = None
+    _client: httpx.AsyncClient
+    _url_template: Callable[[ReceivePayloadType], ReceivePayloadType]
+    _topic: dict[str, Any]
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config: ConfigType,
+        config_entry: ConfigEntry,
+        discovery_data: DiscoveryInfoType | None,
+    ) -> None:
+        """Initialize the MQTT Image."""
+        self._client = get_async_client(hass)
+        ImageEntity.__init__(self, hass)
+        MqttEntity.__init__(self, hass, config, config_entry, discovery_data)
+
+    @staticmethod
+    def config_schema() -> vol.Schema:
+        """Return the config schema."""
+        return DISCOVERY_SCHEMA
+
+    def _setup_from_config(self, config: ConfigType) -> None:
+        """(Re)Setup the entity."""
+        self._topic = {
+            key: config.get(key)
+            for key in (
+                CONF_IMAGE_TOPIC,
+                CONF_URL_TOPIC,
+            )
+        }
+        if CONF_IMAGE_TOPIC in config:
+            self._attr_content_type = config.get(
+                CONF_CONTENT_TYPE, DEFAULT_CONTENT_TYPE
+            )
+        if CONF_URL_TOPIC in config:
+            self._attr_image_url = None
+        self._url_template = MqttValueTemplate(
+            config.get(CONF_URL_TEMPLATE), entity=self
+        ).async_render_with_possible_json_value
+
+    def _prepare_subscribe_topics(self) -> None:
+        """(Re)Subscribe to topics."""
+
+        topics: dict[str, Any] = {}
+
+        def add_subscribe_topic(topic: str, msg_callback: MessageCallbackType) -> bool:
+            """Add a topic to subscribe to."""
+            encoding: str | None
+            encoding = (
+                None
+                if CONF_IMAGE_TOPIC in self._config
+                else self._config[CONF_ENCODING] or None
+            )
+            if has_topic := self._topic[topic] is not None:
+                topics[topic] = {
+                    "topic": self._topic[topic],
+                    "msg_callback": msg_callback,
+                    "qos": self._config[CONF_QOS],
+                    "encoding": encoding,
+                }
+            return has_topic
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def image_data_received(msg: ReceiveMessage) -> None:
+            """Handle new MQTT messages."""
+            try:
+                if CONF_IMAGE_ENCODING in self._config:
+                    self._last_image = b64decode(msg.payload)
+                else:
+                    assert isinstance(msg.payload, bytes)
+                    self._last_image = msg.payload
+            except (binascii.Error, ValueError, AssertionError) as err:
+                _LOGGER.error(
+                    "Error processing image data received at topic %s: %s",
+                    msg.topic,
+                    err,
+                )
+                self._last_image = None
+            self._attr_image_last_updated = dt_util.utcnow()
+            get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+
+        add_subscribe_topic(CONF_IMAGE_TOPIC, image_data_received)
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def image_from_url_request_received(msg: ReceiveMessage) -> None:
+            """Handle new MQTT messages."""
+
+            try:
+                url = cv.url(self._url_template(msg.payload))
+                self._attr_image_url = url
+            except vol.Invalid:
+                _LOGGER.error(
+                    "Invalid image URL '%s' received at topic %s",
+                    msg.payload,
+                    msg.topic,
+                )
+            self._attr_image_last_updated = dt_util.utcnow()
+            self._cached_image = None
+            get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+
+        add_subscribe_topic(CONF_URL_TOPIC, image_from_url_request_received)
+
+        self._sub_state = subscription.async_prepare_subscribe_topics(
+            self.hass, self._sub_state, topics
+        )
+
+    async def _subscribe_topics(self) -> None:
+        """(Re)Subscribe to topics."""
+        await subscription.async_subscribe_topics(self.hass, self._sub_state)
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+        if CONF_IMAGE_TOPIC in self._config:
+            return self._last_image
+        return await super().async_image()
diff --git a/homeassistant/components/mqtt/light/__init__.py b/homeassistant/components/mqtt/light/__init__.py
index 5cd42ef1934..2c70490ac5e 100644
--- a/homeassistant/components/mqtt/light/__init__.py
+++ b/homeassistant/components/mqtt/light/__init__.py
@@ -69,7 +69,7 @@ async def async_setup_entry(
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up MQTT lights configured under the light platform key (deprecated)."""
+    """Set up MQTT lights through YAML and through MQTT discovery."""
     setup = functools.partial(
         _async_setup_entity, hass, async_add_entities, config_entry=config_entry
     )
diff --git a/homeassistant/components/mqtt/light/schema_basic.py b/homeassistant/components/mqtt/light/schema_basic.py
index b3659a67e61..7f2c2cf5e06 100644
--- a/homeassistant/components/mqtt/light/schema_basic.py
+++ b/homeassistant/components/mqtt/light/schema_basic.py
@@ -111,10 +111,6 @@ 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_WHITE_VALUE_COMMAND_TOPIC = "white_value_command_topic"
-CONF_WHITE_VALUE_SCALE = "white_value_scale"
-CONF_WHITE_VALUE_STATE_TOPIC = "white_value_state_topic"
-CONF_WHITE_VALUE_TEMPLATE = "white_value_template"
 CONF_ON_COMMAND_TYPE = "on_command_type"
 
 MQTT_LIGHT_ATTRIBUTES_BLOCKED = frozenset(
@@ -167,7 +163,7 @@ VALUE_TEMPLATE_KEYS = [
     CONF_XY_VALUE_TEMPLATE,
 ]
 
-_PLATFORM_SCHEMA_BASE = (
+PLATFORM_SCHEMA_MODERN_BASIC = (
     MQTT_RW_SCHEMA.extend(
         {
             vol.Optional(CONF_BRIGHTNESS_COMMAND_TEMPLATE): cv.template,
@@ -228,21 +224,7 @@ _PLATFORM_SCHEMA_BASE = (
 )
 
 DISCOVERY_SCHEMA_BASIC = vol.All(
-    # CONF_WHITE_VALUE_* is no longer supported, support was removed in 2022.9
-    cv.removed(CONF_WHITE_VALUE_COMMAND_TOPIC),
-    cv.removed(CONF_WHITE_VALUE_SCALE),
-    cv.removed(CONF_WHITE_VALUE_STATE_TOPIC),
-    cv.removed(CONF_WHITE_VALUE_TEMPLATE),
-    _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
-)
-
-PLATFORM_SCHEMA_MODERN_BASIC = vol.All(
-    # CONF_WHITE_VALUE_* is no longer supported, support was removed in 2022.9
-    cv.removed(CONF_WHITE_VALUE_COMMAND_TOPIC),
-    cv.removed(CONF_WHITE_VALUE_SCALE),
-    cv.removed(CONF_WHITE_VALUE_STATE_TOPIC),
-    cv.removed(CONF_WHITE_VALUE_TEMPLATE),
-    _PLATFORM_SCHEMA_BASE,
+    PLATFORM_SCHEMA_MODERN_BASIC.extend({}, extra=vol.REMOVE_EXTRA),
 )
 
 
diff --git a/homeassistant/components/mqtt/light/schema_json.py b/homeassistant/components/mqtt/light/schema_json.py
index c40dae659b7..70992887ca7 100644
--- a/homeassistant/components/mqtt/light/schema_json.py
+++ b/homeassistant/components/mqtt/light/schema_json.py
@@ -101,8 +101,6 @@ CONF_FLASH_TIME_SHORT = "flash_time_short"
 CONF_MAX_MIREDS = "max_mireds"
 CONF_MIN_MIREDS = "min_mireds"
 
-CONF_WHITE_VALUE = "white_value"
-
 
 def valid_color_configuration(config: ConfigType) -> ConfigType:
     """Test color_mode is not combined with deprecated config."""
@@ -158,15 +156,11 @@ _PLATFORM_SCHEMA_BASE = (
 )
 
 DISCOVERY_SCHEMA_JSON = vol.All(
-    # CONF_WHITE_VALUE is no longer supported, support was removed in 2022.9
-    cv.removed(CONF_WHITE_VALUE),
     _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
     valid_color_configuration,
 )
 
 PLATFORM_SCHEMA_MODERN_JSON = vol.All(
-    # CONF_WHITE_VALUE is no longer supported, support was removed in 2022.9
-    cv.removed(CONF_WHITE_VALUE),
     _PLATFORM_SCHEMA_BASE,
     valid_color_configuration,
 )
diff --git a/homeassistant/components/mqtt/light/schema_template.py b/homeassistant/components/mqtt/light/schema_template.py
index c2b4de289fd..063895d738c 100644
--- a/homeassistant/components/mqtt/light/schema_template.py
+++ b/homeassistant/components/mqtt/light/schema_template.py
@@ -75,7 +75,6 @@ CONF_GREEN_TEMPLATE = "green_template"
 CONF_MAX_MIREDS = "max_mireds"
 CONF_MIN_MIREDS = "min_mireds"
 CONF_RED_TEMPLATE = "red_template"
-CONF_WHITE_VALUE_TEMPLATE = "white_value_template"
 
 COMMAND_TEMPLATES = (CONF_COMMAND_ON_TEMPLATE, CONF_COMMAND_OFF_TEMPLATE)
 VALUE_TEMPLATES = (
@@ -88,7 +87,7 @@ VALUE_TEMPLATES = (
     CONF_STATE_TEMPLATE,
 )
 
-_PLATFORM_SCHEMA_BASE = (
+PLATFORM_SCHEMA_MODERN_TEMPLATE = (
     MQTT_RW_SCHEMA.extend(
         {
             vol.Optional(CONF_BLUE_TEMPLATE): cv.template,
@@ -111,15 +110,7 @@ _PLATFORM_SCHEMA_BASE = (
 )
 
 DISCOVERY_SCHEMA_TEMPLATE = vol.All(
-    # CONF_WHITE_VALUE_TEMPLATE is no longer supported, support was removed in 2022.9
-    cv.removed(CONF_WHITE_VALUE_TEMPLATE),
-    _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
-)
-
-PLATFORM_SCHEMA_MODERN_TEMPLATE = vol.All(
-    # CONF_WHITE_VALUE_TEMPLATE is no longer supported, support was removed in 2022.9
-    cv.removed(CONF_WHITE_VALUE_TEMPLATE),
-    _PLATFORM_SCHEMA_BASE,
+    PLATFORM_SCHEMA_MODERN_TEMPLATE.extend({}, extra=vol.REMOVE_EXTRA),
 )
 
 
diff --git a/homeassistant/components/mqtt/mixins.py b/homeassistant/components/mqtt/mixins.py
index 46744c4d65d..34b61d89c48 100644
--- a/homeassistant/components/mqtt/mixins.py
+++ b/homeassistant/components/mqtt/mixins.py
@@ -244,6 +244,20 @@ class SetupEntity(Protocol):
         """Define setup_entities type."""
 
 
+@callback
+def async_handle_schema_error(
+    discovery_payload: MQTTDiscoveryPayload, err: vol.MultipleInvalid
+) -> None:
+    """Help handling schema errors on MQTT discovery messages."""
+    discovery_topic: str = discovery_payload.discovery_data[ATTR_DISCOVERY_TOPIC]
+    _LOGGER.error(
+        "Error '%s' when processing MQTT discovery message topic: '%s', message: '%s'",
+        err,
+        discovery_topic,
+        discovery_payload,
+    )
+
+
 async def async_setup_entry_helper(
     hass: HomeAssistant,
     domain: str,
@@ -269,8 +283,15 @@ async def async_setup_entry_helper(
         try:
             config: DiscoveryInfoType = discovery_schema(discovery_payload)
             await async_setup(config, discovery_data=discovery_data)
+        except vol.Invalid as err:
+            discovery_hash = discovery_data[ATTR_DISCOVERY_HASH]
+            clear_discovery_hash(hass, discovery_hash)
+            async_dispatcher_send(
+                hass, MQTT_DISCOVERY_DONE.format(discovery_hash), None
+            )
+            async_handle_schema_error(discovery_payload, err)
         except Exception:
-            discovery_hash: tuple[str, str] = discovery_data[ATTR_DISCOVERY_HASH]
+            discovery_hash = discovery_data[ATTR_DISCOVERY_HASH]
             clear_discovery_hash(hass, discovery_hash)
             async_dispatcher_send(
                 hass, MQTT_DISCOVERY_DONE.format(discovery_hash), None
@@ -1037,7 +1058,11 @@ class MqttEntity(
 
     async def discovery_update(self, discovery_payload: MQTTDiscoveryPayload) -> None:
         """Handle updated discovery message."""
-        config: DiscoveryInfoType = self.config_schema()(discovery_payload)
+        try:
+            config: DiscoveryInfoType = self.config_schema()(discovery_payload)
+        except vol.Invalid as err:
+            async_handle_schema_error(discovery_payload, err)
+            return
         self._config = config
         self._setup_common_attributes_from_config(self._config)
         self._setup_from_config(self._config)
diff --git a/homeassistant/components/mqtt/number.py b/homeassistant/components/mqtt/number.py
index c0cb00211e3..5986eab1207 100644
--- a/homeassistant/components/mqtt/number.py
+++ b/homeassistant/components/mqtt/number.py
@@ -186,6 +186,9 @@ class MqttNumber(MqttEntity, RestoreNumber):
             """Handle new MQTT messages."""
             num_value: int | float | None
             payload = str(self._value_template(msg.payload))
+            if not payload.strip():
+                _LOGGER.debug("Ignoring empty state update from '%s'", msg.topic)
+                return
             try:
                 if payload == self._config[CONF_PAYLOAD_RESET]:
                     num_value = None
diff --git a/homeassistant/components/mqtt/subscription.py b/homeassistant/components/mqtt/subscription.py
index 7ccc31bd335..dda80bba84e 100644
--- a/homeassistant/components/mqtt/subscription.py
+++ b/homeassistant/components/mqtt/subscription.py
@@ -8,8 +8,8 @@ import attr
 
 from homeassistant.core import HomeAssistant
 
-from . import debug_info
 from .. import mqtt
+from . import debug_info
 from .const import DEFAULT_QOS
 from .models import MessageCallbackType
 
diff --git a/homeassistant/components/mqtt/water_heater.py b/homeassistant/components/mqtt/water_heater.py
new file mode 100644
index 00000000000..0f622d55b84
--- /dev/null
+++ b/homeassistant/components/mqtt/water_heater.py
@@ -0,0 +1,318 @@
+"""Support for MQTT water heater devices."""
+from __future__ import annotations
+
+import functools
+import logging
+from typing import Any
+
+import voluptuous as vol
+
+from homeassistant.components import water_heater
+from homeassistant.components.water_heater import (
+    ATTR_OPERATION_MODE,
+    DEFAULT_MIN_TEMP,
+    STATE_ECO,
+    STATE_ELECTRIC,
+    STATE_GAS,
+    STATE_HEAT_PUMP,
+    STATE_HIGH_DEMAND,
+    STATE_PERFORMANCE,
+    WaterHeaterEntity,
+    WaterHeaterEntityFeature,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    CONF_NAME,
+    CONF_OPTIMISTIC,
+    CONF_PAYLOAD_OFF,
+    CONF_PAYLOAD_ON,
+    CONF_TEMPERATURE_UNIT,
+    CONF_VALUE_TEMPLATE,
+    PRECISION_HALVES,
+    PRECISION_TENTHS,
+    PRECISION_WHOLE,
+    STATE_OFF,
+    UnitOfTemperature,
+)
+from homeassistant.core import HomeAssistant, callback
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.template import Template
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util.unit_conversion import TemperatureConverter
+
+from .climate import MqttTemperatureControlEntity
+from .config import DEFAULT_RETAIN, MQTT_BASE_SCHEMA
+from .const import (
+    CONF_CURRENT_TEMP_TEMPLATE,
+    CONF_CURRENT_TEMP_TOPIC,
+    CONF_MODE_COMMAND_TEMPLATE,
+    CONF_MODE_COMMAND_TOPIC,
+    CONF_MODE_LIST,
+    CONF_MODE_STATE_TEMPLATE,
+    CONF_MODE_STATE_TOPIC,
+    CONF_PRECISION,
+    CONF_RETAIN,
+    CONF_TEMP_COMMAND_TEMPLATE,
+    CONF_TEMP_COMMAND_TOPIC,
+    CONF_TEMP_INITIAL,
+    CONF_TEMP_MAX,
+    CONF_TEMP_MIN,
+    CONF_TEMP_STATE_TEMPLATE,
+    CONF_TEMP_STATE_TOPIC,
+    DEFAULT_OPTIMISTIC,
+)
+from .debug_info import log_messages
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, async_setup_entry_helper
+from .models import MqttCommandTemplate, MqttValueTemplate, ReceiveMessage
+from .util import get_mqtt_data, valid_publish_topic, valid_subscribe_topic
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = "MQTT Water Heater"
+
+MQTT_WATER_HEATER_ATTRIBUTES_BLOCKED = frozenset(
+    {
+        water_heater.ATTR_CURRENT_TEMPERATURE,
+        water_heater.ATTR_MAX_TEMP,
+        water_heater.ATTR_MIN_TEMP,
+        water_heater.ATTR_TEMPERATURE,
+        water_heater.ATTR_OPERATION_LIST,
+        water_heater.ATTR_OPERATION_MODE,
+    }
+)
+
+VALUE_TEMPLATE_KEYS = (
+    CONF_CURRENT_TEMP_TEMPLATE,
+    CONF_MODE_STATE_TEMPLATE,
+    CONF_TEMP_STATE_TEMPLATE,
+)
+
+COMMAND_TEMPLATE_KEYS = {
+    CONF_MODE_COMMAND_TEMPLATE,
+    CONF_TEMP_COMMAND_TEMPLATE,
+}
+
+
+TOPIC_KEYS = (
+    CONF_CURRENT_TEMP_TOPIC,
+    CONF_MODE_COMMAND_TOPIC,
+    CONF_MODE_STATE_TOPIC,
+    CONF_TEMP_COMMAND_TOPIC,
+    CONF_TEMP_STATE_TOPIC,
+)
+
+
+_PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
+    {
+        vol.Optional(CONF_CURRENT_TEMP_TEMPLATE): cv.template,
+        vol.Optional(CONF_CURRENT_TEMP_TOPIC): valid_subscribe_topic,
+        vol.Optional(CONF_MODE_COMMAND_TEMPLATE): cv.template,
+        vol.Optional(CONF_MODE_COMMAND_TOPIC): valid_publish_topic,
+        vol.Optional(
+            CONF_MODE_LIST,
+            default=[
+                STATE_ECO,
+                STATE_ELECTRIC,
+                STATE_GAS,
+                STATE_HEAT_PUMP,
+                STATE_HIGH_DEMAND,
+                STATE_PERFORMANCE,
+                STATE_OFF,
+            ],
+        ): cv.ensure_list,
+        vol.Optional(CONF_MODE_STATE_TEMPLATE): cv.template,
+        vol.Optional(CONF_MODE_STATE_TOPIC): valid_subscribe_topic,
+        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+        vol.Optional(CONF_OPTIMISTIC, default=DEFAULT_OPTIMISTIC): cv.boolean,
+        vol.Optional(CONF_PAYLOAD_ON, default="ON"): cv.string,
+        vol.Optional(CONF_PAYLOAD_OFF, default="OFF"): cv.string,
+        vol.Optional(CONF_PRECISION): vol.In(
+            [PRECISION_TENTHS, PRECISION_HALVES, PRECISION_WHOLE]
+        ),
+        vol.Optional(CONF_RETAIN, default=DEFAULT_RETAIN): cv.boolean,
+        vol.Optional(CONF_TEMP_INITIAL): cv.positive_int,
+        vol.Optional(CONF_TEMP_MIN): vol.Coerce(float),
+        vol.Optional(CONF_TEMP_MAX): vol.Coerce(float),
+        vol.Optional(CONF_TEMP_COMMAND_TEMPLATE): cv.template,
+        vol.Optional(CONF_TEMP_COMMAND_TOPIC): valid_publish_topic,
+        vol.Optional(CONF_TEMP_STATE_TEMPLATE): cv.template,
+        vol.Optional(CONF_TEMP_STATE_TOPIC): valid_subscribe_topic,
+        vol.Optional(CONF_TEMPERATURE_UNIT): cv.temperature_unit,
+        vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+    }
+).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
+
+PLATFORM_SCHEMA_MODERN = vol.All(
+    _PLATFORM_SCHEMA_BASE,
+)
+
+_DISCOVERY_SCHEMA_BASE = _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA)
+
+DISCOVERY_SCHEMA = vol.All(
+    _DISCOVERY_SCHEMA_BASE,
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up MQTT water heater device through YAML and through MQTT discovery."""
+    setup = functools.partial(
+        _async_setup_entity, hass, async_add_entities, config_entry=config_entry
+    )
+    await async_setup_entry_helper(hass, water_heater.DOMAIN, setup, DISCOVERY_SCHEMA)
+
+
+async def _async_setup_entity(
+    hass: HomeAssistant,
+    async_add_entities: AddEntitiesCallback,
+    config: ConfigType,
+    config_entry: ConfigEntry,
+    discovery_data: DiscoveryInfoType | None = None,
+) -> None:
+    """Set up the MQTT water heater devices."""
+    async_add_entities([MqttWaterHeater(hass, config, config_entry, discovery_data)])
+
+
+class MqttWaterHeater(MqttTemperatureControlEntity, WaterHeaterEntity):
+    """Representation of an MQTT water heater device."""
+
+    _entity_id_format = water_heater.ENTITY_ID_FORMAT
+    _attributes_extra_blocked = MQTT_WATER_HEATER_ATTRIBUTES_BLOCKED
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config: ConfigType,
+        config_entry: ConfigEntry,
+        discovery_data: DiscoveryInfoType | None,
+    ) -> None:
+        """Initialize the water heater device."""
+        MqttTemperatureControlEntity.__init__(
+            self, hass, config, config_entry, discovery_data
+        )
+
+    @staticmethod
+    def config_schema() -> vol.Schema:
+        """Return the config schema."""
+        return DISCOVERY_SCHEMA
+
+    def _setup_from_config(self, config: ConfigType) -> None:
+        """(Re)Setup the entity."""
+        self._attr_operation_list = config[CONF_MODE_LIST]
+        self._attr_temperature_unit = config.get(
+            CONF_TEMPERATURE_UNIT, self.hass.config.units.temperature_unit
+        )
+        if (min_temp := config.get(CONF_TEMP_MIN)) is not None:
+            self._attr_min_temp = min_temp
+        if (max_temp := config.get(CONF_TEMP_MAX)) is not None:
+            self._attr_max_temp = max_temp
+        if (precision := config.get(CONF_PRECISION)) is not None:
+            self._attr_precision = precision
+
+        self._topic = {key: config.get(key) for key in TOPIC_KEYS}
+
+        self._optimistic = config[CONF_OPTIMISTIC]
+
+        # Set init temp, if it is missing convert the default to the temperature units
+        init_temp: float = config.get(
+            CONF_TEMP_INITIAL,
+            TemperatureConverter.convert(
+                DEFAULT_MIN_TEMP,
+                UnitOfTemperature.FAHRENHEIT,
+                self.temperature_unit,
+            ),
+        )
+        if self._topic[CONF_TEMP_STATE_TOPIC] is None or self._optimistic:
+            self._attr_target_temperature = init_temp
+        if self._topic[CONF_MODE_STATE_TOPIC] is None or self._optimistic:
+            self._attr_current_operation = STATE_OFF
+
+        value_templates: dict[str, Template | None] = {}
+        for key in VALUE_TEMPLATE_KEYS:
+            value_templates[key] = None
+        if CONF_VALUE_TEMPLATE in config:
+            value_templates = {
+                key: config.get(CONF_VALUE_TEMPLATE) for key in VALUE_TEMPLATE_KEYS
+            }
+        for key in VALUE_TEMPLATE_KEYS & config.keys():
+            value_templates[key] = config[key]
+        self._value_templates = {
+            key: MqttValueTemplate(
+                template,
+                entity=self,
+            ).async_render_with_possible_json_value
+            for key, template in value_templates.items()
+        }
+
+        self._command_templates = {}
+        for key in COMMAND_TEMPLATE_KEYS:
+            self._command_templates[key] = MqttCommandTemplate(
+                config.get(key), entity=self
+            ).async_render
+
+        support = WaterHeaterEntityFeature(0)
+        if (self._topic[CONF_TEMP_STATE_TOPIC] is not None) or (
+            self._topic[CONF_TEMP_COMMAND_TOPIC] is not None
+        ):
+            support |= WaterHeaterEntityFeature.TARGET_TEMPERATURE
+
+        if (self._topic[CONF_MODE_STATE_TOPIC] is not None) or (
+            self._topic[CONF_MODE_COMMAND_TOPIC] is not None
+        ):
+            support |= WaterHeaterEntityFeature.OPERATION_MODE
+
+        self._attr_supported_features = support
+
+    def _prepare_subscribe_topics(self) -> None:
+        """(Re)Subscribe to topics."""
+        topics: dict[str, dict[str, Any]] = {}
+
+        @callback
+        def handle_mode_received(
+            msg: ReceiveMessage, template_name: str, attr: str, mode_list: str
+        ) -> None:
+            """Handle receiving listed mode via MQTT."""
+            payload = self.render_template(msg, template_name)
+
+            if payload not in self._config[mode_list]:
+                _LOGGER.error("Invalid %s mode: %s", mode_list, payload)
+            else:
+                setattr(self, attr, payload)
+                get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def handle_current_mode_received(msg: ReceiveMessage) -> None:
+            """Handle receiving operation mode via MQTT."""
+            handle_mode_received(
+                msg,
+                CONF_MODE_STATE_TEMPLATE,
+                "_attr_current_operation",
+                CONF_MODE_LIST,
+            )
+
+        self.add_subscription(
+            topics, CONF_MODE_STATE_TOPIC, handle_current_mode_received
+        )
+
+        self.prepare_subscribe_topics(topics)
+
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set new target temperature."""
+        operation_mode: str | None
+        if (operation_mode := kwargs.get(ATTR_OPERATION_MODE)) is not None:
+            await self.async_set_operation_mode(operation_mode)
+        await super().async_set_temperature(**kwargs)
+
+    async def async_set_operation_mode(self, operation_mode: str) -> None:
+        """Set new operation mode."""
+        payload = self._command_templates[CONF_MODE_COMMAND_TEMPLATE](operation_mode)
+        await self._publish(CONF_MODE_COMMAND_TOPIC, payload)
+
+        if self._optimistic or self._topic[CONF_MODE_STATE_TOPIC] is None:
+            self._attr_current_operation = operation_mode
+            self.async_write_ha_state()
diff --git a/homeassistant/components/myq/manifest.json b/homeassistant/components/myq/manifest.json
index 05f698f2170..5e03f962d15 100644
--- a/homeassistant/components/myq/manifest.json
+++ b/homeassistant/components/myq/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "myq",
   "name": "MyQ",
-  "codeowners": ["@bdraco", "@ehendrix23"],
+  "codeowners": ["@ehendrix23"],
   "config_flow": true,
   "dhcp": [
     {
diff --git a/homeassistant/components/mysensors/device.py b/homeassistant/components/mysensors/device.py
index d7405dba187..42c5a40636e 100644
--- a/homeassistant/components/mysensors/device.py
+++ b/homeassistant/components/mysensors/device.py
@@ -227,7 +227,6 @@ class MySensorsEntity(MySensorsDevice, Entity):
         """Return entity specific state attributes."""
         attr = self._extra_attributes
 
-        assert self.platform
         assert self.platform.config_entry
         attr[ATTR_DEVICE] = self.platform.config_entry.data[CONF_DEVICE]
 
diff --git a/homeassistant/components/mysensors/strings.json b/homeassistant/components/mysensors/strings.json
index dc5dc76c7ae..7e0ff2c99d6 100644
--- a/homeassistant/components/mysensors/strings.json
+++ b/homeassistant/components/mysensors/strings.json
@@ -19,7 +19,7 @@
         "description": "Ethernet gateway setup",
         "data": {
           "device": "IP address of the gateway",
-          "tcp_port": "port",
+          "tcp_port": "[%key:common::config_flow::data::port%]",
           "version": "MySensors version",
           "persistence_file": "persistence file (leave empty to auto-generate)"
         }
@@ -30,17 +30,17 @@
           "device": "Serial port",
           "baud_rate": "baud rate",
           "version": "MySensors version",
-          "persistence_file": "persistence file (leave empty to auto-generate)"
+          "persistence_file": "Persistence file (leave empty to auto-generate)"
         }
       },
       "gw_mqtt": {
         "description": "MQTT gateway setup",
         "data": {
-          "retain": "mqtt retain",
-          "topic_in_prefix": "prefix for input topics (topic_in_prefix)",
-          "topic_out_prefix": "prefix for output topics (topic_out_prefix)",
+          "retain": "MQTT retain",
+          "topic_in_prefix": "Prefix for input topics (topic_in_prefix)",
+          "topic_out_prefix": "Prefix for output topics (topic_out_prefix)",
           "version": "MySensors version",
-          "persistence_file": "persistence file (leave empty to auto-generate)"
+          "persistence_file": "Persistence file (leave empty to auto-generate)"
         }
       }
     },
diff --git a/homeassistant/components/mystrom/__init__.py b/homeassistant/components/mystrom/__init__.py
index 54a24b9b4af..160cd0e8634 100644
--- a/homeassistant/components/mystrom/__init__.py
+++ b/homeassistant/components/mystrom/__init__.py
@@ -1 +1,79 @@
-"""The mystrom component."""
+"""The myStrom integration."""
+from __future__ import annotations
+
+import logging
+
+import pymystrom
+from pymystrom.bulb import MyStromBulb
+from pymystrom.exceptions import MyStromConnectionError
+from pymystrom.switch import MyStromSwitch
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+
+from .const import DOMAIN
+from .models import MyStromData
+
+PLATFORMS_SWITCH = [Platform.SWITCH]
+PLATFORMS_BULB = [Platform.LIGHT]
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up myStrom from a config entry."""
+    host = entry.data[CONF_HOST]
+    device = None
+    try:
+        info = await pymystrom.get_device_info(host)
+    except MyStromConnectionError as err:
+        _LOGGER.error("No route to myStrom plug: %s", host)
+        raise ConfigEntryNotReady() from err
+
+    device_type = info["type"]
+    if device_type in [101, 106, 107]:
+        device = MyStromSwitch(host)
+        platforms = PLATFORMS_SWITCH
+    elif device_type == 102:
+        mac = info["mac"]
+        device = MyStromBulb(host, mac)
+        platforms = PLATFORMS_BULB
+        if device.bulb_type not in ["rgblamp", "strip"]:
+            _LOGGER.error(
+                "Device %s (%s) is not a myStrom bulb nor myStrom LED Strip",
+                host,
+                mac,
+            )
+            return False
+    else:
+        _LOGGER.error("Unsupported myStrom device type: %s", device_type)
+        return False
+
+    try:
+        await device.get_state()
+    except MyStromConnectionError as err:
+        _LOGGER.error("No route to myStrom plug: %s", info["ip"])
+        raise ConfigEntryNotReady() from err
+
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = MyStromData(
+        device=device,
+        info=info,
+    )
+    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."""
+    device_type = hass.data[DOMAIN][entry.entry_id].info["type"]
+    if device_type in [101, 106, 107]:
+        platforms = PLATFORMS_SWITCH
+    elif device_type == 102:
+        platforms = PLATFORMS_BULB
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, platforms):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
diff --git a/homeassistant/components/mystrom/config_flow.py b/homeassistant/components/mystrom/config_flow.py
new file mode 100644
index 00000000000..3dc334d8252
--- /dev/null
+++ b/homeassistant/components/mystrom/config_flow.py
@@ -0,0 +1,57 @@
+"""Config flow for myStrom integration."""
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+import pymystrom
+from pymystrom.exceptions import MyStromConnectionError
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_HOST, CONF_NAME
+from homeassistant.data_entry_flow import FlowResult
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = "myStrom Device"
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Optional(CONF_NAME, default=DEFAULT_NAME): str,
+        vol.Required(CONF_HOST): str,
+    }
+)
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for myStrom."""
+
+    VERSION = 1
+
+    async def async_step_import(self, import_config: dict[str, Any]) -> FlowResult:
+        """Handle import from config."""
+        return await self.async_step_user(import_config)
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            try:
+                info = await pymystrom.get_device_info(user_input[CONF_HOST])
+            except MyStromConnectionError:
+                errors["base"] = "cannot_connect"
+            else:
+                await self.async_set_unique_id(info["mac"])
+                self._abort_if_unique_id_configured()
+                data = {CONF_HOST: user_input[CONF_HOST]}
+                title = user_input.get(CONF_NAME) or DEFAULT_NAME
+                return self.async_create_entry(title=title, data=data)
+
+        schema = self.add_suggested_values_to_schema(STEP_USER_DATA_SCHEMA, user_input)
+        return self.async_show_form(step_id="user", data_schema=schema, errors=errors)
diff --git a/homeassistant/components/mystrom/const.py b/homeassistant/components/mystrom/const.py
index 87697acbe96..5641463abf1 100644
--- a/homeassistant/components/mystrom/const.py
+++ b/homeassistant/components/mystrom/const.py
@@ -1,2 +1,4 @@
 """Constants for the myStrom integration."""
 DOMAIN = "mystrom"
+DEFAULT_NAME = "myStrom"
+MANUFACTURER = "myStrom"
diff --git a/homeassistant/components/mystrom/light.py b/homeassistant/components/mystrom/light.py
index e01cebb818d..14badde17d2 100644
--- a/homeassistant/components/mystrom/light.py
+++ b/homeassistant/components/mystrom/light.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from pymystrom.bulb import MyStromBulb
 from pymystrom.exceptions import MyStromConnectionError
 import voluptuous as vol
 
@@ -17,13 +16,17 @@ from homeassistant.components.light import (
     LightEntity,
     LightEntityFeature,
 )
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
+from .const import DOMAIN, MANUFACTURER
+
 _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_NAME = "myStrom bulb"
@@ -40,6 +43,15 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
 )
 
 
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the myStrom entities."""
+    info = hass.data[DOMAIN][entry.entry_id].info
+    device = hass.data[DOMAIN][entry.entry_id].device
+    async_add_entities([MyStromLight(device, entry.title, info["mac"])])
+
+
 async def async_setup_platform(
     hass: HomeAssistant,
     config: ConfigType,
@@ -47,23 +59,20 @@ async def async_setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the myStrom light integration."""
-    host = config.get(CONF_HOST)
-    mac = config.get(CONF_MAC)
-    name = config.get(CONF_NAME)
-
-    bulb = MyStromBulb(host, mac)
-    try:
-        await bulb.get_state()
-        if bulb.bulb_type not in ["rgblamp", "strip"]:
-            _LOGGER.error(
-                "Device %s (%s) is not a myStrom bulb nor myStrom LED Strip", host, mac
-            )
-            return
-    except MyStromConnectionError as err:
-        _LOGGER.warning("No route to myStrom bulb: %s", host)
-        raise PlatformNotReady() from err
-
-    async_add_entities([MyStromLight(bulb, name, mac)], True)
+    async_create_issue(
+        hass,
+        DOMAIN,
+        "deprecated_yaml",
+        breaks_in_ha_version="2023.12.0",
+        is_fixable=False,
+        severity=IssueSeverity.WARNING,
+        translation_key="deprecated_yaml",
+    )
+    hass.async_create_task(
+        hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_IMPORT}, data=config
+        )
+    )
 
 
 class MyStromLight(LightEntity):
@@ -81,6 +90,12 @@ class MyStromLight(LightEntity):
         self._attr_available = False
         self._attr_unique_id = mac
         self._attr_hs_color = 0, 0
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, mac)},
+            name=name,
+            manufacturer=MANUFACTURER,
+            sw_version=self._bulb.firmware,
+        )
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on the light."""
diff --git a/homeassistant/components/mystrom/manifest.json b/homeassistant/components/mystrom/manifest.json
index 7659b1d8025..eaf9eb6acdc 100644
--- a/homeassistant/components/mystrom/manifest.json
+++ b/homeassistant/components/mystrom/manifest.json
@@ -2,6 +2,7 @@
   "domain": "mystrom",
   "name": "myStrom",
   "codeowners": ["@fabaff"],
+  "config_flow": true,
   "dependencies": ["http"],
   "documentation": "https://www.home-assistant.io/integrations/mystrom",
   "iot_class": "local_polling",
diff --git a/homeassistant/components/mystrom/models.py b/homeassistant/components/mystrom/models.py
new file mode 100644
index 00000000000..96cc40996ef
--- /dev/null
+++ b/homeassistant/components/mystrom/models.py
@@ -0,0 +1,14 @@
+"""Models for the mystrom integration."""
+from dataclasses import dataclass
+from typing import Any
+
+from pymystrom.bulb import MyStromBulb
+from pymystrom.switch import MyStromSwitch
+
+
+@dataclass
+class MyStromData:
+    """Data class for mystrom device data."""
+
+    device: MyStromSwitch | MyStromBulb
+    info: dict[str, Any]
diff --git a/homeassistant/components/mystrom/strings.json b/homeassistant/components/mystrom/strings.json
new file mode 100644
index 00000000000..259501e1486
--- /dev/null
+++ b/homeassistant/components/mystrom/strings.json
@@ -0,0 +1,24 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "name": "[%key:common::config_flow::data::name%]",
+          "host": "[%key:common::config_flow::data::host%]"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    }
+  },
+  "issues": {
+    "deprecated_yaml": {
+      "title": "The myStrom YAML configuration is being removed",
+      "description": "Configuring myStrom using YAML is being removed.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove the myStrom YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
+    }
+  }
+}
diff --git a/homeassistant/components/mystrom/switch.py b/homeassistant/components/mystrom/switch.py
index 3d073693b1e..8e89bb5f151 100644
--- a/homeassistant/components/mystrom/switch.py
+++ b/homeassistant/components/mystrom/switch.py
@@ -5,17 +5,20 @@ import logging
 from typing import Any
 
 from pymystrom.exceptions import MyStromConnectionError
-from pymystrom.switch import MyStromSwitch as _MyStromSwitch
 import voluptuous as vol
 
 from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
+from .const import DOMAIN, MANUFACTURER
+
 DEFAULT_NAME = "myStrom Switch"
 
 _LOGGER = logging.getLogger(__name__)
@@ -28,6 +31,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
 )
 
 
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the myStrom entities."""
+    device = hass.data[DOMAIN][entry.entry_id].device
+    async_add_entities([MyStromSwitch(device, entry.title)])
+
+
 async def async_setup_platform(
     hass: HomeAssistant,
     config: ConfigType,
@@ -35,17 +46,20 @@ async def async_setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the myStrom switch/plug integration."""
-    name = config.get(CONF_NAME)
-    host = config.get(CONF_HOST)
-
-    try:
-        plug = _MyStromSwitch(host)
-        await plug.get_state()
-    except MyStromConnectionError as err:
-        _LOGGER.error("No route to myStrom plug: %s", host)
-        raise PlatformNotReady() from err
-
-    async_add_entities([MyStromSwitch(plug, name)])
+    async_create_issue(
+        hass,
+        DOMAIN,
+        "deprecated_yaml",
+        breaks_in_ha_version="2023.12.0",
+        is_fixable=False,
+        severity=IssueSeverity.WARNING,
+        translation_key="deprecated_yaml",
+    )
+    hass.async_create_task(
+        hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_IMPORT}, data=config
+        )
+    )
 
 
 class MyStromSwitch(SwitchEntity):
@@ -56,6 +70,12 @@ class MyStromSwitch(SwitchEntity):
         self.plug = plug
         self._attr_name = name
         self._attr_unique_id = self.plug.mac
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, self.plug.mac)},
+            name=name,
+            manufacturer=MANUFACTURER,
+            sw_version=self.plug.firmware,
+        )
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the switch on."""
diff --git a/homeassistant/components/nad/manifest.json b/homeassistant/components/nad/manifest.json
index dd354086a1a..2e2d44341af 100644
--- a/homeassistant/components/nad/manifest.json
+++ b/homeassistant/components/nad/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/nad",
   "iot_class": "local_polling",
   "loggers": ["nad_receiver"],
-  "requirements": ["nad_receiver==0.3.0"]
+  "requirements": ["nad-receiver==0.3.0"]
 }
diff --git a/homeassistant/components/ness_alarm/__init__.py b/homeassistant/components/ness_alarm/__init__.py
index c81c3e0c7f7..c1d97f781af 100644
--- a/homeassistant/components/ness_alarm/__init__.py
+++ b/homeassistant/components/ness_alarm/__init__.py
@@ -1,6 +1,7 @@
 """Support for Ness D8X/D16X devices."""
 from collections import namedtuple
 import datetime
+import logging
 
 from nessclient import ArmingState, Client
 import voluptuous as vol
@@ -21,8 +22,11 @@ from homeassistant.core import HomeAssistant, ServiceCall
 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.start import async_at_started
 from homeassistant.helpers.typing import ConfigType
 
+_LOGGER = logging.getLogger(__name__)
+
 DOMAIN = "ness_alarm"
 DATA_NESS = "ness_alarm"
 
@@ -109,6 +113,14 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _close)
 
+    async def _started(event):
+        # Force update for current arming status and current zone states (once Home Assistant has finished loading required sensors and panel)
+        _LOGGER.debug("invoking client keepalive() & update()")
+        hass.loop.create_task(client.keepalive())
+        hass.loop.create_task(client.update())
+
+    async_at_started(hass, _started)
+
     hass.async_create_task(
         async_load_platform(
             hass, Platform.BINARY_SENSOR, DOMAIN, {CONF_ZONES: zones}, config
@@ -131,10 +143,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     client.on_zone_change(on_zone_change)
     client.on_state_change(on_state_change)
 
-    # Force update for current arming status and current zone states
-    hass.loop.create_task(client.keepalive())
-    hass.loop.create_task(client.update())
-
     async def handle_panic(call: ServiceCall) -> None:
         await client.panic(call.data[ATTR_CODE])
 
diff --git a/homeassistant/components/nest/camera_sdm.py b/homeassistant/components/nest/camera_sdm.py
index 834202ba58d..3eceb448fa4 100644
--- a/homeassistant/components/nest/camera_sdm.py
+++ b/homeassistant/components/nest/camera_sdm.py
@@ -61,6 +61,7 @@ class NestCamera(Camera):
     """Devices that support cameras."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, device: Device) -> None:
         """Initialize the camera."""
diff --git a/homeassistant/components/nest/climate_sdm.py b/homeassistant/components/nest/climate_sdm.py
index ab0ce20a9a1..ca975ed055d 100644
--- a/homeassistant/components/nest/climate_sdm.py
+++ b/homeassistant/components/nest/climate_sdm.py
@@ -99,6 +99,7 @@ class ThermostatEntity(ClimateEntity):
     _attr_max_temp = MAX_TEMP
     _attr_has_entity_name = True
     _attr_should_poll = False
+    _attr_name = None
 
     def __init__(self, device: Device) -> None:
         """Initialize ThermostatEntity."""
diff --git a/homeassistant/components/nest/manifest.json b/homeassistant/components/nest/manifest.json
index 6af293aba97..dbb30ceb52a 100644
--- a/homeassistant/components/nest/manifest.json
+++ b/homeassistant/components/nest/manifest.json
@@ -20,5 +20,5 @@
   "iot_class": "cloud_push",
   "loggers": ["google_nest_sdm", "nest"],
   "quality_scale": "platinum",
-  "requirements": ["python-nest==4.2.0", "google-nest-sdm==2.2.4"]
+  "requirements": ["python-nest==4.2.0", "google-nest-sdm==2.2.5"]
 }
diff --git a/homeassistant/components/netatmo/__init__.py b/homeassistant/components/netatmo/__init__.py
index aa8728d548d..e26a32965a3 100644
--- a/homeassistant/components/netatmo/__init__.py
+++ b/homeassistant/components/netatmo/__init__.py
@@ -234,11 +234,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             await register_webhook(None)
         cloud.async_listen_connection_change(hass, manage_cloudhook)
 
+    elif hass.state == CoreState.running:
+        await register_webhook(None)
     else:
-        if hass.state == CoreState.running:
-            await register_webhook(None)
-        else:
-            hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, register_webhook)
+        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, register_webhook)
 
     hass.services.async_register(DOMAIN, "register_webhook", register_webhook)
     hass.services.async_register(DOMAIN, "unregister_webhook", unregister_webhook)
diff --git a/homeassistant/components/netatmo/device_trigger.py b/homeassistant/components/netatmo/device_trigger.py
index f3f45458d78..f4719badcfa 100644
--- a/homeassistant/components/netatmo/device_trigger.py
+++ b/homeassistant/components/netatmo/device_trigger.py
@@ -56,7 +56,7 @@ TRIGGER_TYPES = OUTDOOR_CAMERA_TRIGGERS + INDOOR_CAMERA_TRIGGERS + CLIMATE_TRIGG
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Optional(CONF_SUBTYPE): str,
     }
@@ -111,7 +111,7 @@ async def async_get_triggers(
                             CONF_PLATFORM: "device",
                             CONF_DEVICE_ID: device_id,
                             CONF_DOMAIN: DOMAIN,
-                            CONF_ENTITY_ID: entry.entity_id,
+                            CONF_ENTITY_ID: entry.id,
                             CONF_TYPE: trigger,
                             CONF_SUBTYPE: subtype,
                         }
@@ -122,7 +122,7 @@ async def async_get_triggers(
                         CONF_PLATFORM: "device",
                         CONF_DEVICE_ID: device_id,
                         CONF_DOMAIN: DOMAIN,
-                        CONF_ENTITY_ID: entry.entity_id,
+                        CONF_ENTITY_ID: entry.id,
                         CONF_TYPE: trigger,
                     }
                 )
diff --git a/homeassistant/components/netatmo/strings.json b/homeassistant/components/netatmo/strings.json
index a500689a937..5fdf580c6aa 100644
--- a/homeassistant/components/netatmo/strings.json
+++ b/homeassistant/components/netatmo/strings.json
@@ -47,9 +47,9 @@
   },
   "device_automation": {
     "trigger_subtype": {
-      "away": "away",
-      "schedule": "schedule",
-      "hg": "frost guard"
+      "away": "Away",
+      "schedule": "Schedule",
+      "hg": "Frost guard"
     },
     "trigger_type": {
       "turned_off": "{entity_name} turned off",
diff --git a/homeassistant/components/netgear/__init__.py b/homeassistant/components/netgear/__init__.py
index 8f81de43ebb..ef31a887691 100644
--- a/homeassistant/components/netgear/__init__.py
+++ b/homeassistant/components/netgear/__init__.py
@@ -208,7 +208,7 @@ async def update_listener(hass: HomeAssistant, config_entry: ConfigEntry) -> Non
 async def async_remove_config_entry_device(
     hass: HomeAssistant, config_entry: ConfigEntry, device_entry: dr.DeviceEntry
 ) -> bool:
-    """Remove a config entry from a device."""
+    """Remove a device from a config entry."""
     router = hass.data[DOMAIN][config_entry.entry_id][KEY_ROUTER]
 
     device_mac = None
diff --git a/homeassistant/components/network/__init__.py b/homeassistant/components/network/__init__.py
index 30ff2280408..32bb9a574cd 100644
--- a/homeassistant/components/network/__init__.py
+++ b/homeassistant/components/network/__init__.py
@@ -119,6 +119,32 @@ async def async_get_ipv4_broadcast_addresses(hass: HomeAssistant) -> set[IPv4Add
     return broadcast_addresses
 
 
+async def async_get_announce_addresses(hass: HomeAssistant) -> list[str]:
+    """Return a list of IP addresses to announce/use via zeroconf/ssdp/etc.
+
+    The default ip address is always returned first if available.
+    """
+    adapters = await async_get_adapters(hass)
+    addresses: list[str] = []
+    default_ip: str | None = None
+    for adapter in adapters:
+        if not adapter["enabled"]:
+            continue
+        for ips in adapter["ipv4"]:
+            addresses.append(str(IPv4Address(ips["address"])))
+        for ips in adapter["ipv6"]:
+            addresses.append(str(IPv6Address(ips["address"])))
+
+    # Puts the default IPv4 address first in the list to preserve compatibility,
+    # because some mDNS implementations ignores anything but the first announced
+    # address.
+    if default_ip := await async_get_source_ip(hass, target_ip=MDNS_TARGET_IP):
+        if default_ip in addresses:
+            addresses.remove(default_ip)
+        return [default_ip] + list(addresses)
+    return list(addresses)
+
+
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up network for Home Assistant."""
     # Avoid circular issue: http->network->websocket_api->http
diff --git a/homeassistant/components/nextbus/manifest.json b/homeassistant/components/nextbus/manifest.json
index b77ffa86f03..4b8bd1a9294 100644
--- a/homeassistant/components/nextbus/manifest.json
+++ b/homeassistant/components/nextbus/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/nextbus",
   "iot_class": "cloud_polling",
   "loggers": ["py_nextbus"],
-  "requirements": ["py_nextbusnext==0.1.5"]
+  "requirements": ["py-nextbusnext==0.1.5"]
 }
diff --git a/homeassistant/components/nextbus/sensor.py b/homeassistant/components/nextbus/sensor.py
index 02f5d8695ca..b8f36e10fa1 100644
--- a/homeassistant/components/nextbus/sensor.py
+++ b/homeassistant/components/nextbus/sensor.py
@@ -108,41 +108,19 @@ class NextBusDepartureSensor(SensorEntity):
         self.agency = agency
         self.route = route
         self.stop = stop
-        self._custom_name = name
-        # Maybe pull a more user friendly name from the API here
-        self._name = f"{agency} {route}"
-        self._client = client
+        self._attr_extra_state_attributes = {}
 
-        # set up default state attributes
-        self._state = None
-        self._attributes = {}
+        # Maybe pull a more user friendly name from the API here
+        self._attr_name = f"{agency} {route}"
+        if name:
+            self._attr_name = name
+
+        self._client = client
 
     def _log_debug(self, message, *args):
         """Log debug message with prefix."""
         _LOGGER.debug(":".join((self.agency, self.route, self.stop, message)), *args)
 
-    @property
-    def name(self):
-        """Return sensor name.
-
-        Uses an auto generated name based on the data from the API unless a
-        custom name is provided in the configuration.
-        """
-        if self._custom_name:
-            return self._custom_name
-
-        return self._name
-
-    @property
-    def native_value(self):
-        """Return current state of the sensor."""
-        return self._state
-
-    @property
-    def extra_state_attributes(self):
-        """Return additional state attributes."""
-        return self._attributes
-
     def update(self) -> None:
         """Update sensor with new departures times."""
         # Note: using Multi because there is a bug with the single stop impl
@@ -151,21 +129,22 @@ class NextBusDepartureSensor(SensorEntity):
         )
 
         self._log_debug("Predictions results: %s", results)
+        self._attr_attribution = results.get("copyright")
 
         if "Error" in results:
             self._log_debug("Could not get predictions: %s", results)
 
         if not results.get("predictions"):
             self._log_debug("No predictions available")
-            self._state = None
+            self._attr_native_value = None
             # Remove attributes that may now be outdated
-            self._attributes.pop("upcoming", None)
+            self._attr_extra_state_attributes.pop("upcoming", None)
             return
 
         results = results["predictions"]
 
         # Set detailed attributes
-        self._attributes.update(
+        self._attr_extra_state_attributes.update(
             {
                 "agency": results.get("agencyTitle"),
                 "route": results.get("routeTitle"),
@@ -176,13 +155,13 @@ class NextBusDepartureSensor(SensorEntity):
         # List all messages in the attributes
         messages = listify(results.get("message", []))
         self._log_debug("Messages: %s", messages)
-        self._attributes["message"] = " -- ".join(
+        self._attr_extra_state_attributes["message"] = " -- ".join(
             message.get("text", "") for message in messages
         )
 
         # List out all directions in the attributes
         directions = listify(results.get("direction", []))
-        self._attributes["direction"] = ", ".join(
+        self._attr_extra_state_attributes["direction"] = ", ".join(
             direction.get("title", "") for direction in directions
         )
 
@@ -196,14 +175,16 @@ class NextBusDepartureSensor(SensorEntity):
         # Short circuit if we don't have any actual bus predictions
         if not predictions:
             self._log_debug("No upcoming predictions available")
-            self._state = None
-            self._attributes["upcoming"] = "No upcoming predictions"
+            self._attr_native_value = None
+            self._attr_extra_state_attributes["upcoming"] = "No upcoming predictions"
             return
 
         # Generate list of upcoming times
-        self._attributes["upcoming"] = ", ".join(
+        self._attr_extra_state_attributes["upcoming"] = ", ".join(
             sorted((p["minutes"] for p in predictions), key=int)
         )
 
         latest_prediction = maybe_first(predictions)
-        self._state = utc_from_timestamp(int(latest_prediction["epochTime"]) / 1000)
+        self._attr_native_value = utc_from_timestamp(
+            int(latest_prediction["epochTime"]) / 1000
+        )
diff --git a/homeassistant/components/nibe_heatpump/__init__.py b/homeassistant/components/nibe_heatpump/__init__.py
index b46102879c4..a38e2182ad7 100644
--- a/homeassistant/components/nibe_heatpump/__init__.py
+++ b/homeassistant/components/nibe_heatpump/__init__.py
@@ -5,7 +5,6 @@ import asyncio
 from collections import defaultdict
 from collections.abc import Callable, Iterable
 from datetime import timedelta
-from functools import cached_property
 from typing import Any, Generic, TypeVar
 
 from nibe.coil import Coil, CoilData
@@ -15,6 +14,7 @@ from nibe.connection.nibegw import NibeGW, ProductInfo
 from nibe.exceptions import CoilNotFoundException, ReadException
 from nibe.heatpump import HeatPump, Model, Series
 
+from homeassistant.backports.functools import cached_property
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_IP_ADDRESS,
diff --git a/homeassistant/components/nina/__init__.py b/homeassistant/components/nina/__init__.py
index 88d61a427b5..fbb8e32bebe 100644
--- a/homeassistant/components/nina/__init__.py
+++ b/homeassistant/components/nina/__init__.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+import re
 from typing import Any
 
 from async_timeout import timeout
@@ -13,7 +14,15 @@ 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, CONF_FILTER_CORONA, CONF_REGIONS, DOMAIN, SCAN_INTERVAL
+from .const import (
+    _LOGGER,
+    CONF_FILTER_CORONA,
+    CONF_HEADLINE_FILTER,
+    CONF_REGIONS,
+    DOMAIN,
+    NO_MATCH_REGEX,
+    SCAN_INTERVAL,
+)
 
 PLATFORMS: list[str] = [Platform.BINARY_SENSOR]
 
@@ -23,8 +32,18 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     regions: dict[str, str] = entry.data[CONF_REGIONS]
 
+    if CONF_HEADLINE_FILTER not in entry.data:
+        filter_regex = NO_MATCH_REGEX
+
+        if entry.data[CONF_FILTER_CORONA]:
+            filter_regex = ".*corona.*"
+
+        new_data = {**entry.data, CONF_HEADLINE_FILTER: filter_regex}
+        new_data.pop(CONF_FILTER_CORONA, None)
+        hass.config_entries.async_update_entry(entry, data=new_data)
+
     coordinator = NINADataUpdateCoordinator(
-        hass, regions, entry.data[CONF_FILTER_CORONA]
+        hass, regions, entry.data[CONF_HEADLINE_FILTER]
     )
 
     await coordinator.async_config_entry_first_refresh()
@@ -70,12 +89,12 @@ class NINADataUpdateCoordinator(
     """Class to manage fetching NINA data API."""
 
     def __init__(
-        self, hass: HomeAssistant, regions: dict[str, str], corona_filter: bool
+        self, hass: HomeAssistant, regions: dict[str, str], headline_filter: str
     ) -> None:
         """Initialize."""
         self._regions: dict[str, str] = regions
         self._nina: Nina = Nina(async_get_clientsession(hass))
-        self.corona_filter: bool = corona_filter
+        self.headline_filter: str = headline_filter
 
         for region in regions:
             self._nina.addRegion(region)
@@ -125,7 +144,9 @@ class NINADataUpdateCoordinator(
             warnings_for_regions: list[NinaWarningData] = []
 
             for raw_warn in raw_warnings:
-                if "corona" in raw_warn.headline.lower() and self.corona_filter:
+                if re.search(
+                    self.headline_filter, raw_warn.headline, flags=re.IGNORECASE
+                ):
                     continue
 
                 warning_data: NinaWarningData = NinaWarningData(
diff --git a/homeassistant/components/nina/config_flow.py b/homeassistant/components/nina/config_flow.py
index f1579bc05ec..d41fa6dee3e 100644
--- a/homeassistant/components/nina/config_flow.py
+++ b/homeassistant/components/nina/config_flow.py
@@ -18,12 +18,13 @@ from homeassistant.helpers.entity_registry import (
 
 from .const import (
     _LOGGER,
-    CONF_FILTER_CORONA,
+    CONF_HEADLINE_FILTER,
     CONF_MESSAGE_SLOTS,
     CONF_REGIONS,
     CONST_REGION_MAPPING,
     CONST_REGIONS,
     DOMAIN,
+    NO_MATCH_REGEX,
 )
 
 
@@ -125,6 +126,9 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 if group_input := user_input.get(group):
                     user_input[CONF_REGIONS] += group_input
 
+            if not user_input[CONF_HEADLINE_FILTER]:
+                user_input[CONF_HEADLINE_FILTER] = NO_MATCH_REGEX
+
             if user_input[CONF_REGIONS]:
                 return self.async_create_entry(
                     title="NINA",
@@ -144,7 +148,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                     vol.Required(CONF_MESSAGE_SLOTS, default=5): vol.All(
                         int, vol.Range(min=1, max=20)
                     ),
-                    vol.Required(CONF_FILTER_CORONA, default=True): cv.boolean,
+                    vol.Optional(CONF_HEADLINE_FILTER, default=""): cv.string,
                 }
             ),
             errors=errors,
@@ -255,10 +259,10 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
                         CONF_MESSAGE_SLOTS,
                         default=self.data[CONF_MESSAGE_SLOTS],
                     ): vol.All(int, vol.Range(min=1, max=20)),
-                    vol.Required(
-                        CONF_FILTER_CORONA,
-                        default=self.data[CONF_FILTER_CORONA],
-                    ): cv.boolean,
+                    vol.Optional(
+                        CONF_HEADLINE_FILTER,
+                        default=self.data[CONF_HEADLINE_FILTER],
+                    ): cv.string,
                 }
             ),
             errors=errors,
diff --git a/homeassistant/components/nina/const.py b/homeassistant/components/nina/const.py
index 8ba7c5ffaa6..36096d97dc1 100644
--- a/homeassistant/components/nina/const.py
+++ b/homeassistant/components/nina/const.py
@@ -11,9 +11,12 @@ SCAN_INTERVAL: timedelta = timedelta(minutes=5)
 
 DOMAIN: str = "nina"
 
+NO_MATCH_REGEX: str = "/(?!)/"
+
 CONF_REGIONS: str = "regions"
 CONF_MESSAGE_SLOTS: str = "slots"
-CONF_FILTER_CORONA: str = "corona_filter"
+CONF_FILTER_CORONA: str = "corona_filter"  # deprecated
+CONF_HEADLINE_FILTER: str = "headline_filter"
 
 ATTR_HEADLINE: str = "headline"
 ATTR_DESCRIPTION: str = "description"
diff --git a/homeassistant/components/nina/manifest.json b/homeassistant/components/nina/manifest.json
index 6386a70d08b..98a088620ea 100644
--- a/homeassistant/components/nina/manifest.json
+++ b/homeassistant/components/nina/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/nina",
   "iot_class": "cloud_polling",
   "loggers": ["pynina"],
-  "requirements": ["pynina==0.3.0"]
+  "requirements": ["PyNINA==0.3.0"]
 }
diff --git a/homeassistant/components/nina/strings.json b/homeassistant/components/nina/strings.json
index b22c2640084..23a1fb8dfa6 100644
--- a/homeassistant/components/nina/strings.json
+++ b/homeassistant/components/nina/strings.json
@@ -11,7 +11,7 @@
           "_r_to_u": "City/county (R-U)",
           "_v_to_z": "City/county (V-Z)",
           "slots": "Maximum warnings per city/county",
-          "corona_filter": "Remove Corona Warnings"
+          "headline_filter": "Blacklist regex to filter warning headlines"
         }
       }
     },
@@ -36,7 +36,7 @@
           "_r_to_u": "City/county (R-U)",
           "_v_to_z": "City/county (V-Z)",
           "slots": "Maximum warnings per city/county",
-          "corona_filter": "Remove Corona Warnings"
+          "headline_filter": "Blacklist regex to filter warning headlines"
         }
       }
     },
diff --git a/homeassistant/components/norway_air/manifest.json b/homeassistant/components/norway_air/manifest.json
index d04e07f0214..4a3fc7cee96 100644
--- a/homeassistant/components/norway_air/manifest.json
+++ b/homeassistant/components/norway_air/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/norway_air",
   "iot_class": "cloud_polling",
   "loggers": ["metno"],
-  "requirements": ["pyMetno==0.10.0"]
+  "requirements": ["PyMetno==0.10.0"]
 }
diff --git a/homeassistant/components/notify/__init__.py b/homeassistant/components/notify/__init__.py
index eae47b55179..e9e61527884 100644
--- a/homeassistant/components/notify/__init__.py
+++ b/homeassistant/components/notify/__init__.py
@@ -19,7 +19,6 @@ from .const import (  # noqa: F401
     ATTR_TITLE,
     DOMAIN,
     NOTIFY_SERVICE_SCHEMA,
-    PERSISTENT_NOTIFICATION_SERVICE_SCHEMA,
     SERVICE_NOTIFY,
     SERVICE_PERSISTENT_NOTIFICATION,
 )
@@ -70,13 +69,19 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             title_tpl.hass = hass
             title = title_tpl.async_render(parse_result=False)
 
-        pn.async_create(hass, message.async_render(parse_result=False), title)
+        notification_id = None
+        if data := service.data.get(ATTR_DATA):
+            notification_id = data.get(pn.ATTR_NOTIFICATION_ID)
+
+        pn.async_create(
+            hass, message.async_render(parse_result=False), title, notification_id
+        )
 
     hass.services.async_register(
         DOMAIN,
         SERVICE_PERSISTENT_NOTIFICATION,
         persistent_notification,
-        schema=PERSISTENT_NOTIFICATION_SERVICE_SCHEMA,
+        schema=NOTIFY_SERVICE_SCHEMA,
     )
 
     return True
diff --git a/homeassistant/components/notify/const.py b/homeassistant/components/notify/const.py
index d30702915d9..38dba680635 100644
--- a/homeassistant/components/notify/const.py
+++ b/homeassistant/components/notify/const.py
@@ -31,10 +31,3 @@ NOTIFY_SERVICE_SCHEMA = vol.Schema(
         vol.Optional(ATTR_DATA): dict,
     }
 )
-
-PERSISTENT_NOTIFICATION_SERVICE_SCHEMA = vol.Schema(
-    {
-        vol.Required(ATTR_MESSAGE): cv.template,
-        vol.Optional(ATTR_TITLE): cv.template,
-    }
-)
diff --git a/homeassistant/components/notify/services.yaml b/homeassistant/components/notify/services.yaml
index 1a0de7344a3..9311acf2ba9 100644
--- a/homeassistant/components/notify/services.yaml
+++ b/homeassistant/components/notify/services.yaml
@@ -51,3 +51,11 @@ persistent_notification:
       example: "Your Garage Door Friend"
       selector:
         text:
+    data:
+      name: Data
+      description:
+        Extended information for notification. Optional depending on the
+        platform.
+      example: platform specific
+      selector:
+        object:
diff --git a/homeassistant/components/nsw_fuel_station/__init__.py b/homeassistant/components/nsw_fuel_station/__init__.py
index 6d45104e5d3..818656779a3 100644
--- a/homeassistant/components/nsw_fuel_station/__init__.py
+++ b/homeassistant/components/nsw_fuel_station/__init__.py
@@ -8,6 +8,7 @@ import logging
 from nsw_fuel import FuelCheckClient, FuelCheckError, Station
 
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -18,6 +19,8 @@ _LOGGER = logging.getLogger(__name__)
 DOMAIN = "nsw_fuel_station"
 SCAN_INTERVAL = datetime.timedelta(hours=1)
 
+CONFIG_SCHEMA = cv.platform_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the NSW Fuel Station platform."""
diff --git a/homeassistant/components/nsw_rural_fire_service_feed/manifest.json b/homeassistant/components/nsw_rural_fire_service_feed/manifest.json
index 02f7b985b3b..cea62996e6d 100644
--- a/homeassistant/components/nsw_rural_fire_service_feed/manifest.json
+++ b/homeassistant/components/nsw_rural_fire_service_feed/manifest.json
@@ -6,5 +6,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aio_geojson_nsw_rfs_incidents"],
-  "requirements": ["aio_geojson_nsw_rfs_incidents==0.6"]
+  "requirements": ["aio-geojson-nsw-rfs-incidents==0.6"]
 }
diff --git a/homeassistant/components/number/__init__.py b/homeassistant/components/number/__init__.py
index 2ad63c75e04..24c44b901a1 100644
--- a/homeassistant/components/number/__init__.py
+++ b/homeassistant/components/number/__init__.py
@@ -135,39 +135,6 @@ class NumberEntityDescription(EntityDescription):
     step: None = None
     unit_of_measurement: None = None  # Type override, use native_unit_of_measurement
 
-    def __post_init__(self) -> None:
-        """Post initialisation processing."""
-        if (
-            self.max_value is not None
-            or self.min_value is not None
-            or self.step is not None
-            or self.unit_of_measurement is not None
-        ):
-            if (  # type: ignore[unreachable]
-                self.__class__.__name__ == "NumberEntityDescription"
-            ):
-                caller = inspect.stack()[2]
-                module = inspect.getmodule(caller[0])
-            else:
-                module = inspect.getmodule(self)
-            if module and module.__file__ and "custom_components" in module.__file__:
-                report_issue = "report it to the custom integration author."
-            else:
-                report_issue = (
-                    "create a bug report at "
-                    "https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue"
-                )
-            _LOGGER.warning(
-                (
-                    "%s is setting deprecated attributes on an instance of"
-                    " NumberEntityDescription, this is not valid and will be"
-                    " unsupported from Home Assistant 2022.10. Please %s"
-                ),
-                module.__name__ if module else self.__class__.__name__,
-                report_issue,
-            )
-            self.native_unit_of_measurement = self.unit_of_measurement
-
 
 def ceil_decimal(value: float, precision: float = 0) -> float:
     """Return the ceiling of f with d decimals.
@@ -258,6 +225,13 @@ class NumberEntity(Entity):
             ATTR_MODE: self.mode,
         }
 
+    def _default_to_device_class_name(self) -> bool:
+        """Return True if an unnamed entity should be named by its device class.
+
+        For numbers this is True if the entity has a device class.
+        """
+        return self.device_class is not None
+
     @property
     def device_class(self) -> NumberDeviceClass | None:
         """Return the class of this entity."""
@@ -283,15 +257,6 @@ class NumberEntity(Entity):
     @final
     def min_value(self) -> float:
         """Return the minimum value."""
-        if hasattr(self, "_attr_min_value"):
-            self._report_deprecated_number_entity()
-            return self._attr_min_value  # type: ignore[return-value]
-        if (
-            hasattr(self, "entity_description")
-            and self.entity_description.min_value is not None
-        ):
-            self._report_deprecated_number_entity()  # type: ignore[unreachable]
-            return self.entity_description.min_value
         return self._convert_to_state_value(self.native_min_value, floor_decimal)
 
     @property
@@ -310,15 +275,6 @@ class NumberEntity(Entity):
     @final
     def max_value(self) -> float:
         """Return the maximum value."""
-        if hasattr(self, "_attr_max_value"):
-            self._report_deprecated_number_entity()
-            return self._attr_max_value  # type: ignore[return-value]
-        if (
-            hasattr(self, "entity_description")
-            and self.entity_description.max_value is not None
-        ):
-            self._report_deprecated_number_entity()  # type: ignore[unreachable]
-            return self.entity_description.max_value
         return self._convert_to_state_value(self.native_max_value, ceil_decimal)
 
     @property
@@ -335,15 +291,6 @@ class NumberEntity(Entity):
     @final
     def step(self) -> float:
         """Return the increment/decrement step."""
-        if hasattr(self, "_attr_step"):
-            self._report_deprecated_number_entity()
-            return self._attr_step  # type: ignore[return-value]
-        if (
-            hasattr(self, "entity_description")
-            and self.entity_description.step is not None
-        ):
-            self._report_deprecated_number_entity()  # type: ignore[unreachable]
-            return self.entity_description.step
         if hasattr(self, "_attr_native_step"):
             return self._attr_native_step
         if (native_step := self.native_step) is not None:
@@ -389,17 +336,6 @@ class NumberEntity(Entity):
         if self._number_option_unit_of_measurement:
             return self._number_option_unit_of_measurement
 
-        if hasattr(self, "_attr_unit_of_measurement"):
-            self._report_deprecated_number_entity()
-            return self._attr_unit_of_measurement
-        if (
-            hasattr(self, "entity_description")
-            and self.entity_description.unit_of_measurement is not None
-        ):
-            return (  # type: ignore[unreachable]
-                self.entity_description.unit_of_measurement
-            )
-
         native_unit_of_measurement = self.native_unit_of_measurement
 
         if (
@@ -420,10 +356,6 @@ class NumberEntity(Entity):
     @final
     def value(self) -> float | None:
         """Return the entity value to represent the entity state."""
-        if hasattr(self, "_attr_value"):
-            self._report_deprecated_number_entity()
-            return self._attr_value
-
         if (native_value := self.native_value) is None:
             return native_value
         return self._convert_to_state_value(native_value, round)
@@ -450,7 +382,6 @@ class NumberEntity(Entity):
         self, value: float, method: Callable[[float, int], float]
     ) -> float:
         """Convert a value in the number's native unit to the configured unit."""
-
         native_unit_of_measurement = self.native_unit_of_measurement
         unit_of_measurement = self.unit_of_measurement
         device_class = self.device_class
@@ -480,7 +411,6 @@ class NumberEntity(Entity):
 
     def convert_to_native_value(self, value: float) -> float:
         """Convert a value to the number's native unit."""
-
         native_unit_of_measurement = self.native_unit_of_measurement
         unit_of_measurement = self.unit_of_measurement
         device_class = self.device_class
@@ -501,21 +431,6 @@ class NumberEntity(Entity):
 
         return value
 
-    def _report_deprecated_number_entity(self) -> None:
-        """Report that the number entity has not been upgraded."""
-        if not self._deprecated_number_entity_reported:
-            self._deprecated_number_entity_reported = True
-            report_issue = self._suggest_report_issue()
-            _LOGGER.warning(
-                (
-                    "Entity %s (%s) is using deprecated NumberEntity features which"
-                    " will be unsupported from Home Assistant Core 2022.10, please %s"
-                ),
-                self.entity_id,
-                type(self),
-                report_issue,
-            )
-
     @callback
     def async_registry_entry_updated(self) -> None:
         """Run when the entity registry entry has been updated."""
diff --git a/homeassistant/components/number/device_action.py b/homeassistant/components/number/device_action.py
index 971f8d5a514..22a51d85ad9 100644
--- a/homeassistant/components/number/device_action.py
+++ b/homeassistant/components/number/device_action.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -19,15 +20,22 @@ from .const import ATTR_VALUE, DOMAIN, SERVICE_SET_VALUE
 
 ATYP_SET_VALUE = "set_value"
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): ATYP_SET_VALUE,
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(ATTR_VALUE): vol.Coerce(float),
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -44,7 +52,7 @@ async def async_get_actions(
             {
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: ATYP_SET_VALUE,
             }
         )
diff --git a/homeassistant/components/obihai/__init__.py b/homeassistant/components/obihai/__init__.py
index 82e42b67586..a3e16fbad76 100644
--- a/homeassistant/components/obihai/__init__.py
+++ b/homeassistant/components/obihai/__init__.py
@@ -6,11 +6,19 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import format_mac
 
 from .connectivity import ObihaiConnection
-from .const import LOGGER, PLATFORMS
+from .const import DOMAIN, LOGGER, PLATFORMS
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up from a config entry."""
+
+    requester = ObihaiConnection(
+        entry.data[CONF_HOST],
+        username=entry.data[CONF_USERNAME],
+        password=entry.data[CONF_PASSWORD],
+    )
+    await hass.async_add_executor_job(requester.update)
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = requester
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
@@ -23,12 +31,7 @@ async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     LOGGER.debug("Migrating from version %s", version)
     if version != 2:
-        requester = ObihaiConnection(
-            entry.data[CONF_HOST],
-            username=entry.data[CONF_USERNAME],
-            password=entry.data[CONF_PASSWORD],
-        )
-        await hass.async_add_executor_job(requester.update)
+        requester: ObihaiConnection = hass.data[DOMAIN][entry.entry_id]
 
         device_mac = await hass.async_add_executor_job(
             requester.pyobihai.get_device_mac
diff --git a/homeassistant/components/obihai/button.py b/homeassistant/components/obihai/button.py
index 0b84d40f4d2..d1b924b4693 100644
--- a/homeassistant/components/obihai/button.py
+++ b/homeassistant/components/obihai/button.py
@@ -2,21 +2,19 @@
 
 from __future__ import annotations
 
-from pyobihai import PyObihai
-
 from homeassistant.components.button import (
     ButtonDeviceClass,
     ButtonEntity,
     ButtonEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_platform
 
 from .connectivity import ObihaiConnection
-from .const import OBIHAI
+from .const import DOMAIN, OBIHAI
 
 BUTTON_DESCRIPTION = ButtonEntityDescription(
     key="reboot",
@@ -32,13 +30,10 @@ async def async_setup_entry(
     async_add_entities: entity_platform.AddEntitiesCallback,
 ) -> None:
     """Set up the Obihai sensor entries."""
-    username = entry.data[CONF_USERNAME]
-    password = entry.data[CONF_PASSWORD]
-    host = entry.data[CONF_HOST]
-    requester = ObihaiConnection(host, username, password)
 
-    await hass.async_add_executor_job(requester.update)
-    buttons = [ObihaiButton(requester.pyobihai, requester.serial)]
+    requester: ObihaiConnection = hass.data[DOMAIN][entry.entry_id]
+
+    buttons = [ObihaiButton(requester)]
     async_add_entities(buttons, update_before_add=True)
 
 
@@ -47,10 +42,11 @@ class ObihaiButton(ButtonEntity):
 
     entity_description = BUTTON_DESCRIPTION
 
-    def __init__(self, pyobihai: PyObihai, serial: str) -> None:
+    def __init__(self, requester: ObihaiConnection) -> None:
         """Initialize monitor sensor."""
-        self._pyobihai = pyobihai
-        self._attr_unique_id = f"{serial}-reboot"
+        self.requester = requester
+        self._pyobihai = requester.pyobihai
+        self._attr_unique_id = f"{requester.serial}-reboot"
 
     def press(self) -> None:
         """Press button."""
diff --git a/homeassistant/components/obihai/connectivity.py b/homeassistant/components/obihai/connectivity.py
index 071390f1ad9..1ab3095a5a8 100644
--- a/homeassistant/components/obihai/connectivity.py
+++ b/homeassistant/components/obihai/connectivity.py
@@ -53,14 +53,15 @@ class ObihaiConnection:
         self.line_services: list = []
         self.call_direction: list = []
         self.pyobihai: PyObihai = None
+        self.available: bool = True
 
     def update(self) -> bool:
         """Validate connection and retrieve a list of sensors."""
 
         if not self.pyobihai:
-            self.pyobihai = get_pyobihai(self.host, self.username, self.password)
+            self.pyobihai = validate_auth(self.host, self.username, self.password)
 
-            if not self.pyobihai.check_account():
+            if not self.pyobihai:
                 return False
 
         self.serial = self.pyobihai.get_device_serial()
diff --git a/homeassistant/components/obihai/manifest.json b/homeassistant/components/obihai/manifest.json
index 2907f3f179d..0f13bde5d6b 100644
--- a/homeassistant/components/obihai/manifest.json
+++ b/homeassistant/components/obihai/manifest.json
@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/obihai",
   "iot_class": "local_polling",
   "loggers": ["pyobihai"],
-  "requirements": ["pyobihai==1.3.2"]
+  "requirements": ["pyobihai==1.4.2"]
 }
diff --git a/homeassistant/components/obihai/sensor.py b/homeassistant/components/obihai/sensor.py
index 010b9780076..53208a1e6a1 100644
--- a/homeassistant/components/obihai/sensor.py
+++ b/homeassistant/components/obihai/sensor.py
@@ -1,20 +1,19 @@
 """Support for Obihai Sensors."""
 from __future__ import annotations
 
-from datetime import timedelta
+import datetime
 
-from pyobihai import PyObihai
+from requests.exceptions import RequestException
 
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .connectivity import ObihaiConnection
-from .const import OBIHAI
+from .const import DOMAIN, LOGGER, OBIHAI
 
-SCAN_INTERVAL = timedelta(seconds=5)
+SCAN_INTERVAL = datetime.timedelta(seconds=5)
 
 
 async def async_setup_entry(
@@ -22,24 +21,18 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Obihai sensor entries."""
 
-    username = entry.data[CONF_USERNAME]
-    password = entry.data[CONF_PASSWORD]
-    host = entry.data[CONF_HOST]
-    requester = ObihaiConnection(host, username, password)
+    requester: ObihaiConnection = hass.data[DOMAIN][entry.entry_id]
 
-    await hass.async_add_executor_job(requester.update)
     sensors = []
     for key in requester.services:
-        sensors.append(ObihaiServiceSensors(requester.pyobihai, requester.serial, key))
+        sensors.append(ObihaiServiceSensors(requester, key))
 
     if requester.line_services is not None:
         for key in requester.line_services:
-            sensors.append(
-                ObihaiServiceSensors(requester.pyobihai, requester.serial, key)
-            )
+            sensors.append(ObihaiServiceSensors(requester, key))
 
     for key in requester.call_direction:
-        sensors.append(ObihaiServiceSensors(requester.pyobihai, requester.serial, key))
+        sensors.append(ObihaiServiceSensors(requester, key))
 
     async_add_entities(sensors, update_before_add=True)
 
@@ -47,18 +40,21 @@ async def async_setup_entry(
 class ObihaiServiceSensors(SensorEntity):
     """Get the status of each Obihai Lines."""
 
-    def __init__(self, pyobihai: PyObihai, serial: str, service_name: str) -> None:
+    def __init__(self, requester: ObihaiConnection, service_name: str) -> None:
         """Initialize monitor sensor."""
+
+        self.requester = requester
         self._service_name = service_name
         self._attr_name = f"{OBIHAI} {self._service_name}"
-        self._pyobihai = pyobihai
-        self._attr_unique_id = f"{serial}-{self._service_name}"
+        self._pyobihai = requester.pyobihai
+        self._attr_unique_id = f"{requester.serial}-{self._service_name}"
         if self._service_name == "Last Reboot":
             self._attr_device_class = SensorDeviceClass.TIMESTAMP
 
     @property
     def icon(self) -> str:
         """Return an icon."""
+
         if self._service_name == "Call Direction":
             if self._attr_native_value == "No Active Calls":
                 return "mdi:phone-off"
@@ -87,26 +83,40 @@ class ObihaiServiceSensors(SensorEntity):
 
     def update(self) -> None:
         """Update the sensor."""
-        if not self._pyobihai.check_account():
-            self._attr_native_value = None
-            self._attr_available = False
+
+        LOGGER.debug("Running update on %s", self._service_name)
+        try:
+            # port connection, and last caller info
+            if "Caller Info" in self._service_name or "Port" in self._service_name:
+                services = self._pyobihai.get_line_state()
+
+                if services is not None and self._service_name in services:
+                    self._attr_native_value = services.get(self._service_name)
+            elif self._service_name == "Call Direction":
+                call_direction = self._pyobihai.get_call_direction()
+
+                if self._service_name in call_direction:
+                    self._attr_native_value = call_direction.get(self._service_name)
+            else:  # SIP Profile service sensors, phone sensor, and last reboot
+                services = self._pyobihai.get_state()
+
+                if self._service_name in services:
+                    self._attr_native_value = services.get(self._service_name)
+
+            if not self.requester.available:
+                self.requester.available = True
+                LOGGER.info("Connection restored")
+            self._attr_available = True
+
             return
 
-        services = self._pyobihai.get_state()
+        except RequestException as exc:
+            if self.requester.available:
+                LOGGER.warning("Connection failed, Obihai offline? %s", exc)
+        except IndexError as exc:
+            if self.requester.available:
+                LOGGER.warning("Connection failed, bad response: %s", exc)
 
-        if self._service_name in services:
-            self._attr_native_value = services.get(self._service_name)
-
-        services = self._pyobihai.get_line_state()
-
-        if services is not None and self._service_name in services:
-            self._attr_native_value = services.get(self._service_name)
-
-        call_direction = self._pyobihai.get_call_direction()
-
-        if self._service_name in call_direction:
-            self._attr_native_value = call_direction.get(self._service_name)
-
-        if self._attr_native_value is None:
-            self._attr_available = False
-        self._attr_available = True
+        self._attr_native_value = None
+        self._attr_available = False
+        self.requester.available = False
diff --git a/homeassistant/components/onboarding/views.py b/homeassistant/components/onboarding/views.py
index 51817be35b8..5b47394e0e4 100644
--- a/homeassistant/components/onboarding/views.py
+++ b/homeassistant/components/onboarding/views.py
@@ -193,7 +193,7 @@ class CoreConfigOnboardingView(_BaseOnboardingView):
             await self._async_mark_done(hass)
 
             # Integrations to set up when finishing onboarding
-            onboard_integrations = ["met", "radio_browser"]
+            onboard_integrations = ["google_translate", "met", "radio_browser"]
 
             # pylint: disable-next=import-outside-toplevel
             from homeassistant.components import hassio
diff --git a/homeassistant/components/oncue/const.py b/homeassistant/components/oncue/const.py
index bf248369987..7118944a4ec 100644
--- a/homeassistant/components/oncue/const.py
+++ b/homeassistant/components/oncue/const.py
@@ -3,10 +3,15 @@
 import asyncio
 
 import aiohttp
+from aiooncue import ServiceFailedException
 
 DOMAIN = "oncue"
 
-CONNECTION_EXCEPTIONS = (asyncio.TimeoutError, aiohttp.ClientError)
+CONNECTION_EXCEPTIONS = (
+    asyncio.TimeoutError,
+    aiohttp.ClientError,
+    ServiceFailedException,
+)
 
 CONNECTION_ESTABLISHED_KEY: str = "NetworkConnectionEstablished"
 
diff --git a/homeassistant/components/oncue/manifest.json b/homeassistant/components/oncue/manifest.json
index 02c953736bb..24414e4efb8 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.4"]
+  "requirements": ["aiooncue==0.3.5"]
 }
diff --git a/homeassistant/components/ondilo_ico/sensor.py b/homeassistant/components/ondilo_ico/sensor.py
index 129cdf50979..5e226dcead7 100644
--- a/homeassistant/components/ondilo_ico/sensor.py
+++ b/homeassistant/components/ondilo_ico/sensor.py
@@ -70,8 +70,8 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="rssi",
         name="RSSI",
+        icon="mdi:wifi",
         native_unit_of_measurement=PERCENTAGE,
-        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
diff --git a/homeassistant/components/open_meteo/weather.py b/homeassistant/components/open_meteo/weather.py
index 2d06b20a30a..b23abb54f8b 100644
--- a/homeassistant/components/open_meteo/weather.py
+++ b/homeassistant/components/open_meteo/weather.py
@@ -34,6 +34,7 @@ class OpenMeteoWeatherEntity(
     """Defines an Open-Meteo weather entity."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_native_precipitation_unit = UnitOfPrecipitationDepth.MILLIMETERS
     _attr_native_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_native_wind_speed_unit = UnitOfSpeed.KILOMETERS_PER_HOUR
diff --git a/homeassistant/components/openhome/__init__.py b/homeassistant/components/openhome/__init__.py
index 78294ceb6f4..c7ee5a7d00c 100644
--- a/homeassistant/components/openhome/__init__.py
+++ b/homeassistant/components/openhome/__init__.py
@@ -1 +1,55 @@
 """The openhome component."""
+
+import asyncio
+import logging
+
+import aiohttp
+from async_upnp_client.client import UpnpError
+from openhomedevice.device import Device
+
+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 config_validation as cv
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+PLATFORMS = [Platform.MEDIA_PLAYER, Platform.UPDATE]
+
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
+
+async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+    """Cleanup before removing 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
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+) -> bool:
+    """Set up the configuration config entry."""
+    _LOGGER.debug("Setting up config entry: %s", config_entry.unique_id)
+
+    device = await hass.async_add_executor_job(Device, config_entry.data[CONF_HOST])
+
+    try:
+        await device.init()
+    except (asyncio.TimeoutError, aiohttp.ClientError, UpnpError) as exc:
+        raise ConfigEntryNotReady from exc
+
+    _LOGGER.debug("Initialised device: %s", device.uuid())
+
+    hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = device
+
+    await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
+
+    return True
diff --git a/homeassistant/components/openhome/config_flow.py b/homeassistant/components/openhome/config_flow.py
new file mode 100644
index 00000000000..c8a13a3c7aa
--- /dev/null
+++ b/homeassistant/components/openhome/config_flow.py
@@ -0,0 +1,66 @@
+"""Config flow for Linn / OpenHome."""
+
+import logging
+from typing import Any
+
+from homeassistant.components.ssdp import (
+    ATTR_UPNP_FRIENDLY_NAME,
+    ATTR_UPNP_UDN,
+    SsdpServiceInfo,
+)
+from homeassistant.config_entries import ConfigFlow
+from homeassistant.const import CONF_HOST, CONF_NAME
+from homeassistant.data_entry_flow import FlowResult
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def _is_complete_discovery(discovery_info: SsdpServiceInfo) -> bool:
+    """Test if discovery is complete and usable."""
+    return bool(ATTR_UPNP_UDN in discovery_info.upnp and discovery_info.ssdp_location)
+
+
+class OpenhomeConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle an Openhome config flow."""
+
+    async def async_step_ssdp(self, discovery_info: SsdpServiceInfo) -> FlowResult:
+        """Handle a flow initialized by discovery."""
+        _LOGGER.debug("async_step_ssdp: started")
+
+        if not _is_complete_discovery(discovery_info):
+            _LOGGER.debug("async_step_ssdp: Incomplete discovery, ignoring")
+            return self.async_abort(reason="incomplete_discovery")
+
+        _LOGGER.debug(
+            "async_step_ssdp: setting unique id %s", discovery_info.upnp[ATTR_UPNP_UDN]
+        )
+
+        await self.async_set_unique_id(discovery_info.upnp[ATTR_UPNP_UDN])
+        self._abort_if_unique_id_configured({CONF_HOST: discovery_info.ssdp_location})
+
+        _LOGGER.debug(
+            "async_step_ssdp: create entry %s", discovery_info.upnp[ATTR_UPNP_UDN]
+        )
+
+        self.context[CONF_NAME] = discovery_info.upnp[ATTR_UPNP_FRIENDLY_NAME]
+        self.context[CONF_HOST] = discovery_info.ssdp_location
+
+        return await self.async_step_confirm()
+
+    async def async_step_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle user-confirmation of discovered node."""
+
+        if user_input is not None:
+            return self.async_create_entry(
+                title=self.context[CONF_NAME],
+                data={CONF_HOST: self.context[CONF_HOST]},
+            )
+
+        return self.async_show_form(
+            step_id="confirm",
+            description_placeholders={CONF_NAME: self.context[CONF_NAME]},
+        )
diff --git a/homeassistant/components/openhome/manifest.json b/homeassistant/components/openhome/manifest.json
index aa563151f0b..de6c56a01dd 100644
--- a/homeassistant/components/openhome/manifest.json
+++ b/homeassistant/components/openhome/manifest.json
@@ -2,8 +2,23 @@
   "domain": "openhome",
   "name": "Linn / OpenHome",
   "codeowners": ["@bazwilliams"],
+  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/openhome",
   "iot_class": "local_polling",
   "loggers": ["async_upnp_client", "openhomedevice"],
-  "requirements": ["openhomedevice==2.0.2"]
+  "requirements": ["openhomedevice==2.2.0"],
+  "ssdp": [
+    {
+      "st": "urn:av-openhome-org:service:Product:1"
+    },
+    {
+      "st": "urn:av-openhome-org:service:Product:2"
+    },
+    {
+      "st": "urn:av-openhome-org:service:Product:3"
+    },
+    {
+      "st": "urn:av-openhome-org:service:Product:4"
+    }
+  ]
 }
diff --git a/homeassistant/components/openhome/media_player.py b/homeassistant/components/openhome/media_player.py
index b625d9976da..77ab0ac0aaf 100644
--- a/homeassistant/components/openhome/media_player.py
+++ b/homeassistant/components/openhome/media_player.py
@@ -9,7 +9,6 @@ from typing import Any, Concatenate, ParamSpec, TypeVar
 
 import aiohttp
 from async_upnp_client.client import UpnpError
-from openhomedevice.device import Device
 import voluptuous as vol
 
 from homeassistant.components import media_source
@@ -21,12 +20,13 @@ from homeassistant.components.media_player import (
     MediaType,
     async_process_play_media_url,
 )
+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 import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .const import ATTR_PIN_INDEX, DATA_OPENHOME, SERVICE_INVOKE_PIN
+from .const import ATTR_PIN_INDEX, DOMAIN, SERVICE_INVOKE_PIN
 
 _OpenhomeDeviceT = TypeVar("_OpenhomeDeviceT", bound="OpenhomeDevice")
 _R = TypeVar("_R")
@@ -41,34 +41,20 @@ SUPPORT_OPENHOME = (
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Openhome platform."""
+    """Set up the Openhome config entry."""
 
-    if not discovery_info:
-        return
+    _LOGGER.debug("Setting up config entry: %s", config_entry.unique_id)
 
-    openhome_data = hass.data.setdefault(DATA_OPENHOME, set())
-
-    name = discovery_info.get("name")
-    description = discovery_info.get("ssdp_description")
-
-    _LOGGER.info("Openhome device found: %s", name)
-    device = await hass.async_add_executor_job(Device, description)
-    await device.init()
-
-    # if device has already been discovered
-    if device.uuid() in openhome_data:
-        return
+    device = hass.data[DOMAIN][config_entry.entry_id]
 
     entity = OpenhomeDevice(hass, device)
 
     async_add_entities([entity])
-    openhome_data.add(device.uuid())
 
     platform = entity_platform.async_get_current_platform()
 
@@ -133,6 +119,18 @@ class OpenhomeDevice(MediaPlayerEntity):
         self._attr_state = MediaPlayerState.PLAYING
         self._available = True
 
+    @property
+    def device_info(self):
+        """Return a device description for device registry."""
+        return DeviceInfo(
+            identifiers={
+                (DOMAIN, self._device.uuid()),
+            },
+            manufacturer=self._device.manufacturer(),
+            model=self._device.model_name(),
+            name=self._device.friendly_name(),
+        )
+
     @property
     def available(self):
         """Device is available."""
diff --git a/homeassistant/components/openhome/update.py b/homeassistant/components/openhome/update.py
new file mode 100644
index 00000000000..54c2d16fb2b
--- /dev/null
+++ b/homeassistant/components/openhome/update.py
@@ -0,0 +1,103 @@
+"""Update entities for Linn devices."""
+from __future__ import annotations
+
+import asyncio
+import logging
+from typing import Any
+
+import aiohttp
+from async_upnp_client.client import UpnpError
+
+from homeassistant.components.update import (
+    UpdateDeviceClass,
+    UpdateEntity,
+    UpdateEntityFeature,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up update entities for Reolink component."""
+
+    _LOGGER.debug("Setting up config entry: %s", config_entry.unique_id)
+
+    device = hass.data[DOMAIN][config_entry.entry_id]
+
+    entity = OpenhomeUpdateEntity(device)
+
+    await entity.async_update()
+
+    async_add_entities([entity])
+
+
+class OpenhomeUpdateEntity(UpdateEntity):
+    """Update entity for a Linn DS device."""
+
+    _attr_device_class = UpdateDeviceClass.FIRMWARE
+    _attr_supported_features = UpdateEntityFeature.INSTALL
+    _attr_has_entity_name = True
+    _attr_name = None
+
+    def __init__(self, device):
+        """Initialize a Linn DS update entity."""
+        self._device = device
+        self._attr_unique_id = f"{device.uuid()}-update"
+
+    @property
+    def device_info(self):
+        """Return a device description for device registry."""
+        return DeviceInfo(
+            identifiers={
+                (DOMAIN, self._device.uuid()),
+            },
+            manufacturer=self._device.manufacturer(),
+            model=self._device.model_name(),
+            name=self._device.friendly_name(),
+        )
+
+    async def async_update(self) -> None:
+        """Update state of entity."""
+
+        software_status = await self._device.software_status()
+
+        if not software_status:
+            self._attr_installed_version = None
+            self._attr_latest_version = None
+            self._attr_release_summary = None
+            self._attr_release_url = None
+            return
+
+        self._attr_installed_version = software_status["current_software"]["version"]
+
+        if software_status["status"] == "update_available":
+            self._attr_latest_version = software_status["update_info"]["updates"][0][
+                "version"
+            ]
+            self._attr_release_summary = software_status["update_info"]["updates"][0][
+                "description"
+            ]
+            self._attr_release_url = software_status["update_info"]["releasenotesuri"]
+
+    async def async_install(
+        self, version: str | None, backup: bool, **kwargs: Any
+    ) -> None:
+        """Install the latest firmware version."""
+        try:
+            if self.latest_version:
+                await self._device.update_firmware()
+        except (asyncio.TimeoutError, aiohttp.ClientError, UpnpError) as err:
+            raise HomeAssistantError(
+                f"Error updating {self._device.device.friendly_name}: {err}"
+            ) from err
diff --git a/homeassistant/components/opensky/manifest.json b/homeassistant/components/opensky/manifest.json
index cda86006bbd..6c6d3acb30e 100644
--- a/homeassistant/components/opensky/manifest.json
+++ b/homeassistant/components/opensky/manifest.json
@@ -4,5 +4,5 @@
   "codeowners": ["@joostlek"],
   "documentation": "https://www.home-assistant.io/integrations/opensky",
   "iot_class": "cloud_polling",
-  "requirements": ["python-opensky==0.0.9"]
+  "requirements": ["python-opensky==0.0.10"]
 }
diff --git a/homeassistant/components/openweathermap/const.py b/homeassistant/components/openweathermap/const.py
index 4af068f2b84..d53fbc136b2 100644
--- a/homeassistant/components/openweathermap/const.py
+++ b/homeassistant/components/openweathermap/const.py
@@ -35,6 +35,7 @@ ATTR_API_DEW_POINT = "dew_point"
 ATTR_API_WEATHER = "weather"
 ATTR_API_TEMPERATURE = "temperature"
 ATTR_API_FEELS_LIKE_TEMPERATURE = "feels_like_temperature"
+ATTR_API_WIND_GUST = "wind_gust"
 ATTR_API_WIND_SPEED = "wind_speed"
 ATTR_API_WIND_BEARING = "wind_bearing"
 ATTR_API_HUMIDITY = "humidity"
@@ -50,7 +51,10 @@ ATTR_API_FORECAST = "forecast"
 UPDATE_LISTENER = "update_listener"
 PLATFORMS = [Platform.SENSOR, Platform.WEATHER]
 
+ATTR_API_FORECAST_CLOUDS = "clouds"
 ATTR_API_FORECAST_CONDITION = "condition"
+ATTR_API_FORECAST_FEELS_LIKE_TEMPERATURE = "feels_like_temperature"
+ATTR_API_FORECAST_HUMIDITY = "humidity"
 ATTR_API_FORECAST_PRECIPITATION = "precipitation"
 ATTR_API_FORECAST_PRECIPITATION_PROBABILITY = "precipitation_probability"
 ATTR_API_FORECAST_PRESSURE = "pressure"
diff --git a/homeassistant/components/openweathermap/weather.py b/homeassistant/components/openweathermap/weather.py
index da29031d513..30f98bb39d1 100644
--- a/homeassistant/components/openweathermap/weather.py
+++ b/homeassistant/components/openweathermap/weather.py
@@ -4,7 +4,10 @@ from __future__ import annotations
 from typing import cast
 
 from homeassistant.components.weather import (
+    ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
+    ATTR_FORECAST_HUMIDITY,
+    ATTR_FORECAST_NATIVE_APPARENT_TEMP,
     ATTR_FORECAST_NATIVE_PRECIPITATION,
     ATTR_FORECAST_NATIVE_PRESSURE,
     ATTR_FORECAST_NATIVE_TEMP,
@@ -29,9 +32,15 @@ from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import (
+    ATTR_API_CLOUDS,
     ATTR_API_CONDITION,
+    ATTR_API_DEW_POINT,
+    ATTR_API_FEELS_LIKE_TEMPERATURE,
     ATTR_API_FORECAST,
+    ATTR_API_FORECAST_CLOUDS,
     ATTR_API_FORECAST_CONDITION,
+    ATTR_API_FORECAST_FEELS_LIKE_TEMPERATURE,
+    ATTR_API_FORECAST_HUMIDITY,
     ATTR_API_FORECAST_PRECIPITATION,
     ATTR_API_FORECAST_PRECIPITATION_PROBABILITY,
     ATTR_API_FORECAST_PRESSURE,
@@ -44,6 +53,7 @@ from .const import (
     ATTR_API_PRESSURE,
     ATTR_API_TEMPERATURE,
     ATTR_API_WIND_BEARING,
+    ATTR_API_WIND_GUST,
     ATTR_API_WIND_SPEED,
     ATTRIBUTION,
     DEFAULT_NAME,
@@ -64,6 +74,9 @@ FORECAST_MAP = {
     ATTR_API_FORECAST_TIME: ATTR_FORECAST_TIME,
     ATTR_API_FORECAST_WIND_BEARING: ATTR_FORECAST_WIND_BEARING,
     ATTR_API_FORECAST_WIND_SPEED: ATTR_FORECAST_NATIVE_WIND_SPEED,
+    ATTR_API_FORECAST_CLOUDS: ATTR_FORECAST_CLOUD_COVERAGE,
+    ATTR_API_FORECAST_HUMIDITY: ATTR_FORECAST_HUMIDITY,
+    ATTR_API_FORECAST_FEELS_LIKE_TEMPERATURE: ATTR_FORECAST_NATIVE_APPARENT_TEMP,
 }
 
 
@@ -116,6 +129,16 @@ class OpenWeatherMapWeather(WeatherEntity):
         """Return the current condition."""
         return self._weather_coordinator.data[ATTR_API_CONDITION]
 
+    @property
+    def cloud_coverage(self) -> float | None:
+        """Return the Cloud coverage in %."""
+        return self._weather_coordinator.data[ATTR_API_CLOUDS]
+
+    @property
+    def native_apparent_temperature(self) -> float | None:
+        """Return the apparent temperature."""
+        return self._weather_coordinator.data[ATTR_API_FEELS_LIKE_TEMPERATURE]
+
     @property
     def native_temperature(self) -> float | None:
         """Return the temperature."""
@@ -131,6 +154,16 @@ class OpenWeatherMapWeather(WeatherEntity):
         """Return the humidity."""
         return self._weather_coordinator.data[ATTR_API_HUMIDITY]
 
+    @property
+    def native_dew_point(self) -> float | None:
+        """Return the dew point."""
+        return self._weather_coordinator.data[ATTR_API_DEW_POINT]
+
+    @property
+    def native_wind_gust_speed(self) -> float | None:
+        """Return the wind gust speed."""
+        return self._weather_coordinator.data[ATTR_API_WIND_GUST]
+
     @property
     def native_wind_speed(self) -> float | None:
         """Return the wind speed."""
diff --git a/homeassistant/components/openweathermap/weather_update_coordinator.py b/homeassistant/components/openweathermap/weather_update_coordinator.py
index 4602615769a..521c1f87ca2 100644
--- a/homeassistant/components/openweathermap/weather_update_coordinator.py
+++ b/homeassistant/components/openweathermap/weather_update_coordinator.py
@@ -21,7 +21,10 @@ from .const import (
     ATTR_API_DEW_POINT,
     ATTR_API_FEELS_LIKE_TEMPERATURE,
     ATTR_API_FORECAST,
+    ATTR_API_FORECAST_CLOUDS,
     ATTR_API_FORECAST_CONDITION,
+    ATTR_API_FORECAST_FEELS_LIKE_TEMPERATURE,
+    ATTR_API_FORECAST_HUMIDITY,
     ATTR_API_FORECAST_PRECIPITATION,
     ATTR_API_FORECAST_PRECIPITATION_PROBABILITY,
     ATTR_API_FORECAST_PRESSURE,
@@ -41,6 +44,7 @@ from .const import (
     ATTR_API_WEATHER,
     ATTR_API_WEATHER_CODE,
     ATTR_API_WIND_BEARING,
+    ATTR_API_WIND_GUST,
     ATTR_API_WIND_SPEED,
     CONDITION_CLASSES,
     DOMAIN,
@@ -130,6 +134,7 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
             ATTR_API_PRESSURE: current_weather.pressure.get("press"),
             ATTR_API_HUMIDITY: current_weather.humidity,
             ATTR_API_WIND_BEARING: current_weather.wind().get("deg"),
+            ATTR_API_WIND_GUST: current_weather.wind().get("gust"),
             ATTR_API_WIND_SPEED: current_weather.wind().get("speed"),
             ATTR_API_CLOUDS: current_weather.clouds,
             ATTR_API_RAIN: self._get_rain(current_weather.rain),
@@ -174,7 +179,11 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
             ATTR_API_FORECAST_CONDITION: self._get_condition(
                 entry.weather_code, entry.reference_time("unix")
             ),
-            ATTR_API_CLOUDS: entry.clouds,
+            ATTR_API_FORECAST_CLOUDS: entry.clouds,
+            ATTR_API_FORECAST_FEELS_LIKE_TEMPERATURE: entry.temperature("celsius").get(
+                "feels_like_day"
+            ),
+            ATTR_API_FORECAST_HUMIDITY: entry.humidity,
         }
 
         temperature_dict = entry.temperature("celsius")
diff --git a/homeassistant/components/opnsense/__init__.py b/homeassistant/components/opnsense/__init__.py
index bd074cf5e5e..0111379df44 100644
--- a/homeassistant/components/opnsense/__init__.py
+++ b/homeassistant/components/opnsense/__init__.py
@@ -49,7 +49,7 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     tracker_interfaces = conf[CONF_TRACKER_INTERFACE]
 
     interfaces_client = diagnostics.InterfaceClient(
-        api_key, api_secret, url, verify_ssl
+        api_key, api_secret, url, verify_ssl, timeout=20
     )
     try:
         interfaces_client.get_arp()
@@ -60,7 +60,7 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     if tracker_interfaces:
         # Verify that specified tracker interfaces are valid
         netinsight_client = diagnostics.NetworkInsightClient(
-            api_key, api_secret, url, verify_ssl
+            api_key, api_secret, url, verify_ssl, timeout=20
         )
         interfaces = list(netinsight_client.get_interfaces().values())
         for interface in tracker_interfaces:
diff --git a/homeassistant/components/opnsense/manifest.json b/homeassistant/components/opnsense/manifest.json
index 89e8efa3426..bf8a41d1785 100644
--- a/homeassistant/components/opnsense/manifest.json
+++ b/homeassistant/components/opnsense/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/opnsense",
   "iot_class": "local_polling",
   "loggers": ["pbr", "pyopnsense"],
-  "requirements": ["pyopnsense==0.2.0"]
+  "requirements": ["pyopnsense==0.4.0"]
 }
diff --git a/homeassistant/components/otbr/config_flow.py b/homeassistant/components/otbr/config_flow.py
index c8ab8246c8b..67c8412102d 100644
--- a/homeassistant/components/otbr/config_flow.py
+++ b/homeassistant/components/otbr/config_flow.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import asyncio
+from contextlib import suppress
 import logging
 from typing import cast
 
@@ -12,11 +13,18 @@ from python_otbr_api.tlv_parser import MeshcopTLVType
 import voluptuous as vol
 import yarl
 
-from homeassistant.components.hassio import HassioServiceInfo
+from homeassistant.components.hassio import (
+    HassioAPIError,
+    HassioServiceInfo,
+    async_get_addon_info,
+)
+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
 from homeassistant.const import CONF_URL
+from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResult
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DEFAULT_CHANNEL, DOMAIN
@@ -25,6 +33,32 @@ from .util import get_allowed_channel
 _LOGGER = logging.getLogger(__name__)
 
 
+def _is_yellow(hass: HomeAssistant) -> bool:
+    """Return True if Home Assistant is running on a Home Assistant Yellow."""
+    try:
+        yellow_hardware.async_info(hass)
+    except HomeAssistantError:
+        return False
+    return True
+
+
+async def _title(hass: HomeAssistant, discovery_info: HassioServiceInfo) -> str:
+    """Return config entry title."""
+    device: str | None = None
+
+    with suppress(HassioAPIError):
+        addon_info = await async_get_addon_info(hass, discovery_info.slug)
+        device = addon_info.get("options", {}).get("device")
+
+    if _is_yellow(hass) and device == "/dev/TTYAMA1":
+        return "Home Assistant Yellow"
+
+    if device and "SkyConnect" in device:
+        return "Home Assistant SkyConnect"
+
+    return discovery_info.name
+
+
 class OTBRConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Open Thread Border Router."""
 
@@ -124,6 +158,6 @@ class OTBRConfigFlow(ConfigFlow, domain=DOMAIN):
 
         await self.async_set_unique_id(discovery_info.uuid)
         return self.async_create_entry(
-            title="Open Thread Border Router",
+            title=await _title(self.hass, discovery_info),
             data=config_entry_data,
         )
diff --git a/homeassistant/components/overkiz/climate_entities/atlantic_electrical_heater_with_adjustable_temperature_setpoint.py b/homeassistant/components/overkiz/climate_entities/atlantic_electrical_heater_with_adjustable_temperature_setpoint.py
index d79d2fca686..5807ccecd74 100644
--- a/homeassistant/components/overkiz/climate_entities/atlantic_electrical_heater_with_adjustable_temperature_setpoint.py
+++ b/homeassistant/components/overkiz/climate_entities/atlantic_electrical_heater_with_adjustable_temperature_setpoint.py
@@ -45,7 +45,7 @@ OVERKIZ_TO_PRESET_MODE: dict[str, str] = {
 PRESET_MODE_TO_OVERKIZ = {v: k for k, v in OVERKIZ_TO_PRESET_MODE.items()}
 
 # Map Overkiz HVAC modes to Home Assistant HVAC modes
-OVERKIZ_TO_HVAC_MODE: dict[str, str] = {
+OVERKIZ_TO_HVAC_MODE: dict[str, HVACMode] = {
     OverkizCommandParam.ON: HVACMode.HEAT,
     OverkizCommandParam.OFF: HVACMode.OFF,
     OverkizCommandParam.AUTO: HVACMode.AUTO,
@@ -83,7 +83,7 @@ class AtlanticElectricalHeaterWithAdjustableTemperatureSetpoint(
         )
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool mode."""
         states = self.device.states
         if (state := states[OverkizState.CORE_OPERATING_MODE]) and state.value_as_str:
diff --git a/homeassistant/components/overkiz/climate_entities/atlantic_electrical_towel_dryer.py b/homeassistant/components/overkiz/climate_entities/atlantic_electrical_towel_dryer.py
index c8e4920a113..0c378d088c5 100644
--- a/homeassistant/components/overkiz/climate_entities/atlantic_electrical_towel_dryer.py
+++ b/homeassistant/components/overkiz/climate_entities/atlantic_electrical_towel_dryer.py
@@ -20,7 +20,7 @@ from ..entity import OverkizEntity
 
 PRESET_DRYING = "drying"
 
-OVERKIZ_TO_HVAC_MODE: dict[str, str] = {
+OVERKIZ_TO_HVAC_MODE: dict[str, HVACMode] = {
     OverkizCommandParam.EXTERNAL: HVACMode.HEAT,  # manu
     OverkizCommandParam.INTERNAL: HVACMode.AUTO,  # prog
     OverkizCommandParam.STANDBY: HVACMode.OFF,
@@ -62,7 +62,7 @@ class AtlanticElectricalTowelDryer(OverkizEntity, ClimateEntity):
             self._attr_supported_features |= ClimateEntityFeature.PRESET_MODE
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool mode."""
         if OverkizState.CORE_OPERATING_MODE in self.device.states:
             return OVERKIZ_TO_HVAC_MODE[
@@ -71,7 +71,7 @@ class AtlanticElectricalTowelDryer(OverkizEntity, ClimateEntity):
 
         return HVACMode.OFF
 
-    async def async_set_hvac_mode(self, hvac_mode: str) -> None:
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target hvac mode."""
         await self.executor.async_execute_command(
             OverkizCommand.SET_TOWEL_DRYER_OPERATING_MODE,
diff --git a/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_heating_zone.py b/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_heating_zone.py
index b6835d93ebb..7722269a48b 100644
--- a/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_heating_zone.py
+++ b/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_heating_zone.py
@@ -21,7 +21,7 @@ from ..const import DOMAIN
 from ..coordinator import OverkizDataUpdateCoordinator
 from ..entity import OverkizEntity
 
-OVERKIZ_TO_HVAC_MODE: dict[str, str] = {
+OVERKIZ_TO_HVAC_MODE: dict[str, HVACMode] = {
     OverkizCommandParam.AUTO: HVACMode.AUTO,
     OverkizCommandParam.ECO: HVACMode.AUTO,
     OverkizCommandParam.MANU: HVACMode.HEAT,
@@ -101,7 +101,7 @@ class AtlanticPassAPCHeatingZone(OverkizEntity, ClimateEntity):
         return None
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool mode."""
         return OVERKIZ_TO_HVAC_MODE[
             cast(str, self.executor.select_state(OverkizState.IO_PASS_APC_HEATING_MODE))
@@ -135,7 +135,7 @@ class AtlanticPassAPCHeatingZone(OverkizEntity, ClimateEntity):
             OverkizCommand.REFRESH_PASS_APC_HEATING_PROFILE
         )
 
-    async def async_set_hvac_mode(self, hvac_mode: str) -> None:
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target hvac mode."""
         await self.async_set_heating_mode(HVAC_MODE_TO_OVERKIZ[hvac_mode])
 
diff --git a/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_zone_control.py b/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_zone_control.py
index 33c1f0c4a2a..74f7637b997 100644
--- a/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_zone_control.py
+++ b/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_zone_control.py
@@ -8,7 +8,7 @@ from homeassistant.const import UnitOfTemperature
 
 from ..entity import OverkizEntity
 
-OVERKIZ_TO_HVAC_MODE: dict[str, str] = {
+OVERKIZ_TO_HVAC_MODE: dict[str, HVACMode] = {
     OverkizCommandParam.HEATING: HVACMode.HEAT,
     OverkizCommandParam.DRYING: HVACMode.DRY,
     OverkizCommandParam.COOLING: HVACMode.COOL,
@@ -25,7 +25,7 @@ class AtlanticPassAPCZoneControl(OverkizEntity, ClimateEntity):
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool mode."""
         return OVERKIZ_TO_HVAC_MODE[
             cast(
@@ -33,7 +33,7 @@ class AtlanticPassAPCZoneControl(OverkizEntity, ClimateEntity):
             )
         ]
 
-    async def async_set_hvac_mode(self, hvac_mode: str) -> None:
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target hvac mode."""
         await self.executor.async_execute_command(
             OverkizCommand.SET_PASS_APC_OPERATING_MODE, HVAC_MODE_TO_OVERKIZ[hvac_mode]
diff --git a/homeassistant/components/overkiz/climate_entities/somfy_thermostat.py b/homeassistant/components/overkiz/climate_entities/somfy_thermostat.py
index aaae64e0454..7409b5307cf 100644
--- a/homeassistant/components/overkiz/climate_entities/somfy_thermostat.py
+++ b/homeassistant/components/overkiz/climate_entities/somfy_thermostat.py
@@ -74,7 +74,7 @@ class SomfyThermostat(OverkizEntity, ClimateEntity):
         )
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool mode."""
         return OVERKIZ_TO_HVAC_MODES[
             cast(
diff --git a/homeassistant/components/overkiz/climate_entities/valve_heating_temperature_interface.py b/homeassistant/components/overkiz/climate_entities/valve_heating_temperature_interface.py
index fdaf0d61f1f..3d883738de2 100644
--- a/homeassistant/components/overkiz/climate_entities/valve_heating_temperature_interface.py
+++ b/homeassistant/components/overkiz/climate_entities/valve_heating_temperature_interface.py
@@ -73,7 +73,7 @@ class ValveHeatingTemperatureInterface(OverkizEntity, ClimateEntity):
         )
 
     @property
-    def hvac_action(self) -> str:
+    def hvac_action(self) -> HVACAction:
         """Return the current running hvac operation."""
         return OVERKIZ_TO_HVAC_ACTION[
             cast(str, self.executor.select_state(OverkizState.CORE_OPEN_CLOSED_VALVE))
diff --git a/homeassistant/components/overkiz/entity.py b/homeassistant/components/overkiz/entity.py
index 6306a11acf0..16ea12a5d96 100644
--- a/homeassistant/components/overkiz/entity.py
+++ b/homeassistant/components/overkiz/entity.py
@@ -18,6 +18,7 @@ class OverkizEntity(CoordinatorEntity[OverkizDataUpdateCoordinator]):
     """Representation of an Overkiz device entity."""
 
     _attr_has_entity_name = True
+    _attr_name: str | None = None
 
     def __init__(
         self, device_url: str, coordinator: OverkizDataUpdateCoordinator
@@ -118,3 +119,5 @@ class OverkizDescriptiveEntity(OverkizEntity):
             # In case of sub device, use the provided label
             # and append the name of the type of entity
             self._attr_name = f"{self.device.label} {description.name}"
+        elif isinstance(description.name, str):
+            self._attr_name = description.name
diff --git a/homeassistant/components/overkiz/manifest.json b/homeassistant/components/overkiz/manifest.json
index b03b60cd753..d88996c7e02 100644
--- a/homeassistant/components/overkiz/manifest.json
+++ b/homeassistant/components/overkiz/manifest.json
@@ -13,7 +13,7 @@
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["boto3", "botocore", "pyhumps", "pyoverkiz", "s3transfer"],
-  "requirements": ["pyoverkiz==1.8.0"],
+  "requirements": ["pyoverkiz==1.9.0"],
   "zeroconf": [
     {
       "type": "_kizbox._tcp.local.",
diff --git a/homeassistant/components/owntracks/config_flow.py b/homeassistant/components/owntracks/config_flow.py
index b82a8727388..13b2051ffa2 100644
--- a/homeassistant/components/owntracks/config_flow.py
+++ b/homeassistant/components/owntracks/config_flow.py
@@ -34,8 +34,8 @@ class OwnTracksFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
         if supports_encryption():
             secret_desc = (
-                f"The encryption key is {secret} (on Android under preferences ->"
-                " advanced)"
+                f"The encryption key is {secret} (on Android under Preferences >"
+                " Advanced)"
             )
         else:
             secret_desc = "Encryption is not supported because nacl is not installed."
diff --git a/homeassistant/components/owntracks/strings.json b/homeassistant/components/owntracks/strings.json
index a127d9d6a4a..2486e01223f 100644
--- a/homeassistant/components/owntracks/strings.json
+++ b/homeassistant/components/owntracks/strings.json
@@ -11,7 +11,7 @@
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     },
     "create_entry": {
-      "default": "\n\nOn Android, open [the OwnTracks app]({android_url}), go to preferences -> connection. Change the following settings:\n - Mode: Private HTTP\n - Host: {webhook_url}\n - Identification:\n   - Username: `'<Your name>'`\n   - Device ID: `'<Your device name>'`\n\nOn iOS, open [the OwnTracks app]({ios_url}), tap (i) icon in top left -> settings. Change the following settings:\n - Mode: HTTP\n - URL: {webhook_url}\n - Turn on authentication\n - UserID: `'<Your name>'`\n\n{secret}\n\nSee [the documentation]({docs_url}) for more information."
+      "default": "\n\nOn Android, open [the OwnTracks app]({android_url}), go to Preferences > Connection. Change the following settings:\n - Mode: HTTP\n - Host: {webhook_url}\n - Identification:\n   - Username: `'<Your name>'`\n   - Device ID: `'<Your device name>'`\n\nOn iOS, open [the OwnTracks app]({ios_url}), tap (i) icon in top left > Settings. Change the following settings:\n - Mode: HTTP\n - URL: {webhook_url}\n - Turn on authentication\n - UserID: `'<Your name>'`\n\n{secret}\n\nSee [the documentation]({docs_url}) for more information."
     }
   }
 }
diff --git a/homeassistant/components/panasonic_viera/manifest.json b/homeassistant/components/panasonic_viera/manifest.json
index d626ae2bf9e..2afa6599cb2 100644
--- a/homeassistant/components/panasonic_viera/manifest.json
+++ b/homeassistant/components/panasonic_viera/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/panasonic_viera",
   "iot_class": "local_polling",
   "loggers": ["panasonic_viera"],
-  "requirements": ["panasonic_viera==0.3.6"]
+  "requirements": ["panasonic-viera==0.3.6"]
 }
diff --git a/homeassistant/components/persistent_notification/__init__.py b/homeassistant/components/persistent_notification/__init__.py
index fe8849c7788..581720c2730 100644
--- a/homeassistant/components/persistent_notification/__init__.py
+++ b/homeassistant/components/persistent_notification/__init__.py
@@ -1,7 +1,7 @@
 """Support for displaying persistent notifications."""
 from __future__ import annotations
 
-from collections.abc import Mapping
+from collections.abc import Callable, Mapping
 from datetime import datetime
 import logging
 from typing import Any, Final, TypedDict
@@ -10,7 +10,7 @@ import voluptuous as vol
 
 from homeassistant.backports.enum import StrEnum
 from homeassistant.components import websocket_api
-from homeassistant.core import HomeAssistant, ServiceCall, callback
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import config_validation as cv, singleton
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
@@ -63,6 +63,17 @@ _LOGGER = logging.getLogger(__name__)
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
 
+@callback
+def async_register_callback(
+    hass: HomeAssistant,
+    _callback: Callable[[UpdateType, dict[str, Notification]], None],
+) -> CALLBACK_TYPE:
+    """Register a callback."""
+    return async_dispatcher_connect(
+        hass, SIGNAL_PERSISTENT_NOTIFICATIONS_UPDATED, _callback
+    )
+
+
 @bind_hass
 def create(
     hass: HomeAssistant,
@@ -129,6 +140,20 @@ def async_dismiss(hass: HomeAssistant, notification_id: str) -> None:
     )
 
 
+@callback
+def async_dismiss_all(hass: HomeAssistant) -> None:
+    """Remove all notifications."""
+    notifications = _async_get_or_create_notifications(hass)
+    notifications_copy = notifications.copy()
+    notifications.clear()
+    async_dispatcher_send(
+        hass,
+        SIGNAL_PERSISTENT_NOTIFICATIONS_UPDATED,
+        UpdateType.REMOVED,
+        notifications_copy,
+    )
+
+
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the persistent notification component."""
 
@@ -147,6 +172,11 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         """Handle the dismiss notification service call."""
         async_dismiss(hass, call.data[ATTR_NOTIFICATION_ID])
 
+    @callback
+    def dismiss_all_service(call: ServiceCall) -> None:
+        """Handle the dismiss all notification service call."""
+        async_dismiss_all(hass)
+
     hass.services.async_register(
         DOMAIN,
         "create",
@@ -164,6 +194,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         DOMAIN, "dismiss", dismiss_service, SCHEMA_SERVICE_NOTIFICATION
     )
 
+    hass.services.async_register(DOMAIN, "dismiss_all", dismiss_all_service, None)
+
     websocket_api.async_register_command(hass, websocket_get_notifications)
     websocket_api.async_register_command(hass, websocket_subscribe_notifications)
 
diff --git a/homeassistant/components/persistent_notification/services.yaml b/homeassistant/components/persistent_notification/services.yaml
index 60dbf5c864a..046ea237560 100644
--- a/homeassistant/components/persistent_notification/services.yaml
+++ b/homeassistant/components/persistent_notification/services.yaml
@@ -4,14 +4,14 @@ create:
   fields:
     message:
       name: Message
-      description: Message body of the notification. [Templates accepted]
+      description: Message body of the notification.
       required: true
       example: Please check your configuration.yaml.
       selector:
         text:
     title:
       name: Title
-      description: Optional title for your notification. [Templates accepted]
+      description: Optional title for your notification.
       example: Test notification
       selector:
         text:
@@ -33,3 +33,7 @@ dismiss:
       example: 1234
       selector:
         text:
+
+dismiss_all:
+  name: Dismiss All
+  description: Remove all notifications.
diff --git a/homeassistant/components/persistent_notification/trigger.py b/homeassistant/components/persistent_notification/trigger.py
new file mode 100644
index 00000000000..4c9c2bd9204
--- /dev/null
+++ b/homeassistant/components/persistent_notification/trigger.py
@@ -0,0 +1,80 @@
+"""Offer persistent_notifications triggered automation rules."""
+from __future__ import annotations
+
+import logging
+from typing import Final
+
+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.trigger import TriggerActionType, TriggerData, TriggerInfo
+from homeassistant.helpers.typing import ConfigType
+
+from . import Notification, UpdateType, async_register_callback
+
+_LOGGER = logging.getLogger(__name__)
+
+
+CONF_NOTIFICATION_ID: Final = "notification_id"
+CONF_UPDATE_TYPE: Final = "update_type"
+
+TRIGGER_SCHEMA = cv.TRIGGER_BASE_SCHEMA.extend(
+    {
+        vol.Required(CONF_PLATFORM): "persistent_notification",
+        vol.Optional(CONF_NOTIFICATION_ID): str,
+        vol.Optional(CONF_UPDATE_TYPE): vol.All(
+            cv.ensure_list, [vol.Coerce(UpdateType)]
+        ),
+    }
+)
+
+
+async def async_attach_trigger(
+    hass: HomeAssistant,
+    config: ConfigType,
+    action: TriggerActionType,
+    trigger_info: TriggerInfo,
+) -> CALLBACK_TYPE:
+    """Listen for state changes based on configuration."""
+    trigger_data: TriggerData = trigger_info["trigger_data"]
+    job = HassJob(action)
+
+    persistent_notification_id = config.get(CONF_NOTIFICATION_ID)
+    update_types = config.get(CONF_UPDATE_TYPE)
+
+    @callback
+    def persistent_notification_listener(
+        update_type: UpdateType, notifications: dict[str, Notification]
+    ) -> None:
+        """Listen for persistent_notification updates."""
+
+        for notification in notifications.values():
+            if update_types and update_type not in update_types:
+                continue
+            if (
+                persistent_notification_id
+                and notification[CONF_NOTIFICATION_ID] != persistent_notification_id
+            ):
+                continue
+
+            hass.async_run_hass_job(
+                job,
+                {
+                    "trigger": {
+                        **trigger_data,
+                        "platform": "persistent_notification",
+                        "update_type": update_type,
+                        "notification": notification,
+                    }
+                },
+            )
+
+    _LOGGER.debug(
+        "Attaching persistent_notification trigger for ID: '%s', update_types: %s",
+        persistent_notification_id,
+        update_types,
+    )
+
+    return async_register_callback(hass, persistent_notification_listener)
diff --git a/homeassistant/components/philips_js/manifest.json b/homeassistant/components/philips_js/manifest.json
index 705acefa60f..46b1340a28d 100644
--- a/homeassistant/components/philips_js/manifest.json
+++ b/homeassistant/components/philips_js/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/philips_js",
   "iot_class": "local_polling",
   "loggers": ["haphilipsjs"],
-  "requirements": ["ha-philipsjs==3.0.0"]
+  "requirements": ["ha-philipsjs==3.1.0"]
 }
diff --git a/homeassistant/components/philips_js/media_player.py b/homeassistant/components/philips_js/media_player.py
index c6ca70bdc84..bdd55bb2dad 100644
--- a/homeassistant/components/philips_js/media_player.py
+++ b/homeassistant/components/philips_js/media_player.py
@@ -70,6 +70,7 @@ class PhilipsTVMediaPlayer(
 
     _attr_device_class = MediaPlayerDeviceClass.TV
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/picnic/strings.json b/homeassistant/components/picnic/strings.json
index ff91b5259b2..f0e0d93231c 100644
--- a/homeassistant/components/picnic/strings.json
+++ b/homeassistant/components/picnic/strings.json
@@ -50,7 +50,7 @@
         "name": "Status of last order"
       },
       "last_order_max_order_time": {
-        "name": "Max order time of last slot"
+        "name": "Max order time of last order"
       },
       "last_order_delivery_time": {
         "name": "Last order delivery time"
diff --git a/homeassistant/components/ping/__init__.py b/homeassistant/components/ping/__init__.py
index b78702de54d..3ff36f2e283 100644
--- a/homeassistant/components/ping/__init__.py
+++ b/homeassistant/components/ping/__init__.py
@@ -6,6 +6,7 @@ import logging
 from icmplib import SocketPermissionError, ping as icmp_ping
 
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.reload import async_setup_reload_service
 from homeassistant.helpers.typing import ConfigType
 
@@ -13,6 +14,8 @@ from .const import DOMAIN, PING_PRIVS, PLATFORMS
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.platform_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the ping integration."""
diff --git a/homeassistant/components/ping/binary_sensor.py b/homeassistant/components/ping/binary_sensor.py
index c8b4ce5a204..786012d466c 100644
--- a/homeassistant/components/ping/binary_sensor.py
+++ b/homeassistant/components/ping/binary_sensor.py
@@ -6,14 +6,14 @@ from contextlib import suppress
 from datetime import timedelta
 import logging
 import re
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import async_timeout
 from icmplib import NameLookupError, async_ping
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import (
-    PLATFORM_SCHEMA,
+    PLATFORM_SCHEMA as PARENT_PLATFORM_SCHEMA,
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
@@ -53,7 +53,7 @@ PING_MATCHER_BUSYBOX = re.compile(
 
 WIN32_PING_MATCHER = re.compile(r"(?P<min>\d+)ms.+(?P<max>\d+)ms.+(?P<avg>\d+)ms")
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
+PLATFORM_SCHEMA = PARENT_PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_HOST): cv.string,
         vol.Optional(CONF_NAME): cv.string,
@@ -89,27 +89,14 @@ async def async_setup_platform(
 class PingBinarySensor(RestoreEntity, BinarySensorEntity):
     """Representation of a Ping Binary sensor."""
 
+    _attr_device_class = BinarySensorDeviceClass.CONNECTIVITY
+
     def __init__(self, name: str, ping: PingDataSubProcess | PingDataICMPLib) -> None:
         """Initialize the Ping Binary sensor."""
-        self._available = False
-        self._name = name
+        self._attr_available = False
+        self._attr_name = name
         self._ping = ping
 
-    @property
-    def name(self) -> str:
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def available(self) -> bool:
-        """Return if we have done the first ping."""
-        return self._available
-
-    @property
-    def device_class(self) -> BinarySensorDeviceClass:
-        """Return the class of this sensor."""
-        return BinarySensorDeviceClass.CONNECTIVITY
-
     @property
     def is_on(self) -> bool:
         """Return true if the binary sensor is on."""
@@ -130,7 +117,7 @@ class PingBinarySensor(RestoreEntity, BinarySensorEntity):
     async def async_update(self) -> None:
         """Get the latest data."""
         await self._ping.async_update()
-        self._available = True
+        self._attr_available = True
 
     async def async_added_to_hass(self) -> None:
         """Restore previous state on restart to avoid blocking startup."""
@@ -138,7 +125,7 @@ class PingBinarySensor(RestoreEntity, BinarySensorEntity):
 
         last_state = await self.async_get_last_state()
         if last_state is not None:
-            self._available = True
+            self._attr_available = True
 
         if last_state is None or last_state.state != STATE_ON:
             self._ping.data = None
@@ -221,7 +208,7 @@ class PingDataSubProcess(PingData):
             self._ip_address,
         ]
 
-    async def async_ping(self):
+    async def async_ping(self) -> dict[str, Any] | None:
         """Send ICMP echo request and return details if success."""
         pinger = await asyncio.create_subprocess_exec(
             *self._ping_cmd,
@@ -249,7 +236,7 @@ class PingDataSubProcess(PingData):
                     out_error,
                 )
 
-            if pinger.returncode > 1:
+            if pinger.returncode and pinger.returncode > 1:
                 # returncode of 1 means the host is unreachable
                 _LOGGER.exception(
                     "Error running command: `%s`, return code: %s",
@@ -261,9 +248,13 @@ class PingDataSubProcess(PingData):
                 match = PING_MATCHER_BUSYBOX.search(
                     str(out_data).rsplit("\n", maxsplit=1)[-1]
                 )
+                if TYPE_CHECKING:
+                    assert match is not None
                 rtt_min, rtt_avg, rtt_max = match.groups()
                 return {"min": rtt_min, "avg": rtt_avg, "max": rtt_max, "mdev": ""}
             match = PING_MATCHER.search(str(out_data).rsplit("\n", maxsplit=1)[-1])
+            if TYPE_CHECKING:
+                assert match is not None
             rtt_min, rtt_avg, rtt_max, rtt_mdev = match.groups()
             return {"min": rtt_min, "avg": rtt_avg, "max": rtt_max, "mdev": rtt_mdev}
         except asyncio.TimeoutError:
@@ -274,7 +265,7 @@ class PingDataSubProcess(PingData):
             )
             if pinger:
                 with suppress(TypeError):
-                    await pinger.kill()
+                    await pinger.kill()  # type: ignore[func-returns-value]
                 del pinger
 
             return None
diff --git a/homeassistant/components/ping/device_tracker.py b/homeassistant/components/ping/device_tracker.py
index 68111df89ea..f546bd6bacc 100644
--- a/homeassistant/components/ping/device_tracker.py
+++ b/homeassistant/components/ping/device_tracker.py
@@ -2,14 +2,13 @@
 from __future__ import annotations
 
 import asyncio
-from datetime import timedelta
+from datetime import datetime, timedelta
 import logging
 import subprocess
 
 from icmplib import async_multiping
 import voluptuous as vol
 
-from homeassistant import util
 from homeassistant.components.device_tracker import (
     CONF_SCAN_INTERVAL,
     PLATFORM_SCHEMA as BASE_PLATFORM_SCHEMA,
@@ -22,6 +21,7 @@ from homeassistant.core import HomeAssistant
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util import dt as dt_util
 from homeassistant.util.async_ import gather_with_concurrency
 from homeassistant.util.process import kill_subprocess
 
@@ -44,7 +44,14 @@ PLATFORM_SCHEMA = BASE_PLATFORM_SCHEMA.extend(
 class HostSubProcess:
     """Host object with ping detection."""
 
-    def __init__(self, ip_address, dev_id, hass, config, privileged):
+    def __init__(
+        self,
+        ip_address: str,
+        dev_id: str,
+        hass: HomeAssistant,
+        config: ConfigType,
+        privileged: bool | None,
+    ) -> None:
         """Initialize the Host pinger."""
         self.hass = hass
         self.ip_address = ip_address
@@ -52,7 +59,7 @@ class HostSubProcess:
         self._count = config[CONF_PING_COUNT]
         self._ping_cmd = ["ping", "-n", "-q", "-c1", "-W1", ip_address]
 
-    def ping(self):
+    def ping(self) -> bool | None:
         """Send an ICMP echo request and return True if success."""
         with subprocess.Popen(
             self._ping_cmd,
@@ -108,7 +115,7 @@ async def async_setup_scanner(
             for (dev_id, ip) in config[CONF_HOSTS].items()
         ]
 
-        async def async_update(now):
+        async def async_update(now: datetime) -> None:
             """Update all the hosts on every interval time."""
             results = await gather_with_concurrency(
                 CONCURRENT_PING_LIMIT,
@@ -124,7 +131,7 @@ async def async_setup_scanner(
 
     else:
 
-        async def async_update(now):
+        async def async_update(now: datetime) -> None:
             """Update all the hosts on every interval time."""
             responses = await async_multiping(
                 list(ip_to_dev_id),
@@ -141,14 +148,14 @@ async def async_setup_scanner(
                 )
             )
 
-    async def _async_update_interval(now):
+    async def _async_update_interval(now: datetime) -> None:
         try:
             await async_update(now)
         finally:
             if not hass.is_stopping:
                 async_track_point_in_utc_time(
-                    hass, _async_update_interval, util.dt.utcnow() + interval
+                    hass, _async_update_interval, now + interval
                 )
 
-    await _async_update_interval(None)
+    await _async_update_interval(dt_util.now())
     return True
diff --git a/homeassistant/components/plex/__init__.py b/homeassistant/components/plex/__init__.py
index 59ae14b8ca9..4ce5a359dcd 100644
--- a/homeassistant/components/plex/__init__.py
+++ b/homeassistant/components/plex/__init__.py
@@ -18,7 +18,11 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_URL, CONF_VERIFY_SSL, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.dispatcher import (
@@ -54,6 +58,8 @@ from .view import PlexImageView
 
 _LOGGER = logging.getLogger(__package__)
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 def is_plex_media_id(media_content_id):
     """Return whether the media_content_id is a valid Plex media_id."""
diff --git a/homeassistant/components/plex/manifest.json b/homeassistant/components/plex/manifest.json
index 4c4ed8d8d0a..bc0c54c49bf 100644
--- a/homeassistant/components/plex/manifest.json
+++ b/homeassistant/components/plex/manifest.json
@@ -8,7 +8,7 @@
   "iot_class": "local_push",
   "loggers": ["plexapi", "plexwebsocket"],
   "requirements": [
-    "plexapi==4.13.2",
+    "PlexAPI==4.13.2",
     "plexauth==0.0.6",
     "plexwebsocket==0.0.13"
   ],
diff --git a/homeassistant/components/plex/media_player.py b/homeassistant/components/plex/media_player.py
index be572679605..6585c011c2d 100644
--- a/homeassistant/components/plex/media_player.py
+++ b/homeassistant/components/plex/media_player.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 from collections.abc import Callable
 from functools import wraps
 import logging
-from typing import Any, Concatenate, ParamSpec, TypeVar
+from typing import Any, Concatenate, ParamSpec, TypeVar, cast
 
 import plexapi.exceptions
 import requests.exceptions
@@ -535,7 +535,10 @@ class PlexMediaPlayer(MediaPlayerEntity):
             identifiers={(DOMAIN, self.machine_identifier)},
             manufacturer=self.device_platform or "Plex",
             model=self.device_product or self.device_make,
-            name=self.name,
+            # Instead of setting the device name to the entity name, plex
+            # should be updated to set has_entity_name = True, and set the entity
+            # name to None
+            name=cast(str | None, self.name),
             sw_version=self.device_version,
             via_device=(DOMAIN, self.plex_server.machine_identifier),
         )
diff --git a/homeassistant/components/plex/server.py b/homeassistant/components/plex/server.py
index 9684c79792a..1c3c944c9c4 100644
--- a/homeassistant/components/plex/server.py
+++ b/homeassistant/components/plex/server.py
@@ -199,7 +199,8 @@ class PlexServer:
                         if _update_plexdirect_hostname():
                             config_entry_update_needed = True
                         else:
-                            raise Unauthorized(  # pylint: disable=raise-missing-from
+                            # pylint: disable-next=raise-missing-from
+                            raise Unauthorized(  # noqa: TRY200
                                 "New certificate cannot be validated"
                                 " with provided token"
                             )
diff --git a/homeassistant/components/plex/services.py b/homeassistant/components/plex/services.py
index 62576471448..10d005d1043 100644
--- a/homeassistant/components/plex/services.py
+++ b/homeassistant/components/plex/services.py
@@ -145,7 +145,7 @@ def process_plex_payload(
             plex_server = get_plex_server(hass, plex_server_id=server_id)
         else:
             # Handle legacy payloads without server_id in URL host position
-            if plex_url.host == "search":
+            if plex_url.host == "search":  # noqa: PLR5501
                 content = {}
             else:
                 content = int(plex_url.host)  # type: ignore[arg-type]
diff --git a/homeassistant/components/plugwise/climate.py b/homeassistant/components/plugwise/climate.py
index f7941d1f02d..36626c2324e 100644
--- a/homeassistant/components/plugwise/climate.py
+++ b/homeassistant/components/plugwise/climate.py
@@ -42,6 +42,7 @@ class PlugwiseClimateEntity(PlugwiseEntity, ClimateEntity):
     """Representation of an Plugwise thermostat."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_translation_key = DOMAIN
 
diff --git a/homeassistant/components/plugwise/sensor.py b/homeassistant/components/plugwise/sensor.py
index d708fe741c2..7a504a0db84 100644
--- a/homeassistant/components/plugwise/sensor.py
+++ b/homeassistant/components/plugwise/sensor.py
@@ -343,6 +343,7 @@ SENSORS: tuple[SensorEntityDescription, ...] = (
         native_unit_of_measurement=LIGHT_LUX,
         device_class=SensorDeviceClass.ILLUMINANCE,
         state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     SensorEntityDescription(
         key="modulation_level",
diff --git a/homeassistant/components/progettihwsw/__init__.py b/homeassistant/components/progettihwsw/__init__.py
index bce25c07b17..d1d27b78769 100644
--- a/homeassistant/components/progettihwsw/__init__.py
+++ b/homeassistant/components/progettihwsw/__init__.py
@@ -1,7 +1,7 @@
 """Automation manager for boards manufactured by ProgettiHWSW Italy."""
 
-from ProgettiHWSW.ProgettiHWSWAPI import ProgettiHWSWAPI
 from ProgettiHWSW.input import Input
+from ProgettiHWSW.ProgettiHWSWAPI import ProgettiHWSWAPI
 from ProgettiHWSW.relay import Relay
 
 from homeassistant.config_entries import ConfigEntry
diff --git a/homeassistant/components/progettihwsw/binary_sensor.py b/homeassistant/components/progettihwsw/binary_sensor.py
index 058d76cdf05..b2019389fe3 100644
--- a/homeassistant/components/progettihwsw/binary_sensor.py
+++ b/homeassistant/components/progettihwsw/binary_sensor.py
@@ -2,8 +2,8 @@
 from datetime import timedelta
 import logging
 
-from ProgettiHWSW.input import Input
 import async_timeout
+from ProgettiHWSW.input import Input
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
diff --git a/homeassistant/components/progettihwsw/manifest.json b/homeassistant/components/progettihwsw/manifest.json
index e22abd6dd4a..6cad66e1360 100644
--- a/homeassistant/components/progettihwsw/manifest.json
+++ b/homeassistant/components/progettihwsw/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/progettihwsw",
   "iot_class": "local_polling",
   "loggers": ["ProgettiHWSW"],
-  "requirements": ["progettihwsw==0.1.1"]
+  "requirements": ["ProgettiHWSW==0.1.1"]
 }
diff --git a/homeassistant/components/progettihwsw/switch.py b/homeassistant/components/progettihwsw/switch.py
index 956848a6594..dc7f838bcbc 100644
--- a/homeassistant/components/progettihwsw/switch.py
+++ b/homeassistant/components/progettihwsw/switch.py
@@ -3,8 +3,8 @@ from datetime import timedelta
 import logging
 from typing import Any
 
-from ProgettiHWSW.relay import Relay
 import async_timeout
+from ProgettiHWSW.relay import Relay
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
diff --git a/homeassistant/components/prometheus/manifest.json b/homeassistant/components/prometheus/manifest.json
index dbbe8a1c9fc..8ec332c1daf 100644
--- a/homeassistant/components/prometheus/manifest.json
+++ b/homeassistant/components/prometheus/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/prometheus",
   "iot_class": "assumed_state",
   "loggers": ["prometheus_client"],
-  "requirements": ["prometheus_client==0.7.1"]
+  "requirements": ["prometheus-client==0.7.1"]
 }
diff --git a/homeassistant/components/proximity/__init__.py b/homeassistant/components/proximity/__init__.py
index 0567c551d98..a4520435161 100644
--- a/homeassistant/components/proximity/__init__.py
+++ b/homeassistant/components/proximity/__init__.py
@@ -110,6 +110,10 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 class Proximity(Entity):
     """Representation of a Proximity."""
 
+    # This entity is legacy and does not have a platform.
+    # We can't fix this easily without breaking changes.
+    _no_platform_reported = True
+
     def __init__(
         self,
         hass: HomeAssistant,
diff --git a/homeassistant/components/proxy/manifest.json b/homeassistant/components/proxy/manifest.json
index 7ebaa6e53dd..88a2a6c9b0f 100644
--- a/homeassistant/components/proxy/manifest.json
+++ b/homeassistant/components/proxy/manifest.json
@@ -3,5 +3,5 @@
   "name": "Camera Proxy",
   "codeowners": [],
   "documentation": "https://www.home-assistant.io/integrations/proxy",
-  "requirements": ["pillow==9.5.0"]
+  "requirements": ["Pillow==9.5.0"]
 }
diff --git a/homeassistant/components/prusalink/sensor.py b/homeassistant/components/prusalink/sensor.py
index 4f93fd3407e..1ee4274e5bb 100644
--- a/homeassistant/components/prusalink/sensor.py
+++ b/homeassistant/components/prusalink/sensor.py
@@ -47,6 +47,7 @@ SENSORS: dict[str, tuple[PrusaLinkSensorEntityDescription, ...]] = {
     "printer": (
         PrusaLinkSensorEntityDescription[PrinterInfo](
             key="printer.state",
+            name=None,
             icon="mdi:printer-3d",
             value_fn=lambda data: (
                 "pausing"
diff --git a/homeassistant/components/ps4/__init__.py b/homeassistant/components/ps4/__init__.py
index 0f5c57c5e4c..1c87a275126 100644
--- a/homeassistant/components/ps4/__init__.py
+++ b/homeassistant/components/ps4/__init__.py
@@ -53,6 +53,8 @@ PS4_COMMAND_SCHEMA = vol.Schema(
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 class PS4Data:
     """Init Data Class."""
diff --git a/homeassistant/components/ps4/media_player.py b/homeassistant/components/ps4/media_player.py
index 23438dd80c4..42bc15cf0ca 100644
--- a/homeassistant/components/ps4/media_player.py
+++ b/homeassistant/components/ps4/media_player.py
@@ -192,12 +192,10 @@ class PS4Device(MediaPlayerEntity):
                             self.async_get_title_data(title_id, name),
                             "ps4.media_player-get_title_data",
                         )
-                else:
-                    if self.state != MediaPlayerState.IDLE:
-                        self.idle()
-            else:
-                if self.state != MediaPlayerState.STANDBY:
-                    self.state_standby()
+                elif self.state != MediaPlayerState.IDLE:
+                    self.idle()
+            elif self.state != MediaPlayerState.STANDBY:
+                self.state_standby()
 
         elif self._retry > DEFAULT_RETRIES:
             self.state_unknown()
diff --git a/homeassistant/components/pushbullet/__init__.py b/homeassistant/components/pushbullet/__init__.py
index bed0e94ccd9..14d90d4ca0b 100644
--- a/homeassistant/components/pushbullet/__init__.py
+++ b/homeassistant/components/pushbullet/__init__.py
@@ -14,7 +14,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, 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 .api import PushBulletNotificationProvider
@@ -24,6 +24,8 @@ PLATFORMS = [Platform.SENSOR]
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the pushbullet component."""
diff --git a/homeassistant/components/pushover/__init__.py b/homeassistant/components/pushover/__init__.py
index 551e374fbb6..c3b15b7c130 100644
--- a/homeassistant/components/pushover/__init__.py
+++ b/homeassistant/components/pushover/__init__.py
@@ -7,13 +7,15 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import discovery
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from .const import CONF_USER_KEY, DATA_HASS_CONFIG, DOMAIN
 
 PLATFORMS = [Platform.NOTIFY]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the pushover component."""
diff --git a/homeassistant/components/pushover/manifest.json b/homeassistant/components/pushover/manifest.json
index d086321c088..3b538f756e0 100644
--- a/homeassistant/components/pushover/manifest.json
+++ b/homeassistant/components/pushover/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/pushover",
   "iot_class": "cloud_push",
   "loggers": ["pushover_complete"],
-  "requirements": ["pushover_complete==1.1.1"]
+  "requirements": ["pushover-complete==1.1.1"]
 }
diff --git a/homeassistant/components/python_script/__init__.py b/homeassistant/components/python_script/__init__.py
index bbb262ac7db..10751d28c06 100644
--- a/homeassistant/components/python_script/__init__.py
+++ b/homeassistant/components/python_script/__init__.py
@@ -221,7 +221,7 @@ def execute(hass, filename, source, data=None):
     try:
         _LOGGER.info("Executing %s: %s", filename, data)
         # pylint: disable-next=exec-used
-        exec(compiled.code, restricted_globals)
+        exec(compiled.code, restricted_globals)  # noqa: S102
     except ScriptError as err:
         logger.error("Error executing script: %s", err)
     except Exception as err:  # pylint: disable=broad-except
diff --git a/homeassistant/components/python_script/manifest.json b/homeassistant/components/python_script/manifest.json
index eb6cfe236e0..63aa2f2f916 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==6.0"]
+  "requirements": ["RestrictedPython==6.0"]
 }
diff --git a/homeassistant/components/qbittorrent/__init__.py b/homeassistant/components/qbittorrent/__init__.py
index 5154ae155ec..53e8d4b9660 100644
--- a/homeassistant/components/qbittorrent/__init__.py
+++ b/homeassistant/components/qbittorrent/__init__.py
@@ -35,11 +35,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             entry.data[CONF_VERIFY_SSL],
         )
     except LoginRequired as err:
-        _LOGGER.error("Invalid credentials")
-        raise ConfigEntryNotReady from err
+        raise ConfigEntryNotReady("Invalid credentials") from err
     except RequestException as err:
-        _LOGGER.error("Failed to connect")
-        raise ConfigEntryNotReady from err
+        raise ConfigEntryNotReady("Failed to connect") from err
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
diff --git a/homeassistant/components/qbittorrent/manifest.json b/homeassistant/components/qbittorrent/manifest.json
index c56bb8102b8..e2c1526e4f8 100644
--- a/homeassistant/components/qbittorrent/manifest.json
+++ b/homeassistant/components/qbittorrent/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "local_polling",
   "loggers": ["qbittorrent"],
-  "requirements": ["python-qbittorrent==0.4.2"]
+  "requirements": ["python-qbittorrent==0.4.3"]
 }
diff --git a/homeassistant/components/qbittorrent/sensor.py b/homeassistant/components/qbittorrent/sensor.py
index 6b758daab0a..15a634cf7a9 100644
--- a/homeassistant/components/qbittorrent/sensor.py
+++ b/homeassistant/components/qbittorrent/sensor.py
@@ -86,7 +86,7 @@ async def async_setup_platform(
         hass,
         DOMAIN,
         "deprecated_yaml",
-        breaks_in_ha_version="2023.6.0",
+        breaks_in_ha_version="2023.11.0",
         is_fixable=False,
         severity=ir.IssueSeverity.WARNING,
         translation_key="deprecated_yaml",
diff --git a/homeassistant/components/qld_bushfire/manifest.json b/homeassistant/components/qld_bushfire/manifest.json
index e21371d96af..5e7d9948309 100644
--- a/homeassistant/components/qld_bushfire/manifest.json
+++ b/homeassistant/components/qld_bushfire/manifest.json
@@ -6,5 +6,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["georss_qld_bushfire_alert_client"],
-  "requirements": ["georss_qld_bushfire_alert_client==0.5"]
+  "requirements": ["georss-qld-bushfire-alert-client==0.5"]
 }
diff --git a/homeassistant/components/qnap/__init__.py b/homeassistant/components/qnap/__init__.py
index 534096628df..2491e69803f 100644
--- a/homeassistant/components/qnap/__init__.py
+++ b/homeassistant/components/qnap/__init__.py
@@ -1 +1,33 @@
 """The qnap component."""
+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 QnapCoordinator
+
+PLATFORMS: list[Platform] = [
+    Platform.SENSOR,
+]
+
+
+async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+    """Set the config entry up."""
+    hass.data.setdefault(DOMAIN, {})
+    coordinator = QnapCoordinator(hass, config_entry)
+    # Fetch initial data so we have data when entities subscribe
+    await coordinator.async_config_entry_first_refresh()
+    hass.data[DOMAIN][config_entry.entry_id] = 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:
+    """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
diff --git a/homeassistant/components/qnap/config_flow.py b/homeassistant/components/qnap/config_flow.py
new file mode 100644
index 00000000000..689fe30a870
--- /dev/null
+++ b/homeassistant/components/qnap/config_flow.py
@@ -0,0 +1,99 @@
+"""Config flow to configure qnap component."""
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from qnapstats import QNAPStats
+from requests.exceptions import ConnectTimeout
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_MONITORED_CONDITIONS,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_SSL,
+    CONF_USERNAME,
+    CONF_VERIFY_SSL,
+)
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers import config_validation as cv
+
+from .const import (
+    CONF_DRIVES,
+    CONF_NICS,
+    CONF_VOLUMES,
+    DEFAULT_PORT,
+    DEFAULT_SSL,
+    DEFAULT_TIMEOUT,
+    DEFAULT_VERIFY_SSL,
+    DOMAIN,
+)
+
+DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_HOST): cv.string,
+        vol.Required(CONF_USERNAME): cv.string,
+        vol.Required(CONF_PASSWORD): cv.string,
+        vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
+        vol.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
+        vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+    }
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class QnapConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Qnap configuration flow."""
+
+    VERSION = 1
+
+    async def async_step_import(self, import_info: dict[str, Any]) -> FlowResult:
+        """Set the config entry up from yaml."""
+        import_info.pop(CONF_MONITORED_CONDITIONS, None)
+        import_info.pop(CONF_NICS, None)
+        import_info.pop(CONF_DRIVES, None)
+        import_info.pop(CONF_VOLUMES, None)
+        return await self.async_step_user(import_info)
+
+    async def async_step_user(
+        self,
+        user_input: dict[str, Any] | None = None,
+    ) -> FlowResult:
+        """Handle a flow initialized by the user."""
+        errors = {}
+        if user_input is not None:
+            host = user_input[CONF_HOST]
+            protocol = "https" if user_input[CONF_SSL] else "http"
+            api = QNAPStats(
+                host=f"{protocol}://{host}",
+                port=user_input[CONF_PORT],
+                username=user_input[CONF_USERNAME],
+                password=user_input[CONF_PASSWORD],
+                verify_ssl=user_input[CONF_VERIFY_SSL],
+                timeout=DEFAULT_TIMEOUT,
+            )
+            try:
+                stats = await self.hass.async_add_executor_job(api.get_system_stats)
+            except ConnectTimeout:
+                errors["base"] = "cannot_connect"
+            except TypeError:
+                errors["base"] = "invalid_auth"
+            except Exception as error:  # pylint: disable=broad-except
+                _LOGGER.error(error)
+                errors["base"] = "unknown"
+            else:
+                unique_id = stats["system"]["serial_number"]
+                await self.async_set_unique_id(unique_id)
+                self._abort_if_unique_id_configured()
+                title = stats["system"]["name"]
+                return self.async_create_entry(title=title, data=user_input)
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=self.add_suggested_values_to_schema(DATA_SCHEMA, user_input),
+            errors=errors,
+        )
diff --git a/homeassistant/components/qnap/const.py b/homeassistant/components/qnap/const.py
new file mode 100644
index 00000000000..d1bbb64cc47
--- /dev/null
+++ b/homeassistant/components/qnap/const.py
@@ -0,0 +1,12 @@
+"""The Qnap constants."""
+
+CONF_DRIVES = "drives"
+CONF_NICS = "nics"
+CONF_VOLUMES = "volumes"
+
+DEFAULT_PORT = 8080
+DEFAULT_TIMEOUT = 5
+DEFAULT_SSL = False
+DEFAULT_VERIFY_SSL = True
+
+DOMAIN = "qnap"
diff --git a/homeassistant/components/qnap/coordinator.py b/homeassistant/components/qnap/coordinator.py
new file mode 100644
index 00000000000..b868a931ebd
--- /dev/null
+++ b/homeassistant/components/qnap/coordinator.py
@@ -0,0 +1,59 @@
+"""Data coordinator for the qnap integration."""
+from __future__ import annotations
+
+from datetime import timedelta
+import logging
+from typing import Any
+
+from qnapstats import QNAPStats
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_SSL,
+    CONF_TIMEOUT,
+    CONF_USERNAME,
+    CONF_VERIFY_SSL,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from .const import DOMAIN
+
+UPDATE_INTERVAL = timedelta(minutes=1)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class QnapCoordinator(DataUpdateCoordinator[dict[str, dict[str, Any]]]):
+    """Custom coordinator for the qnap integration."""
+
+    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+        """Initialize the qnap coordinator."""
+        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=UPDATE_INTERVAL)
+
+        protocol = "https" if config_entry.data[CONF_SSL] else "http"
+        self._api = QNAPStats(
+            f"{protocol}://{config_entry.data.get(CONF_HOST)}",
+            config_entry.data.get(CONF_PORT),
+            config_entry.data.get(CONF_USERNAME),
+            config_entry.data.get(CONF_PASSWORD),
+            verify_ssl=config_entry.data.get(CONF_VERIFY_SSL),
+            timeout=config_entry.data.get(CONF_TIMEOUT),
+        )
+
+    def _sync_update(self) -> dict[str, dict[str, Any]]:
+        """Get the latest data from the Qnap API."""
+        return {
+            "system_stats": self._api.get_system_stats(),
+            "system_health": self._api.get_system_health(),
+            "smart_drive_health": self._api.get_smart_disk_health(),
+            "volumes": self._api.get_volumes(),
+            "bandwidth": self._api.get_bandwidth(),
+        }
+
+    async def _async_update_data(self) -> dict[str, dict[str, Any]]:
+        """Get the latest data from the Qnap API."""
+        return await self.hass.async_add_executor_job(self._sync_update)
diff --git a/homeassistant/components/qnap/manifest.json b/homeassistant/components/qnap/manifest.json
index 95ab9264dfc..608d57a7cc4 100644
--- a/homeassistant/components/qnap/manifest.json
+++ b/homeassistant/components/qnap/manifest.json
@@ -1,8 +1,10 @@
 {
   "domain": "qnap",
   "name": "QNAP",
-  "codeowners": [],
+  "codeowners": ["@disforw"],
+  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/qnap",
+  "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["qnapstats"],
   "requirements": ["qnapstats==0.4.0"]
diff --git a/homeassistant/components/qnap/sensor.py b/homeassistant/components/qnap/sensor.py
index 66fc5631718..6d214b63e2e 100644
--- a/homeassistant/components/qnap/sensor.py
+++ b/homeassistant/components/qnap/sensor.py
@@ -1,17 +1,17 @@
 """Support for QNAP NAS Sensors."""
 from __future__ import annotations
 
-from datetime import timedelta
 import logging
 
-from qnapstats import QNAPStats
 import voluptuous as vol
 
+from homeassistant import config_entries
 from homeassistant.components.sensor import (
     PLATFORM_SCHEMA,
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
+    SensorStateClass,
 )
 from homeassistant.const import (
     ATTR_NAME,
@@ -31,14 +31,25 @@ 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 import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import Throttle
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import (
+    CONF_DRIVES,
+    CONF_NICS,
+    CONF_VOLUMES,
+    DEFAULT_PORT,
+    DEFAULT_TIMEOUT,
+    DOMAIN,
+)
+from .coordinator import QnapCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 ATTR_DRIVE = "Drive"
-ATTR_DRIVE_SIZE = "Drive Size"
 ATTR_IP = "IP Address"
 ATTR_MAC = "MAC Address"
 ATTR_MASK = "Mask"
@@ -53,18 +64,6 @@ ATTR_TYPE = "Type"
 ATTR_UPTIME = "Uptime"
 ATTR_VOLUME_SIZE = "Volume Size"
 
-CONF_DRIVES = "drives"
-CONF_NICS = "nics"
-CONF_VOLUMES = "volumes"
-DEFAULT_NAME = "QNAP"
-DEFAULT_PORT = 8080
-DEFAULT_TIMEOUT = 5
-
-MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=1)
-
-NOTIFICATION_ID = "qnap_notification"
-NOTIFICATION_TITLE = "QNAP Sensor Setup"
-
 _SYSTEM_MON_COND: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="status",
@@ -76,6 +75,8 @@ _SYSTEM_MON_COND: tuple[SensorEntityDescription, ...] = (
         name="System Temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
+        icon="mdi:thermometer",
+        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 _CPU_MON_COND: tuple[SensorEntityDescription, ...] = (
@@ -84,12 +85,16 @@ _CPU_MON_COND: tuple[SensorEntityDescription, ...] = (
         name="CPU Temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
+        icon="mdi:checkbox-marked-circle-outline",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="cpu_usage",
         name="CPU Usage",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:chip",
+        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 _MEMORY_MON_COND: tuple[SensorEntityDescription, ...] = (
@@ -99,6 +104,8 @@ _MEMORY_MON_COND: tuple[SensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfInformation.GIBIBYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         icon="mdi:memory",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="memory_used",
@@ -106,12 +113,15 @@ _MEMORY_MON_COND: tuple[SensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfInformation.GIBIBYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         icon="mdi:memory",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="memory_percent_used",
         name="Memory Usage",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:memory",
+        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 _NETWORK_MON_COND: tuple[SensorEntityDescription, ...] = (
@@ -126,6 +136,8 @@ _NETWORK_MON_COND: tuple[SensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfDataRate.MEBIBYTES_PER_SECOND,
         device_class=SensorDeviceClass.DATA_RATE,
         icon="mdi:upload",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="network_rx",
@@ -133,6 +145,8 @@ _NETWORK_MON_COND: tuple[SensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfDataRate.MEBIBYTES_PER_SECOND,
         device_class=SensorDeviceClass.DATA_RATE,
         icon="mdi:download",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 _DRIVE_MON_COND: tuple[SensorEntityDescription, ...] = (
@@ -140,12 +154,16 @@ _DRIVE_MON_COND: tuple[SensorEntityDescription, ...] = (
         key="drive_smart_status",
         name="SMART Status",
         icon="mdi:checkbox-marked-circle-outline",
+        entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="drive_temp",
         name="Temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
+        icon="mdi:thermometer",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 _VOLUME_MON_COND: tuple[SensorEntityDescription, ...] = (
@@ -155,6 +173,8 @@ _VOLUME_MON_COND: tuple[SensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfInformation.GIBIBYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         icon="mdi:chart-pie",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="volume_size_free",
@@ -162,12 +182,15 @@ _VOLUME_MON_COND: tuple[SensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfInformation.GIBIBYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         icon="mdi:chart-pie",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="volume_percentage_used",
         name="Volume Used",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:chart-pie",
+        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 
@@ -202,77 +225,90 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
 )
 
 
-def setup_platform(
+async def async_setup_platform(
     hass: HomeAssistant,
     config: ConfigType,
-    add_entities: AddEntitiesCallback,
+    async_add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the QNAP NAS sensor."""
-    api = QNAPStatsAPI(config)
-    api.update()
+    """Set up the qnap sensor platform from yaml."""
 
-    # QNAP is not available
-    if not api.data:
+    async_create_issue(
+        hass,
+        DOMAIN,
+        "deprecated_yaml",
+        breaks_in_ha_version="2023.12.0",
+        is_fixable=False,
+        severity=IssueSeverity.WARNING,
+        translation_key="deprecated_yaml",
+    )
+
+    hass.async_create_task(
+        hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=config
+        )
+    )
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: config_entries.ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up entry."""
+    coordinator = QnapCoordinator(hass, config_entry)
+    await coordinator.async_refresh()
+    if not coordinator.last_update_success:
         raise PlatformNotReady
-
-    monitored_conditions = config[CONF_MONITORED_CONDITIONS]
+    uid = config_entry.unique_id
+    assert uid is not None
     sensors: list[QNAPSensor] = []
 
-    # Basic sensors
     sensors.extend(
         [
-            QNAPSystemSensor(api, description)
+            QNAPSystemSensor(coordinator, description, uid)
             for description in _SYSTEM_MON_COND
-            if description.key in monitored_conditions
         ]
     )
+
     sensors.extend(
-        [
-            QNAPCPUSensor(api, description)
-            for description in _CPU_MON_COND
-            if description.key in monitored_conditions
-        ]
+        [QNAPCPUSensor(coordinator, description, uid) for description in _CPU_MON_COND]
     )
+
     sensors.extend(
         [
-            QNAPMemorySensor(api, description)
+            QNAPMemorySensor(coordinator, description, uid)
             for description in _MEMORY_MON_COND
-            if description.key in monitored_conditions
         ]
     )
 
     # Network sensors
     sensors.extend(
         [
-            QNAPNetworkSensor(api, description, nic)
-            for nic in config.get(CONF_NICS, api.data["system_stats"]["nics"])
+            QNAPNetworkSensor(coordinator, description, uid, nic)
+            for nic in coordinator.data["system_stats"]["nics"]
             for description in _NETWORK_MON_COND
-            if description.key in monitored_conditions
         ]
     )
 
     # Drive sensors
     sensors.extend(
         [
-            QNAPDriveSensor(api, description, drive)
-            for drive in config.get(CONF_DRIVES, api.data["smart_drive_health"])
+            QNAPDriveSensor(coordinator, description, uid, drive)
+            for drive in coordinator.data["smart_drive_health"]
             for description in _DRIVE_MON_COND
-            if description.key in monitored_conditions
         ]
     )
 
     # Volume sensors
     sensors.extend(
         [
-            QNAPVolumeSensor(api, description, volume)
-            for volume in config.get(CONF_VOLUMES, api.data["volumes"])
+            QNAPVolumeSensor(coordinator, description, uid, volume)
+            for volume in coordinator.data["volumes"]
             for description in _VOLUME_MON_COND
-            if description.key in monitored_conditions
         ]
     )
-
-    add_entities(sensors)
+    async_add_entities(sensors)
 
 
 def round_nicely(number):
@@ -285,62 +321,38 @@ def round_nicely(number):
     return round(number)
 
 
-class QNAPStatsAPI:
-    """Class to interface with the API."""
-
-    def __init__(self, config):
-        """Initialize the API wrapper."""
-
-        protocol = "https" if config[CONF_SSL] else "http"
-        self._api = QNAPStats(
-            f"{protocol}://{config.get(CONF_HOST)}",
-            config.get(CONF_PORT),
-            config.get(CONF_USERNAME),
-            config.get(CONF_PASSWORD),
-            verify_ssl=config.get(CONF_VERIFY_SSL),
-            timeout=config.get(CONF_TIMEOUT),
-        )
-
-        self.data = {}
-
-    @Throttle(MIN_TIME_BETWEEN_UPDATES)
-    def update(self):
-        """Update API information and store locally."""
-        try:
-            self.data["system_stats"] = self._api.get_system_stats()
-            self.data["system_health"] = self._api.get_system_health()
-            self.data["smart_drive_health"] = self._api.get_smart_disk_health()
-            self.data["volumes"] = self._api.get_volumes()
-            self.data["bandwidth"] = self._api.get_bandwidth()
-        except Exception:  # pylint: disable=broad-except
-            _LOGGER.exception("Failed to fetch QNAP stats from the NAS")
-
-
-class QNAPSensor(SensorEntity):
+class QNAPSensor(CoordinatorEntity[QnapCoordinator], SensorEntity):
     """Base class for a QNAP sensor."""
 
     def __init__(
-        self, api, description: SensorEntityDescription, monitor_device=None
+        self,
+        coordinator: QnapCoordinator,
+        description: SensorEntityDescription,
+        unique_id: str,
+        monitor_device: str | None = None,
     ) -> None:
         """Initialize the sensor."""
+        super().__init__(coordinator)
         self.entity_description = description
+        self.device_name = self.coordinator.data["system_stats"]["system"]["name"]
         self.monitor_device = monitor_device
-        self._api = api
+        self._attr_unique_id = f"{unique_id}_{description.key}"
+        if monitor_device:
+            self._attr_unique_id = f"{self._attr_unique_id}_{monitor_device}"
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, unique_id)},
+            name=self.device_name,
+            model=self.coordinator.data["system_stats"]["system"]["model"],
+            sw_version=self.coordinator.data["system_stats"]["firmware"]["version"],
+            manufacturer="QNAP",
+        )
 
     @property
     def name(self):
         """Return the name of the sensor, if any."""
-        server_name = self._api.data["system_stats"]["system"]["name"]
-
         if self.monitor_device is not None:
-            return (
-                f"{server_name} {self.entity_description.name} ({self.monitor_device})"
-            )
-        return f"{server_name} {self.entity_description.name}"
-
-    def update(self) -> None:
-        """Get the latest data for the states."""
-        self._api.update()
+            return f"{self.device_name} {self.entity_description.name} ({self.monitor_device})"
+        return f"{self.device_name} {self.entity_description.name}"
 
 
 class QNAPCPUSensor(QNAPSensor):
@@ -350,9 +362,9 @@ class QNAPCPUSensor(QNAPSensor):
     def native_value(self):
         """Return the state of the sensor."""
         if self.entity_description.key == "cpu_temp":
-            return self._api.data["system_stats"]["cpu"]["temp_c"]
+            return self.coordinator.data["system_stats"]["cpu"]["temp_c"]
         if self.entity_description.key == "cpu_usage":
-            return self._api.data["system_stats"]["cpu"]["usage_percent"]
+            return self.coordinator.data["system_stats"]["cpu"]["usage_percent"]
 
 
 class QNAPMemorySensor(QNAPSensor):
@@ -361,11 +373,11 @@ class QNAPMemorySensor(QNAPSensor):
     @property
     def native_value(self):
         """Return the state of the sensor."""
-        free = float(self._api.data["system_stats"]["memory"]["free"]) / 1024
+        free = float(self.coordinator.data["system_stats"]["memory"]["free"]) / 1024
         if self.entity_description.key == "memory_free":
             return round_nicely(free)
 
-        total = float(self._api.data["system_stats"]["memory"]["total"]) / 1024
+        total = float(self.coordinator.data["system_stats"]["memory"]["total"]) / 1024
 
         used = total - free
         if self.entity_description.key == "memory_used":
@@ -377,8 +389,8 @@ class QNAPMemorySensor(QNAPSensor):
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if self._api.data:
-            data = self._api.data["system_stats"]["memory"]
+        if self.coordinator.data:
+            data = self.coordinator.data["system_stats"]["memory"]
             size = round_nicely(float(data["total"]) / 1024)
             return {ATTR_MEMORY_SIZE: f"{size} {UnitOfInformation.GIBIBYTES}"}
 
@@ -390,10 +402,10 @@ class QNAPNetworkSensor(QNAPSensor):
     def native_value(self):
         """Return the state of the sensor."""
         if self.entity_description.key == "network_link_status":
-            nic = self._api.data["system_stats"]["nics"][self.monitor_device]
+            nic = self.coordinator.data["system_stats"]["nics"][self.monitor_device]
             return nic["link_status"]
 
-        data = self._api.data["bandwidth"][self.monitor_device]
+        data = self.coordinator.data["bandwidth"][self.monitor_device]
         if self.entity_description.key == "network_tx":
             return round_nicely(data["tx"] / 1024 / 1024)
 
@@ -403,8 +415,8 @@ class QNAPNetworkSensor(QNAPSensor):
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if self._api.data:
-            data = self._api.data["system_stats"]["nics"][self.monitor_device]
+        if self.coordinator.data:
+            data = self.coordinator.data["system_stats"]["nics"][self.monitor_device]
             return {
                 ATTR_IP: data["ip"],
                 ATTR_MASK: data["mask"],
@@ -423,16 +435,16 @@ class QNAPSystemSensor(QNAPSensor):
     def native_value(self):
         """Return the state of the sensor."""
         if self.entity_description.key == "status":
-            return self._api.data["system_health"]
+            return self.coordinator.data["system_health"]
 
         if self.entity_description.key == "system_temp":
-            return int(self._api.data["system_stats"]["system"]["temp_c"])
+            return int(self.coordinator.data["system_stats"]["system"]["temp_c"])
 
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if self._api.data:
-            data = self._api.data["system_stats"]
+        if self.coordinator.data:
+            data = self.coordinator.data["system_stats"]
             days = int(data["uptime"]["days"])
             hours = int(data["uptime"]["hours"])
             minutes = int(data["uptime"]["minutes"])
@@ -451,7 +463,7 @@ class QNAPDriveSensor(QNAPSensor):
     @property
     def native_value(self):
         """Return the state of the sensor."""
-        data = self._api.data["smart_drive_health"][self.monitor_device]
+        data = self.coordinator.data["smart_drive_health"][self.monitor_device]
 
         if self.entity_description.key == "drive_smart_status":
             return data["health"]
@@ -462,7 +474,7 @@ class QNAPDriveSensor(QNAPSensor):
     @property
     def name(self):
         """Return the name of the sensor, if any."""
-        server_name = self._api.data["system_stats"]["system"]["name"]
+        server_name = self.coordinator.data["system_stats"]["system"]["name"]
 
         return (
             f"{server_name} {self.entity_description.name} (Drive"
@@ -472,8 +484,8 @@ class QNAPDriveSensor(QNAPSensor):
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if self._api.data:
-            data = self._api.data["smart_drive_health"][self.monitor_device]
+        if self.coordinator.data:
+            data = self.coordinator.data["smart_drive_health"][self.monitor_device]
             return {
                 ATTR_DRIVE: data["drive_number"],
                 ATTR_MODEL: data["model"],
@@ -488,7 +500,7 @@ class QNAPVolumeSensor(QNAPSensor):
     @property
     def native_value(self):
         """Return the state of the sensor."""
-        data = self._api.data["volumes"][self.monitor_device]
+        data = self.coordinator.data["volumes"][self.monitor_device]
 
         free_gb = int(data["free_size"]) / 1024 / 1024 / 1024
         if self.entity_description.key == "volume_size_free":
@@ -506,12 +518,10 @@ class QNAPVolumeSensor(QNAPSensor):
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if self._api.data:
-            data = self._api.data["volumes"][self.monitor_device]
+        if self.coordinator.data:
+            data = self.coordinator.data["volumes"][self.monitor_device]
             total_gb = int(data["total_size"]) / 1024 / 1024 / 1024
 
             return {
-                ATTR_VOLUME_SIZE: (
-                    f"{round_nicely(total_gb)} {UnitOfInformation.GIBIBYTES}"
-                )
+                ATTR_VOLUME_SIZE: f"{round_nicely(total_gb)} {UnitOfInformation.GIBIBYTES}"
             }
diff --git a/homeassistant/components/qnap/strings.json b/homeassistant/components/qnap/strings.json
new file mode 100644
index 00000000000..26ca5dedd34
--- /dev/null
+++ b/homeassistant/components/qnap/strings.json
@@ -0,0 +1,23 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "title": "Connect to the QNAP device",
+        "description": "This qnap sensor allows getting various statistics from your QNAP NAS.",
+        "data": {
+          "host": "Hostname",
+          "username": "Username",
+          "password": "Password",
+          "port": "Port",
+          "ssl": "Enable SSL",
+          "verify_ssl": "Verify SSL"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "Cannot connect to host",
+      "invalid_auth": "Bad authentication",
+      "unknown": "Unknown error"
+    }
+  }
+}
diff --git a/homeassistant/components/qrcode/manifest.json b/homeassistant/components/qrcode/manifest.json
index 787255187cc..a19760ad989 100644
--- a/homeassistant/components/qrcode/manifest.json
+++ b/homeassistant/components/qrcode/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/qrcode",
   "iot_class": "calculated",
   "loggers": ["pyzbar"],
-  "requirements": ["pillow==9.5.0", "pyzbar==0.1.7"]
+  "requirements": ["Pillow==9.5.0", "pyzbar==0.1.7"]
 }
diff --git a/homeassistant/components/rachio/manifest.json b/homeassistant/components/rachio/manifest.json
index 14582134e84..e58341633b1 100644
--- a/homeassistant/components/rachio/manifest.json
+++ b/homeassistant/components/rachio/manifest.json
@@ -25,7 +25,7 @@
   },
   "iot_class": "cloud_push",
   "loggers": ["rachiopy"],
-  "requirements": ["rachiopy==1.0.3"],
+  "requirements": ["RachioPy==1.0.3"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",
diff --git a/homeassistant/components/radarr/binary_sensor.py b/homeassistant/components/radarr/binary_sensor.py
index 5339588c5fa..5d439680bc2 100644
--- a/homeassistant/components/radarr/binary_sensor.py
+++ b/homeassistant/components/radarr/binary_sensor.py
@@ -18,7 +18,7 @@ from .const import DOMAIN, HEALTH_ISSUES
 
 BINARY_SENSOR_TYPE = BinarySensorEntityDescription(
     key="health",
-    name="Health",
+    translation_key="health",
     entity_category=EntityCategory.DIAGNOSTIC,
     device_class=BinarySensorDeviceClass.PROBLEM,
 )
diff --git a/homeassistant/components/radarr/sensor.py b/homeassistant/components/radarr/sensor.py
index 0ed64ce3035..367e302d56f 100644
--- a/homeassistant/components/radarr/sensor.py
+++ b/homeassistant/components/radarr/sensor.py
@@ -18,8 +18,6 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfInformation
 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.typing import ConfigType, DiscoveryInfoType
 
 from . import RadarrEntity
 from .const import DOMAIN
@@ -78,7 +76,7 @@ SENSOR_TYPES: dict[str, RadarrSensorEntityDescription[Any]] = {
     ),
     "movie": RadarrSensorEntityDescription[int](
         key="movies",
-        name="Movies",
+        translation_key="movies",
         native_unit_of_measurement="Movies",
         icon="mdi:television",
         entity_registry_enabled_default=False,
@@ -86,7 +84,7 @@ SENSOR_TYPES: dict[str, RadarrSensorEntityDescription[Any]] = {
     ),
     "status": RadarrSensorEntityDescription[SystemStatus](
         key="start_time",
-        name="Start time",
+        translation_key="start_time",
         device_class=SensorDeviceClass.TIMESTAMP,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
@@ -104,24 +102,6 @@ BYTE_SIZES = [
 PARALLEL_UPDATES = 1
 
 
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the Radarr platform."""
-    async_create_issue(
-        hass,
-        DOMAIN,
-        "removed_yaml",
-        breaks_in_ha_version="2022.12.0",
-        is_fixable=False,
-        severity=IssueSeverity.WARNING,
-        translation_key="removed_yaml",
-    )
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
diff --git a/homeassistant/components/radarr/strings.json b/homeassistant/components/radarr/strings.json
index 299dd0a56b0..5cd7bcfc449 100644
--- a/homeassistant/components/radarr/strings.json
+++ b/homeassistant/components/radarr/strings.json
@@ -35,10 +35,19 @@
       }
     }
   },
-  "issues": {
-    "removed_yaml": {
-      "title": "The Radarr YAML configuration has been removed",
-      "description": "Configuring Radarr using YAML has been removed.\n\nYour existing YAML configuration is not used by Home Assistant.\n\nRemove the YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
+  "entity": {
+    "binary_sensor": {
+      "health": {
+        "name": "Health"
+      }
+    },
+    "sensor": {
+      "movies": {
+        "name": "Movies"
+      },
+      "start_time": {
+        "name": "Start time"
+      }
     }
   }
 }
diff --git a/homeassistant/components/radio_browser/__init__.py b/homeassistant/components/radio_browser/__init__.py
index d93d7c48823..fdd7537e9e1 100644
--- a/homeassistant/components/radio_browser/__init__.py
+++ b/homeassistant/components/radio_browser/__init__.py
@@ -1,6 +1,7 @@
 """The Radio Browser integration."""
 from __future__ import annotations
 
+from aiodns.error import DNSError
 from radios import RadioBrowser, RadioBrowserError
 
 from homeassistant.config_entries import ConfigEntry
@@ -23,7 +24,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     try:
         await radios.stats()
-    except RadioBrowserError as err:
+    except (DNSError, RadioBrowserError) as err:
         raise ConfigEntryNotReady("Could not connect to Radio Browser API") from err
 
     hass.data[DOMAIN] = radios
diff --git a/homeassistant/components/rainbird/switch.py b/homeassistant/components/rainbird/switch.py
index 38f3c03fb03..e915c52c9dc 100644
--- a/homeassistant/components/rainbird/switch.py
+++ b/homeassistant/components/rainbird/switch.py
@@ -67,6 +67,7 @@ class RainBirdSwitch(CoordinatorEntity[RainbirdUpdateCoordinator], SwitchEntity)
             self._attr_name = imported_name
             self._attr_has_entity_name = False
         else:
+            self._attr_name = None
             self._attr_has_entity_name = True
         self._state = None
         self._duration_minutes = duration_minutes
diff --git a/homeassistant/components/recollect_waste/calendar.py b/homeassistant/components/recollect_waste/calendar.py
index 120ab77c3b3..c439f647da5 100644
--- a/homeassistant/components/recollect_waste/calendar.py
+++ b/homeassistant/components/recollect_waste/calendar.py
@@ -48,6 +48,7 @@ class ReCollectWasteCalendar(ReCollectWasteEntity, CalendarEntity):
     """Define a ReCollect Waste calendar."""
 
     _attr_icon = "mdi:delete-empty"
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/recorder/history/legacy.py b/homeassistant/components/recorder/history/legacy.py
index 74b17d9daa7..64ce1aa7d55 100644
--- a/homeassistant/components/recorder/history/legacy.py
+++ b/homeassistant/components/recorder/history/legacy.py
@@ -434,11 +434,11 @@ def _state_changed_during_period_stmt(
             )
         else:
             stmt += lambda q: q.order_by(States.entity_id, States.last_updated.desc())
+    elif schema_version >= 31:
+        stmt += lambda q: q.order_by(States.entity_id, States.last_updated_ts)
     else:
-        if schema_version >= 31:
-            stmt += lambda q: q.order_by(States.entity_id, States.last_updated_ts)
-        else:
-            stmt += lambda q: q.order_by(States.entity_id, States.last_updated)
+        stmt += lambda q: q.order_by(States.entity_id, States.last_updated)
+
     if limit:
         stmt += lambda q: q.limit(limit)
     return stmt
diff --git a/homeassistant/components/recorder/manifest.json b/homeassistant/components/recorder/manifest.json
index 33c6a516c65..2e868542457 100644
--- a/homeassistant/components/recorder/manifest.json
+++ b/homeassistant/components/recorder/manifest.json
@@ -7,7 +7,7 @@
   "iot_class": "local_push",
   "quality_scale": "internal",
   "requirements": [
-    "sqlalchemy==2.0.15",
+    "SQLAlchemy==2.0.15",
     "fnv-hash-fast==0.3.1",
     "psutil-home-assistant==0.0.1"
   ]
diff --git a/homeassistant/components/recorder/migration.py b/homeassistant/components/recorder/migration.py
index b8436da97d5..33d8c7b5e67 100644
--- a/homeassistant/components/recorder/migration.py
+++ b/homeassistant/components/recorder/migration.py
@@ -1303,7 +1303,7 @@ def _migrate_statistics_columns_to_timestamp(
             with session_scope(session=session_maker()) as session:
                 session.connection().execute(
                     text(
-                        f"UPDATE {table} set start_ts=strftime('%s',start) + "
+                        f"UPDATE {table} set start_ts=strftime('%s',start) + "  # noqa: S608
                         "cast(substr(start,-7) AS FLOAT), "
                         f"created_ts=strftime('%s',created) + "
                         "cast(substr(created,-7) AS FLOAT), "
@@ -1321,7 +1321,7 @@ def _migrate_statistics_columns_to_timestamp(
                 with session_scope(session=session_maker()) as session:
                     result = session.connection().execute(
                         text(
-                            f"UPDATE {table} set start_ts="
+                            f"UPDATE {table} set start_ts="  # noqa: S608
                             "IF(start is NULL or UNIX_TIMESTAMP(start) is NULL,0,"
                             "UNIX_TIMESTAMP(start) "
                             "), "
@@ -1343,7 +1343,7 @@ def _migrate_statistics_columns_to_timestamp(
                 with session_scope(session=session_maker()) as session:
                     result = session.connection().execute(
                         text(
-                            f"UPDATE {table} set start_ts="  # nosec
+                            f"UPDATE {table} set start_ts="  # noqa: S608
                             "(case when start is NULL then 0 else EXTRACT(EPOCH FROM start::timestamptz) end), "
                             "created_ts=EXTRACT(EPOCH FROM created::timestamptz), "
                             "last_reset_ts=EXTRACT(EPOCH FROM last_reset::timestamptz) "
diff --git a/homeassistant/components/recorder/pool.py b/homeassistant/components/recorder/pool.py
index 09b113f03eb..46f140305e3 100644
--- a/homeassistant/components/recorder/pool.py
+++ b/homeassistant/components/recorder/pool.py
@@ -92,7 +92,7 @@ class RecorderPool(SingletonThreadPool, NullPool):  # type: ignore[misc]
             exclude_integrations={"recorder"},
             error_if_core=False,
         )
-        return super(NullPool, self)._create_connection()
+        return NullPool._create_connection(self)
 
 
 class MutexPool(StaticPool):
diff --git a/homeassistant/components/recorder/statistics.py b/homeassistant/components/recorder/statistics.py
index ee9662a2157..9bbf35bb40a 100644
--- a/homeassistant/components/recorder/statistics.py
+++ b/homeassistant/components/recorder/statistics.py
@@ -2400,7 +2400,7 @@ def cleanup_statistics_timestamp_migration(instance: Recorder) -> bool:
             with session_scope(session=instance.get_session()) as session:
                 session.connection().execute(
                     text(
-                        f"update {table} set start = NULL, created = NULL, last_reset = NULL;"
+                        f"update {table} set start = NULL, created = NULL, last_reset = NULL;"  # noqa: S608
                     )
                 )
     elif engine.dialect.name == SupportedDialect.MYSQL:
@@ -2410,7 +2410,7 @@ def cleanup_statistics_timestamp_migration(instance: Recorder) -> bool:
                     session.connection()
                     .execute(
                         text(
-                            f"UPDATE {table} set start=NULL, created=NULL, last_reset=NULL where start is not NULL LIMIT 100000;"
+                            f"UPDATE {table} set start=NULL, created=NULL, last_reset=NULL where start is not NULL LIMIT 100000;"  # noqa: S608
                         )
                     )
                     .rowcount
@@ -2425,7 +2425,7 @@ def cleanup_statistics_timestamp_migration(instance: Recorder) -> bool:
                     session.connection()
                     .execute(
                         text(
-                            f"UPDATE {table} set start=NULL, created=NULL, last_reset=NULL "  # nosec
+                            f"UPDATE {table} set start=NULL, created=NULL, last_reset=NULL "  # noqa: S608
                             f"where id in (select id from {table} where start is not NULL LIMIT 100000)"
                         )
                     )
diff --git a/homeassistant/components/recorder/table_managers/event_data.py b/homeassistant/components/recorder/table_managers/event_data.py
index 4e08719e572..85266a37939 100644
--- a/homeassistant/components/recorder/table_managers/event_data.py
+++ b/homeassistant/components/recorder/table_managers/event_data.py
@@ -10,11 +10,11 @@ from sqlalchemy.orm.session import Session
 from homeassistant.core import Event
 from homeassistant.util.json import JSON_ENCODE_EXCEPTIONS
 
-from . import BaseLRUTableManager
 from ..const import SQLITE_MAX_BIND_VARS
 from ..db_schema import EventData
 from ..queries import get_shared_event_datas
 from ..util import chunked, execute_stmt_lambda_element
+from . import BaseLRUTableManager
 
 if TYPE_CHECKING:
     from ..core import Recorder
diff --git a/homeassistant/components/recorder/table_managers/event_types.py b/homeassistant/components/recorder/table_managers/event_types.py
index d5541c547d5..fd03bdd14d2 100644
--- a/homeassistant/components/recorder/table_managers/event_types.py
+++ b/homeassistant/components/recorder/table_managers/event_types.py
@@ -9,12 +9,12 @@ from sqlalchemy.orm.session import Session
 
 from homeassistant.core import Event
 
-from . import BaseLRUTableManager
 from ..const import SQLITE_MAX_BIND_VARS
 from ..db_schema import EventTypes
 from ..queries import find_event_type_ids
 from ..tasks import RefreshEventTypesTask
 from ..util import chunked, execute_stmt_lambda_element
+from . import BaseLRUTableManager
 
 if TYPE_CHECKING:
     from ..core import Recorder
diff --git a/homeassistant/components/recorder/table_managers/state_attributes.py b/homeassistant/components/recorder/table_managers/state_attributes.py
index 442277be96e..3ae67b932bf 100644
--- a/homeassistant/components/recorder/table_managers/state_attributes.py
+++ b/homeassistant/components/recorder/table_managers/state_attributes.py
@@ -11,11 +11,11 @@ from homeassistant.core import Event
 from homeassistant.helpers.entity import entity_sources
 from homeassistant.util.json import JSON_ENCODE_EXCEPTIONS
 
-from . import BaseLRUTableManager
 from ..const import SQLITE_MAX_BIND_VARS
 from ..db_schema import StateAttributes
 from ..queries import get_shared_attributes
 from ..util import chunked, execute_stmt_lambda_element
+from . import BaseLRUTableManager
 
 if TYPE_CHECKING:
     from ..core import Recorder
diff --git a/homeassistant/components/recorder/table_managers/states_meta.py b/homeassistant/components/recorder/table_managers/states_meta.py
index bc4a8cfd2d9..b8f6204d318 100644
--- a/homeassistant/components/recorder/table_managers/states_meta.py
+++ b/homeassistant/components/recorder/table_managers/states_meta.py
@@ -8,11 +8,11 @@ from sqlalchemy.orm.session import Session
 
 from homeassistant.core import Event
 
-from . import BaseLRUTableManager
 from ..const import SQLITE_MAX_BIND_VARS
 from ..db_schema import StatesMeta
 from ..queries import find_all_states_metadata_ids, find_states_metadata_ids
 from ..util import chunked, execute_stmt_lambda_element
+from . import BaseLRUTableManager
 
 if TYPE_CHECKING:
     from ..core import Recorder
diff --git a/homeassistant/components/recorder/util.py b/homeassistant/components/recorder/util.py
index 1c50fd0a77c..f3de9824a16 100644
--- a/homeassistant/components/recorder/util.py
+++ b/homeassistant/components/recorder/util.py
@@ -278,9 +278,11 @@ def basic_sanity_check(cursor: SQLiteCursor) -> bool:
 
     for table in TABLES_TO_CHECK:
         if table in (TABLE_RECORDER_RUNS, TABLE_SCHEMA_CHANGES):
-            cursor.execute(f"SELECT * FROM {table};")  # nosec # not injection
+            cursor.execute(f"SELECT * FROM {table};")  # noqa: S608 # not injection
         else:
-            cursor.execute(f"SELECT * FROM {table} LIMIT 1;")  # nosec # not injection
+            cursor.execute(
+                f"SELECT * FROM {table} LIMIT 1;"  # noqa: S608 # not injection
+            )
 
     return True
 
@@ -528,11 +530,10 @@ def setup_connection_for_dialect(
                         version,
                     )
 
-            else:
-                if not version or version < MIN_VERSION_MYSQL:
-                    _fail_unsupported_version(
-                        version or version_string, "MySQL", MIN_VERSION_MYSQL
-                    )
+            elif not version or version < MIN_VERSION_MYSQL:
+                _fail_unsupported_version(
+                    version or version_string, "MySQL", MIN_VERSION_MYSQL
+                )
 
             slow_range_in_select = bool(
                 not version
diff --git a/homeassistant/components/remote/device_action.py b/homeassistant/components/remote/device_action.py
index 09c540b5e01..936c7aca37a 100644
--- a/homeassistant/components/remote/device_action.py
+++ b/homeassistant/components/remote/device_action.py
@@ -3,7 +3,10 @@ from __future__ import annotations
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import toggle_entity
+from homeassistant.components.device_automation import (
+    async_validate_entity_schema,
+    toggle_entity,
+)
 from homeassistant.const import CONF_DOMAIN
 from homeassistant.core import Context, HomeAssistant
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
@@ -12,7 +15,14 @@ from . import DOMAIN
 
 # mypy: disallow-any-generics
 
-ACTION_SCHEMA = toggle_entity.ACTION_SCHEMA.extend({vol.Required(CONF_DOMAIN): DOMAIN})
+_ACTION_SCHEMA = toggle_entity.ACTION_SCHEMA.extend({vol.Required(CONF_DOMAIN): DOMAIN})
+
+
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
 
 
 async def async_call_action_from_config(
diff --git a/homeassistant/components/remote_rpi_gpio/__init__.py b/homeassistant/components/remote_rpi_gpio/__init__.py
index c77ae7fde9c..1654cc0c01d 100644
--- a/homeassistant/components/remote_rpi_gpio/__init__.py
+++ b/homeassistant/components/remote_rpi_gpio/__init__.py
@@ -2,9 +2,6 @@
 from gpiozero import LED, DigitalInputDevice
 from gpiozero.pins.pigpio import PiGPIOFactory
 
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.typing import ConfigType
-
 CONF_BOUNCETIME = "bouncetime"
 CONF_INVERT_LOGIC = "invert_logic"
 CONF_PULL_MODE = "pull_mode"
@@ -16,11 +13,6 @@ DEFAULT_PULL_MODE = "UP"
 DOMAIN = "remote_rpi_gpio"
 
 
-def setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Raspberry Pi Remote GPIO component."""
-    return True
-
-
 def setup_output(address, port, invert_logic):
     """Set up a GPIO as output."""
 
diff --git a/homeassistant/components/remote_rpi_gpio/binary_sensor.py b/homeassistant/components/remote_rpi_gpio/binary_sensor.py
index 37994830c4d..bc0e694e8eb 100644
--- a/homeassistant/components/remote_rpi_gpio/binary_sensor.py
+++ b/homeassistant/components/remote_rpi_gpio/binary_sensor.py
@@ -11,6 +11,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
+from .. import remote_rpi_gpio
 from . import (
     CONF_BOUNCETIME,
     CONF_INVERT_LOGIC,
@@ -19,7 +20,6 @@ from . import (
     DEFAULT_INVERT_LOGIC,
     DEFAULT_PULL_MODE,
 )
-from .. import remote_rpi_gpio
 
 CONF_PORTS = "ports"
 
diff --git a/homeassistant/components/remote_rpi_gpio/switch.py b/homeassistant/components/remote_rpi_gpio/switch.py
index 862efb0f89d..962cf6b4f3c 100644
--- a/homeassistant/components/remote_rpi_gpio/switch.py
+++ b/homeassistant/components/remote_rpi_gpio/switch.py
@@ -12,8 +12,8 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import CONF_INVERT_LOGIC, DEFAULT_INVERT_LOGIC
 from .. import remote_rpi_gpio
+from . import CONF_INVERT_LOGIC, DEFAULT_INVERT_LOGIC
 
 CONF_PORTS = "ports"
 
diff --git a/homeassistant/components/renson/__init__.py b/homeassistant/components/renson/__init__.py
new file mode 100644
index 00000000000..211f7c88e40
--- /dev/null
+++ b/homeassistant/components/renson/__init__.py
@@ -0,0 +1,88 @@
+"""The Renson integration."""
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import timedelta
+import logging
+from typing import Any
+
+import async_timeout
+from renson_endura_delta.renson import RensonVentilation
+
+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.update_coordinator import DataUpdateCoordinator
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+PLATFORMS = [
+    Platform.SENSOR,
+]
+
+
+@dataclass
+class RensonData:
+    """Renson data class."""
+
+    api: RensonVentilation
+    coordinator: RensonCoordinator
+
+
+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)
+
+    if not await hass.async_add_executor_job(api.connect):
+        raise ConfigEntryNotReady("Cannot connect to Renson device")
+
+    await coordinator.async_config_entry_first_refresh()
+
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = RensonData(
+        api,
+        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."""
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
+
+
+class RensonCoordinator(DataUpdateCoordinator):
+    """Data update coordinator for Renson."""
+
+    def __init__(
+        self,
+        name: str,
+        hass: HomeAssistant,
+        api: RensonVentilation,
+        update_interval=timedelta(seconds=30),
+    ) -> None:
+        """Initialize my coordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            # Name of the data. For logging purposes.
+            name=name,
+            # Polling interval. Will only be polled if there are subscribers.
+            update_interval=update_interval,
+        )
+        self.api = api
+
+    async def _async_update_data(self) -> dict[str, Any]:
+        """Fetch data from API endpoint."""
+        async with async_timeout.timeout(30):
+            return await self.hass.async_add_executor_job(self.api.get_all_data)
diff --git a/homeassistant/components/renson/config_flow.py b/homeassistant/components/renson/config_flow.py
new file mode 100644
index 00000000000..9883772ce02
--- /dev/null
+++ b/homeassistant/components/renson/config_flow.py
@@ -0,0 +1,70 @@
+"""Config flow for Renson integration."""
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from renson_endura_delta import renson
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.exceptions import HomeAssistantError
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_HOST): str,
+    }
+)
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Renson."""
+
+    VERSION = 1
+
+    async def validate_input(
+        self, hass: HomeAssistant, data: dict[str, Any]
+    ) -> dict[str, Any]:
+        """Validate the user input allows us to connect."""
+        api = renson.RensonVentilation(data[CONF_HOST])
+
+        if not await self.hass.async_add_executor_job(api.connect):
+            raise CannotConnect
+
+        return {"title": "Renson"}
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id="user", data_schema=STEP_USER_DATA_SCHEMA
+            )
+
+        errors = {}
+
+        try:
+            info = await self.validate_input(self.hass, user_input)
+        except CannotConnect:
+            errors["base"] = "cannot_connect"
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Unexpected exception")
+            errors["base"] = "unknown"
+        else:
+            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 CannotConnect(HomeAssistantError):
+    """Error to indicate we cannot connect."""
diff --git a/homeassistant/components/renson/const.py b/homeassistant/components/renson/const.py
new file mode 100644
index 00000000000..840e1ce428a
--- /dev/null
+++ b/homeassistant/components/renson/const.py
@@ -0,0 +1,3 @@
+"""Constants for the Renson integration."""
+
+DOMAIN = "renson"
diff --git a/homeassistant/components/renson/entity.py b/homeassistant/components/renson/entity.py
new file mode 100644
index 00000000000..526077d2d7f
--- /dev/null
+++ b/homeassistant/components/renson/entity.py
@@ -0,0 +1,47 @@
+"""Entity class for Renson ventilation unit."""
+from __future__ import annotations
+
+from renson_endura_delta.field_enum import (
+    DEVICE_NAME_FIELD,
+    FIRMWARE_VERSION_FIELD,
+    HARDWARE_VERSION_FIELD,
+    MAC_ADDRESS,
+)
+from renson_endura_delta.renson import RensonVentilation
+
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from . import RensonCoordinator
+from .const import DOMAIN
+
+
+class RensonEntity(CoordinatorEntity[RensonCoordinator]):
+    """Renson entity."""
+
+    def __init__(
+        self, name: str, api: RensonVentilation, coordinator: RensonCoordinator
+    ) -> None:
+        """Initialize the Renson entity."""
+        super().__init__(coordinator)
+
+        self._attr_device_info = DeviceInfo(
+            identifiers={
+                (DOMAIN, api.get_field_value(coordinator.data, MAC_ADDRESS.name))
+            },
+            manufacturer="Renson",
+            model=api.get_field_value(coordinator.data, DEVICE_NAME_FIELD.name),
+            name="Ventilation",
+            sw_version=api.get_field_value(
+                coordinator.data, FIRMWARE_VERSION_FIELD.name
+            ),
+            hw_version=api.get_field_value(
+                coordinator.data, HARDWARE_VERSION_FIELD.name
+            ),
+        )
+
+        self.api = api
+
+        self._attr_unique_id = (
+            api.get_field_value(coordinator.data, MAC_ADDRESS.name) + f"{name}"
+        )
diff --git a/homeassistant/components/renson/manifest.json b/homeassistant/components/renson/manifest.json
new file mode 100644
index 00000000000..5ff219cc26c
--- /dev/null
+++ b/homeassistant/components/renson/manifest.json
@@ -0,0 +1,9 @@
+{
+  "domain": "renson",
+  "name": "Renson",
+  "codeowners": ["@jimmyd-be"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/renson",
+  "iot_class": "local_polling",
+  "requirements": ["renson-endura-delta==1.5.0"]
+}
diff --git a/homeassistant/components/renson/sensor.py b/homeassistant/components/renson/sensor.py
new file mode 100644
index 00000000000..9817951b094
--- /dev/null
+++ b/homeassistant/components/renson/sensor.py
@@ -0,0 +1,314 @@
+"""Sensor data of the Renson ventilation unit."""
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from renson_endura_delta.field_enum import (
+    AIR_QUALITY_FIELD,
+    BREEZE_LEVEL_FIELD,
+    BREEZE_TEMPERATURE_FIELD,
+    BYPASS_LEVEL_FIELD,
+    BYPASS_TEMPERATURE_FIELD,
+    CO2_FIELD,
+    CO2_HYSTERESIS_FIELD,
+    CO2_QUALITY_FIELD,
+    CO2_THRESHOLD_FIELD,
+    CURRENT_AIRFLOW_EXTRACT_FIELD,
+    CURRENT_AIRFLOW_INGOING_FIELD,
+    CURRENT_LEVEL_FIELD,
+    DAY_POLLUTION_FIELD,
+    DAYTIME_FIELD,
+    FILTER_REMAIN_FIELD,
+    HUMIDITY_FIELD,
+    INDOOR_TEMP_FIELD,
+    MANUAL_LEVEL_FIELD,
+    NIGHT_POLLUTION_FIELD,
+    NIGHTTIME_FIELD,
+    OUTDOOR_TEMP_FIELD,
+    FieldEnum,
+)
+from renson_endura_delta.renson import RensonVentilation
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    CONCENTRATION_PARTS_PER_MILLION,
+    PERCENTAGE,
+    UnitOfTemperature,
+    UnitOfTime,
+    UnitOfVolumeFlowRate,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from . import RensonCoordinator, RensonData
+from .const import DOMAIN
+from .entity import RensonEntity
+
+
+@dataclass
+class RensonSensorEntityDescriptionMixin:
+    """Mixin for required keys."""
+
+    field: FieldEnum
+    raw_format: bool
+
+
+@dataclass
+class RensonSensorEntityDescription(
+    SensorEntityDescription, RensonSensorEntityDescriptionMixin
+):
+    """Description of sensor."""
+
+
+SENSORS: tuple[RensonSensorEntityDescription, ...] = (
+    RensonSensorEntityDescription(
+        key="CO2_QUALITY_FIELD",
+        name="CO2 quality category",
+        field=CO2_QUALITY_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=["good", "bad", "poor"],
+    ),
+    RensonSensorEntityDescription(
+        key="AIR_QUALITY_FIELD",
+        name="Air quality category",
+        field=AIR_QUALITY_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=["good", "bad", "poor"],
+    ),
+    RensonSensorEntityDescription(
+        key="CO2_FIELD",
+        name="CO2 quality",
+        field=CO2_FIELD,
+        raw_format=True,
+        state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.CO2,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+    ),
+    RensonSensorEntityDescription(
+        key="AIR_FIELD",
+        name="Air quality",
+        field=AIR_QUALITY_FIELD,
+        state_class=SensorStateClass.MEASUREMENT,
+        raw_format=True,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+    ),
+    RensonSensorEntityDescription(
+        key="CURRENT_LEVEL_FIELD",
+        name="Ventilation level",
+        field=CURRENT_LEVEL_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=["Off", "Level1", "Level2", "Level3", "Level4", "Breeze", "Holiday"],
+    ),
+    RensonSensorEntityDescription(
+        key="CURRENT_AIRFLOW_EXTRACT_FIELD",
+        name="Total airflow out",
+        field=CURRENT_AIRFLOW_EXTRACT_FIELD,
+        raw_format=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR,
+    ),
+    RensonSensorEntityDescription(
+        key="CURRENT_AIRFLOW_INGOING_FIELD",
+        name="Total airflow in",
+        field=CURRENT_AIRFLOW_INGOING_FIELD,
+        raw_format=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR,
+    ),
+    RensonSensorEntityDescription(
+        key="OUTDOOR_TEMP_FIELD",
+        name="Outdoor air temperature",
+        field=OUTDOOR_TEMP_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+    ),
+    RensonSensorEntityDescription(
+        key="INDOOR_TEMP_FIELD",
+        name="Extract air temperature",
+        field=INDOOR_TEMP_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+    ),
+    RensonSensorEntityDescription(
+        key="FILTER_REMAIN_FIELD",
+        name="Filter change",
+        field=FILTER_REMAIN_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.DURATION,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfTime.DAYS,
+    ),
+    RensonSensorEntityDescription(
+        key="HUMIDITY_FIELD",
+        name="Relative humidity",
+        field=HUMIDITY_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.HUMIDITY,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=PERCENTAGE,
+    ),
+    RensonSensorEntityDescription(
+        key="MANUAL_LEVEL_FIELD",
+        name="Manual level",
+        field=MANUAL_LEVEL_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=["Off", "Level1", "Level2", "Level3", "Level4", "Breeze", "Holiday"],
+    ),
+    RensonSensorEntityDescription(
+        key="BREEZE_TEMPERATURE_FIELD",
+        name="Breeze temperature",
+        field=BREEZE_TEMPERATURE_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        entity_registry_enabled_default=False,
+    ),
+    RensonSensorEntityDescription(
+        key="BREEZE_LEVEL_FIELD",
+        name="Breeze level",
+        field=BREEZE_LEVEL_FIELD,
+        raw_format=False,
+        entity_registry_enabled_default=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=["Off", "Level1", "Level2", "Level3", "Level4", "Breeze"],
+    ),
+    RensonSensorEntityDescription(
+        key="DAYTIME_FIELD",
+        name="Start day time",
+        field=DAYTIME_FIELD,
+        raw_format=False,
+        entity_registry_enabled_default=False,
+    ),
+    RensonSensorEntityDescription(
+        key="NIGHTTIME_FIELD",
+        name="Start night time",
+        field=NIGHTTIME_FIELD,
+        raw_format=False,
+        entity_registry_enabled_default=False,
+    ),
+    RensonSensorEntityDescription(
+        key="DAY_POLLUTION_FIELD",
+        name="Day pollution level",
+        field=DAY_POLLUTION_FIELD,
+        raw_format=False,
+        entity_registry_enabled_default=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=[
+            "Level1",
+            "Level2",
+            "Level3",
+            "Level4",
+        ],
+    ),
+    RensonSensorEntityDescription(
+        key="NIGHT_POLLUTION_FIELD",
+        name="Night pollution level",
+        field=NIGHT_POLLUTION_FIELD,
+        raw_format=False,
+        entity_registry_enabled_default=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=[
+            "Level1",
+            "Level2",
+            "Level3",
+            "Level4",
+        ],
+    ),
+    RensonSensorEntityDescription(
+        key="CO2_THRESHOLD_FIELD",
+        name="CO2 threshold",
+        field=CO2_THRESHOLD_FIELD,
+        raw_format=False,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        entity_registry_enabled_default=False,
+    ),
+    RensonSensorEntityDescription(
+        key="CO2_HYSTERESIS_FIELD",
+        name="CO2 hysteresis",
+        field=CO2_HYSTERESIS_FIELD,
+        raw_format=False,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        entity_registry_enabled_default=False,
+    ),
+    RensonSensorEntityDescription(
+        key="BYPASS_TEMPERATURE_FIELD",
+        name="Bypass activation temperature",
+        field=BYPASS_TEMPERATURE_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+    ),
+    RensonSensorEntityDescription(
+        key="BYPASS_LEVEL_FIELD",
+        name="Bypass level",
+        field=BYPASS_LEVEL_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.POWER_FACTOR,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=PERCENTAGE,
+    ),
+)
+
+
+class RensonSensor(RensonEntity, SensorEntity):
+    """Get a sensor data from the Renson API and store it in the state of the class."""
+
+    def __init__(
+        self,
+        description: RensonSensorEntityDescription,
+        api: RensonVentilation,
+        coordinator: RensonCoordinator,
+    ) -> None:
+        """Initialize class."""
+        super().__init__(description.key, api, coordinator)
+
+        self.field = description.field
+        self.entity_description = description
+
+        self.data_type = description.field.field_type
+        self.raw_format = description.raw_format
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        all_data = self.coordinator.data
+
+        value = self.api.get_field_value(all_data, self.field.name)
+
+        if self.raw_format:
+            self._attr_native_value = value
+        else:
+            self._attr_native_value = self.api.parse_value(value, self.data_type)
+
+        self.async_write_ha_state()
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the Renson sensor platform."""
+
+    data: RensonData = hass.data[DOMAIN][config_entry.entry_id]
+
+    entities = [
+        RensonSensor(description, data.api, data.coordinator) for description in SENSORS
+    ]
+
+    async_add_entities(entities)
diff --git a/homeassistant/components/renson/strings.json b/homeassistant/components/renson/strings.json
new file mode 100644
index 00000000000..16c5de158a9
--- /dev/null
+++ b/homeassistant/components/renson/strings.json
@@ -0,0 +1,15 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    }
+  }
+}
diff --git a/homeassistant/components/reolink/__init__.py b/homeassistant/components/reolink/__init__.py
index a5050d3c436..923df261d84 100644
--- a/homeassistant/components/reolink/__init__.py
+++ b/homeassistant/components/reolink/__init__.py
@@ -8,7 +8,6 @@ from datetime import timedelta
 import logging
 from typing import Literal
 
-from aiohttp import ClientConnectorError
 import async_timeout
 from reolink_aio.exceptions import CredentialsInvalidError, ReolinkError
 
@@ -58,8 +57,6 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         await host.stop()
         raise ConfigEntryAuthFailed(err) from err
     except (
-        ClientConnectorError,
-        asyncio.TimeoutError,
         ReolinkException,
         ReolinkError,
     ) as err:
diff --git a/homeassistant/components/reolink/config_flow.py b/homeassistant/components/reolink/config_flow.py
index df5bf968ae1..75ad26665c3 100644
--- a/homeassistant/components/reolink/config_flow.py
+++ b/homeassistant/components/reolink/config_flow.py
@@ -79,6 +79,10 @@ class ReolinkFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         self._username = entry_data[CONF_USERNAME]
         self._password = entry_data[CONF_PASSWORD]
         self._reauth = True
+        self.context["title_placeholders"]["ip_address"] = entry_data[CONF_HOST]
+        self.context["title_placeholders"]["hostname"] = self.context[
+            "title_placeholders"
+        ]["name"]
         return await self.async_step_reauth_confirm()
 
     async def async_step_reauth_confirm(
diff --git a/homeassistant/components/reolink/host.py b/homeassistant/components/reolink/host.py
index c57f7b1e77e..81fbda63fef 100644
--- a/homeassistant/components/reolink/host.py
+++ b/homeassistant/components/reolink/host.py
@@ -9,6 +9,7 @@ from typing import Any
 import aiohttp
 from aiohttp.web import Request
 from reolink_aio.api import Host
+from reolink_aio.enums import SubType
 from reolink_aio.exceptions import ReolinkError, SubscriptionError
 
 from homeassistant.components import webhook
@@ -24,9 +25,11 @@ from .const import CONF_PROTOCOL, CONF_USE_HTTPS, DOMAIN
 from .exceptions import ReolinkSetupException, ReolinkWebhookException, UserNotAdmin
 
 DEFAULT_TIMEOUT = 60
-FIRST_ONVIF_TIMEOUT = 15
+FIRST_ONVIF_TIMEOUT = 10
 SUBSCRIPTION_RENEW_THRESHOLD = 300
 POLL_INTERVAL_NO_PUSH = 5
+LONG_POLL_COOLDOWN = 0.75
+LONG_POLL_ERROR_COOLDOWN = 30
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -59,10 +62,14 @@ class ReolinkHost:
         self.webhook_id: str | None = None
         self._base_url: str = ""
         self._webhook_url: str = ""
-        self._webhook_reachable: asyncio.Event = asyncio.Event()
+        self._webhook_reachable: bool = False
+        self._long_poll_received: bool = False
+        self._long_poll_error: bool = False
         self._cancel_poll: CALLBACK_TYPE | None = None
         self._cancel_onvif_check: CALLBACK_TYPE | None = None
+        self._cancel_long_poll_check: CALLBACK_TYPE | None = None
         self._poll_job = HassJob(self._async_poll_all_motion, cancel_on_shutdown=True)
+        self._long_poll_task: asyncio.Task | None = None
         self._lost_subscription: bool = False
 
     @property
@@ -184,15 +191,32 @@ class ReolinkHost:
 
     async def _async_check_onvif(self, *_) -> None:
         """Check the ONVIF subscription."""
-        if (
-            self._api.supported(None, "initial_ONVIF_state")
-            and not self._webhook_reachable.is_set()
-        ):
+        if self._webhook_reachable:
+            ir.async_delete_issue(self._hass, DOMAIN, "webhook_url")
+            self._cancel_onvif_check = None
+            return
+        if self._api.supported(None, "initial_ONVIF_state"):
             _LOGGER.debug(
                 "Did not receive initial ONVIF state on webhook '%s' after %i seconds",
                 self._webhook_url,
                 FIRST_ONVIF_TIMEOUT,
             )
+
+        # ONVIF push is not received, start long polling and schedule check
+        await self._async_start_long_polling()
+        self._cancel_long_poll_check = async_call_later(
+            self._hass, FIRST_ONVIF_TIMEOUT, self._async_check_onvif_long_poll
+        )
+
+        self._cancel_onvif_check = None
+
+    async def _async_check_onvif_long_poll(self, *_) -> None:
+        """Check if ONVIF long polling is working."""
+        if not self._long_poll_received:
+            _LOGGER.debug(
+                "Did not receive state through ONVIF long polling after %i seconds",
+                FIRST_ONVIF_TIMEOUT,
+            )
             ir.async_create_issue(
                 self._hass,
                 DOMAIN,
@@ -209,10 +233,10 @@ class ReolinkHost:
         else:
             ir.async_delete_issue(self._hass, DOMAIN, "webhook_url")
 
-        # If no ONVIF push is received, start fast polling
+        # If no ONVIF push or long polling state is received, start fast polling
         await self._async_poll_all_motion()
 
-        self._cancel_onvif_check = None
+        self._cancel_long_poll_check = None
 
     async def update_states(self) -> None:
         """Call the API of the camera device to update the internal states."""
@@ -222,11 +246,7 @@ class ReolinkHost:
         """Disconnect from the API, so the connection will be released."""
         try:
             await self._api.unsubscribe()
-        except (
-            aiohttp.ClientConnectorError,
-            asyncio.TimeoutError,
-            ReolinkError,
-        ) as err:
+        except ReolinkError as err:
             _LOGGER.error(
                 "Reolink error while unsubscribing from host %s:%s: %s",
                 self._api.host,
@@ -236,11 +256,7 @@ class ReolinkHost:
 
         try:
             await self._api.logout()
-        except (
-            aiohttp.ClientConnectorError,
-            asyncio.TimeoutError,
-            ReolinkError,
-        ) as err:
+        except ReolinkError as err:
             _LOGGER.error(
                 "Reolink error while logging out for host %s:%s: %s",
                 self._api.host,
@@ -248,6 +264,20 @@ class ReolinkHost:
                 str(err),
             )
 
+    async def _async_start_long_polling(self):
+        """Start ONVIF long polling task."""
+        if self._long_poll_task is None:
+            await self._api.subscribe(sub_type=SubType.long_poll)
+            self._long_poll_task = asyncio.create_task(self._async_long_polling())
+
+    async def _async_stop_long_polling(self):
+        """Stop ONVIF long polling task."""
+        if self._long_poll_task is not None:
+            self._long_poll_task.cancel()
+            self._long_poll_task = None
+
+        await self._api.unsubscribe(sub_type=SubType.long_poll)
+
     async def stop(self, event=None):
         """Disconnect the API."""
         if self._cancel_poll is not None:
@@ -256,6 +286,10 @@ class ReolinkHost:
         if self._cancel_onvif_check is not None:
             self._cancel_onvif_check()
             self._cancel_onvif_check = None
+        if self._cancel_long_poll_check is not None:
+            self._cancel_long_poll_check()
+            self._cancel_long_poll_check = None
+        await self._async_stop_long_polling()
         self.unregister_webhook()
         await self.disconnect()
 
@@ -264,7 +298,7 @@ class ReolinkHost:
         if self.webhook_id is None:
             self.register_webhook()
 
-        if self._api.subscribed:
+        if self._api.subscribed(SubType.push):
             _LOGGER.debug(
                 "Host %s: is already subscribed to webhook %s",
                 self._api.host,
@@ -283,7 +317,9 @@ class ReolinkHost:
     async def renew(self) -> None:
         """Renew the subscription of motion events (lease time is 15 minutes)."""
         try:
-            await self._renew()
+            await self._renew(SubType.push)
+            if self._long_poll_task is not None:
+                await self._renew(SubType.long_poll)
         except SubscriptionError as err:
             if not self._lost_subscription:
                 self._lost_subscription = True
@@ -295,22 +331,27 @@ class ReolinkHost:
         else:
             self._lost_subscription = False
 
-    async def _renew(self) -> None:
+    async def _renew(self, sub_type: SubType) -> None:
         """Execute the renew of the subscription."""
-        if not self._api.subscribed:
+        if not self._api.subscribed(sub_type):
             _LOGGER.debug(
-                "Host %s: requested to renew a non-existing Reolink subscription, "
+                "Host %s: requested to renew a non-existing Reolink %s subscription, "
                 "trying to subscribe from scratch",
                 self._api.host,
+                sub_type,
             )
-            await self.subscribe()
+            if sub_type == SubType.push:
+                await self.subscribe()
+            else:
+                await self._api.subscribe(self._webhook_url, sub_type)
             return
 
-        timer = self._api.renewtimer
+        timer = self._api.renewtimer(sub_type)
         _LOGGER.debug(
-            "Host %s:%s should renew subscription in: %i seconds",
+            "Host %s:%s should renew %s subscription in: %i seconds",
             self._api.host,
             self._api.port,
+            sub_type,
             timer,
         )
         if timer > SUBSCRIPTION_RENEW_THRESHOLD:
@@ -318,25 +359,29 @@ class ReolinkHost:
 
         if timer > 0:
             try:
-                await self._api.renew()
+                await self._api.renew(sub_type)
             except SubscriptionError as err:
                 _LOGGER.debug(
-                    "Host %s: error renewing Reolink subscription, "
+                    "Host %s: error renewing Reolink %s subscription, "
                     "trying to subscribe again: %s",
                     self._api.host,
+                    sub_type,
                     err,
                 )
             else:
                 _LOGGER.debug(
-                    "Host %s successfully renewed Reolink subscription", self._api.host
+                    "Host %s successfully renewed Reolink %s subscription",
+                    self._api.host,
+                    sub_type,
                 )
                 return
 
-        await self._api.subscribe(self._webhook_url)
+        await self._api.subscribe(self._webhook_url, sub_type)
 
         _LOGGER.debug(
-            "Host %s: Reolink re-subscription successful after it was expired",
+            "Host %s: Reolink %s re-subscription successful after it was expired",
             self._api.host,
+            sub_type,
         )
 
     def register_webhook(self) -> None:
@@ -387,31 +432,56 @@ class ReolinkHost:
         webhook.async_unregister(self._hass, self.webhook_id)
         self.webhook_id = None
 
+    async def _async_long_polling(self, *_) -> None:
+        """Use ONVIF long polling to immediately receive events."""
+        # This task will be cancelled once _async_stop_long_polling is called
+        while True:
+            if self._webhook_reachable:
+                self._long_poll_task = None
+                await self._async_stop_long_polling()
+                return
+
+            try:
+                channels = await self._api.pull_point_request()
+            except ReolinkError as ex:
+                if not self._long_poll_error:
+                    _LOGGER.error("Error while requesting ONVIF pull point: %s", ex)
+                    await self._api.unsubscribe(sub_type=SubType.long_poll)
+                self._long_poll_error = True
+                await asyncio.sleep(LONG_POLL_ERROR_COOLDOWN)
+                continue
+            except Exception as ex:
+                _LOGGER.exception("Error while requesting ONVIF pull point: %s", ex)
+                await self._api.unsubscribe(sub_type=SubType.long_poll)
+                raise ex
+
+            self._long_poll_error = False
+
+            if not self._long_poll_received and channels != []:
+                self._long_poll_received = True
+                ir.async_delete_issue(self._hass, DOMAIN, "webhook_url")
+
+            self._signal_write_ha_state(channels)
+
+            # Cooldown to prevent CPU over usage on camera freezes
+            await asyncio.sleep(LONG_POLL_COOLDOWN)
+
     async def _async_poll_all_motion(self, *_) -> None:
         """Poll motion and AI states until the first ONVIF push is received."""
-        if self._webhook_reachable.is_set():
-            # ONVIF push is working, stop polling
+        if self._webhook_reachable or self._long_poll_received:
+            # ONVIF push or long polling is working, stop fast polling
             self._cancel_poll = None
             return
 
         try:
             await self._api.get_motion_state_all_ch()
-        except (
-            aiohttp.ClientConnectorError,
-            ReolinkError,
-        ) as err:
+        except ReolinkError as err:
             _LOGGER.error(
                 "Reolink error while polling motion state for host %s:%s: %s",
                 self._api.host,
                 self._api.port,
                 str(err),
             )
-        except asyncio.TimeoutError:
-            _LOGGER.error(
-                "Reolink timeout error while polling motion state for host %s:%s",
-                self._api.host,
-                self._api.port,
-            )
         finally:
             # schedule next poll
             if not self._hass.is_stopping:
@@ -419,10 +489,7 @@ class ReolinkHost:
                     self._hass, POLL_INTERVAL_NO_PUSH, self._poll_job
                 )
 
-        # After receiving the new motion states in the upstream lib,
-        # update the binary sensors with async_write_ha_state
-        # The same dispatch as for the webhook can be used
-        async_dispatcher_send(self._hass, f"{self.webhook_id}_all", {})
+        self._signal_write_ha_state(None)
 
     async def handle_webhook(
         self, hass: HomeAssistant, webhook_id: str, request: Request
@@ -470,8 +537,8 @@ class ReolinkHost:
         """Process the data from the Reolink webhook."""
         # This task is executed in the background so we need to catch exceptions
         # and log them
-        if not self._webhook_reachable.is_set():
-            self._webhook_reachable.set()
+        if not self._webhook_reachable:
+            self._webhook_reachable = True
             ir.async_delete_issue(self._hass, DOMAIN, "webhook_url")
 
         try:
@@ -494,9 +561,13 @@ class ReolinkHost:
             )
             return
 
+        self._signal_write_ha_state(channels)
+
+    def _signal_write_ha_state(self, channels: list[int] | None) -> None:
+        """Update the binary sensors with async_write_ha_state."""
         if channels is None:
-            async_dispatcher_send(hass, f"{webhook_id}_all", {})
+            async_dispatcher_send(self._hass, f"{self.webhook_id}_all", {})
             return
 
         for channel in channels:
-            async_dispatcher_send(hass, f"{webhook_id}_{channel}", {})
+            async_dispatcher_send(self._hass, f"{self.webhook_id}_{channel}", {})
diff --git a/homeassistant/components/reolink/manifest.json b/homeassistant/components/reolink/manifest.json
index 413c106b53e..69b3d5db6f7 100644
--- a/homeassistant/components/reolink/manifest.json
+++ b/homeassistant/components/reolink/manifest.json
@@ -18,5 +18,5 @@
   "documentation": "https://www.home-assistant.io/integrations/reolink",
   "iot_class": "local_push",
   "loggers": ["reolink_aio"],
-  "requirements": ["reolink-aio==0.5.16"]
+  "requirements": ["reolink-aio==0.7.1"]
 }
diff --git a/homeassistant/components/reolink/switch.py b/homeassistant/components/reolink/switch.py
index 1a4deda17e3..aa121911758 100644
--- a/homeassistant/components/reolink/switch.py
+++ b/homeassistant/components/reolink/switch.py
@@ -98,6 +98,50 @@ SWITCH_ENTITIES = (
         value=lambda api, ch: api.ptz_guard_enabled(ch),
         method=lambda api, ch, value: api.set_ptz_guard(ch, enable=value),
     ),
+    ReolinkSwitchEntityDescription(
+        key="email",
+        name="Email on event",
+        icon="mdi:email",
+        entity_category=EntityCategory.CONFIG,
+        supported=lambda api, ch: api.supported(ch, "email") and api.is_nvr,
+        value=lambda api, ch: api.email_enabled(ch),
+        method=lambda api, ch, value: api.set_email(ch, value),
+    ),
+    ReolinkSwitchEntityDescription(
+        key="ftp_upload",
+        name="FTP upload",
+        icon="mdi:swap-horizontal",
+        entity_category=EntityCategory.CONFIG,
+        supported=lambda api, ch: api.supported(ch, "ftp") and api.is_nvr,
+        value=lambda api, ch: api.ftp_enabled(ch),
+        method=lambda api, ch, value: api.set_ftp(ch, value),
+    ),
+    ReolinkSwitchEntityDescription(
+        key="push_notifications",
+        name="Push notifications",
+        icon="mdi:message-badge",
+        entity_category=EntityCategory.CONFIG,
+        supported=lambda api, ch: api.supported(ch, "push") and api.is_nvr,
+        value=lambda api, ch: api.push_enabled(ch),
+        method=lambda api, ch, value: api.set_push(ch, value),
+    ),
+    ReolinkSwitchEntityDescription(
+        key="record",
+        name="Record",
+        icon="mdi:record-rec",
+        supported=lambda api, ch: api.supported(ch, "recording") and api.is_nvr,
+        value=lambda api, ch: api.recording_enabled(ch),
+        method=lambda api, ch, value: api.set_recording(ch, value),
+    ),
+    ReolinkSwitchEntityDescription(
+        key="buzzer",
+        name="Buzzer on event",
+        icon="mdi:room-service",
+        entity_category=EntityCategory.CONFIG,
+        supported=lambda api, ch: api.supported(ch, "buzzer") and api.is_nvr,
+        value=lambda api, ch: api.buzzer_enabled(ch),
+        method=lambda api, ch, value: api.set_buzzer(ch, value),
+    ),
     ReolinkSwitchEntityDescription(
         key="doorbell_button_sound",
         name="Doorbell button sound",
diff --git a/homeassistant/components/reolink/update.py b/homeassistant/components/reolink/update.py
index aeb44cb7740..fbbb037080b 100644
--- a/homeassistant/components/reolink/update.py
+++ b/homeassistant/components/reolink/update.py
@@ -5,6 +5,7 @@ import logging
 from typing import Any, Literal
 
 from reolink_aio.exceptions import ReolinkError
+from reolink_aio.software_version import NewSoftwareVersion
 
 from homeassistant.components.update import (
     UpdateDeviceClass,
@@ -30,8 +31,7 @@ async def async_setup_entry(
 ) -> None:
     """Set up update entities for Reolink component."""
     reolink_data: ReolinkData = hass.data[DOMAIN][config_entry.entry_id]
-    if reolink_data.host.api.supported(None, "update"):
-        async_add_entities([ReolinkUpdateEntity(reolink_data)])
+    async_add_entities([ReolinkUpdateEntity(reolink_data)])
 
 
 class ReolinkUpdateEntity(
@@ -40,7 +40,6 @@ class ReolinkUpdateEntity(
     """Update entity for a Netgear device."""
 
     _attr_device_class = UpdateDeviceClass.FIRMWARE
-    _attr_supported_features = UpdateEntityFeature.INSTALL
     _attr_release_url = "https://reolink.com/download-center/"
     _attr_name = "Update"
 
@@ -64,7 +63,30 @@ class ReolinkUpdateEntity(
         if not self.coordinator.data:
             return self.installed_version
 
-        return self.coordinator.data
+        if isinstance(self.coordinator.data, str):
+            return self.coordinator.data
+
+        return self.coordinator.data.version_string
+
+    @property
+    def supported_features(self) -> UpdateEntityFeature:
+        """Flag supported features."""
+        supported_features = UpdateEntityFeature.INSTALL
+        if isinstance(self.coordinator.data, NewSoftwareVersion):
+            supported_features |= UpdateEntityFeature.RELEASE_NOTES
+        return supported_features
+
+    async def async_release_notes(self) -> str | None:
+        """Return the release notes."""
+        if not isinstance(self.coordinator.data, NewSoftwareVersion):
+            return None
+
+        return (
+            "If the install button fails, download this"
+            f" [firmware zip file]({self.coordinator.data.download_url})."
+            " Then, follow the installation guide (PDF in the zip file).\n\n"
+            f"## Release notes\n\n{self.coordinator.data.release_notes}"
+        )
 
     async def async_install(
         self, version: str | None, backup: bool, **kwargs: Any
diff --git a/homeassistant/components/repetier/sensor.py b/homeassistant/components/repetier/sensor.py
index 24c97c74b0f..784555e6c73 100644
--- a/homeassistant/components/repetier/sensor.py
+++ b/homeassistant/components/repetier/sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.helpers.typing import UNDEFINED, ConfigType, DiscoveryInfoType
 
 from . import REPETIER_API, SENSOR_TYPES, UPDATE_SIGNAL, RepetierSensorEntityDescription
 
@@ -45,7 +45,8 @@ def setup_platform(
         sensor_type = info["sensor_type"]
         temp_id = info["temp_id"]
         description = SENSOR_TYPES[sensor_type]
-        name = f"{info['name']}{description.name or ''}"
+        name_suffix = "" if description.name is UNDEFINED else description.name
+        name = f"{info['name']}{name_suffix}"
         if temp_id is not None:
             _LOGGER.debug("%s Temp_id: %s", sensor_type, temp_id)
             name = f"{name}{temp_id}"
diff --git a/homeassistant/components/rest/__init__.py b/homeassistant/components/rest/__init__.py
index b249b7536b5..ee79c45921c 100644
--- a/homeassistant/components/rest/__init__.py
+++ b/homeassistant/components/rest/__init__.py
@@ -6,7 +6,7 @@ from collections.abc import Coroutine
 import contextlib
 from datetime import timedelta
 import logging
-from typing import Any, cast
+from typing import Any
 
 import httpx
 import voluptuous as vol
@@ -160,11 +160,7 @@ def _rest_coordinator(
     if resource_template:
 
         async def _async_refresh_with_resource_template() -> None:
-            rest.set_url(
-                cast(template.Template, resource_template).async_render(
-                    parse_result=False
-                )
-            )
+            rest.set_url(resource_template.async_render(parse_result=False))
             await rest.async_update()
 
         update_method = _async_refresh_with_resource_template
diff --git a/homeassistant/components/rest/const.py b/homeassistant/components/rest/const.py
index 0bf0ea9743d..8fb08f766fa 100644
--- a/homeassistant/components/rest/const.py
+++ b/homeassistant/components/rest/const.py
@@ -26,3 +26,10 @@ REST = "rest"
 REST_DATA = "rest_data"
 
 METHODS = ["POST", "GET"]
+
+XML_MIME_TYPES = (
+    "application/rss+xml",
+    "application/xhtml+xml",
+    "application/xml",
+    "text/xml",
+)
diff --git a/homeassistant/components/rest/data.py b/homeassistant/components/rest/data.py
index 95086f68d70..1f331651165 100644
--- a/homeassistant/components/rest/data.py
+++ b/homeassistant/components/rest/data.py
@@ -3,14 +3,19 @@ from __future__ import annotations
 
 import logging
 import ssl
+from xml.parsers.expat import ExpatError
 
 import httpx
+import xmltodict
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import template
 from homeassistant.helpers.httpx_client import create_async_httpx_client
+from homeassistant.helpers.json import json_dumps
 from homeassistant.util.ssl import SSLCipherList
 
+from .const import XML_MIME_TYPES
+
 DEFAULT_TIMEOUT = 10
 
 _LOGGER = logging.getLogger(__name__)
@@ -59,6 +64,26 @@ class RestData:
         """Set url."""
         self._resource = url
 
+    def data_without_xml(self) -> str | None:
+        """If the data is an XML string, convert it to a JSON string."""
+        _LOGGER.debug("Data fetched from resource: %s", self.data)
+        if (
+            (value := self.data) is not None
+            # If the http request failed, headers will be None
+            and (headers := self.headers) is not None
+            and (content_type := headers.get("content-type"))
+            and content_type.startswith(XML_MIME_TYPES)
+        ):
+            try:
+                value = json_dumps(xmltodict.parse(value))
+            except ExpatError:
+                _LOGGER.warning(
+                    "REST xml result could not be parsed and converted to JSON"
+                )
+            else:
+                _LOGGER.debug("JSON converted from XML: %s", self.data)
+        return value
+
     async def async_update(self, log_errors: bool = True) -> None:
         """Get the latest data from REST service with provided method."""
         if not self._async_client:
diff --git a/homeassistant/components/rest/sensor.py b/homeassistant/components/rest/sensor.py
index 6fc0b69d1fd..18d0b6c7e76 100644
--- a/homeassistant/components/rest/sensor.py
+++ b/homeassistant/components/rest/sensor.py
@@ -3,11 +3,9 @@ from __future__ import annotations
 
 import logging
 import ssl
-from xml.parsers.expat import ExpatError
 
 from jsonpath import jsonpath
 import voluptuous as vol
-import xmltodict
 
 from homeassistant.components.sensor import (
     DOMAIN as SENSOR_DOMAIN,
@@ -26,7 +24,6 @@ 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.json import json_dumps
 from homeassistant.helpers.template_entity import TemplateSensor
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -127,26 +124,7 @@ class RestSensor(RestEntity, TemplateSensor):
 
     def _update_from_rest_data(self) -> None:
         """Update state from the rest data."""
-        value = self.rest.data
-        _LOGGER.debug("Data fetched from resource: %s", value)
-        if self.rest.headers is not None:
-            # If the http request failed, headers will be None
-            content_type = self.rest.headers.get("content-type")
-
-            if content_type and (
-                content_type.startswith("text/xml")
-                or content_type.startswith("application/xml")
-                or content_type.startswith("application/xhtml+xml")
-                or content_type.startswith("application/rss+xml")
-            ):
-                try:
-                    value = json_dumps(xmltodict.parse(value))
-                    _LOGGER.debug("JSON converted from XML: %s", value)
-                except ExpatError:
-                    _LOGGER.warning(
-                        "REST xml result could not be parsed and converted to JSON"
-                    )
-                    _LOGGER.debug("Erroneous XML: %s", value)
+        value = self.rest.data_without_xml()
 
         if self._json_attrs:
             self._attr_extra_state_attributes = {}
diff --git a/homeassistant/components/rest/switch.py b/homeassistant/components/rest/switch.py
index 89b6529d483..342808f3250 100644
--- a/homeassistant/components/rest/switch.py
+++ b/homeassistant/components/rest/switch.py
@@ -232,12 +232,11 @@ class RestSwitch(TemplateEntity, SwitchEntity):
                 self._attr_is_on = False
             else:
                 self._attr_is_on = None
+        elif text == self._body_on.template:
+            self._attr_is_on = True
+        elif text == self._body_off.template:
+            self._attr_is_on = False
         else:
-            if text == self._body_on.template:
-                self._attr_is_on = True
-            elif text == self._body_off.template:
-                self._attr_is_on = False
-            else:
-                self._attr_is_on = None
+            self._attr_is_on = None
 
         return req
diff --git a/homeassistant/components/rflink/__init__.py b/homeassistant/components/rflink/__init__.py
index b563275297f..8df2d7ec343 100644
--- a/homeassistant/components/rflink/__init__.py
+++ b/homeassistant/components/rflink/__init__.py
@@ -323,7 +323,6 @@ class RflinkDevice(Entity):
     Contains the common logic for Rflink entities.
     """
 
-    platform = None
     _state: bool | None = None
     _available = True
     _attr_should_poll = False
diff --git a/homeassistant/components/rfxtrx/__init__.py b/homeassistant/components/rfxtrx/__init__.py
index de8a9fc6b8d..3544abcfdd1 100644
--- a/homeassistant/components/rfxtrx/__init__.py
+++ b/homeassistant/components/rfxtrx/__init__.py
@@ -8,8 +8,8 @@ import copy
 import logging
 from typing import Any, NamedTuple, cast
 
-import RFXtrx as rfxtrxmod
 import async_timeout
+import RFXtrx as rfxtrxmod
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
@@ -548,6 +548,8 @@ class RfxtrxCommandEntity(RfxtrxEntity):
     Contains the common logic for Rfxtrx lights and switches.
     """
 
+    _attr_name = None
+
     def __init__(
         self,
         device: rfxtrxmod.RFXtrxDevice,
diff --git a/homeassistant/components/rfxtrx/binary_sensor.py b/homeassistant/components/rfxtrx/binary_sensor.py
index b729138f73e..03cf65a49ff 100644
--- a/homeassistant/components/rfxtrx/binary_sensor.py
+++ b/homeassistant/components/rfxtrx/binary_sensor.py
@@ -130,6 +130,7 @@ class RfxtrxBinarySensor(RfxtrxEntity, BinarySensorEntity):
     """
 
     _attr_force_update = True
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/rfxtrx/config_flow.py b/homeassistant/components/rfxtrx/config_flow.py
index 2e054ce4724..8d55208cbb7 100644
--- a/homeassistant/components/rfxtrx/config_flow.py
+++ b/homeassistant/components/rfxtrx/config_flow.py
@@ -8,8 +8,8 @@ import itertools
 import os
 from typing import Any, TypedDict, cast
 
-import RFXtrx as rfxtrxmod
 from async_timeout import timeout
+import RFXtrx as rfxtrxmod
 import serial
 import serial.tools.list_ports
 import voluptuous as vol
diff --git a/homeassistant/components/ridwell/calendar.py b/homeassistant/components/ridwell/calendar.py
index 57919ed1feb..3ef3bbdc5ae 100644
--- a/homeassistant/components/ridwell/calendar.py
+++ b/homeassistant/components/ridwell/calendar.py
@@ -50,6 +50,7 @@ class RidwellCalendar(RidwellEntity, CalendarEntity):
     """Define a Ridwell calendar."""
 
     _attr_icon = "mdi:delete-empty"
+    _attr_name = None
 
     def __init__(
         self, coordinator: RidwellDataUpdateCoordinator, account: RidwellAccount
diff --git a/homeassistant/components/ring/__init__.py b/homeassistant/components/ring/__init__.py
index fb037eca05d..56aad1a845b 100644
--- a/homeassistant/components/ring/__init__.py
+++ b/homeassistant/components/ring/__init__.py
@@ -6,7 +6,6 @@ from collections.abc import Callable
 from datetime import timedelta
 from functools import partial
 import logging
-from pathlib import Path
 from typing import Any
 
 from oauthlib.oauth2 import AccessDeniedError
@@ -18,7 +17,6 @@ from homeassistant.const import Platform, __version__
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.event import async_track_time_interval
-from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.async_ import run_callback_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
@@ -41,22 +39,6 @@ PLATFORMS = [
 ]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Ring component."""
-    if DOMAIN not in config:
-        return True
-
-    def legacy_cleanup():
-        """Clean up old tokens."""
-        old_cache = Path(hass.config.path(".ring_cache.pickle"))
-        if old_cache.is_file():
-            old_cache.unlink()
-
-    await hass.async_add_executor_job(legacy_cleanup)
-
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up a config entry."""
 
diff --git a/homeassistant/components/ring/manifest.json b/homeassistant/components/ring/manifest.json
index 7cb34b4d71f..355c630272e 100644
--- a/homeassistant/components/ring/manifest.json
+++ b/homeassistant/components/ring/manifest.json
@@ -13,5 +13,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ring",
   "iot_class": "cloud_polling",
   "loggers": ["ring_doorbell"],
-  "requirements": ["ring_doorbell==0.7.2"]
+  "requirements": ["ring-doorbell==0.7.2"]
 }
diff --git a/homeassistant/components/rituals_perfume_genie/binary_sensor.py b/homeassistant/components/rituals_perfume_genie/binary_sensor.py
index 19732169b86..73499fb5ccc 100644
--- a/homeassistant/components/rituals_perfume_genie/binary_sensor.py
+++ b/homeassistant/components/rituals_perfume_genie/binary_sensor.py
@@ -39,7 +39,6 @@ class RitualsBinarySensorEntityDescription(
 ENTITY_DESCRIPTIONS = (
     RitualsBinarySensorEntityDescription(
         key="charging",
-        translation_key="charging",
         device_class=BinarySensorDeviceClass.BATTERY_CHARGING,
         entity_category=EntityCategory.DIAGNOSTIC,
         is_on_fn=lambda diffuser: diffuser.charging,
diff --git a/homeassistant/components/rituals_perfume_genie/diagnostics.py b/homeassistant/components/rituals_perfume_genie/diagnostics.py
new file mode 100644
index 00000000000..75b622b48b1
--- /dev/null
+++ b/homeassistant/components/rituals_perfume_genie/diagnostics.py
@@ -0,0 +1,31 @@
+"""Diagnostics support for Rituals Perfume Genie."""
+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 RitualsDataUpdateCoordinator
+
+TO_REDACT = {
+    "hublot",
+    "hash",
+}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: ConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    coordinators: dict[str, RitualsDataUpdateCoordinator] = hass.data[DOMAIN][
+        entry.entry_id
+    ]
+    return {
+        "diffusers": [
+            async_redact_data(coordinator.diffuser.data, TO_REDACT)
+            for coordinator in coordinators.values()
+        ]
+    }
diff --git a/homeassistant/components/rituals_perfume_genie/sensor.py b/homeassistant/components/rituals_perfume_genie/sensor.py
index 944efb21536..09189dabfad 100644
--- a/homeassistant/components/rituals_perfume_genie/sensor.py
+++ b/homeassistant/components/rituals_perfume_genie/sensor.py
@@ -40,7 +40,6 @@ class RitualsSensorEntityDescription(
 ENTITY_DESCRIPTIONS = (
     RitualsSensorEntityDescription(
         key="battery_percentage",
-        translation_key="battery_percentage",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
         value_fn=lambda diffuser: diffuser.battery_percentage,
diff --git a/homeassistant/components/rituals_perfume_genie/strings.json b/homeassistant/components/rituals_perfume_genie/strings.json
index f4570dd4cfc..48e9be670ec 100644
--- a/homeassistant/components/rituals_perfume_genie/strings.json
+++ b/homeassistant/components/rituals_perfume_genie/strings.json
@@ -19,11 +19,6 @@
     }
   },
   "entity": {
-    "binary_sensor": {
-      "charging": {
-        "name": "[%key:component::binary_sensor::entity_component::battery_charging::name%]"
-      }
-    },
     "number": {
       "perfume_amount": {
         "name": "Perfume amount"
@@ -35,9 +30,6 @@
       }
     },
     "sensor": {
-      "battery_percentage": {
-        "name": "[%key:component::sensor::entity_component::battery::name%]"
-      },
       "fill": {
         "name": "Fill"
       },
diff --git a/homeassistant/components/rituals_perfume_genie/switch.py b/homeassistant/components/rituals_perfume_genie/switch.py
index a6083e51430..77776704a60 100644
--- a/homeassistant/components/rituals_perfume_genie/switch.py
+++ b/homeassistant/components/rituals_perfume_genie/switch.py
@@ -36,6 +36,7 @@ class RitualsSwitchEntityDescription(
 ENTITY_DESCRIPTIONS = (
     RitualsSwitchEntityDescription(
         key="is_on",
+        name=None,
         icon="mdi:fan",
         is_on_fn=lambda diffuser: diffuser.is_on,
         turn_on_fn=lambda diffuser: diffuser.turn_on(),
diff --git a/homeassistant/components/roborock/device.py b/homeassistant/components/roborock/device.py
index 41db2cc08ac..90ca13c5146 100644
--- a/homeassistant/components/roborock/device.py
+++ b/homeassistant/components/roborock/device.py
@@ -2,6 +2,8 @@
 
 from typing import Any
 
+from roborock.api import AttributeCache
+from roborock.command_cache import CacheableAttribute
 from roborock.containers import Status
 from roborock.exceptions import RoborockException
 from roborock.local_api import RoborockLocalClient
@@ -27,6 +29,15 @@ class RoborockEntity(Entity):
         self._attr_device_info = device_info
         self._api = api
 
+    @property
+    def api(self) -> RoborockLocalClient:
+        """Returns the api."""
+        return self._api
+
+    def get_cache(self, attribute: CacheableAttribute) -> AttributeCache:
+        """Get an item from the api cache."""
+        return self._api.cache.get(attribute)
+
     async def send(
         self, command: RoborockCommand, params: dict[str, Any] | list[Any] | None = None
     ) -> dict:
@@ -72,3 +83,13 @@ class RoborockCoordinatedEntity(
             if status:
                 return status
         return Status({})
+
+    async def send(
+        self,
+        command: RoborockCommand,
+        params: dict[str, Any] | list[Any] | None = None,
+    ) -> dict:
+        """Overloads normal send command but refreshes coordinator."""
+        res = await super().send(command, params)
+        await self.coordinator.async_refresh()
+        return res
diff --git a/homeassistant/components/roborock/manifest.json b/homeassistant/components/roborock/manifest.json
index 0cd437278cf..baab687e64a 100644
--- a/homeassistant/components/roborock/manifest.json
+++ b/homeassistant/components/roborock/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/roborock",
   "iot_class": "local_polling",
   "loggers": ["roborock"],
-  "requirements": ["python-roborock==0.23.4"]
+  "requirements": ["python-roborock==0.29.2"]
 }
diff --git a/homeassistant/components/roborock/sensor.py b/homeassistant/components/roborock/sensor.py
index ec973addae3..8398995462f 100644
--- a/homeassistant/components/roborock/sensor.py
+++ b/homeassistant/components/roborock/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import EntityCategory, UnitOfTime
+from homeassistant.const import AREA_SQUARE_METERS, EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
@@ -99,6 +99,20 @@ SENSOR_DESCRIPTIONS = [
         entity_category=EntityCategory.DIAGNOSTIC,
         options=RoborockStateCode.keys(),
     ),
+    RoborockSensorDescription(
+        key="cleaning_area",
+        icon="mdi:texture-box",
+        translation_key="cleaning_area",
+        value_fn=lambda data: data.status.square_meter_clean_area,
+        native_unit_of_measurement=AREA_SQUARE_METERS,
+    ),
+    RoborockSensorDescription(
+        key="total_cleaning_area",
+        icon="mdi:texture-box",
+        translation_key="total_cleaning_area",
+        value_fn=lambda data: data.clean_summary.square_meter_clean_area,
+        native_unit_of_measurement=AREA_SQUARE_METERS,
+    ),
 ]
 
 
@@ -119,6 +133,7 @@ async def async_setup_entry(
         )
         for device_id, coordinator in coordinators.items()
         for description in SENSOR_DESCRIPTIONS
+        if description.value_fn(coordinator.roborock_device_info.props) is not None
     )
 
 
diff --git a/homeassistant/components/roborock/strings.json b/homeassistant/components/roborock/strings.json
index 00ebd3833a8..f711ceaf74a 100644
--- a/homeassistant/components/roborock/strings.json
+++ b/homeassistant/components/roborock/strings.json
@@ -28,6 +28,9 @@
   },
   "entity": {
     "sensor": {
+      "cleaning_area": {
+        "name": "Cleaning area"
+      },
       "cleaning_time": {
         "name": "Cleaning time"
       },
@@ -73,6 +76,9 @@
       },
       "total_cleaning_time": {
         "name": "Total cleaning time"
+      },
+      "total_cleaning_area": {
+        "name": "Total cleaning area"
       }
     },
     "select": {
@@ -104,6 +110,9 @@
       "child_lock": {
         "name": "Child lock"
       },
+      "dnd_switch": {
+        "name": "Do not disturb"
+      },
       "status_indicator": {
         "name": "Status indicator light"
       }
diff --git a/homeassistant/components/roborock/switch.py b/homeassistant/components/roborock/switch.py
index d8ff50430cb..a0b3d5be295 100644
--- a/homeassistant/components/roborock/switch.py
+++ b/homeassistant/components/roborock/switch.py
@@ -1,17 +1,21 @@
 """Support for Roborock switch."""
+from __future__ import annotations
+
 import asyncio
 from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
 import logging
 from typing import Any
 
-from roborock.exceptions import RoborockException
-from roborock.roborock_typing import RoborockCommand
+from roborock.api import AttributeCache
+from roborock.command_cache import CacheableAttribute
+from roborock.local_api import RoborockLocalClient
 
 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 import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import slugify
 
@@ -27,13 +31,11 @@ class RoborockSwitchDescriptionMixin:
     """Define an entity description mixin for switch entities."""
 
     # Gets the status of the switch
-    get_value: Callable[[RoborockEntity], Coroutine[Any, Any, dict]]
-    # Evaluate the result of get_value to determine a bool
-    evaluate_value: Callable[[dict], bool]
+    cache_key: CacheableAttribute
     # Sets the status of the switch
-    set_command: Callable[[RoborockEntity, bool], Coroutine[Any, Any, dict]]
-    # Check support of this feature
-    check_support: Callable[[RoborockDataUpdateCoordinator], Coroutine[Any, Any, dict]]
+    update_value: Callable[[AttributeCache, bool], Coroutine[Any, Any, dict]]
+    # Attribute from cache
+    attribute: str
 
 
 @dataclass
@@ -45,33 +47,45 @@ class RoborockSwitchDescription(
 
 SWITCH_DESCRIPTIONS: list[RoborockSwitchDescription] = [
     RoborockSwitchDescription(
-        set_command=lambda entity, value: entity.send(
-            RoborockCommand.SET_CHILD_LOCK_STATUS, {"lock_status": 1 if value else 0}
+        cache_key=CacheableAttribute.child_lock_status,
+        update_value=lambda cache, value: cache.update_value(
+            {"lock_status": 1 if value else 0}
         ),
-        get_value=lambda data: data.send(RoborockCommand.GET_CHILD_LOCK_STATUS),
-        check_support=lambda data: data.api.send_command(
-            RoborockCommand.GET_CHILD_LOCK_STATUS
-        ),
-        evaluate_value=lambda data: data["lock_status"] == 1,
+        attribute="lock_status",
         key="child_lock",
         translation_key="child_lock",
         icon="mdi:account-lock",
         entity_category=EntityCategory.CONFIG,
     ),
     RoborockSwitchDescription(
-        set_command=lambda entity, value: entity.send(
-            RoborockCommand.SET_FLOW_LED_STATUS, {"status": 1 if value else 0}
+        cache_key=CacheableAttribute.flow_led_status,
+        update_value=lambda cache, value: cache.update_value(
+            {"status": 1 if value else 0}
         ),
-        get_value=lambda data: data.send(RoborockCommand.GET_FLOW_LED_STATUS),
-        check_support=lambda data: data.api.send_command(
-            RoborockCommand.GET_FLOW_LED_STATUS
-        ),
-        evaluate_value=lambda data: data["status"] == 1,
+        attribute="status",
         key="status_indicator",
         translation_key="status_indicator",
         icon="mdi:alarm-light-outline",
         entity_category=EntityCategory.CONFIG,
     ),
+    RoborockSwitchDescription(
+        cache_key=CacheableAttribute.dnd_timer,
+        update_value=lambda cache, value: cache.update_value(
+            [
+                cache.value.get("start_hour"),
+                cache.value.get("start_minute"),
+                cache.value.get("end_hour"),
+                cache.value.get("end_minute"),
+            ]
+        )
+        if value
+        else cache.close_value(),
+        attribute="enabled",
+        key="dnd_switch",
+        translation_key="dnd_switch",
+        icon="mdi:bell-cancel",
+        entity_category=EntityCategory.CONFIG,
+    ),
 ]
 
 
@@ -81,73 +95,74 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up Roborock switch platform."""
-
     coordinators: dict[str, RoborockDataUpdateCoordinator] = hass.data[DOMAIN][
         config_entry.entry_id
     ]
     possible_entities: list[
-        tuple[str, RoborockDataUpdateCoordinator, RoborockSwitchDescription]
+        tuple[RoborockDataUpdateCoordinator, RoborockSwitchDescription]
     ] = [
-        (device_id, coordinator, description)
-        for device_id, coordinator in coordinators.items()
+        (coordinator, description)
+        for coordinator in coordinators.values()
         for description in SWITCH_DESCRIPTIONS
     ]
     # We need to check if this function is supported by the device.
     results = await asyncio.gather(
         *(
-            description.check_support(coordinator)
-            for _, coordinator, description in possible_entities
+            coordinator.api.cache.get(description.cache_key).async_value()
+            for coordinator, description in possible_entities
         ),
         return_exceptions=True,
     )
-    valid_entities: list[RoborockSwitchEntity] = []
-    for posible_entity, result in zip(possible_entities, results):
-        if isinstance(result, Exception):
-            if not isinstance(result, RoborockException):
-                raise result
+    valid_entities: list[RoborockSwitch] = []
+    for (coordinator, description), result in zip(possible_entities, results):
+        if result is None or isinstance(result, Exception):
             _LOGGER.debug("Not adding entity because of %s", result)
         else:
             valid_entities.append(
-                RoborockSwitchEntity(
-                    f"{posible_entity[2].key}_{slugify(posible_entity[0])}",
-                    posible_entity[1],
-                    posible_entity[2],
-                    result,
+                RoborockSwitch(
+                    f"{description.key}_{slugify(coordinator.roborock_device_info.device.duid)}",
+                    coordinator.device_info,
+                    description,
+                    coordinator.api,
                 )
             )
-    async_add_entities(
-        valid_entities,
-        True,
-    )
+    async_add_entities(valid_entities)
 
 
-class RoborockSwitchEntity(RoborockEntity, SwitchEntity):
-    """A class to let you turn functionality on Roborock devices on and off."""
+class RoborockSwitch(RoborockEntity, SwitchEntity):
+    """A class to let you turn functionality on Roborock devices on and off that does need a coordinator."""
 
     entity_description: RoborockSwitchDescription
 
     def __init__(
         self,
         unique_id: str,
-        coordinator: RoborockDataUpdateCoordinator,
-        entity_description: RoborockSwitchDescription,
-        initial_value: bool,
+        device_info: DeviceInfo,
+        description: RoborockSwitchDescription,
+        api: RoborockLocalClient,
     ) -> None:
-        """Create a switch entity."""
-        self.entity_description = entity_description
-        super().__init__(unique_id, coordinator.device_info, coordinator.api)
-        self._attr_is_on = initial_value
+        """Initialize the entity."""
+        super().__init__(unique_id, device_info, api)
+        self.entity_description = description
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off the switch."""
-        await self.entity_description.set_command(self, False)
+        await self.entity_description.update_value(
+            self.get_cache(self.entity_description.cache_key), False
+        )
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on the switch."""
-        await self.entity_description.set_command(self, True)
-
-    async def async_update(self) -> None:
-        """Update switch."""
-        self._attr_is_on = self.entity_description.evaluate_value(
-            await self.entity_description.get_value(self)
+        await self.entity_description.update_value(
+            self.get_cache(self.entity_description.cache_key), True
+        )
+
+    @property
+    def is_on(self) -> bool | None:
+        """Return True if entity is on."""
+        return (
+            self.get_cache(self.entity_description.cache_key).value.get(
+                self.entity_description.attribute
+            )
+            == 1
         )
diff --git a/homeassistant/components/roborock/vacuum.py b/homeassistant/components/roborock/vacuum.py
index 9e486fa54b1..5f66338ecc1 100644
--- a/homeassistant/components/roborock/vacuum.py
+++ b/homeassistant/components/roborock/vacuum.py
@@ -83,6 +83,7 @@ class RoborockVacuum(RoborockCoordinatedEntity, StateVacuumEntity):
         | VacuumEntityFeature.START
     )
     _attr_translation_key = DOMAIN
+    _attr_name = None
 
     def __init__(
         self,
@@ -144,7 +145,6 @@ class RoborockVacuum(RoborockCoordinatedEntity, StateVacuumEntity):
             RoborockCommand.SET_CUSTOM_MODE,
             [self._device_status.fan_power.as_dict().get(fan_speed)],
         )
-        await self.coordinator.async_request_refresh()
 
     async def async_start_pause(self) -> None:
         """Start, pause or resume the cleaning task."""
diff --git a/homeassistant/components/roku/media_player.py b/homeassistant/components/roku/media_player.py
index 877e58233d5..a8c1cf4698c 100644
--- a/homeassistant/components/roku/media_player.py
+++ b/homeassistant/components/roku/media_player.py
@@ -108,6 +108,7 @@ async def async_setup_entry(
 class RokuMediaPlayer(RokuEntity, MediaPlayerEntity):
     """Representation of a Roku media player on the network."""
 
+    _attr_name = None
     _attr_supported_features = (
         MediaPlayerEntityFeature.PREVIOUS_TRACK
         | MediaPlayerEntityFeature.NEXT_TRACK
diff --git a/homeassistant/components/roku/remote.py b/homeassistant/components/roku/remote.py
index fceac67a477..0271e4a0f73 100644
--- a/homeassistant/components/roku/remote.py
+++ b/homeassistant/components/roku/remote.py
@@ -37,6 +37,8 @@ async def async_setup_entry(
 class RokuRemote(RokuEntity, RemoteEntity):
     """Device that sends commands to an Roku."""
 
+    _attr_name = None
+
     @property
     def is_on(self) -> bool:
         """Return true if device is on."""
diff --git a/homeassistant/components/roon/media_player.py b/homeassistant/components/roon/media_player.py
index 3bcafe4ba9a..6d096ea8b1a 100644
--- a/homeassistant/components/roon/media_player.py
+++ b/homeassistant/components/roon/media_player.py
@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any
+from typing import Any, cast
 
 from roonapi import split_media_path
 import voluptuous as vol
@@ -159,7 +159,10 @@ class RoonDevice(MediaPlayerEntity):
             dev_model = self.player_data["source_controls"][0].get("display_name")
         return DeviceInfo(
             identifiers={(DOMAIN, self.unique_id)},
-            name=self.name,
+            # Instead of setting the device name to the entity name, roon
+            # should be updated to set has_entity_name = True, and set the entity
+            # name to None
+            name=cast(str | None, self.name),
             manufacturer="RoonLabs",
             model=dev_model,
             via_device=(DOMAIN, self._server.roon_id),
diff --git a/homeassistant/components/ruuvi_gateway/bluetooth.py b/homeassistant/components/ruuvi_gateway/bluetooth.py
index 4dd973155a9..47a9bbfdde0 100644
--- a/homeassistant/components/ruuvi_gateway/bluetooth.py
+++ b/homeassistant/components/ruuvi_gateway/bluetooth.py
@@ -9,6 +9,7 @@ from home_assistant_bluetooth import BluetoothServiceInfoBleak
 
 from homeassistant.components.bluetooth import (
     FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS,
+    MONOTONIC_TIME,
     BaseHaRemoteScanner,
     async_get_advertisement_callback,
     async_register_scanner,
@@ -47,6 +48,7 @@ class RuuviGatewayScanner(BaseHaRemoteScanner):
     @callback
     def _async_handle_new_data(self) -> None:
         now = time.time()
+        monotonic_now = MONOTONIC_TIME()
         for tag_data in self.coordinator.data:
             data_age_seconds = now - tag_data.timestamp  # Both are Unix time
             if data_age_seconds > FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS:
@@ -62,6 +64,7 @@ class RuuviGatewayScanner(BaseHaRemoteScanner):
                 manufacturer_data=anno.manufacturer_data,
                 tx_power=anno.tx_power,
                 details={},
+                advertisement_monotonic_time=monotonic_now - data_age_seconds,
             )
 
     @callback
diff --git a/homeassistant/components/ruuvitag_ble/manifest.json b/homeassistant/components/ruuvitag_ble/manifest.json
index 6cabecb7912..fa8ec80423c 100644
--- a/homeassistant/components/ruuvitag_ble/manifest.json
+++ b/homeassistant/components/ruuvitag_ble/manifest.json
@@ -16,5 +16,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/ruuvitag_ble",
   "iot_class": "local_push",
-  "requirements": ["ruuvitag-ble==0.1.1"]
+  "requirements": ["ruuvitag-ble==0.1.2"]
 }
diff --git a/homeassistant/components/samsungtv/bridge.py b/homeassistant/components/samsungtv/bridge.py
index ba09cf9fe3b..0cc4dd556d5 100644
--- a/homeassistant/components/samsungtv/bridge.py
+++ b/homeassistant/components/samsungtv/bridge.py
@@ -549,7 +549,7 @@ class SamsungTVWSBridge(
             except (ConnectionFailure, OSError, AsyncioTimeoutError) as err:
                 LOGGER.debug("Failing config: %s, %s error: %s", config, type(err), err)
         # pylint: disable-next=useless-else-on-loop
-        else:
+        else:  # noqa: PLW0120
             if result:
                 return result
 
diff --git a/homeassistant/components/samsungtv/config_flow.py b/homeassistant/components/samsungtv/config_flow.py
index f98e3667b59..124dab73004 100644
--- a/homeassistant/components/samsungtv/config_flow.py
+++ b/homeassistant/components/samsungtv/config_flow.py
@@ -184,7 +184,6 @@ class SamsungTVConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             raise AbortFlow(result)
         assert method is not None
         self._bridge = SamsungTVBridge.get_bridge(self.hass, method, self._host)
-        return
 
     async def _async_get_device_info_and_method(
         self,
diff --git a/homeassistant/components/samsungtv/entity.py b/homeassistant/components/samsungtv/entity.py
index 418feecbf94..4d5ea3d5fab 100644
--- a/homeassistant/components/samsungtv/entity.py
+++ b/homeassistant/components/samsungtv/entity.py
@@ -1,6 +1,8 @@
 """Base SamsungTV Entity."""
 from __future__ import annotations
 
+from typing import cast
+
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_MAC, CONF_MODEL, CONF_NAME
 from homeassistant.helpers import device_registry as dr
@@ -20,7 +22,9 @@ class SamsungTVEntity(Entity):
         self._attr_name = config_entry.data.get(CONF_NAME)
         self._attr_unique_id = config_entry.unique_id
         self._attr_device_info = DeviceInfo(
-            name=self.name,
+            # Instead of setting the device name to the entity name, samsungtv
+            # should be updated to set has_entity_name = True
+            name=cast(str | None, self.name),
             manufacturer=config_entry.data.get(CONF_MANUFACTURER),
             model=config_entry.data.get(CONF_MODEL),
         )
diff --git a/homeassistant/components/satel_integra/binary_sensor.py b/homeassistant/components/satel_integra/binary_sensor.py
index 389bde884ef..5d2ce2c193c 100644
--- a/homeassistant/components/satel_integra/binary_sensor.py
+++ b/homeassistant/components/satel_integra/binary_sensor.py
@@ -80,11 +80,10 @@ class SatelIntegraBinarySensor(BinarySensorEntity):
                 self._state = 1
             else:
                 self._state = 0
+        elif self._device_number in self._satel.violated_zones:
+            self._state = 1
         else:
-            if self._device_number in self._satel.violated_zones:
-                self._state = 1
-            else:
-                self._state = 0
+            self._state = 0
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass, self._react_to_signal, self._devices_updated
diff --git a/homeassistant/components/satel_integra/manifest.json b/homeassistant/components/satel_integra/manifest.json
index ffb2c1a3af2..828261aa466 100644
--- a/homeassistant/components/satel_integra/manifest.json
+++ b/homeassistant/components/satel_integra/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/satel_integra",
   "iot_class": "local_push",
   "loggers": ["satel_integra"],
-  "requirements": ["satel_integra==0.3.7"]
+  "requirements": ["satel-integra==0.3.7"]
 }
diff --git a/homeassistant/components/scrape/strings.json b/homeassistant/components/scrape/strings.json
index 857d53eb527..e5ed8613fc4 100644
--- a/homeassistant/components/scrape/strings.json
+++ b/homeassistant/components/scrape/strings.json
@@ -171,6 +171,7 @@
         "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_parts::name%]",
         "voltage": "[%key:component::sensor::entity_component::voltage::name%]",
         "volume": "[%key:component::sensor::entity_component::volume::name%]",
         "volume_storage": "[%key:component::sensor::entity_component::volume_storage::name%]",
diff --git a/homeassistant/components/screenlogic/__init__.py b/homeassistant/components/screenlogic/__init__.py
index 6662c20ad4f..3370c196c3c 100644
--- a/homeassistant/components/screenlogic/__init__.py
+++ b/homeassistant/components/screenlogic/__init__.py
@@ -168,4 +168,3 @@ class ScreenlogicDataUpdateCoordinator(DataUpdateCoordinator[None]):
             if self.gateway.is_connected:
                 await self.gateway.async_disconnect()
             raise UpdateFailed(ex.msg) from ex
-        return None
diff --git a/homeassistant/components/script/__init__.py b/homeassistant/components/script/__init__.py
index 659131e902b..f8d41db0e11 100644
--- a/homeassistant/components/script/__init__.py
+++ b/homeassistant/components/script/__init__.py
@@ -1,6 +1,7 @@
 """Support for scripts."""
 from __future__ import annotations
 
+from abc import ABC, abstractmethod
 import asyncio
 from dataclasses import dataclass
 import logging
@@ -28,7 +29,14 @@ from homeassistant.const import (
     SERVICE_TURN_ON,
     STATE_ON,
 )
-from homeassistant.core import HomeAssistant, ServiceCall, callback
+from homeassistant.core import (
+    Context,
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+    callback,
+)
 from homeassistant.helpers import entity_registry as er
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.config_validation import make_entity_service_schema
@@ -87,12 +95,12 @@ def _scripts_with_x(
     if DOMAIN not in hass.data:
         return []
 
-    component: EntityComponent[ScriptEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseScriptEntity] = hass.data[DOMAIN]
 
     return [
         script_entity.entity_id
         for script_entity in component.entities
-        if referenced_id in getattr(script_entity.script, property_name)
+        if referenced_id in getattr(script_entity, property_name)
     ]
 
 
@@ -101,12 +109,12 @@ def _x_in_script(hass: HomeAssistant, entity_id: str, property_name: str) -> lis
     if DOMAIN not in hass.data:
         return []
 
-    component: EntityComponent[ScriptEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseScriptEntity] = hass.data[DOMAIN]
 
     if (script_entity := component.get_entity(entity_id)) is None:
         return []
 
-    return list(getattr(script_entity.script, property_name))
+    return list(getattr(script_entity, property_name))
 
 
 @callback
@@ -151,7 +159,7 @@ def scripts_with_blueprint(hass: HomeAssistant, blueprint_path: str) -> list[str
     if DOMAIN not in hass.data:
         return []
 
-    component: EntityComponent[ScriptEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseScriptEntity] = hass.data[DOMAIN]
 
     return [
         script_entity.entity_id
@@ -166,7 +174,7 @@ def blueprint_in_script(hass: HomeAssistant, entity_id: str) -> str | None:
     if DOMAIN not in hass.data:
         return None
 
-    component: EntityComponent[ScriptEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseScriptEntity] = hass.data[DOMAIN]
 
     if (script_entity := component.get_entity(entity_id)) is None:
         return None
@@ -176,7 +184,9 @@ def blueprint_in_script(hass: HomeAssistant, entity_id: str) -> str | None:
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Load the scripts from the configuration."""
-    hass.data[DOMAIN] = component = EntityComponent[ScriptEntity](LOGGER, DOMAIN, hass)
+    hass.data[DOMAIN] = component = EntityComponent[BaseScriptEntity](
+        LOGGER, DOMAIN, hass
+    )
 
     # Process integration platforms right away since
     # we will create entities before firing EVENT_COMPONENT_LOADED
@@ -253,6 +263,7 @@ class ScriptEntityConfig:
     key: str
     raw_blueprint_inputs: ConfigType | None
     raw_config: ConfigType | None
+    validation_failed: bool
 
 
 async def _prepare_script_config(
@@ -267,9 +278,12 @@ async def _prepare_script_config(
     for key, config_block in conf.items():
         raw_config = cast(ScriptConfig, config_block).raw_config
         raw_blueprint_inputs = cast(ScriptConfig, config_block).raw_blueprint_inputs
+        validation_failed = cast(ScriptConfig, config_block).validation_failed
 
         script_configs.append(
-            ScriptEntityConfig(config_block, key, raw_blueprint_inputs, raw_config)
+            ScriptEntityConfig(
+                config_block, key, raw_blueprint_inputs, raw_config, validation_failed
+            )
         )
 
     return script_configs
@@ -277,11 +291,20 @@ async def _prepare_script_config(
 
 async def _create_script_entities(
     hass: HomeAssistant, script_configs: list[ScriptEntityConfig]
-) -> list[ScriptEntity]:
+) -> list[BaseScriptEntity]:
     """Create script entities from prepared configuration."""
-    entities: list[ScriptEntity] = []
+    entities: list[BaseScriptEntity] = []
 
     for script_config in script_configs:
+        if script_config.validation_failed:
+            entities.append(
+                UnavailableScriptEntity(
+                    script_config.key,
+                    script_config.raw_config,
+                )
+            )
+            continue
+
         entity = ScriptEntity(
             hass,
             script_config.key,
@@ -295,16 +318,20 @@ async def _create_script_entities(
 
 
 async def _async_process_config(
-    hass: HomeAssistant, config: ConfigType, component: EntityComponent[ScriptEntity]
+    hass: HomeAssistant,
+    config: ConfigType,
+    component: EntityComponent[BaseScriptEntity],
 ) -> None:
     """Process script configuration."""
     entities = []
 
-    def script_matches_config(script: ScriptEntity, config: ScriptEntityConfig) -> bool:
+    def script_matches_config(
+        script: BaseScriptEntity, config: ScriptEntityConfig
+    ) -> bool:
         return script.unique_id == config.key and script.raw_config == config.raw_config
 
     def find_matches(
-        scripts: list[ScriptEntity],
+        scripts: list[BaseScriptEntity],
         script_configs: list[ScriptEntityConfig],
     ) -> tuple[set[int], set[int]]:
         """Find matches between a list of script entities and a list of configurations.
@@ -331,7 +358,7 @@ async def _async_process_config(
         return script_matches, config_matches
 
     script_configs = await _prepare_script_config(hass, config)
-    scripts: list[ScriptEntity] = list(component.entities)
+    scripts: list[BaseScriptEntity] = list(component.entities)
 
     # Find scripts and configurations which have matches
     script_matches, config_matches = find_matches(scripts, script_configs)
@@ -352,7 +379,78 @@ async def _async_process_config(
     await component.async_add_entities(entities)
 
 
-class ScriptEntity(ToggleEntity, RestoreEntity):
+class BaseScriptEntity(ToggleEntity, ABC):
+    """Base class for script entities."""
+
+    raw_config: ConfigType | None
+
+    @property
+    @abstractmethod
+    def referenced_areas(self) -> set[str]:
+        """Return a set of referenced areas."""
+
+    @property
+    @abstractmethod
+    def referenced_blueprint(self) -> str | None:
+        """Return referenced blueprint or None."""
+
+    @property
+    @abstractmethod
+    def referenced_devices(self) -> set[str]:
+        """Return a set of referenced devices."""
+
+    @property
+    @abstractmethod
+    def referenced_entities(self) -> set[str]:
+        """Return a set of referenced entities."""
+
+
+class UnavailableScriptEntity(BaseScriptEntity):
+    """A non-functional script entity with its state set to unavailable.
+
+    This class is instatiated when an script fails to validate.
+    """
+
+    _attr_should_poll = False
+    _attr_available = False
+
+    def __init__(
+        self,
+        key: str,
+        raw_config: ConfigType | None,
+    ) -> None:
+        """Initialize a script entity."""
+        self._name = raw_config.get(CONF_ALIAS, key) if raw_config else key
+        self._attr_unique_id = key
+        self.raw_config = raw_config
+
+    @property
+    def name(self) -> str:
+        """Return the name of the entity."""
+        return self._name
+
+    @property
+    def referenced_areas(self) -> set[str]:
+        """Return a set of referenced areas."""
+        return set()
+
+    @property
+    def referenced_blueprint(self) -> str | None:
+        """Return referenced blueprint or None."""
+        return None
+
+    @property
+    def referenced_devices(self) -> set[str]:
+        """Return a set of referenced devices."""
+        return set()
+
+    @property
+    def referenced_entities(self) -> set[str]:
+        """Return a set of referenced entities."""
+        return set()
+
+
+class ScriptEntity(BaseScriptEntity, RestoreEntity):
     """Representation of a script entity."""
 
     icon = None
@@ -414,6 +512,11 @@ class ScriptEntity(ToggleEntity, RestoreEntity):
         """Return true if script is on."""
         return self.script.is_running
 
+    @property
+    def referenced_areas(self) -> set[str]:
+        """Return a set of referenced areas."""
+        return self.script.referenced_areas
+
     @property
     def referenced_blueprint(self):
         """Return referenced blueprint or None."""
@@ -421,6 +524,16 @@ class ScriptEntity(ToggleEntity, RestoreEntity):
             return None
         return self._blueprint_inputs[CONF_USE_BLUEPRINT][CONF_PATH]
 
+    @property
+    def referenced_devices(self) -> set[str]:
+        """Return a set of referenced devices."""
+        return self.script.referenced_devices
+
+    @property
+    def referenced_entities(self) -> set[str]:
+        """Return a set of referenced entities."""
+        return self.script.referenced_entities
+
     @callback
     def async_change_listener(self):
         """Update state."""
@@ -436,6 +549,12 @@ class ScriptEntity(ToggleEntity, RestoreEntity):
         variables = kwargs.get("variables")
         context = kwargs.get("context")
         wait = kwargs.get("wait", True)
+        await self._async_start_run(variables, context, wait)
+
+    async def _async_start_run(
+        self, variables: dict, context: Context, wait: bool
+    ) -> ServiceResponse:
+        """Start the run of a script."""
         self.async_set_context(context)
         self.hass.bus.async_fire(
             EVENT_SCRIPT_STARTED,
@@ -444,8 +563,7 @@ class ScriptEntity(ToggleEntity, RestoreEntity):
         )
         coro = self._async_run(variables, context)
         if wait:
-            await coro
-            return
+            return await coro
 
         # Caller does not want to wait for called script to finish so let script run in
         # separate Task. Make a new empty script stack; scripts are allowed to
@@ -457,6 +575,7 @@ class ScriptEntity(ToggleEntity, RestoreEntity):
         # Wait for first state change so we can guarantee that
         # it is written to the State Machine before we return.
         await self._changed.wait()
+        return None
 
     async def _async_run(self, variables, context):
         with trace_script(
@@ -483,16 +602,25 @@ class ScriptEntity(ToggleEntity, RestoreEntity):
         """
         await self.script.async_stop()
 
-    async def _service_handler(self, service: ServiceCall) -> None:
+    async def _service_handler(self, service: ServiceCall) -> ServiceResponse:
         """Execute a service call to script.<script name>."""
-        await self.async_turn_on(variables=service.data, context=service.context)
+        response = await self._async_start_run(
+            variables=service.data, context=service.context, wait=True
+        )
+        if service.return_response:
+            return response
+        return None
 
     async def async_added_to_hass(self) -> None:
         """Restore last triggered on startup and register service."""
 
         unique_id = cast(str, self.unique_id)
         self.hass.services.async_register(
-            DOMAIN, unique_id, self._service_handler, schema=SCRIPT_SERVICE_SCHEMA
+            DOMAIN,
+            unique_id,
+            self._service_handler,
+            schema=SCRIPT_SERVICE_SCHEMA,
+            supports_response=SupportsResponse.OPTIONAL,
         )
 
         # Register the service description
@@ -522,7 +650,7 @@ def websocket_config(
     msg: dict[str, Any],
 ) -> None:
     """Get script config."""
-    component: EntityComponent[ScriptEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseScriptEntity] = hass.data[DOMAIN]
 
     script = component.get_entity(msg["entity_id"])
 
diff --git a/homeassistant/components/script/config.py b/homeassistant/components/script/config.py
index 193a010671e..10c7f08484b 100644
--- a/homeassistant/components/script/config.py
+++ b/homeassistant/components/script/config.py
@@ -49,6 +49,15 @@ from .helpers import async_get_blueprints
 
 PACKAGE_MERGE_HINT = "dict"
 
+_MINIMAL_SCRIPT_ENTITY_SCHEMA = vol.Schema(
+    {
+        CONF_ALIAS: cv.string,
+        vol.Optional(CONF_DESCRIPTION): cv.string,
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+
+
 SCRIPT_ENTITY_SCHEMA = make_script_schema(
     {
         vol.Optional(CONF_ALIAS): cv.string,
@@ -74,7 +83,11 @@ SCRIPT_ENTITY_SCHEMA = make_script_schema(
 
 
 async def _async_validate_config_item(
-    hass: HomeAssistant, object_id: str, config: ConfigType, warn_on_errors: bool
+    hass: HomeAssistant,
+    object_id: str,
+    config: ConfigType,
+    raise_on_errors: bool,
+    warn_on_errors: bool,
 ) -> ScriptConfig:
     """Validate config item."""
     raw_config = None
@@ -110,6 +123,15 @@ async def _async_validate_config_item(
         )
         return
 
+    def _minimal_config() -> ScriptConfig:
+        """Try validating id, alias and description."""
+        minimal_config = _MINIMAL_SCRIPT_ENTITY_SCHEMA(config)
+        script_config = ScriptConfig(minimal_config)
+        script_config.raw_blueprint_inputs = raw_blueprint_inputs
+        script_config.raw_config = raw_config
+        script_config.validation_failed = True
+        return script_config
+
     if is_blueprint_instance_config(config):
         uses_blueprint = True
         blueprints = async_get_blueprints(hass)
@@ -121,7 +143,9 @@ async def _async_validate_config_item(
                     "Failed to generate script from blueprint: %s",
                     err,
                 )
-            raise
+            if raise_on_errors:
+                raise
+            return _minimal_config()
 
         raw_blueprint_inputs = blueprint_inputs.config_with_inputs
 
@@ -136,7 +160,9 @@ async def _async_validate_config_item(
                     blueprint_inputs.inputs,
                     err,
                 )
-            raise HomeAssistantError from err
+            if raise_on_errors:
+                raise HomeAssistantError(err) from err
+            return _minimal_config()
 
     script_name = f"Script with object id '{object_id}'"
     if isinstance(config, Mapping):
@@ -152,10 +178,16 @@ async def _async_validate_config_item(
         validated_config = SCRIPT_ENTITY_SCHEMA(config)
     except vol.Invalid as err:
         _log_invalid_script(err, script_name, "could not be validated", config)
-        raise
+        if raise_on_errors:
+            raise
+        return _minimal_config()
+
+    script_config = ScriptConfig(validated_config)
+    script_config.raw_blueprint_inputs = raw_blueprint_inputs
+    script_config.raw_config = raw_config
 
     try:
-        validated_config[CONF_SEQUENCE] = await async_validate_actions_config(
+        script_config[CONF_SEQUENCE] = await async_validate_actions_config(
             hass, validated_config[CONF_SEQUENCE]
         )
     except (
@@ -165,11 +197,11 @@ async def _async_validate_config_item(
         _log_invalid_script(
             err, script_name, "failed to setup actions", validated_config
         )
-        raise
+        if raise_on_errors:
+            raise
+        script_config.validation_failed = True
+        return script_config
 
-    script_config = ScriptConfig(validated_config)
-    script_config.raw_blueprint_inputs = raw_blueprint_inputs
-    script_config.raw_config = raw_config
     return script_config
 
 
@@ -178,6 +210,7 @@ class ScriptConfig(dict):
 
     raw_config: ConfigType | None = None
     raw_blueprint_inputs: ConfigType | None = None
+    validation_failed: bool = False
 
 
 async def _try_async_validate_config_item(
@@ -187,7 +220,7 @@ async def _try_async_validate_config_item(
 ) -> ScriptConfig | None:
     """Validate config item."""
     try:
-        return await _async_validate_config_item(hass, object_id, config, True)
+        return await _async_validate_config_item(hass, object_id, config, False, True)
     except (vol.Invalid, HomeAssistantError):
         return None
 
@@ -198,7 +231,7 @@ async def async_validate_config_item(
     config: dict[str, Any],
 ) -> ScriptConfig | None:
     """Validate config item, called by EditScriptConfigView."""
-    return await _async_validate_config_item(hass, object_id, config, False)
+    return await _async_validate_config_item(hass, object_id, config, True, False)
 
 
 async def async_validate_config(hass, config):
diff --git a/homeassistant/components/scsgate/__init__.py b/homeassistant/components/scsgate/__init__.py
index 5810f12bca2..af5921e2c3b 100644
--- a/homeassistant/components/scsgate/__init__.py
+++ b/homeassistant/components/scsgate/__init__.py
@@ -74,7 +74,7 @@ class SCSGate:
     def handle_message(self, message):
         """Handle a messages seen on the bus."""
 
-        self._logger.debug(f"Received message {message}")
+        self._logger.debug("Received message %s", message)
         if not isinstance(message, StateMessage) and not isinstance(
             message, ScenarioTriggeredMessage
         ):
@@ -98,9 +98,7 @@ class SCSGate:
                 self._logger.error(msg)
         else:
             self._logger.info(
-                "Ignoring state message for device {} because unknown".format(
-                    message.entity
-                )
+                "Ignoring state message for device %s because unknown", message.entity
             )
 
     @property
diff --git a/homeassistant/components/season/sensor.py b/homeassistant/components/season/sensor.py
index 27a46943bb3..4d78e60db0f 100644
--- a/homeassistant/components/season/sensor.py
+++ b/homeassistant/components/season/sensor.py
@@ -94,6 +94,7 @@ class SeasonSensorEntity(SensorEntity):
 
     _attr_device_class = SensorDeviceClass.ENUM
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_options = ["spring", "summer", "autumn", "winter"]
     _attr_translation_key = "season"
 
diff --git a/homeassistant/components/select/device_action.py b/homeassistant/components/select/device_action.py
index d553cdf3043..a7d47d8c833 100644
--- a/homeassistant/components/select/device_action.py
+++ b/homeassistant/components/select/device_action.py
@@ -5,6 +5,10 @@ from contextlib import suppress
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+    async_validate_entity_schema,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -33,43 +37,50 @@ from .const import (
     SERVICE_SELECT_PREVIOUS,
 )
 
-ACTION_SCHEMA = vol.Any(
+_ACTION_SCHEMA = vol.Any(
     cv.DEVICE_ACTION_BASE_SCHEMA.extend(
         {
             vol.Required(CONF_TYPE): SERVICE_SELECT_FIRST,
-            vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         }
     ),
     cv.DEVICE_ACTION_BASE_SCHEMA.extend(
         {
             vol.Required(CONF_TYPE): SERVICE_SELECT_LAST,
-            vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         }
     ),
     cv.DEVICE_ACTION_BASE_SCHEMA.extend(
         {
             vol.Required(CONF_TYPE): SERVICE_SELECT_NEXT,
-            vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Optional(CONF_CYCLE, default=True): cv.boolean,
         }
     ),
     cv.DEVICE_ACTION_BASE_SCHEMA.extend(
         {
             vol.Required(CONF_TYPE): SERVICE_SELECT_PREVIOUS,
-            vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Optional(CONF_CYCLE, default=True): cv.boolean,
         }
     ),
     cv.DEVICE_ACTION_BASE_SCHEMA.extend(
         {
             vol.Required(CONF_TYPE): SERVICE_SELECT_OPTION,
-            vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_OPTION): cv.string,
         }
     ),
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -79,7 +90,7 @@ async def async_get_actions(
         {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
             CONF_TYPE: service_conf_type,
         }
         for service_conf_type in (
@@ -130,7 +141,10 @@ async def async_get_action_capabilities(
     if config[CONF_TYPE] == SERVICE_SELECT_OPTION:
         options: list[str] = []
         with suppress(HomeAssistantError):
-            options = get_capability(hass, config[CONF_ENTITY_ID], ATTR_OPTIONS) or []
+            entry = async_get_entity_registry_entry_or_raise(
+                hass, config[CONF_ENTITY_ID]
+            )
+            options = get_capability(hass, entry.entity_id, ATTR_OPTIONS) or []
         return {
             "extra_fields": vol.Schema({vol.Required(CONF_OPTION): vol.In(options)})
         }
diff --git a/homeassistant/components/select/device_condition.py b/homeassistant/components/select/device_condition.py
index 13280ba4f0e..712e7bf78b6 100644
--- a/homeassistant/components/select/device_condition.py
+++ b/homeassistant/components/select/device_condition.py
@@ -3,6 +3,9 @@ from __future__ import annotations
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+)
 from homeassistant.const import (
     CONF_CONDITION,
     CONF_DEVICE_ID,
@@ -30,7 +33,7 @@ CONDITION_TYPES = {"selected_option"}
 
 CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
         vol.Required(CONF_OPTION): str,
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
@@ -48,7 +51,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
             CONF_TYPE: "selected_option",
         }
         for entry in er.async_entries_for_device(registry, device_id)
@@ -62,11 +65,14 @@ def async_condition_from_config(
 ) -> condition.ConditionCheckerType:
     """Create a function to test a device condition."""
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[CONF_ENTITY_ID])
+
     @callback
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
         return condition.state(
-            hass, config[CONF_ENTITY_ID], config[CONF_OPTION], config.get(CONF_FOR)
+            hass, entity_id, config[CONF_OPTION], config.get(CONF_FOR)
         )
 
     return test_is_state
@@ -76,8 +82,10 @@ async def async_get_condition_capabilities(
     hass: HomeAssistant, config: ConfigType
 ) -> dict[str, vol.Schema]:
     """List condition capabilities."""
+
     try:
-        options = get_capability(hass, config[CONF_ENTITY_ID], ATTR_OPTIONS) or []
+        entry = async_get_entity_registry_entry_or_raise(hass, config[CONF_ENTITY_ID])
+        options = get_capability(hass, entry.entity_id, ATTR_OPTIONS) or []
     except HomeAssistantError:
         options = []
 
diff --git a/homeassistant/components/select/device_trigger.py b/homeassistant/components/select/device_trigger.py
index 8e8267cb5e0..2cd2da0e1a6 100644
--- a/homeassistant/components/select/device_trigger.py
+++ b/homeassistant/components/select/device_trigger.py
@@ -3,7 +3,10 @@ from __future__ import annotations
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import DEVICE_TRIGGER_BASE_SCHEMA
+from homeassistant.components.device_automation import (
+    DEVICE_TRIGGER_BASE_SCHEMA,
+    async_get_entity_registry_entry_or_raise,
+)
 from homeassistant.components.homeassistant.triggers.state import (
     CONF_FOR,
     CONF_FROM,
@@ -31,7 +34,7 @@ TRIGGER_TYPES = {"current_option_changed"}
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Optional(CONF_TO): vol.Any(vol.Coerce(str)),
         vol.Optional(CONF_FROM): vol.Any(vol.Coerce(str)),
@@ -50,7 +53,7 @@ async def async_get_triggers(
             CONF_PLATFORM: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
             CONF_TYPE: "current_option_changed",
         }
         for entry in er.async_entries_for_device(registry, device_id)
@@ -89,8 +92,10 @@ async def async_get_trigger_capabilities(
     hass: HomeAssistant, config: ConfigType
 ) -> dict[str, vol.Schema]:
     """List trigger capabilities."""
+
     try:
-        options = get_capability(hass, config[CONF_ENTITY_ID], ATTR_OPTIONS) or []
+        entry = async_get_entity_registry_entry_or_raise(hass, config[CONF_ENTITY_ID])
+        options = get_capability(hass, entry.entity_id, ATTR_OPTIONS) or []
     except HomeAssistantError:
         options = []
 
diff --git a/homeassistant/components/sense/manifest.json b/homeassistant/components/sense/manifest.json
index 72072d36031..8c20db2e422 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.11.2"]
+  "requirements": ["sense-energy==0.12.0"]
 }
diff --git a/homeassistant/components/senseme/__init__.py b/homeassistant/components/senseme/__init__.py
deleted file mode 100644
index a744dd0d0b8..00000000000
--- a/homeassistant/components/senseme/__init__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""The SenseME integration."""
-from __future__ import annotations
-
-from aiosenseme import async_get_device_by_device_info
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
-
-from .const import CONF_INFO, DOMAIN, PLATFORMS, UPDATE_RATE
-from .discovery import async_start_discovery
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up SenseME from a config entry."""
-    async_start_discovery(hass)
-
-    status, device = await async_get_device_by_device_info(
-        info=entry.data[CONF_INFO], start_first=True, refresh_minutes=UPDATE_RATE
-    )
-    if not status:
-        device.stop()
-        raise ConfigEntryNotReady(f"Connect to address {device.address} failed")
-
-    await device.async_update(not status)
-
-    hass.data[DOMAIN][entry.entry_id] = device
-    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."""
-    hass.data[DOMAIN][entry.entry_id].stop()
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/senseme/binary_sensor.py b/homeassistant/components/senseme/binary_sensor.py
deleted file mode 100644
index d6c9e193ece..00000000000
--- a/homeassistant/components/senseme/binary_sensor.py
+++ /dev/null
@@ -1,41 +0,0 @@
-"""Support for Big Ass Fans SenseME occupancy sensor."""
-from __future__ import annotations
-
-from aiosenseme import SensemeDevice
-
-from homeassistant import config_entries
-from homeassistant.components.binary_sensor import (
-    BinarySensorDeviceClass,
-    BinarySensorEntity,
-)
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .const import DOMAIN
-from .entity import SensemeEntity
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up SenseME occupancy sensors."""
-    device = hass.data[DOMAIN][entry.entry_id]
-    if device.has_sensor:
-        async_add_entities([HASensemeOccupancySensor(device)])
-
-
-class HASensemeOccupancySensor(SensemeEntity, BinarySensorEntity):
-    """Representation of a Big Ass Fans SenseME occupancy sensor."""
-
-    def __init__(self, device: SensemeDevice) -> None:
-        """Initialize the entity."""
-        super().__init__(device, f"{device.name} Occupancy")
-        self._attr_unique_id = f"{self._device.uuid}-SENSOR"
-        self._attr_device_class = BinarySensorDeviceClass.OCCUPANCY
-
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update attrs from device."""
-        self._attr_is_on = self._device.motion_detected
diff --git a/homeassistant/components/senseme/config_flow.py b/homeassistant/components/senseme/config_flow.py
deleted file mode 100644
index 6e2f10c1b36..00000000000
--- a/homeassistant/components/senseme/config_flow.py
+++ /dev/null
@@ -1,148 +0,0 @@
-"""Config flow for SenseME."""
-from __future__ import annotations
-
-import ipaddress
-from typing import Any
-
-from aiosenseme import SensemeDevice, async_get_device_by_ip_address
-import voluptuous as vol
-
-from homeassistant import config_entries
-from homeassistant.components import dhcp
-from homeassistant.const import CONF_DEVICE, CONF_HOST, CONF_ID
-from homeassistant.data_entry_flow import FlowResult
-from homeassistant.helpers.typing import DiscoveryInfoType
-
-from .const import CONF_HOST_MANUAL, CONF_INFO, DOMAIN
-from .discovery import async_discover, async_get_discovered_device
-
-DISCOVER_TIMEOUT = 5
-
-
-class SensemeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
-    """Handle SenseME discovery config flow."""
-
-    VERSION = 1
-
-    def __init__(self) -> None:
-        """Initialize the SenseME config flow."""
-        self._discovered_devices: list[SensemeDevice] | None = None
-        self._discovered_device: SensemeDevice | None = None
-
-    async def async_step_dhcp(self, discovery_info: dhcp.DhcpServiceInfo) -> FlowResult:
-        """Handle discovery via dhcp."""
-        # If discovery is already running, it takes precedence since its more efficient
-        if self._async_current_entries():
-            return self.async_abort(reason="already_configured")
-        if device := await async_get_device_by_ip_address(discovery_info.ip):
-            device.stop()
-        if device is None or not device.uuid:
-            return self.async_abort(reason="cannot_connect")
-        await self.async_set_unique_id(device.uuid)
-        self._discovered_device = device
-        return await self.async_step_discovery_confirm()
-
-    async def async_step_integration_discovery(
-        self, discovery_info: DiscoveryInfoType
-    ) -> FlowResult:
-        """Handle integration discovery."""
-        uuid = discovery_info[CONF_ID]
-        device = async_get_discovered_device(self.hass, discovery_info[CONF_ID])
-        host = device.address
-        await self.async_set_unique_id(uuid)
-        for entry in self._async_current_entries(include_ignore=False):
-            if entry.data[CONF_INFO]["address"] == host:
-                return self.async_abort(reason="already_configured")
-            if entry.unique_id != uuid:
-                continue
-            self.hass.config_entries.async_update_entry(
-                entry, data={CONF_INFO: {**entry.data[CONF_INFO], "address": host}}
-            )
-            return self.async_abort(reason="already_configured")
-        self._discovered_device = device
-        return await self.async_step_discovery_confirm()
-
-    async def async_step_discovery_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
-        """Confirm discovery."""
-        device = self._discovered_device
-        assert device is not None
-
-        if user_input is not None:
-            return await self._async_entry_for_device(device)
-        placeholders = {
-            "name": device.name,
-            "model": device.model,
-            "host": device.address,
-        }
-        self.context["title_placeholders"] = placeholders
-        return self.async_show_form(
-            step_id="discovery_confirm", description_placeholders=placeholders
-        )
-
-    async def _async_entry_for_device(self, device: SensemeDevice) -> FlowResult:
-        """Create a config entry for a device."""
-        await self.async_set_unique_id(device.uuid, raise_on_progress=False)
-        self._abort_if_unique_id_configured()
-        return self.async_create_entry(
-            title=device.name,
-            data={CONF_INFO: device.get_device_info},
-        )
-
-    async def async_step_manual(
-        self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
-        """Handle manual entry of an ip address."""
-        errors = {}
-        if user_input is not None:
-            host = user_input[CONF_HOST]
-            try:
-                ipaddress.ip_address(host)
-            except ValueError:
-                errors[CONF_HOST] = "invalid_host"
-            else:
-                if device := await async_get_device_by_ip_address(host):
-                    device.stop()
-                    return await self._async_entry_for_device(device)
-
-                errors[CONF_HOST] = "cannot_connect"
-
-        return self.async_show_form(
-            step_id="manual",
-            data_schema=vol.Schema({vol.Required(CONF_HOST): str}),
-            errors=errors,
-        )
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
-        """Handle a flow initialized by the user."""
-        if self._discovered_devices is None:
-            self._discovered_devices = await async_discover(self.hass, DISCOVER_TIMEOUT)
-        current_ids = self._async_current_ids()
-        device_selection = {
-            device.uuid: device.name
-            for device in self._discovered_devices
-            if device.uuid not in current_ids
-        }
-
-        if not device_selection:
-            return await self.async_step_manual(user_input=None)
-
-        device_selection[None] = CONF_HOST_MANUAL
-
-        if user_input is not None:
-            if user_input[CONF_DEVICE] is None:
-                return await self.async_step_manual()
-
-            for device in self._discovered_devices:
-                if device.uuid == user_input[CONF_DEVICE]:
-                    return await self._async_entry_for_device(device)
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema(
-                {vol.Required(CONF_DEVICE): vol.In(device_selection)}
-            ),
-        )
diff --git a/homeassistant/components/senseme/const.py b/homeassistant/components/senseme/const.py
deleted file mode 100644
index 5660fc1d177..00000000000
--- a/homeassistant/components/senseme/const.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""Constants for the SenseME integration."""
-
-
-from homeassistant.const import Platform
-
-DOMAIN = "senseme"
-
-# Periodic fan update rate in minutes
-UPDATE_RATE = 1
-
-# data storage
-CONF_INFO = "info"
-CONF_HOST_MANUAL = "IP Address"
-DISCOVERY = "discovery"
-
-# Fan Preset Modes
-PRESET_MODE_WHOOSH = "Whoosh"
-
-# Fan Directions
-SENSEME_DIRECTION_FORWARD = "FWD"
-SENSEME_DIRECTION_REVERSE = "REV"
-
-PLATFORMS = [
-    Platform.BINARY_SENSOR,
-    Platform.FAN,
-    Platform.LIGHT,
-    Platform.SELECT,
-    Platform.SWITCH,
-]
diff --git a/homeassistant/components/senseme/discovery.py b/homeassistant/components/senseme/discovery.py
deleted file mode 100644
index d3924ef16c0..00000000000
--- a/homeassistant/components/senseme/discovery.py
+++ /dev/null
@@ -1,64 +0,0 @@
-"""The SenseME integration discovery."""
-from __future__ import annotations
-
-import asyncio
-
-from aiosenseme import SensemeDevice, SensemeDiscovery
-
-from homeassistant import config_entries
-from homeassistant.const import CONF_ID
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import discovery_flow
-
-from .const import DISCOVERY, DOMAIN
-
-
-@callback
-def async_start_discovery(hass: HomeAssistant) -> bool:
-    """Start discovery if its not already running."""
-    domain_data = hass.data.setdefault(DOMAIN, {})
-    if DISCOVERY in domain_data:
-        return False  # already running
-    discovery = domain_data[DISCOVERY] = SensemeDiscovery(False)
-    discovery.add_callback(lambda devices: async_trigger_discovery(hass, devices))
-    discovery.start()
-    return True  # started
-
-
-@callback
-def async_get_discovered_device(hass: HomeAssistant, uuid: str) -> SensemeDevice:
-    """Return a discovered device."""
-    discovery: SensemeDiscovery = hass.data[DOMAIN][DISCOVERY]
-    devices: list[SensemeDevice] = discovery.devices
-    for discovered_device in devices:
-        if discovered_device.uuid == uuid:
-            return discovered_device
-    raise RuntimeError("Discovered device unexpectedly disappeared")
-
-
-async def async_discover(hass: HomeAssistant, timeout: float) -> list[SensemeDevice]:
-    """Discover devices or restart it if its already running."""
-    started = async_start_discovery(hass)
-    discovery: SensemeDiscovery = hass.data[DOMAIN][DISCOVERY]
-    if not started:  # already running
-        discovery.stop()
-        discovery.start()
-    await asyncio.sleep(timeout)
-    devices: list[SensemeDevice] = discovery.devices
-    return devices
-
-
-@callback
-def async_trigger_discovery(
-    hass: HomeAssistant,
-    discovered_devices: list[SensemeDevice],
-) -> None:
-    """Trigger config flows for discovered devices."""
-    for device in discovered_devices:
-        if device.uuid:
-            discovery_flow.async_create_flow(
-                hass,
-                DOMAIN,
-                context={"source": config_entries.SOURCE_INTEGRATION_DISCOVERY},
-                data={CONF_ID: device.uuid},
-            )
diff --git a/homeassistant/components/senseme/entity.py b/homeassistant/components/senseme/entity.py
deleted file mode 100644
index 9e0ca412628..00000000000
--- a/homeassistant/components/senseme/entity.py
+++ /dev/null
@@ -1,47 +0,0 @@
-"""The SenseME integration entities."""
-from __future__ import annotations
-
-from aiosenseme import SensemeDevice
-
-from homeassistant.core import callback
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.entity import DeviceInfo, Entity
-
-
-class SensemeEntity(Entity):
-    """Base class for senseme entities."""
-
-    _attr_should_poll = False
-
-    def __init__(self, device: SensemeDevice, name: str) -> None:
-        """Initialize the entity."""
-        self._device = device
-        self._attr_name = name
-        self._attr_device_info = DeviceInfo(
-            connections={(dr.CONNECTION_NETWORK_MAC, self._device.mac)},
-            name=self._device.name,
-            manufacturer="Big Ass Fans",
-            model=self._device.model,
-            sw_version=self._device.fw_version,
-            suggested_area=self._device.room_name,
-        )
-        self._async_update_attrs()
-
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update attrs from device."""
-        self._attr_available = self._device.available
-
-    @callback
-    def _async_update_from_device(self) -> None:
-        """Process an update from the device."""
-        self._async_update_attrs()
-        self.async_write_ha_state()
-
-    async def async_added_to_hass(self) -> None:
-        """Add data updated listener after this object has been initialized."""
-        self._device.add_callback(self._async_update_from_device)
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Remove data updated listener after this object has been initialized."""
-        self._device.remove_callback(self._async_update_from_device)
diff --git a/homeassistant/components/senseme/fan.py b/homeassistant/components/senseme/fan.py
deleted file mode 100644
index 63c64a11632..00000000000
--- a/homeassistant/components/senseme/fan.py
+++ /dev/null
@@ -1,113 +0,0 @@
-"""Support for Big Ass Fans SenseME fan."""
-from __future__ import annotations
-
-import math
-from typing import Any
-
-from aiosenseme import SensemeFan
-
-from homeassistant import config_entries
-from homeassistant.components.fan import (
-    DIRECTION_FORWARD,
-    DIRECTION_REVERSE,
-    FanEntity,
-    FanEntityFeature,
-)
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util.percentage import (
-    percentage_to_ranged_value,
-    ranged_value_to_percentage,
-)
-
-from .const import (
-    DOMAIN,
-    PRESET_MODE_WHOOSH,
-    SENSEME_DIRECTION_FORWARD,
-    SENSEME_DIRECTION_REVERSE,
-)
-from .entity import SensemeEntity
-
-SENSEME_DIRECTION_TO_HASS = {
-    SENSEME_DIRECTION_FORWARD: DIRECTION_FORWARD,
-    SENSEME_DIRECTION_REVERSE: DIRECTION_REVERSE,
-}
-HASS_DIRECTION_TO_SENSEME = {v: k for k, v in SENSEME_DIRECTION_TO_HASS.items()}
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up SenseME fans."""
-    device = hass.data[DOMAIN][entry.entry_id]
-    if device.is_fan:
-        async_add_entities([HASensemeFan(device)])
-
-
-class HASensemeFan(SensemeEntity, FanEntity):
-    """SenseME ceiling fan component."""
-
-    _attr_supported_features = FanEntityFeature.SET_SPEED | FanEntityFeature.DIRECTION
-    _attr_preset_modes = [PRESET_MODE_WHOOSH]
-
-    def __init__(self, device: SensemeFan) -> None:
-        """Initialize the entity."""
-        super().__init__(device, device.name)
-        self._attr_speed_count = self._device.fan_speed_max
-        self._attr_unique_id = f"{self._device.uuid}-FAN"  # for legacy compat
-
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update attrs from device."""
-        self._attr_is_on = self._device.fan_on
-        self._attr_current_direction = SENSEME_DIRECTION_TO_HASS.get(
-            self._device.fan_dir, DIRECTION_FORWARD  # None also means forward
-        )
-        if self._device.fan_speed is not None:
-            self._attr_percentage = ranged_value_to_percentage(
-                self._device.fan_speed_limits, self._device.fan_speed
-            )
-        else:
-            self._attr_percentage = None
-        whoosh = self._device.fan_whoosh_mode
-        self._attr_preset_mode = PRESET_MODE_WHOOSH if whoosh else None
-        super()._async_update_attrs()
-
-    async def async_set_percentage(self, percentage: int) -> None:
-        """Set the speed of the fan, as a percentage."""
-        self._device.fan_speed = math.ceil(
-            percentage_to_ranged_value(self._device.fan_speed_limits, percentage)
-        )
-
-    async def async_turn_on(
-        self,
-        percentage: int | None = None,
-        preset_mode: str | None = None,
-        **kwargs: Any,
-    ) -> None:
-        """Turn the fan on with a percentage or preset mode."""
-        if preset_mode is not None:
-            await self.async_set_preset_mode(preset_mode)
-        elif percentage is None:
-            self._device.fan_on = True
-        else:
-            await self.async_set_percentage(percentage)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the fan off."""
-        self._device.fan_on = False
-
-    async def async_set_preset_mode(self, preset_mode: str) -> None:
-        """Set the preset mode of the fan."""
-        if preset_mode != PRESET_MODE_WHOOSH:
-            raise ValueError(f"Invalid preset mode: {preset_mode}")
-        # Sleep mode must be off for Whoosh to work.
-        if self._device.sleep_mode:
-            self._device.sleep_mode = False
-        self._device.fan_whoosh_mode = True
-
-    async def async_set_direction(self, direction: str) -> None:
-        """Set the direction of the fan."""
-        self._device.fan_dir = HASS_DIRECTION_TO_SENSEME[direction]
diff --git a/homeassistant/components/senseme/light.py b/homeassistant/components/senseme/light.py
deleted file mode 100644
index f1150260f38..00000000000
--- a/homeassistant/components/senseme/light.py
+++ /dev/null
@@ -1,110 +0,0 @@
-"""Support for Big Ass Fans SenseME light."""
-from __future__ import annotations
-
-from typing import Any
-
-from aiosenseme import SensemeDevice
-
-from homeassistant import config_entries
-from homeassistant.components.light import (
-    ATTR_BRIGHTNESS,
-    ATTR_COLOR_TEMP,
-    ColorMode,
-    LightEntity,
-)
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util.color import (
-    color_temperature_kelvin_to_mired,
-    color_temperature_mired_to_kelvin,
-)
-
-from .const import DOMAIN
-from .entity import SensemeEntity
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up SenseME lights."""
-    device = hass.data[DOMAIN][entry.entry_id]
-    if not device.has_light:
-        return
-    if device.is_light:
-        async_add_entities([HASensemeStandaloneLight(device)])
-    else:
-        async_add_entities([HASensemeFanLight(device)])
-
-
-class HASensemeLight(SensemeEntity, LightEntity):
-    """Representation of a Big Ass Fans SenseME light."""
-
-    def __init__(self, device: SensemeDevice, name: str) -> None:
-        """Initialize the entity."""
-        super().__init__(device, name)
-        self._attr_unique_id = f"{device.uuid}-LIGHT"  # for legacy compat
-
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update attrs from device."""
-        self._attr_is_on = self._device.light_on
-        if self._device.light_brightness is not None:
-            self._attr_brightness = int(min(255, self._device.light_brightness * 16))
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on the light."""
-        if (brightness := kwargs.get(ATTR_BRIGHTNESS)) is not None:
-            # set the brightness, which will also turn on/off light
-            if brightness == 255:
-                brightness = 256  # this will end up as 16 which is max
-            self._device.light_brightness = int(brightness / 16)
-        else:
-            self._device.light_on = True
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off the light."""
-        self._device.light_on = False
-
-
-class HASensemeFanLight(HASensemeLight):
-    """Representation of a Big Ass Fans SenseME light on a fan."""
-
-    def __init__(self, device: SensemeDevice) -> None:
-        """Init a fan light."""
-        super().__init__(device, device.name)
-        self._attr_supported_color_modes = {ColorMode.BRIGHTNESS}
-        self._attr_color_mode = ColorMode.BRIGHTNESS
-
-
-class HASensemeStandaloneLight(HASensemeLight):
-    """Representation of a Big Ass Fans SenseME light."""
-
-    def __init__(self, device: SensemeDevice) -> None:
-        """Init a standalone light."""
-        super().__init__(device, f"{device.name} Light")
-        self._attr_supported_color_modes = {ColorMode.COLOR_TEMP}
-        self._attr_color_mode = ColorMode.COLOR_TEMP
-        self._attr_min_mireds = color_temperature_kelvin_to_mired(
-            device.light_color_temp_max
-        )
-        self._attr_max_mireds = color_temperature_kelvin_to_mired(
-            device.light_color_temp_min
-        )
-
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update attrs from device."""
-        super()._async_update_attrs()
-        self._attr_color_temp = color_temperature_kelvin_to_mired(
-            self._device.light_color_temp
-        )
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on the light."""
-        if (color_temp := kwargs.get(ATTR_COLOR_TEMP)) is not None:
-            self._device.light_color_temp = color_temperature_mired_to_kelvin(
-                color_temp
-            )
-        await super().async_turn_on(**kwargs)
diff --git a/homeassistant/components/senseme/manifest.json b/homeassistant/components/senseme/manifest.json
deleted file mode 100644
index b5a36609c6a..00000000000
--- a/homeassistant/components/senseme/manifest.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "domain": "senseme",
-  "name": "SenseME",
-  "codeowners": ["@mikelawrence", "@bdraco"],
-  "config_flow": true,
-  "dhcp": [
-    {
-      "registered_devices": true
-    },
-    {
-      "macaddress": "20F85E*"
-    }
-  ],
-  "documentation": "https://www.home-assistant.io/integrations/senseme",
-  "iot_class": "local_push",
-  "loggers": ["aiosenseme"],
-  "requirements": ["aiosenseme==0.6.1"]
-}
diff --git a/homeassistant/components/senseme/select.py b/homeassistant/components/senseme/select.py
deleted file mode 100644
index 251e6c385d8..00000000000
--- a/homeassistant/components/senseme/select.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""Support for Big Ass Fans SenseME selects."""
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-
-from aiosenseme import SensemeFan
-from aiosenseme.device import SensemeDevice
-
-from homeassistant import config_entries
-from homeassistant.components.select import SelectEntity, SelectEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .const import DOMAIN
-from .entity import SensemeEntity
-
-SMART_MODE_TO_HASS = {
-    "OFF": "Off",
-    "COOLING": "Cooling",
-    "HEATING": "Heating",
-    "FOLLOWTSTAT": "Follow Thermostat",
-}
-HASS_TO_SMART_MODE = {v: k for k, v in SMART_MODE_TO_HASS.items()}
-
-
-@dataclass
-class SenseMESelectEntityDescriptionMixin:
-    """Mixin for required keys."""
-
-    value_fn: Callable[[SensemeFan], str]
-    set_fn: Callable[[SensemeFan, str], None]
-
-
-@dataclass
-class SenseMESelectEntityDescription(
-    SelectEntityDescription, SenseMESelectEntityDescriptionMixin
-):
-    """Describes SenseME select entity."""
-
-
-def _set_smart_mode(device: SensemeDevice, value: str) -> None:
-    device.fan_smartmode = HASS_TO_SMART_MODE[value]
-
-
-FAN_SELECTS = [
-    SenseMESelectEntityDescription(
-        key="smart_mode",
-        name="Smart Mode",
-        value_fn=lambda device: SMART_MODE_TO_HASS[device.fan_smartmode],
-        set_fn=_set_smart_mode,
-        options=list(SMART_MODE_TO_HASS.values()),
-    ),
-]
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up SenseME fan selects."""
-    device = hass.data[DOMAIN][entry.entry_id]
-    if device.is_fan:
-        async_add_entities(
-            HASensemeSelect(device, description) for description in FAN_SELECTS
-        )
-
-
-class HASensemeSelect(SensemeEntity, SelectEntity):
-    """SenseME select component."""
-
-    entity_description: SenseMESelectEntityDescription
-
-    def __init__(
-        self, device: SensemeFan, description: SenseMESelectEntityDescription
-    ) -> None:
-        """Initialize the entity."""
-        self.entity_description = description
-        super().__init__(device, f"{device.name} {description.name}")
-        self._attr_unique_id = f"{self._device.uuid}-{description.key}"
-
-    @property
-    def current_option(self) -> str:
-        """Return the current value."""
-        return self.entity_description.value_fn(self._device)
-
-    async def async_select_option(self, option: str) -> None:
-        """Set the option."""
-        self.entity_description.set_fn(self._device, option)
diff --git a/homeassistant/components/senseme/strings.json b/homeassistant/components/senseme/strings.json
deleted file mode 100644
index 2de35bc7fed..00000000000
--- a/homeassistant/components/senseme/strings.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "config": {
-    "flow_title": "{name} - {model} ({host})",
-    "step": {
-      "user": {
-        "description": "Select a device, or choose 'IP Address' to manually enter an IP Address.",
-        "data": {
-          "device": "Device"
-        }
-      },
-      "discovery_confirm": {
-        "description": "Do you want to set up {name} - {model} ({host})?"
-      },
-      "manual": {
-        "description": "Enter an IP Address.",
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]"
-        }
-      }
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
-    "error": {
-      "invalid_host": "[%key:common::config_flow::error::invalid_host%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    }
-  }
-}
diff --git a/homeassistant/components/senseme/switch.py b/homeassistant/components/senseme/switch.py
deleted file mode 100644
index 8ffc9075248..00000000000
--- a/homeassistant/components/senseme/switch.py
+++ /dev/null
@@ -1,138 +0,0 @@
-"""Support for Big Ass Fans SenseME switch."""
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import Any, cast
-
-from aiosenseme import SensemeFan
-from aiosenseme.device import SensemeDevice
-
-from homeassistant import config_entries
-from homeassistant.components.switch import (
-    SwitchDeviceClass,
-    SwitchEntity,
-    SwitchEntityDescription,
-)
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .const import DOMAIN
-from .entity import SensemeEntity
-
-
-@dataclass
-class SenseMESwitchEntityDescriptionMixin:
-    """Mixin for required keys."""
-
-    value_fn: Callable[[SensemeFan], bool]
-    set_fn: Callable[[SensemeFan, bool], None]
-
-
-@dataclass
-class SenseMESwitchEntityDescription(
-    SwitchEntityDescription, SenseMESwitchEntityDescriptionMixin
-):
-    """Describes SenseME switch entity."""
-
-
-def _set_sleep_mode(device: SensemeDevice, value: bool) -> None:
-    device.sleep_mode = value
-
-
-def _set_motion_fan_auto(device: SensemeDevice, value: bool) -> None:
-    device.motion_fan_auto = value
-
-
-def _set_motion_light_auto(device: SensemeDevice, value: bool) -> None:
-    device.motion_light_auto = value
-
-
-FAN_SWITCHES = [
-    # Turning on sleep mode will disable Whoosh
-    SenseMESwitchEntityDescription(
-        key="sleep_mode",
-        name="Sleep Mode",
-        value_fn=lambda device: cast(bool, device.sleep_mode),
-        set_fn=_set_sleep_mode,
-    ),
-    SenseMESwitchEntityDescription(
-        key="motion_fan_auto",
-        name="Motion",
-        value_fn=lambda device: cast(bool, device.motion_fan_auto),
-        set_fn=_set_motion_fan_auto,
-    ),
-]
-
-FAN_LIGHT_SWITCHES = [
-    SenseMESwitchEntityDescription(
-        key="motion_light_auto",
-        name="Light Motion",
-        value_fn=lambda device: cast(bool, device.motion_light_auto),
-        set_fn=_set_motion_light_auto,
-    ),
-]
-
-LIGHT_SWITCHES = [
-    SenseMESwitchEntityDescription(
-        key="sleep_mode",
-        name="Sleep Mode",
-        value_fn=lambda device: cast(bool, device.sleep_mode),
-        set_fn=_set_sleep_mode,
-    ),
-    SenseMESwitchEntityDescription(
-        key="motion_light_auto",
-        name="Motion",
-        value_fn=lambda device: cast(bool, device.motion_light_auto),
-        set_fn=_set_motion_light_auto,
-    ),
-]
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up SenseME fans."""
-    device = hass.data[DOMAIN][entry.entry_id]
-    descriptions: list[SenseMESwitchEntityDescription] = []
-
-    if device.is_fan:
-        descriptions.extend(FAN_SWITCHES)
-        if device.has_light:
-            descriptions.extend(FAN_LIGHT_SWITCHES)
-    elif device.is_light:
-        descriptions.extend(LIGHT_SWITCHES)
-
-    async_add_entities(
-        HASensemeSwitch(device, description) for description in descriptions
-    )
-
-
-class HASensemeSwitch(SensemeEntity, SwitchEntity):
-    """SenseME switch component."""
-
-    entity_description: SenseMESwitchEntityDescription
-
-    def __init__(
-        self, device: SensemeFan, description: SenseMESwitchEntityDescription
-    ) -> None:
-        """Initialize the entity."""
-        self.entity_description = description
-        self._attr_device_class = SwitchDeviceClass.SWITCH
-        super().__init__(device, f"{device.name} {description.name}")
-        self._attr_unique_id = f"{self._device.uuid}-SWITCH-{description.key}"
-
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update attrs from device."""
-        self._attr_is_on = self.entity_description.value_fn(self._device)
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on the switch."""
-        self.entity_description.set_fn(self._device, True)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off the switch."""
-        self.entity_description.set_fn(self._device, False)
diff --git a/homeassistant/components/sensibo/climate.py b/homeassistant/components/sensibo/climate.py
index 9afdff43ef0..4ff63a25455 100644
--- a/homeassistant/components/sensibo/climate.py
+++ b/homeassistant/components/sensibo/climate.py
@@ -163,6 +163,8 @@ async def async_setup_entry(
 class SensiboClimate(SensiboDeviceBaseEntity, ClimateEntity):
     """Representation of a Sensibo device."""
 
+    _attr_name = None
+
     def __init__(
         self, coordinator: SensiboDataUpdateCoordinator, device_id: str
     ) -> None:
diff --git a/homeassistant/components/sensirion_ble/manifest.json b/homeassistant/components/sensirion_ble/manifest.json
index 372f40ac9a8..38f66a88e8e 100644
--- a/homeassistant/components/sensirion_ble/manifest.json
+++ b/homeassistant/components/sensirion_ble/manifest.json
@@ -16,5 +16,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/sensirion_ble",
   "iot_class": "local_push",
-  "requirements": ["sensirion-ble==0.0.1"]
+  "requirements": ["sensirion-ble==0.1.0"]
 }
diff --git a/homeassistant/components/sensor/__init__.py b/homeassistant/components/sensor/__init__.py
index f21f57d9d36..ad09a1b5fdb 100644
--- a/homeassistant/components/sensor/__init__.py
+++ b/homeassistant/components/sensor/__init__.py
@@ -257,6 +257,13 @@ class SensorEntity(Entity):
         self._async_read_entity_options()
         self._update_suggested_precision()
 
+    def _default_to_device_class_name(self) -> bool:
+        """Return True if an unnamed entity should be named by its device class.
+
+        For sensors this is True if the entity has a device class.
+        """
+        return self.device_class not in (None, SensorDeviceClass.ENUM)
+
     @property
     def device_class(self) -> SensorDeviceClass | None:
         """Return the class of this entity."""
@@ -443,8 +450,10 @@ class SensorEntity(Entity):
             return self._sensor_option_unit_of_measurement
 
         # Second priority, for non registered entities: unit suggested by integration
-        if not self.unique_id and self.suggested_unit_of_measurement:
-            return self.suggested_unit_of_measurement
+        if not self.unique_id and (
+            suggested_unit_of_measurement := self.suggested_unit_of_measurement
+        ):
+            return suggested_unit_of_measurement
 
         # Third priority: Legacy temperature conversion, which applies
         # to both registered and non registered entities
diff --git a/homeassistant/components/sensor/device_condition.py b/homeassistant/components/sensor/device_condition.py
index c52e076e51e..7d6c57de296 100644
--- a/homeassistant/components/sensor/device_condition.py
+++ b/homeassistant/components/sensor/device_condition.py
@@ -3,6 +3,9 @@ from __future__ import annotations
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+)
 from homeassistant.components.device_automation.exceptions import (
     InvalidDeviceAutomationConfig,
 )
@@ -136,7 +139,7 @@ ENTITY_CONDITIONS = {
 CONDITION_SCHEMA = vol.All(
     cv.DEVICE_CONDITION_BASE_SCHEMA.extend(
         {
-            vol.Required(CONF_ENTITY_ID): cv.entity_id,
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_TYPE): vol.In(
                 [
                     CONF_IS_APPARENT_POWER,
@@ -223,7 +226,7 @@ async def async_get_conditions(
                 **template,
                 "condition": "device",
                 "device_id": device_id,
-                "entity_id": entry.entity_id,
+                "entity_id": entry.id,
                 "domain": DOMAIN,
             }
             for template in templates
@@ -257,8 +260,10 @@ async def async_get_condition_capabilities(
     hass: HomeAssistant, config: ConfigType
 ) -> dict[str, vol.Schema]:
     """List condition capabilities."""
+
     try:
-        unit_of_measurement = get_unit_of_measurement(hass, config[CONF_ENTITY_ID])
+        entry = async_get_entity_registry_entry_or_raise(hass, config[CONF_ENTITY_ID])
+        unit_of_measurement = get_unit_of_measurement(hass, entry.entity_id)
     except HomeAssistantError:
         unit_of_measurement = None
 
diff --git a/homeassistant/components/sensor/device_trigger.py b/homeassistant/components/sensor/device_trigger.py
index 0d594e1b7c3..1bb41eb2d30 100644
--- a/homeassistant/components/sensor/device_trigger.py
+++ b/homeassistant/components/sensor/device_trigger.py
@@ -1,7 +1,10 @@
 """Provides device triggers for sensors."""
 import voluptuous as vol
 
-from homeassistant.components.device_automation import DEVICE_TRIGGER_BASE_SCHEMA
+from homeassistant.components.device_automation import (
+    DEVICE_TRIGGER_BASE_SCHEMA,
+    async_get_entity_registry_entry_or_raise,
+)
 from homeassistant.components.device_automation.exceptions import (
     InvalidDeviceAutomationConfig,
 )
@@ -136,7 +139,7 @@ ENTITY_TRIGGERS = {
 TRIGGER_SCHEMA = vol.All(
     DEVICE_TRIGGER_BASE_SCHEMA.extend(
         {
-            vol.Required(CONF_ENTITY_ID): cv.entity_id,
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_TYPE): vol.In(
                 [
                     CONF_APPARENT_POWER,
@@ -251,7 +254,7 @@ async def async_get_triggers(
                 **automation,
                 "platform": "device",
                 "device_id": device_id,
-                "entity_id": entry.entity_id,
+                "entity_id": entry.id,
                 "domain": DOMAIN,
             }
             for automation in templates
@@ -264,8 +267,10 @@ async def async_get_trigger_capabilities(
     hass: HomeAssistant, config: ConfigType
 ) -> dict[str, vol.Schema]:
     """List trigger capabilities."""
+
     try:
-        unit_of_measurement = get_unit_of_measurement(hass, config[CONF_ENTITY_ID])
+        entry = async_get_entity_registry_entry_or_raise(hass, config[CONF_ENTITY_ID])
+        unit_of_measurement = get_unit_of_measurement(hass, entry.entity_id)
     except HomeAssistantError:
         unit_of_measurement = None
 
diff --git a/homeassistant/components/sentry/__init__.py b/homeassistant/components/sentry/__init__.py
index 092358e82f6..8815986d368 100644
--- a/homeassistant/components/sentry/__init__.py
+++ b/homeassistant/components/sentry/__init__.py
@@ -206,7 +206,7 @@ def process_before_send(
                 "channel": channel,
                 "custom_components": "\n".join(sorted(custom_components)),
                 "integrations": "\n".join(sorted(integrations)),
-                **system_info,  # type: ignore[arg-type]
+                **system_info,
             },
         }
     )
diff --git a/homeassistant/components/sentry/manifest.json b/homeassistant/components/sentry/manifest.json
index d684ee345b1..336c1cbc7ef 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.23.1"]
+  "requirements": ["sentry-sdk==1.25.1"]
 }
diff --git a/homeassistant/components/senz/__init__.py b/homeassistant/components/senz/__init__.py
index e6ded8e0355..559760ec52d 100644
--- a/homeassistant/components/senz/__init__.py
+++ b/homeassistant/components/senz/__init__.py
@@ -16,8 +16,6 @@ from homeassistant.helpers import (
     config_validation as cv,
     httpx_client,
 )
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .api import SENZConfigEntryAuth
@@ -27,29 +25,13 @@ UPDATE_INTERVAL = timedelta(seconds=30)
 
 _LOGGER = logging.getLogger(__name__)
 
-CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 PLATFORMS = [Platform.CLIMATE]
 
 SENZDataUpdateCoordinator = DataUpdateCoordinator[dict[str, Thermostat]]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the SENZ integration."""
-    if DOMAIN in config:
-        async_create_issue(
-            hass,
-            DOMAIN,
-            "removed_yaml",
-            breaks_in_ha_version="2022.8.0",
-            is_fixable=False,
-            severity=IssueSeverity.WARNING,
-            translation_key="removed_yaml",
-        )
-
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up SENZ from a config entry."""
     implementation = (
diff --git a/homeassistant/components/senz/strings.json b/homeassistant/components/senz/strings.json
index 74ca9f5e3bf..316f7234f9b 100644
--- a/homeassistant/components/senz/strings.json
+++ b/homeassistant/components/senz/strings.json
@@ -16,11 +16,5 @@
     "create_entry": {
       "default": "[%key:common::config_flow::create_entry::authenticated%]"
     }
-  },
-  "issues": {
-    "removed_yaml": {
-      "title": "The nVent RAYCHEM SENZ YAML configuration has been removed",
-      "description": "Configuring nVent RAYCHEM SENZ using YAML has been removed.\n\nYour existing YAML configuration is not used by Home Assistant.\n\nRemove the YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/seven_segments/manifest.json b/homeassistant/components/seven_segments/manifest.json
index 90c5bf59fa3..e9b2e9e2e9c 100644
--- a/homeassistant/components/seven_segments/manifest.json
+++ b/homeassistant/components/seven_segments/manifest.json
@@ -4,5 +4,5 @@
   "codeowners": ["@fabaff"],
   "documentation": "https://www.home-assistant.io/integrations/seven_segments",
   "iot_class": "local_polling",
-  "requirements": ["pillow==9.5.0"]
+  "requirements": ["Pillow==9.5.0"]
 }
diff --git a/homeassistant/components/sharkiq/vacuum.py b/homeassistant/components/sharkiq/vacuum.py
index 5eafbc1e1e2..9121811af3c 100644
--- a/homeassistant/components/sharkiq/vacuum.py
+++ b/homeassistant/components/sharkiq/vacuum.py
@@ -68,6 +68,8 @@ class SharkVacuumEntity(CoordinatorEntity[SharkIqUpdateCoordinator], StateVacuum
     """Shark IQ vacuum entity."""
 
     _attr_fan_speed_list = list(FAN_SPEEDS_MAP)
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_supported_features = (
         VacuumEntityFeature.BATTERY
         | VacuumEntityFeature.FAN_SPEED
@@ -86,7 +88,6 @@ class SharkVacuumEntity(CoordinatorEntity[SharkIqUpdateCoordinator], StateVacuum
         """Create a new SharkVacuumEntity."""
         super().__init__(coordinator)
         self.sharkiq = sharkiq
-        self._attr_name = sharkiq.name
         self._attr_unique_id = sharkiq.serial_number
         self._serial_number = sharkiq.serial_number
 
@@ -122,7 +123,7 @@ class SharkVacuumEntity(CoordinatorEntity[SharkIqUpdateCoordinator], StateVacuum
             identifiers={(DOMAIN, self._serial_number)},
             manufacturer=SHARK,
             model=self.model,
-            name=self.name,
+            name=self.sharkiq.name,
             sw_version=self.sharkiq.get_property_value(
                 Properties.ROBOT_FIRMWARE_VERSION
             ),
diff --git a/homeassistant/components/shelly/__init__.py b/homeassistant/components/shelly/__init__.py
index 7cb1f697765..69959453a78 100644
--- a/homeassistant/components/shelly/__init__.py
+++ b/homeassistant/components/shelly/__init__.py
@@ -44,6 +44,7 @@ from .utils import (
     get_coap_context,
     get_device_entry_gen,
     get_rpc_device_sleep_period,
+    get_rpc_device_wakeup_period,
     get_ws_context,
 )
 
@@ -258,7 +259,9 @@ async def _async_setup_rpc_entry(hass: HomeAssistant, entry: ConfigEntry) -> boo
 
         if sleep_period is None:
             data = {**entry.data}
-            data[CONF_SLEEP_PERIOD] = get_rpc_device_sleep_period(device.config)
+            data[CONF_SLEEP_PERIOD] = get_rpc_device_sleep_period(
+                device.config
+            ) or get_rpc_device_wakeup_period(device.status)
             hass.config_entries.async_update_entry(entry, data=data)
 
         hass.async_create_task(_async_rpc_device_setup())
diff --git a/homeassistant/components/shelly/binary_sensor.py b/homeassistant/components/shelly/binary_sensor.py
index 449fc142218..1474906cacb 100644
--- a/homeassistant/components/shelly/binary_sensor.py
+++ b/homeassistant/components/shelly/binary_sensor.py
@@ -14,6 +14,7 @@ from homeassistant.const import STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.entity_registry import RegistryEntry
+from homeassistant.helpers.restore_state import RestoreEntity
 
 from .const import CONF_SLEEP_PERIOD
 from .entity import (
@@ -290,11 +291,18 @@ class RpcBinarySensor(ShellyRpcAttributeEntity, BinarySensorEntity):
         return bool(self.attribute_value)
 
 
-class BlockSleepingBinarySensor(ShellySleepingBlockAttributeEntity, BinarySensorEntity):
+class BlockSleepingBinarySensor(
+    ShellySleepingBlockAttributeEntity, BinarySensorEntity, RestoreEntity
+):
     """Represent a block sleeping binary sensor."""
 
     entity_description: BlockBinarySensorDescription
 
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        self.last_state = await self.async_get_last_state()
+
     @property
     def is_on(self) -> bool | None:
         """Return true if sensor state is on."""
@@ -307,11 +315,18 @@ class BlockSleepingBinarySensor(ShellySleepingBlockAttributeEntity, BinarySensor
         return self.last_state.state == STATE_ON
 
 
-class RpcSleepingBinarySensor(ShellySleepingRpcAttributeEntity, BinarySensorEntity):
+class RpcSleepingBinarySensor(
+    ShellySleepingRpcAttributeEntity, BinarySensorEntity, RestoreEntity
+):
     """Represent a RPC sleeping binary sensor entity."""
 
     entity_description: RpcBinarySensorDescription
 
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        self.last_state = await self.async_get_last_state()
+
     @property
     def is_on(self) -> bool | None:
         """Return true if RPC sensor state is on."""
diff --git a/homeassistant/components/shelly/bluetooth/scanner.py b/homeassistant/components/shelly/bluetooth/scanner.py
index 5b302e0da62..7c0dc3c792a 100644
--- a/homeassistant/components/shelly/bluetooth/scanner.py
+++ b/homeassistant/components/shelly/bluetooth/scanner.py
@@ -6,7 +6,7 @@ from typing import Any
 from aioshelly.ble import parse_ble_scan_result_event
 from aioshelly.ble.const import BLE_SCAN_RESULT_EVENT, BLE_SCAN_RESULT_VERSION
 
-from homeassistant.components.bluetooth import BaseHaRemoteScanner
+from homeassistant.components.bluetooth import MONOTONIC_TIME, BaseHaRemoteScanner
 from homeassistant.core import callback
 
 from ..const import LOGGER
@@ -44,4 +44,5 @@ class ShellyBLEScanner(BaseHaRemoteScanner):
             parsed.manufacturer_data,
             parsed.tx_power,
             {},
+            MONOTONIC_TIME(),
         )
diff --git a/homeassistant/components/shelly/button.py b/homeassistant/components/shelly/button.py
index 15a05573656..ac01033f2c7 100644
--- a/homeassistant/components/shelly/button.py
+++ b/homeassistant/components/shelly/button.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 
 from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
-from typing import Any, Final, Generic, TypeVar
+from typing import TYPE_CHECKING, Any, Final, Generic, TypeVar
 
 from homeassistant.components.button import (
     ButtonDeviceClass,
@@ -12,14 +12,15 @@ from homeassistant.components.button import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import slugify
 
-from .const import SHELLY_GAS_MODELS
+from .const import LOGGER, SHELLY_GAS_MODELS
 from .coordinator import ShellyBlockCoordinator, ShellyRpcCoordinator, get_entry_data
 from .utils import get_device_entry_gen
 
@@ -79,12 +80,52 @@ BUTTONS: Final[list[ShellyButtonDescription[Any]]] = [
 ]
 
 
+@callback
+def async_migrate_unique_ids(
+    entity_entry: er.RegistryEntry,
+    coordinator: ShellyRpcCoordinator | ShellyBlockCoordinator,
+) -> dict[str, Any] | None:
+    """Migrate button unique IDs."""
+    if not entity_entry.entity_id.startswith("button"):
+        return None
+
+    device_name = slugify(coordinator.device.name)
+
+    for key in ("reboot", "self_test", "mute", "unmute"):
+        old_unique_id = f"{device_name}_{key}"
+        if entity_entry.unique_id == old_unique_id:
+            new_unique_id = f"{coordinator.mac}_{key}"
+            LOGGER.debug(
+                "Migrating unique_id for %s entity from [%s] to [%s]",
+                entity_entry.entity_id,
+                old_unique_id,
+                new_unique_id,
+            )
+            return {
+                "new_unique_id": entity_entry.unique_id.replace(
+                    old_unique_id, new_unique_id
+                )
+            }
+
+    return None
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set buttons for device."""
+
+    @callback
+    def _async_migrate_unique_ids(
+        entity_entry: er.RegistryEntry,
+    ) -> dict[str, Any] | None:
+        """Migrate button unique IDs."""
+        if TYPE_CHECKING:
+            assert coordinator is not None
+        return async_migrate_unique_ids(entity_entry, coordinator)
+
     coordinator: ShellyRpcCoordinator | ShellyBlockCoordinator | None = None
     if get_device_entry_gen(config_entry) == 2:
         coordinator = get_entry_data(hass)[config_entry.entry_id].rpc
@@ -92,6 +133,10 @@ async def async_setup_entry(
         coordinator = get_entry_data(hass)[config_entry.entry_id].block
 
     if coordinator is not None:
+        await er.async_migrate_entries(
+            hass, config_entry.entry_id, _async_migrate_unique_ids
+        )
+
         entities: list[ShellyButton] = []
 
         for button in BUTTONS:
@@ -123,7 +168,7 @@ class ShellyButton(
         self.entity_description = description
 
         self._attr_name = f"{coordinator.device.name} {description.name}"
-        self._attr_unique_id = slugify(self._attr_name)
+        self._attr_unique_id = f"{coordinator.mac}_{description.key}"
         self._attr_device_info = DeviceInfo(
             connections={(CONNECTION_NETWORK_MAC, coordinator.mac)}
         )
diff --git a/homeassistant/components/shelly/config_flow.py b/homeassistant/components/shelly/config_flow.py
index 43e9f9b8fe7..bad13fde006 100644
--- a/homeassistant/components/shelly/config_flow.py
+++ b/homeassistant/components/shelly/config_flow.py
@@ -39,6 +39,7 @@ from .utils import (
     get_info_gen,
     get_model_name,
     get_rpc_device_sleep_period,
+    get_rpc_device_wakeup_period,
     get_ws_context,
     mac_address_from_name,
 )
@@ -76,9 +77,13 @@ async def validate_input(
         )
         await rpc_device.shutdown()
 
+        sleep_period = get_rpc_device_sleep_period(
+            rpc_device.config
+        ) or get_rpc_device_wakeup_period(rpc_device.status)
+
         return {
             "title": rpc_device.name,
-            CONF_SLEEP_PERIOD: get_rpc_device_sleep_period(rpc_device.config),
+            CONF_SLEEP_PERIOD: sleep_period,
             "model": rpc_device.shelly.get("model"),
             "gen": 2,
         }
diff --git a/homeassistant/components/shelly/entity.py b/homeassistant/components/shelly/entity.py
index 1f18a5f8e18..9f95ea5ac21 100644
--- a/homeassistant/components/shelly/entity.py
+++ b/homeassistant/components/shelly/entity.py
@@ -19,7 +19,6 @@ from homeassistant.helpers.entity_registry import (
     async_entries_for_config_entry,
     async_get as er_async_get,
 )
-from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -201,18 +200,13 @@ def async_setup_rpc_attribute_entities(
                 domain = sensor_class.__module__.split(".")[-1]
                 unique_id = f"{coordinator.mac}-{key}-{sensor_id}"
                 async_remove_shelly_entity(hass, domain, unique_id)
-            else:
-                if description.use_polling_coordinator:
-                    if not sleep_period:
-                        entities.append(
-                            sensor_class(
-                                polling_coordinator, key, sensor_id, description
-                            )
-                        )
-                else:
+            elif description.use_polling_coordinator:
+                if not sleep_period:
                     entities.append(
-                        sensor_class(coordinator, key, sensor_id, description)
+                        sensor_class(polling_coordinator, key, sensor_id, description)
                     )
+            else:
+                entities.append(sensor_class(coordinator, key, sensor_id, description))
     if not entities:
         return
 
@@ -276,6 +270,10 @@ def async_setup_entry_rest(
 class BlockEntityDescription(EntityDescription):
     """Class to describe a BLOCK entity."""
 
+    # BlockEntity does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     icon_fn: Callable[[dict], str] | None = None
     unit_fn: Callable[[dict], str] | None = None
     value: Callable[[Any], Any] = lambda val: val
@@ -296,6 +294,10 @@ class RpcEntityRequiredKeysMixin:
 class RpcEntityDescription(EntityDescription, RpcEntityRequiredKeysMixin):
     """Class to describe a RPC entity."""
 
+    # BlockEntity does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     value: Callable[[Any, Any], Any] | None = None
     available: Callable[[dict], bool] | None = None
     removal_condition: Callable[[dict, dict, str], bool] | None = None
@@ -308,6 +310,10 @@ class RpcEntityDescription(EntityDescription, RpcEntityRequiredKeysMixin):
 class RestEntityDescription(EntityDescription):
     """Class to describe a REST entity."""
 
+    # BlockEntity does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     value: Callable[[dict, Any], Any] | None = None
     extra_state_attributes: Callable[[dict], dict | None] | None = None
 
@@ -552,7 +558,7 @@ class ShellyRpcAttributeEntity(ShellyRpcEntity, Entity):
         return self.entity_description.available(self.sub_status)
 
 
-class ShellySleepingBlockAttributeEntity(ShellyBlockAttributeEntity, RestoreEntity):
+class ShellySleepingBlockAttributeEntity(ShellyBlockAttributeEntity):
     """Represent a shelly sleeping block attribute entity."""
 
     # pylint: disable=super-init-not-called
@@ -589,11 +595,6 @@ class ShellySleepingBlockAttributeEntity(ShellyBlockAttributeEntity, RestoreEnti
             self._attr_unique_id = entry.unique_id
             self._attr_name = cast(str, entry.original_name)
 
-    async def async_added_to_hass(self) -> None:
-        """Handle entity which will be added."""
-        await super().async_added_to_hass()
-        self.last_state = await self.async_get_last_state()
-
     @callback
     def _update_callback(self) -> None:
         """Handle device update."""
@@ -629,7 +630,7 @@ class ShellySleepingBlockAttributeEntity(ShellyBlockAttributeEntity, RestoreEnti
                 return
 
 
-class ShellySleepingRpcAttributeEntity(ShellyRpcAttributeEntity, RestoreEntity):
+class ShellySleepingRpcAttributeEntity(ShellyRpcAttributeEntity):
     """Helper class to represent a sleeping rpc attribute."""
 
     entity_description: RpcEntityDescription
@@ -665,8 +666,3 @@ class ShellySleepingRpcAttributeEntity(ShellyRpcAttributeEntity, RestoreEntity):
             )
         elif entry is not None:
             self._attr_name = cast(str, entry.original_name)
-
-    async def async_added_to_hass(self) -> None:
-        """Handle entity which will be added."""
-        await super().async_added_to_hass()
-        self.last_state = await self.async_get_last_state()
diff --git a/homeassistant/components/shelly/manifest.json b/homeassistant/components/shelly/manifest.json
index 39a1427346d..6031b2dcc82 100644
--- a/homeassistant/components/shelly/manifest.json
+++ b/homeassistant/components/shelly/manifest.json
@@ -9,7 +9,7 @@
   "iot_class": "local_push",
   "loggers": ["aioshelly"],
   "quality_scale": "platinum",
-  "requirements": ["aioshelly==5.3.2"],
+  "requirements": ["aioshelly==5.4.0"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",
diff --git a/homeassistant/components/shelly/number.py b/homeassistant/components/shelly/number.py
index a89c74f9e50..f2b6bedb443 100644
--- a/homeassistant/components/shelly/number.py
+++ b/homeassistant/components/shelly/number.py
@@ -1,15 +1,18 @@
 """Number for Shelly."""
 from __future__ import annotations
 
+from collections.abc import Mapping
 from dataclasses import dataclass
 from typing import Any, Final, cast
 
+from aioshelly.block_device import Block
 from aioshelly.exceptions import DeviceConnectionError, InvalidAuthError
 
 from homeassistant.components.number import (
-    NumberEntity,
     NumberEntityDescription,
+    NumberExtraStoredData,
     NumberMode,
+    RestoreNumber,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory
@@ -19,6 +22,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.entity_registry import RegistryEntry
 
 from .const import CONF_SLEEP_PERIOD, LOGGER
+from .coordinator import ShellyBlockCoordinator
 from .entity import (
     BlockEntityDescription,
     ShellySleepingBlockAttributeEntity,
@@ -85,22 +89,39 @@ async def async_setup_entry(
         )
 
 
-# pylint: disable-next=hass-invalid-inheritance # needs fixing
-class BlockSleepingNumber(ShellySleepingBlockAttributeEntity, NumberEntity):
+class BlockSleepingNumber(ShellySleepingBlockAttributeEntity, RestoreNumber):
     """Represent a block sleeping number."""
 
     entity_description: BlockNumberDescription
 
+    def __init__(
+        self,
+        coordinator: ShellyBlockCoordinator,
+        block: Block | None,
+        attribute: str,
+        description: BlockNumberDescription,
+        entry: RegistryEntry | None = None,
+        sensors: Mapping[tuple[str, str], BlockNumberDescription] | None = None,
+    ) -> None:
+        """Initialize the sleeping sensor."""
+        self.restored_data: NumberExtraStoredData | None = None
+        super().__init__(coordinator, block, attribute, description, entry, sensors)
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        self.restored_data = await self.async_get_last_number_data()
+
     @property
     def native_value(self) -> float | None:
         """Return value of number."""
         if self.block is not None:
             return cast(float, self.attribute_value)
 
-        if self.last_state is None:
+        if self.restored_data is None:
             return None
 
-        return cast(float, self.last_state.state)
+        return cast(float, self.restored_data.native_value)
 
     async def async_set_native_value(self, value: float) -> None:
         """Set value."""
diff --git a/homeassistant/components/shelly/sensor.py b/homeassistant/components/shelly/sensor.py
index 4a88157efc6..0260a540f0c 100644
--- a/homeassistant/components/shelly/sensor.py
+++ b/homeassistant/components/shelly/sensor.py
@@ -8,14 +8,15 @@ from typing import Final, cast
 from aioshelly.block_device import Block
 
 from homeassistant.components.sensor import (
+    RestoreSensor,
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
+    SensorExtraStoredData,
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    ATTR_UNIT_OF_MEASUREMENT,
     CONCENTRATION_PARTS_PER_MILLION,
     DEGREE,
     LIGHT_LUX,
@@ -35,7 +36,7 @@ from homeassistant.helpers.entity_registry import RegistryEntry
 from homeassistant.helpers.typing import StateType
 
 from .const import CONF_SLEEP_PERIOD, SHAIR_MAX_WORK_HOURS
-from .coordinator import ShellyBlockCoordinator
+from .coordinator import ShellyBlockCoordinator, ShellyRpcCoordinator
 from .entity import (
     BlockEntityDescription,
     RestEntityDescription,
@@ -776,8 +777,7 @@ class RpcSensor(ShellyRpcAttributeEntity, SensorEntity):
         return self.attribute_value
 
 
-# pylint: disable-next=hass-invalid-inheritance # needs fixing
-class BlockSleepingSensor(ShellySleepingBlockAttributeEntity, SensorEntity):
+class BlockSleepingSensor(ShellySleepingBlockAttributeEntity, RestoreSensor):
     """Represent a block sleeping sensor."""
 
     entity_description: BlockSensorDescription
@@ -793,6 +793,12 @@ class BlockSleepingSensor(ShellySleepingBlockAttributeEntity, SensorEntity):
     ) -> None:
         """Initialize the sleeping sensor."""
         super().__init__(coordinator, block, attribute, description, entry, sensors)
+        self.restored_data: SensorExtraStoredData | None = None
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        self.restored_data = await self.async_get_last_sensor_data()
 
     @property
     def native_value(self) -> StateType:
@@ -800,10 +806,10 @@ class BlockSleepingSensor(ShellySleepingBlockAttributeEntity, SensorEntity):
         if self.block is not None:
             return self.attribute_value
 
-        if self.last_state is None:
+        if self.restored_data is None:
             return None
 
-        return self.last_state.state
+        return cast(StateType, self.restored_data.native_value)
 
     @property
     def native_unit_of_measurement(self) -> str | None:
@@ -811,28 +817,44 @@ class BlockSleepingSensor(ShellySleepingBlockAttributeEntity, SensorEntity):
         if self.block is not None:
             return self.entity_description.native_unit_of_measurement
 
-        if self.last_state is None:
+        if self.restored_data is None:
             return None
 
-        return self.last_state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+        return self.restored_data.native_unit_of_measurement
 
 
-# pylint: disable-next=hass-invalid-inheritance # needs fixing
-class RpcSleepingSensor(ShellySleepingRpcAttributeEntity, SensorEntity):
+class RpcSleepingSensor(ShellySleepingRpcAttributeEntity, RestoreSensor):
     """Represent a RPC sleeping sensor."""
 
     entity_description: RpcSensorDescription
 
+    def __init__(
+        self,
+        coordinator: ShellyRpcCoordinator,
+        key: str,
+        attribute: str,
+        description: RpcEntityDescription,
+        entry: RegistryEntry | None = None,
+    ) -> None:
+        """Initialize the sleeping sensor."""
+        super().__init__(coordinator, key, attribute, description, entry)
+        self.restored_data: SensorExtraStoredData | None = None
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        self.restored_data = await self.async_get_last_sensor_data()
+
     @property
     def native_value(self) -> StateType:
         """Return value of sensor."""
         if self.coordinator.device.initialized:
             return self.attribute_value
 
-        if self.last_state is None:
+        if self.restored_data is None:
             return None
 
-        return self.last_state.state
+        return cast(StateType, self.restored_data.native_value)
 
     @property
     def native_unit_of_measurement(self) -> str | None:
diff --git a/homeassistant/components/shelly/strings.json b/homeassistant/components/shelly/strings.json
index f0d4e1c9bd9..265184e6227 100644
--- a/homeassistant/components/shelly/strings.json
+++ b/homeassistant/components/shelly/strings.json
@@ -103,7 +103,7 @@
         "state": {
           "unknown": "Unknown",
           "warmup": "Warm-up",
-          "normal": "normal",
+          "normal": "Normal",
           "fault": "Fault"
         },
         "state_attributes": {
diff --git a/homeassistant/components/shelly/update.py b/homeassistant/components/shelly/update.py
index 47a39105ac4..3b2096f0c1a 100644
--- a/homeassistant/components/shelly/update.py
+++ b/homeassistant/components/shelly/update.py
@@ -21,6 +21,7 @@ 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.restore_state import RestoreEntity
 
 from .const import CONF_SLEEP_PERIOD
 from .coordinator import ShellyBlockCoordinator, ShellyRpcCoordinator
@@ -282,11 +283,18 @@ class RpcUpdateEntity(ShellyRpcAttributeEntity, UpdateEntity):
             LOGGER.debug("OTA update call successful")
 
 
-class RpcSleepingUpdateEntity(ShellySleepingRpcAttributeEntity, UpdateEntity):
+class RpcSleepingUpdateEntity(
+    ShellySleepingRpcAttributeEntity, UpdateEntity, RestoreEntity
+):
     """Represent a RPC sleeping update entity."""
 
     entity_description: RpcUpdateDescription
 
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        self.last_state = await self.async_get_last_state()
+
     @property
     def installed_version(self) -> str | None:
         """Version currently in use."""
diff --git a/homeassistant/components/shelly/utils.py b/homeassistant/components/shelly/utils.py
index c929e152b3f..03df3da346b 100644
--- a/homeassistant/components/shelly/utils.py
+++ b/homeassistant/components/shelly/utils.py
@@ -255,7 +255,11 @@ def get_block_device_sleep_period(settings: dict[str, Any]) -> int:
 
 
 def get_rpc_device_sleep_period(config: dict[str, Any]) -> int:
-    """Return the device sleep period in seconds or 0 for non sleeping devices."""
+    """Return the device sleep period in seconds or 0 for non sleeping devices.
+
+    sys.sleep.wakeup_period value is deprecated and not available in Shelly
+    firmware 1.0.0 or later.
+    """
     return cast(int, config["sys"].get("sleep", {}).get("wakeup_period", 0))
 
 
diff --git a/homeassistant/components/sighthound/manifest.json b/homeassistant/components/sighthound/manifest.json
index 1b6fbe9548d..2fdf15a4a10 100644
--- a/homeassistant/components/sighthound/manifest.json
+++ b/homeassistant/components/sighthound/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/sighthound",
   "iot_class": "cloud_polling",
   "loggers": ["simplehound"],
-  "requirements": ["pillow==9.5.0", "simplehound==0.3"]
+  "requirements": ["Pillow==9.5.0", "simplehound==0.3"]
 }
diff --git a/homeassistant/components/simplepush/__init__.py b/homeassistant/components/simplepush/__init__.py
index c5782258cb7..e39c3cc6ce1 100644
--- a/homeassistant/components/simplepush/__init__.py
+++ b/homeassistant/components/simplepush/__init__.py
@@ -3,13 +3,15 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DATA_HASS_CONFIG, DOMAIN
 
 PLATFORMS = [Platform.NOTIFY]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the simplepush component."""
diff --git a/homeassistant/components/simplepush/notify.py b/homeassistant/components/simplepush/notify.py
index 3e7fad8863f..cc6c61ced03 100644
--- a/homeassistant/components/simplepush/notify.py
+++ b/homeassistant/components/simplepush/notify.py
@@ -10,18 +10,13 @@ from homeassistant.components.notify import (
     ATTR_DATA,
     ATTR_TITLE,
     ATTR_TITLE_DEFAULT,
-    PLATFORM_SCHEMA as BASE_PLATFORM_SCHEMA,
     BaseNotificationService,
 )
 from homeassistant.const import CONF_EVENT, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .const import ATTR_ATTACHMENTS, ATTR_EVENT, CONF_DEVICE_KEY, CONF_SALT, DOMAIN
-
-# Configuring Simplepush under the notify has been removed in 2022.9.0
-PLATFORM_SCHEMA = BASE_PLATFORM_SCHEMA
+from .const import ATTR_ATTACHMENTS, ATTR_EVENT, CONF_DEVICE_KEY, CONF_SALT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -32,19 +27,9 @@ async def async_get_service(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> SimplePushNotificationService | None:
     """Get the Simplepush notification service."""
-    if discovery_info is None:
-        async_create_issue(
-            hass,
-            DOMAIN,
-            "removed_yaml",
-            breaks_in_ha_version="2022.9.0",
-            is_fixable=False,
-            severity=IssueSeverity.WARNING,
-            translation_key="removed_yaml",
-        )
-        return None
-
-    return SimplePushNotificationService(discovery_info)
+    if discovery_info:
+        return SimplePushNotificationService(discovery_info)
+    return None
 
 
 class SimplePushNotificationService(BaseNotificationService):
diff --git a/homeassistant/components/simplepush/strings.json b/homeassistant/components/simplepush/strings.json
index 68ee5c7a9ed..0031dc32340 100644
--- a/homeassistant/components/simplepush/strings.json
+++ b/homeassistant/components/simplepush/strings.json
@@ -17,11 +17,5 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
-  },
-  "issues": {
-    "removed_yaml": {
-      "title": "The Simplepush YAML configuration has been removed",
-      "description": "Configuring Simplepush using YAML has been removed.\n\nYour existing YAML configuration is not used by Home Assistant.\n\nRemove the Simplepush YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/simplisafe/__init__.py b/homeassistant/components/simplisafe/__init__.py
index 6a3523f07c9..17fc6f3cc4d 100644
--- a/homeassistant/components/simplisafe/__init__.py
+++ b/homeassistant/components/simplisafe/__init__.py
@@ -71,7 +71,6 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_send,
 )
 from homeassistant.helpers.entity import DeviceInfo
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.service import (
     async_register_admin_service,
     verify_domain_control,
@@ -252,45 +251,6 @@ def _async_get_system_for_service_call(
     raise ValueError(f"No system for device ID: {device_id}")
 
 
-@callback
-def _async_log_deprecated_service_call(
-    hass: HomeAssistant,
-    call: ServiceCall,
-    alternate_service: str,
-    alternate_target: str,
-    breaks_in_ha_version: str,
-) -> None:
-    """Log a warning about a deprecated service call."""
-    deprecated_service = f"{call.domain}.{call.service}"
-
-    async_create_issue(
-        hass,
-        DOMAIN,
-        f"deprecated_service_{deprecated_service}",
-        breaks_in_ha_version=breaks_in_ha_version,
-        is_fixable=True,
-        is_persistent=True,
-        severity=IssueSeverity.WARNING,
-        translation_key="deprecated_service",
-        translation_placeholders={
-            "alternate_service": alternate_service,
-            "alternate_target": alternate_target,
-            "deprecated_service": deprecated_service,
-        },
-    )
-
-    LOGGER.warning(
-        (
-            'The "%s" service is deprecated and will be removed in %s; use the "%s" '
-            'service and pass it a target entity ID of "%s"'
-        ),
-        deprecated_service,
-        breaks_in_ha_version,
-        alternate_service,
-        alternate_target,
-    )
-
-
 @callback
 def _async_register_base_station(
     hass: HomeAssistant, entry: ConfigEntry, system: SystemType
diff --git a/homeassistant/components/simplisafe/lock.py b/homeassistant/components/simplisafe/lock.py
index 1e7be48979b..9ce59eb3b56 100644
--- a/homeassistant/components/simplisafe/lock.py
+++ b/homeassistant/components/simplisafe/lock.py
@@ -49,6 +49,9 @@ async def async_setup_entry(
 class SimpliSafeLock(SimpliSafeEntity, LockEntity):
     """Define a SimpliSafe lock."""
 
+    _attr_name = None
+    _device: Lock
+
     def __init__(self, simplisafe: SimpliSafe, system: SystemV3, lock: Lock) -> None:
         """Initialize."""
         super().__init__(
@@ -58,8 +61,6 @@ class SimpliSafeLock(SimpliSafeEntity, LockEntity):
             additional_websocket_events=WEBSOCKET_EVENTS_TO_LISTEN_FOR,
         )
 
-        self._device: Lock
-
     async def async_lock(self, **kwargs: Any) -> None:
         """Lock the lock."""
         try:
diff --git a/homeassistant/components/simplisafe/strings.json b/homeassistant/components/simplisafe/strings.json
index bc03ab4c514..618c21566f7 100644
--- a/homeassistant/components/simplisafe/strings.json
+++ b/homeassistant/components/simplisafe/strings.json
@@ -29,11 +29,5 @@
         }
       }
     }
-  },
-  "issues": {
-    "deprecated_service": {
-      "title": "The {deprecated_service} service is being removed",
-      "description": "Update any automations or scripts that use this service to instead use the `{alternate_service}` service with a target entity ID of `{alternate_target}`. Then, click SUBMIT below to mark this issue as resolved."
-    }
   }
 }
diff --git a/homeassistant/components/sky_hub/__init__.py b/homeassistant/components/sky_hub/__init__.py
index 40637d866ff..a5b8969018f 100644
--- a/homeassistant/components/sky_hub/__init__.py
+++ b/homeassistant/components/sky_hub/__init__.py
@@ -1,8 +1 @@
 """The sky_hub component."""
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.typing import ConfigType
-
-
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the sky_hub component."""
-    return True
diff --git a/homeassistant/components/slack/__init__.py b/homeassistant/components/slack/__init__.py
index 36b457b75b7..076dcf7e590 100644
--- a/homeassistant/components/slack/__init__.py
+++ b/homeassistant/components/slack/__init__.py
@@ -7,11 +7,11 @@ from aiohttp.client_exceptions import ClientError
 from slack import WebClient
 from slack.errors import SlackApiError
 
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
-from homeassistant.const import CONF_API_KEY, CONF_PLATFORM, Platform
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_API_KEY, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import aiohttp_client, discovery
+from homeassistant.helpers import aiohttp_client, config_validation as cv, discovery
 from homeassistant.helpers.device_registry import DeviceEntryType
 from homeassistant.helpers.entity import DeviceInfo, Entity, EntityDescription
 from homeassistant.helpers.typing import ConfigType
@@ -30,21 +30,12 @@ _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [Platform.NOTIFY, Platform.SENSOR]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Slack component."""
     hass.data[DATA_HASS_CONFIG] = config
-
-    # Iterate all entries for notify to only get Slack
-    if Platform.NOTIFY in config:
-        for entry in config[Platform.NOTIFY]:
-            if entry[CONF_PLATFORM] == DOMAIN:
-                hass.async_create_task(
-                    hass.config_entries.flow.async_init(
-                        DOMAIN, context={"source": SOURCE_IMPORT}, data=entry
-                    )
-                )
-
     return True
 
 
diff --git a/homeassistant/components/slack/config_flow.py b/homeassistant/components/slack/config_flow.py
index 253750a2310..187cef057a0 100644
--- a/homeassistant/components/slack/config_flow.py
+++ b/homeassistant/components/slack/config_flow.py
@@ -55,19 +55,6 @@ class SlackFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
-    async def async_step_import(self, import_config: dict[str, str]) -> FlowResult:
-        """Import a config entry from configuration.yaml."""
-        _LOGGER.warning(
-            "Configuration of the Slack integration in YAML is deprecated and "
-            "will be removed in a future release; Your existing configuration "
-            "has been imported into the UI automatically and can be safely removed "
-            "from your configuration.yaml file"
-        )
-        entries = self._async_current_entries()
-        if any(x.data[CONF_API_KEY] == import_config[CONF_API_KEY] for x in entries):
-            return self.async_abort(reason="already_configured")
-        return await self.async_step_user(import_config)
-
     async def _async_try_connect(
         self, token: str
     ) -> tuple[str, None] | tuple[None, dict[str, str]]:
diff --git a/homeassistant/components/slack/notify.py b/homeassistant/components/slack/notify.py
index d587f960704..498eddffa3d 100644
--- a/homeassistant/components/slack/notify.py
+++ b/homeassistant/components/slack/notify.py
@@ -17,16 +17,9 @@ from homeassistant.components.notify import (
     ATTR_DATA,
     ATTR_TARGET,
     ATTR_TITLE,
-    PLATFORM_SCHEMA,
     BaseNotificationService,
 )
-from homeassistant.const import (
-    ATTR_ICON,
-    CONF_API_KEY,
-    CONF_ICON,
-    CONF_PATH,
-    CONF_USERNAME,
-)
+from homeassistant.const import ATTR_ICON, CONF_PATH
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import aiohttp_client, config_validation as cv, template
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -73,16 +66,6 @@ DATA_SCHEMA = vol.All(
     cv.ensure_list, [vol.Any(DATA_FILE_SCHEMA, DATA_TEXT_ONLY_SCHEMA)]
 )
 
-# Deprecated in Home Assistant 2022.5
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {
-        vol.Required(CONF_API_KEY): cv.string,
-        vol.Required(CONF_DEFAULT_CHANNEL): cv.string,
-        vol.Optional(CONF_ICON): cv.string,
-        vol.Optional(CONF_USERNAME): cv.string,
-    }
-)
-
 
 class AuthDictT(TypedDict, total=False):
     """Type for auth request data."""
@@ -117,14 +100,13 @@ async def async_get_service(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> SlackNotificationService | None:
     """Set up the Slack notification service."""
-    if discovery_info is None:
-        return None
-
-    return SlackNotificationService(
-        hass,
-        discovery_info[SLACK_DATA][DATA_CLIENT],
-        discovery_info,
-    )
+    if discovery_info:
+        return SlackNotificationService(
+            hass,
+            discovery_info[SLACK_DATA][DATA_CLIENT],
+            discovery_info,
+        )
+    return None
 
 
 @callback
diff --git a/homeassistant/components/slimproto/manifest.json b/homeassistant/components/slimproto/manifest.json
index f3008d9f1c1..1ef87e84933 100644
--- a/homeassistant/components/slimproto/manifest.json
+++ b/homeassistant/components/slimproto/manifest.json
@@ -6,5 +6,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/slimproto",
   "iot_class": "local_push",
-  "requirements": ["aioslimproto==2.1.1"]
+  "requirements": ["aioslimproto==2.3.2"]
 }
diff --git a/homeassistant/components/smartthings/__init__.py b/homeassistant/components/smartthings/__init__.py
index 4127cd5deb5..024f04b0dc9 100644
--- a/homeassistant/components/smartthings/__init__.py
+++ b/homeassistant/components/smartthings/__init__.py
@@ -16,6 +16,7 @@ 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 ConfigEntryNotReady
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
@@ -51,6 +52,8 @@ from .smartapp import (
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Initialize the SmartThings platform."""
diff --git a/homeassistant/components/smartthings/sensor.py b/homeassistant/components/smartthings/sensor.py
index 40e236f9185..823ca793972 100644
--- a/homeassistant/components/smartthings/sensor.py
+++ b/homeassistant/components/smartthings/sensor.py
@@ -535,7 +535,11 @@ CAPABILITY_TO_SENSORS: dict[str, list[Map]] = {
     ],
 }
 
-UNITS = {"C": UnitOfTemperature.CELSIUS, "F": UnitOfTemperature.FAHRENHEIT}
+UNITS = {
+    "C": UnitOfTemperature.CELSIUS,
+    "F": UnitOfTemperature.FAHRENHEIT,
+    "lux": LIGHT_LUX,
+}
 
 THREE_AXIS_NAMES = ["X Coordinate", "Y Coordinate", "Z Coordinate"]
 POWER_CONSUMPTION_REPORT_NAMES = [
diff --git a/homeassistant/components/smhi/const.py b/homeassistant/components/smhi/const.py
index ad788923c7d..cc1c4550723 100644
--- a/homeassistant/components/smhi/const.py
+++ b/homeassistant/components/smhi/const.py
@@ -3,8 +3,6 @@ from typing import Final
 
 from homeassistant.components.weather import DOMAIN as WEATHER_DOMAIN
 
-ATTR_SMHI_CLOUDINESS: Final = "cloudiness"
-ATTR_SMHI_WIND_GUST_SPEED: Final = "wind_gust_speed"
 ATTR_SMHI_THUNDER_PROBABILITY: Final = "thunder_probability"
 
 DOMAIN = "smhi"
diff --git a/homeassistant/components/smhi/weather.py b/homeassistant/components/smhi/weather.py
index 12781df6891..ece0e4f6d5c 100644
--- a/homeassistant/components/smhi/weather.py
+++ b/homeassistant/components/smhi/weather.py
@@ -27,15 +27,17 @@ from homeassistant.components.weather import (
     ATTR_CONDITION_SUNNY,
     ATTR_CONDITION_WINDY,
     ATTR_CONDITION_WINDY_VARIANT,
+    ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
+    ATTR_FORECAST_HUMIDITY,
     ATTR_FORECAST_NATIVE_PRECIPITATION,
     ATTR_FORECAST_NATIVE_PRESSURE,
     ATTR_FORECAST_NATIVE_TEMP,
     ATTR_FORECAST_NATIVE_TEMP_LOW,
+    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED,
     ATTR_FORECAST_NATIVE_WIND_SPEED,
     ATTR_FORECAST_TIME,
     ATTR_FORECAST_WIND_BEARING,
-    ROUNDING_PRECISION,
     Forecast,
     WeatherEntity,
 )
@@ -58,12 +60,9 @@ from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.util import Throttle, slugify
-from homeassistant.util.unit_conversion import SpeedConverter
 
 from .const import (
-    ATTR_SMHI_CLOUDINESS,
     ATTR_SMHI_THUNDER_PROBABILITY,
-    ATTR_SMHI_WIND_GUST_SPEED,
     DOMAIN,
     ENTITY_ID_SENSOR_FORMAT,
 )
@@ -128,6 +127,7 @@ class SmhiWeather(WeatherEntity):
     _attr_native_pressure_unit = UnitOfPressure.HPA
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
@@ -156,14 +156,7 @@ class SmhiWeather(WeatherEntity):
     def extra_state_attributes(self) -> Mapping[str, Any] | None:
         """Return additional attributes."""
         if self._forecasts:
-            wind_gust = SpeedConverter.convert(
-                self._forecasts[0].wind_gust,
-                UnitOfSpeed.METERS_PER_SECOND,
-                self._wind_speed_unit,
-            )
             return {
-                ATTR_SMHI_CLOUDINESS: self._forecasts[0].cloudiness,
-                ATTR_SMHI_WIND_GUST_SPEED: round(wind_gust, ROUNDING_PRECISION),
                 ATTR_SMHI_THUNDER_PROBABILITY: self._forecasts[0].thunder,
             }
         return None
@@ -189,6 +182,8 @@ class SmhiWeather(WeatherEntity):
             self._attr_wind_bearing = self._forecasts[0].wind_direction
             self._attr_native_visibility = self._forecasts[0].horizontal_visibility
             self._attr_native_pressure = self._forecasts[0].pressure
+            self._attr_native_wind_gust_speed = self._forecasts[0].wind_gust
+            self._attr_cloud_coverage = self._forecasts[0].cloudiness
             self._attr_condition = next(
                 (
                     k
@@ -227,6 +222,9 @@ class SmhiWeather(WeatherEntity):
                     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,
                 }
             )
 
diff --git a/homeassistant/components/snapcast/media_player.py b/homeassistant/components/snapcast/media_player.py
index 624bf7463ba..096e3829bc7 100644
--- a/homeassistant/components/snapcast/media_player.py
+++ b/homeassistant/components/snapcast/media_player.py
@@ -104,7 +104,7 @@ async def async_setup_platform(
         hass,
         DOMAIN,
         "deprecated_yaml",
-        breaks_in_ha_version="2023.6.0",
+        breaks_in_ha_version="2023.11.0",
         is_fixable=False,
         severity=IssueSeverity.WARNING,
         translation_key="deprecated_yaml",
diff --git a/homeassistant/components/snips/__init__.py b/homeassistant/components/snips/__init__.py
index 3d19de74f91..33500217397 100644
--- a/homeassistant/components/snips/__init__.py
+++ b/homeassistant/components/snips/__init__.py
@@ -176,7 +176,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         await mqtt.async_publish(
             hass, "hermes/dialogueManager/startSession", json.dumps(notification)
         )
-        return
 
     async def snips_say_action(call: ServiceCall) -> None:
         """Send a Snips action message."""
@@ -193,7 +192,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         await mqtt.async_publish(
             hass, "hermes/dialogueManager/startSession", json.dumps(notification)
         )
-        return
 
     async def feedback_on(call: ServiceCall) -> None:
         """Turn feedback sounds on."""
diff --git a/homeassistant/components/solaredge/__init__.py b/homeassistant/components/solaredge/__init__.py
index dca129c7a70..0b685661ac3 100644
--- a/homeassistant/components/solaredge/__init__.py
+++ b/homeassistant/components/solaredge/__init__.py
@@ -1,6 +1,8 @@
 """The SolarEdge integration."""
 from __future__ import annotations
 
+import socket
+
 from requests.exceptions import ConnectTimeout, HTTPError
 from solaredge import Solaredge
 
@@ -25,7 +27,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         response = await hass.async_add_executor_job(
             api.get_details, entry.data[CONF_SITE_ID]
         )
-    except (ConnectTimeout, HTTPError) as ex:
+    except (ConnectTimeout, HTTPError, socket.gaierror) as ex:
         LOGGER.error("Could not retrieve details from SolarEdge API")
         raise ConfigEntryNotReady from ex
 
diff --git a/homeassistant/components/solarlog/__init__.py b/homeassistant/components/solarlog/__init__.py
index d35da5b8a90..e0ab838922b 100644
--- a/homeassistant/components/solarlog/__init__.py
+++ b/homeassistant/components/solarlog/__init__.py
@@ -56,7 +56,7 @@ class SolarlogData(update_coordinator.DataUpdateCoordinator):
         try:
             data = await self.hass.async_add_executor_job(SolarLog, self.host)
         except (OSError, Timeout, HTTPError) as err:
-            raise update_coordinator.UpdateFailed(err)
+            raise update_coordinator.UpdateFailed(err) from err
 
         if data.time.year == 1999:
             raise update_coordinator.UpdateFailed(
diff --git a/homeassistant/components/solarlog/config_flow.py b/homeassistant/components/solarlog/config_flow.py
index 4267502e3ca..86fc0607bf3 100644
--- a/homeassistant/components/solarlog/config_flow.py
+++ b/homeassistant/components/solarlog/config_flow.py
@@ -68,9 +68,8 @@ class SolarLogConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
             if self._host_in_configuration_exists(host):
                 self._errors[CONF_HOST] = "already_configured"
-            else:
-                if await self._test_connection(host):
-                    return self.async_create_entry(title=name, data={CONF_HOST: host})
+            elif await self._test_connection(host):
+                return self.async_create_entry(title=name, data={CONF_HOST: host})
         else:
             user_input = {}
             user_input[CONF_NAME] = DEFAULT_NAME
diff --git a/homeassistant/components/solax/manifest.json b/homeassistant/components/solax/manifest.json
index 5ce87c82532..d3f677fa894 100644
--- a/homeassistant/components/solax/manifest.json
+++ b/homeassistant/components/solax/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/solax",
   "iot_class": "local_polling",
   "loggers": ["solax"],
-  "requirements": ["solax==0.3.0"]
+  "requirements": ["solax==0.3.2"]
 }
diff --git a/homeassistant/components/sonos/media_player.py b/homeassistant/components/sonos/media_player.py
index 7e6c210a164..526ddd2bcc7 100644
--- a/homeassistant/components/sonos/media_player.py
+++ b/homeassistant/components/sonos/media_player.py
@@ -190,6 +190,7 @@ async def async_setup_entry(
 class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
     """Representation of a Sonos entity."""
 
+    _attr_name = None
     _attr_supported_features = (
         MediaPlayerEntityFeature.BROWSE_MEDIA
         | MediaPlayerEntityFeature.CLEAR_PLAYLIST
diff --git a/homeassistant/components/sony_projector/manifest.json b/homeassistant/components/sony_projector/manifest.json
index d6637b4232b..5cf5df4c96f 100644
--- a/homeassistant/components/sony_projector/manifest.json
+++ b/homeassistant/components/sony_projector/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/sony_projector",
   "iot_class": "local_polling",
   "loggers": ["pysdcp"],
-  "requirements": ["pysdcp==1"]
+  "requirements": ["pySDCP==1"]
 }
diff --git a/homeassistant/components/soundtouch/__init__.py b/homeassistant/components/soundtouch/__init__.py
index f3fa221db7f..b021604af4a 100644
--- a/homeassistant/components/soundtouch/__init__.py
+++ b/homeassistant/components/soundtouch/__init__.py
@@ -43,6 +43,8 @@ SERVICE_REMOVE_ZONE_SCHEMA = vol.Schema(
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 class SoundTouchData:
     """SoundTouch data stored in the Home Assistant data object."""
diff --git a/homeassistant/components/soundtouch/config_flow.py b/homeassistant/components/soundtouch/config_flow.py
index 489dfff6feb..8f9b993d0d8 100644
--- a/homeassistant/components/soundtouch/config_flow.py
+++ b/homeassistant/components/soundtouch/config_flow.py
@@ -26,17 +26,6 @@ class SoundtouchConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         self.host = None
         self.name = None
 
-    async def async_step_import(self, import_data):
-        """Handle a flow initiated by configuration file."""
-        self.host = import_data[CONF_HOST]
-
-        try:
-            await self._async_get_device_id()
-        except RequestException:
-            return self.async_abort(reason="cannot_connect")
-
-        return await self._async_create_soundtouch_entry()
-
     async def async_step_user(self, user_input=None):
         """Handle a flow initiated by the user."""
         errors = {}
diff --git a/homeassistant/components/soundtouch/media_player.py b/homeassistant/components/soundtouch/media_player.py
index 72118431330..9cd94330812 100644
--- a/homeassistant/components/soundtouch/media_player.py
+++ b/homeassistant/components/soundtouch/media_player.py
@@ -8,11 +8,9 @@ from typing import Any
 
 from libsoundtouch.device import SoundTouchDevice
 from libsoundtouch.utils import Source
-import voluptuous as vol
 
 from homeassistant.components import media_source
 from homeassistant.components.media_player import (
-    PLATFORM_SCHEMA,
     BrowseMedia,
     MediaPlayerDeviceClass,
     MediaPlayerEntity,
@@ -21,20 +19,12 @@ from homeassistant.components.media_player import (
     MediaType,
     async_process_play_media_url,
 )
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
-from homeassistant.const import (
-    CONF_HOST,
-    CONF_NAME,
-    CONF_PORT,
-    EVENT_HOMEASSISTANT_START,
-)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EVENT_HOMEASSISTANT_START
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, format_mac
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import DOMAIN
 
@@ -50,47 +40,6 @@ MAP_STATUS = {
 ATTR_SOUNDTOUCH_GROUP = "soundtouch_group"
 ATTR_SOUNDTOUCH_ZONE = "soundtouch_zone"
 
-PLATFORM_SCHEMA = vol.All(
-    PLATFORM_SCHEMA.extend(
-        {
-            vol.Required(CONF_HOST): cv.string,
-            vol.Optional(CONF_PORT): cv.port,
-            vol.Optional(CONF_NAME, default=""): cv.string,
-        }
-    ),
-)
-
-
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the Bose SoundTouch platform."""
-    async_create_issue(
-        hass,
-        DOMAIN,
-        "deprecated_yaml",
-        breaks_in_ha_version="2022.10.0",
-        is_fixable=False,
-        severity=IssueSeverity.WARNING,
-        translation_key="deprecated_yaml",
-    )
-    _LOGGER.warning(
-        "Configuration of the Bose SoundTouch integration in YAML is "
-        "deprecated and will be removed in Home Assistant 2022.10; Your "
-        "existing configuration has been imported into the UI automatically "
-        "and can be safely removed from your configuration.yaml file"
-    )
-    hass.async_create_task(
-        hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": SOURCE_IMPORT},
-            data=config,
-        )
-    )
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/homeassistant/components/soundtouch/strings.json b/homeassistant/components/soundtouch/strings.json
index 6a8896c8f56..7ebcd4c5285 100644
--- a/homeassistant/components/soundtouch/strings.json
+++ b/homeassistant/components/soundtouch/strings.json
@@ -17,11 +17,5 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
-  },
-  "issues": {
-    "deprecated_yaml": {
-      "title": "The Bose SoundTouch YAML configuration is being removed",
-      "description": "Configuring Bose SoundTouch using YAML is being removed.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove the Bose SoundTouch YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/splunk/manifest.json b/homeassistant/components/splunk/manifest.json
index d889c1437d0..947af317b35 100644
--- a/homeassistant/components/splunk/manifest.json
+++ b/homeassistant/components/splunk/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/splunk",
   "iot_class": "local_push",
   "loggers": ["hass_splunk"],
-  "requirements": ["hass_splunk==0.1.1"]
+  "requirements": ["hass-splunk==0.1.1"]
 }
diff --git a/homeassistant/components/spotify/media_player.py b/homeassistant/components/spotify/media_player.py
index a738952d2ca..0145d6f0906 100644
--- a/homeassistant/components/spotify/media_player.py
+++ b/homeassistant/components/spotify/media_player.py
@@ -106,6 +106,7 @@ class SpotifyMediaPlayer(MediaPlayerEntity):
     _attr_has_entity_name = True
     _attr_icon = "mdi:spotify"
     _attr_media_image_remotely_accessible = False
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/sql/manifest.json b/homeassistant/components/sql/manifest.json
index 4d3e95d6b30..44de8fc6923 100644
--- a/homeassistant/components/sql/manifest.json
+++ b/homeassistant/components/sql/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/sql",
   "iot_class": "local_polling",
-  "requirements": ["sqlalchemy==2.0.15"]
+  "requirements": ["SQLAlchemy==2.0.15"]
 }
diff --git a/homeassistant/components/statsd/__init__.py b/homeassistant/components/statsd/__init__.py
index bfc972a17a1..046c01cba32 100644
--- a/homeassistant/components/statsd/__init__.py
+++ b/homeassistant/components/statsd/__init__.py
@@ -82,9 +82,8 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
                     stat = "{}.{}".format(state.entity_id, key.replace(" ", "_"))
                     statsd_client.gauge(stat, value, sample_rate)
 
-        else:
-            if isinstance(_state, (float, int)):
-                statsd_client.gauge(state.entity_id, _state, sample_rate)
+        elif isinstance(_state, (float, int)):
+            statsd_client.gauge(state.entity_id, _state, sample_rate)
 
         # Increment the count
         statsd_client.incr(state.entity_id, rate=sample_rate)
diff --git a/homeassistant/components/steam_online/config_flow.py b/homeassistant/components/steam_online/config_flow.py
index 8356ad8bbc6..094db9ba207 100644
--- a/homeassistant/components/steam_online/config_flow.py
+++ b/homeassistant/components/steam_online/config_flow.py
@@ -1,7 +1,7 @@
 """Config flow for Steam integration."""
 from __future__ import annotations
 
-from collections.abc import Mapping
+from collections.abc import Iterator, Mapping
 from typing import Any
 
 import steam
@@ -15,6 +15,9 @@ from homeassistant.helpers import config_validation as cv, entity_registry as er
 
 from .const import CONF_ACCOUNT, CONF_ACCOUNTS, DOMAIN, LOGGER, PLACEHOLDERS
 
+# To avoid too long request URIs, the amount of ids to request is limited
+MAX_IDS_TO_REQUEST = 275
+
 
 def validate_input(user_input: dict[str, str]) -> dict[str, str | int]:
     """Handle common flow input validation."""
@@ -108,6 +111,11 @@ class SteamFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         )
 
 
+def _batch_ids(ids: list[str]) -> Iterator[list[str]]:
+    for i in range(0, len(ids), MAX_IDS_TO_REQUEST):
+        yield ids[i : i + MAX_IDS_TO_REQUEST]
+
+
 class SteamOptionsFlowHandler(config_entries.OptionsFlow):
     """Handle Steam client options."""
 
@@ -170,5 +178,11 @@ class SteamOptionsFlowHandler(config_entries.OptionsFlow):
             _users_str = [user["steamid"] for user in friends["friendslist"]["friends"]]
         except steam.api.HTTPError:
             return []
-        names = interface.GetPlayerSummaries(steamids=_users_str)
-        return names["response"]["players"]["player"]
+        names = []
+        for id_batch in _batch_ids(_users_str):
+            names.extend(
+                interface.GetPlayerSummaries(steamids=id_batch)["response"]["players"][
+                    "player"
+                ]
+            )
+        return names
diff --git a/homeassistant/components/steamist/__init__.py b/homeassistant/components/steamist/__init__.py
index 0a363f77e82..ee46d644847 100644
--- a/homeassistant/components/steamist/__init__.py
+++ b/homeassistant/components/steamist/__init__.py
@@ -9,6 +9,7 @@ from aiosteamist import Steamist
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
@@ -25,10 +26,11 @@ from .discovery import (
 
 PLATFORMS: list[str] = [Platform.SENSOR, Platform.SWITCH]
 DISCOVERY_INTERVAL = timedelta(minutes=15)
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the flux_led component."""
+    """Set up the steamist component."""
     domain_data = hass.data.setdefault(DOMAIN, {})
     domain_data[DISCOVERY] = await async_discover_devices(hass, STARTUP_SCAN_TIMEOUT)
 
diff --git a/homeassistant/components/stt/__init__.py b/homeassistant/components/stt/__init__.py
index 516cd4ddea1..679f9b29e41 100644
--- a/homeassistant/components/stt/__init__.py
+++ b/homeassistant/components/stt/__init__.py
@@ -22,6 +22,7 @@ from homeassistant.components.http import HomeAssistantView
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
@@ -65,6 +66,8 @@ __all__ = [
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 @callback
 def async_default_engine(hass: HomeAssistant) -> str | None:
diff --git a/homeassistant/components/stt/legacy.py b/homeassistant/components/stt/legacy.py
index 9ee3f0bb8ad..f14eed467db 100644
--- a/homeassistant/components/stt/legacy.py
+++ b/homeassistant/components/stt/legacy.py
@@ -55,7 +55,7 @@ def async_setup_legacy(
     providers = hass.data[DATA_PROVIDERS] = {}
 
     async def async_setup_platform(p_type, p_config=None, discovery_info=None):
-        """Set up a TTS platform."""
+        """Set up an STT platform."""
         if p_config is None:
             p_config = {}
 
diff --git a/homeassistant/components/sun/__init__.py b/homeassistant/components/sun/__init__.py
index a2378136a06..de1c545739f 100644
--- a/homeassistant/components/sun/__init__.py
+++ b/homeassistant/components/sun/__init__.py
@@ -121,6 +121,9 @@ class Sun(Entity):
 
     _attr_name = "Sun"
     entity_id = ENTITY_ID
+    # This entity is legacy and does not have a platform.
+    # We can't fix this easily without breaking changes.
+    _no_platform_reported = True
 
     location: Location
     elevation: Elevation
diff --git a/homeassistant/components/supla/__init__.py b/homeassistant/components/supla/__init__.py
index 541b31eb0a3..0d1308ca5a6 100644
--- a/homeassistant/components/supla/__init__.py
+++ b/homeassistant/components/supla/__init__.py
@@ -102,7 +102,8 @@ async def discover_devices(hass, hass_config):
             async with async_timeout.timeout(SCAN_INTERVAL.total_seconds()):
                 channels = {
                     channel["id"]: channel
-                    for channel in await server.get_channels(  # pylint: disable=cell-var-from-loop
+                    # pylint: disable-next=cell-var-from-loop
+                    for channel in await server.get_channels(  # noqa: B023
                         include=["iodevice", "state", "connected"]
                     )
                 }
diff --git a/homeassistant/components/swiss_public_transport/manifest.json b/homeassistant/components/swiss_public_transport/manifest.json
index 189e93d3650..fd9908bffeb 100644
--- a/homeassistant/components/swiss_public_transport/manifest.json
+++ b/homeassistant/components/swiss_public_transport/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/swiss_public_transport",
   "iot_class": "cloud_polling",
   "loggers": ["opendata_transport"],
-  "requirements": ["python_opendata_transport==0.3.0"]
+  "requirements": ["python-opendata-transport==0.3.0"]
 }
diff --git a/homeassistant/components/switch/device_action.py b/homeassistant/components/switch/device_action.py
index 1aed2fa2467..ce9f0a36117 100644
--- a/homeassistant/components/switch/device_action.py
+++ b/homeassistant/components/switch/device_action.py
@@ -3,7 +3,10 @@ from __future__ import annotations
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import toggle_entity
+from homeassistant.components.device_automation import (
+    async_validate_entity_schema,
+    toggle_entity,
+)
 from homeassistant.const import CONF_DOMAIN
 from homeassistant.core import Context, HomeAssistant
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
@@ -12,7 +15,14 @@ from . import DOMAIN
 
 # mypy: disallow-any-generics
 
-ACTION_SCHEMA = toggle_entity.ACTION_SCHEMA.extend({vol.Required(CONF_DOMAIN): DOMAIN})
+_ACTION_SCHEMA = toggle_entity.ACTION_SCHEMA.extend({vol.Required(CONF_DOMAIN): DOMAIN})
+
+
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
 
 
 async def async_call_action_from_config(
diff --git a/homeassistant/components/switchbot/binary_sensor.py b/homeassistant/components/switchbot/binary_sensor.py
index 0a0cf40ca8b..cb11c64f16a 100644
--- a/homeassistant/components/switchbot/binary_sensor.py
+++ b/homeassistant/components/switchbot/binary_sensor.py
@@ -94,7 +94,6 @@ class SwitchBotBinarySensor(SwitchbotEntity, BinarySensorEntity):
         self._sensor = binary_sensor
         self._attr_unique_id = f"{coordinator.base_unique_id}-{binary_sensor}"
         self.entity_description = BINARY_SENSOR_TYPES[binary_sensor]
-        self._attr_name = self.entity_description.name
 
     @property
     def is_on(self) -> bool:
diff --git a/homeassistant/components/switchbot/const.py b/homeassistant/components/switchbot/const.py
index a21bd859efc..17e95486298 100644
--- a/homeassistant/components/switchbot/const.py
+++ b/homeassistant/components/switchbot/const.py
@@ -42,6 +42,7 @@ CONNECTABLE_SUPPORTED_MODEL_TYPES = {
 
 NON_CONNECTABLE_SUPPORTED_MODEL_TYPES = {
     SwitchbotModel.METER: SupportedModels.HYGROMETER,
+    SwitchbotModel.IO_METER: SupportedModels.HYGROMETER,
     SwitchbotModel.CONTACT_SENSOR: SupportedModels.CONTACT,
     SwitchbotModel.MOTION_SENSOR: SupportedModels.MOTION,
 }
diff --git a/homeassistant/components/switchbot/cover.py b/homeassistant/components/switchbot/cover.py
index 495ce0468a0..1da879cb02b 100644
--- a/homeassistant/components/switchbot/cover.py
+++ b/homeassistant/components/switchbot/cover.py
@@ -51,6 +51,8 @@ class SwitchBotCurtainEntity(SwitchbotEntity, CoverEntity, RestoreEntity):
         | CoverEntityFeature.STOP
         | CoverEntityFeature.SET_POSITION
     )
+    _attr_translation_key = "cover"
+    _attr_name = None
 
     def __init__(self, coordinator: SwitchbotDataUpdateCoordinator) -> None:
         """Initialize the Switchbot."""
@@ -120,6 +122,7 @@ class SwitchBotBlindTiltEntity(SwitchbotEntity, CoverEntity, RestoreEntity):
         | CoverEntityFeature.STOP_TILT
         | CoverEntityFeature.SET_TILT_POSITION
     )
+    _attr_translation_key = "cover"
     CLOSED_UP_THRESHOLD = 80
     CLOSED_DOWN_THRESHOLD = 20
 
diff --git a/homeassistant/components/switchbot/humidifier.py b/homeassistant/components/switchbot/humidifier.py
index 148e4c3545f..5b53b410208 100644
--- a/homeassistant/components/switchbot/humidifier.py
+++ b/homeassistant/components/switchbot/humidifier.py
@@ -40,6 +40,8 @@ class SwitchBotHumidifier(SwitchbotSwitchedEntity, HumidifierEntity):
     _attr_available_modes = [MODE_NORMAL, MODE_AUTO]
     _device: switchbot.SwitchbotHumidifier
     _attr_min_humidity = 1
+    _attr_translation_key = "humidifier"
+    _attr_name = None
 
     @property
     def is_on(self) -> bool | None:
diff --git a/homeassistant/components/switchbot/light.py b/homeassistant/components/switchbot/light.py
index 5dc99c5d6f1..53b40bbf780 100644
--- a/homeassistant/components/switchbot/light.py
+++ b/homeassistant/components/switchbot/light.py
@@ -46,6 +46,7 @@ class SwitchbotLightEntity(SwitchbotEntity, LightEntity):
     """Representation of switchbot light bulb."""
 
     _device: SwitchbotBaseLight
+    _attr_name = None
 
     def __init__(self, coordinator: SwitchbotDataUpdateCoordinator) -> None:
         """Initialize the Switchbot light."""
diff --git a/homeassistant/components/switchbot/lock.py b/homeassistant/components/switchbot/lock.py
index 738755ae636..7710cde12a9 100644
--- a/homeassistant/components/switchbot/lock.py
+++ b/homeassistant/components/switchbot/lock.py
@@ -26,6 +26,8 @@ async def async_setup_entry(
 class SwitchBotLock(SwitchbotEntity, LockEntity):
     """Representation of a Switchbot lock."""
 
+    _attr_translation_key = "lock"
+    _attr_name = None
     _device: switchbot.SwitchbotLock
 
     def __init__(self, coordinator: SwitchbotDataUpdateCoordinator) -> None:
diff --git a/homeassistant/components/switchbot/manifest.json b/homeassistant/components/switchbot/manifest.json
index c90a1a64289..e45ea1f893e 100644
--- a/homeassistant/components/switchbot/manifest.json
+++ b/homeassistant/components/switchbot/manifest.json
@@ -40,5 +40,5 @@
   "documentation": "https://www.home-assistant.io/integrations/switchbot",
   "iot_class": "local_push",
   "loggers": ["switchbot"],
-  "requirements": ["PySwitchbot==0.37.6"]
+  "requirements": ["PySwitchbot==0.38.0"]
 }
diff --git a/homeassistant/components/switchbot/strings.json b/homeassistant/components/switchbot/strings.json
index 74226583420..2d31a883e4b 100644
--- a/homeassistant/components/switchbot/strings.json
+++ b/homeassistant/components/switchbot/strings.json
@@ -108,6 +108,60 @@
       "power": {
         "name": "[%key:component::sensor::entity_component::power::name%]"
       }
+    },
+    "cover": {
+      "cover": {
+        "state_attributes": {
+          "last_run_success": {
+            "state": {
+              "true": "[%key:component::binary_sensor::entity_component::problem::state::off%]",
+              "false": "[%key:component::binary_sensor::entity_component::problem::state::on%]"
+            }
+          }
+        }
+      }
+    },
+    "humidifier": {
+      "humidifier": {
+        "state_attributes": {
+          "last_run_success": {
+            "state": {
+              "true": "[%key:component::binary_sensor::entity_component::problem::state::off%]",
+              "false": "[%key:component::binary_sensor::entity_component::problem::state::on%]"
+            }
+          }
+        }
+      }
+    },
+    "lock": {
+      "lock": {
+        "state_attributes": {
+          "last_run_success": {
+            "state": {
+              "true": "[%key:component::binary_sensor::entity_component::problem::state::off%]",
+              "false": "[%key:component::binary_sensor::entity_component::problem::state::on%]"
+            }
+          }
+        }
+      }
+    },
+    "switch": {
+      "bot": {
+        "state_attributes": {
+          "last_run_success": {
+            "state": {
+              "true": "[%key:component::binary_sensor::entity_component::problem::state::off%]",
+              "false": "[%key:component::binary_sensor::entity_component::problem::state::on%]"
+            }
+          },
+          "switch_mode": {
+            "state": {
+              "true": "Pull/Retract",
+              "false": "Momentary"
+            }
+          }
+        }
+      }
     }
   }
 }
diff --git a/homeassistant/components/switchbot/switch.py b/homeassistant/components/switchbot/switch.py
index befbf00f8be..f62e4d3f918 100644
--- a/homeassistant/components/switchbot/switch.py
+++ b/homeassistant/components/switchbot/switch.py
@@ -34,6 +34,8 @@ class SwitchBotSwitch(SwitchbotSwitchedEntity, SwitchEntity, RestoreEntity):
     """Representation of a Switchbot switch."""
 
     _attr_device_class = SwitchDeviceClass.SWITCH
+    _attr_translation_key = "bot"
+    _attr_name = None
     _device: switchbot.Switchbot
 
     def __init__(self, coordinator: SwitchbotDataUpdateCoordinator) -> None:
diff --git a/homeassistant/components/switchmate/manifest.json b/homeassistant/components/switchmate/manifest.json
index 7f4d3de5b0e..5467dc512c3 100644
--- a/homeassistant/components/switchmate/manifest.json
+++ b/homeassistant/components/switchmate/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/switchmate",
   "iot_class": "local_polling",
   "loggers": ["switchmate"],
-  "requirements": ["pySwitchmate==0.5.1"]
+  "requirements": ["PySwitchmate==0.5.1"]
 }
diff --git a/homeassistant/components/syncthru/manifest.json b/homeassistant/components/syncthru/manifest.json
index d67e93aa962..a93e02a51c7 100644
--- a/homeassistant/components/syncthru/manifest.json
+++ b/homeassistant/components/syncthru/manifest.json
@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/syncthru",
   "iot_class": "local_polling",
   "loggers": ["pysyncthru"],
-  "requirements": ["pysyncthru==0.7.10", "url-normalize==1.4.3"],
+  "requirements": ["PySyncThru==0.7.10", "url-normalize==1.4.3"],
   "ssdp": [
     {
       "deviceType": "urn:schemas-upnp-org:device:Printer:1",
diff --git a/homeassistant/components/synology_dsm/camera.py b/homeassistant/components/synology_dsm/camera.py
index b85ef5f2e3a..425475dc0d0 100644
--- a/homeassistant/components/synology_dsm/camera.py
+++ b/homeassistant/components/synology_dsm/camera.py
@@ -128,7 +128,6 @@ class SynoDSMCamera(SynologyDSMBaseEntity[SynologyDSMCameraUpdateCoordinator], C
                 _LOGGER.debug("Update stream URL for camera %s", self.camera_data.name)
                 self.stream.update_source(url)
 
-        assert self.platform
         assert self.platform.config_entry
         self.async_on_remove(
             async_dispatcher_connect(
diff --git a/homeassistant/components/synology_dsm/coordinator.py b/homeassistant/components/synology_dsm/coordinator.py
index 3b25d93154a..9d0ccfd86d2 100644
--- a/homeassistant/components/synology_dsm/coordinator.py
+++ b/homeassistant/components/synology_dsm/coordinator.py
@@ -99,7 +99,6 @@ class SynologyDSMCentralUpdateCoordinator(SynologyDSMUpdateCoordinator[None]):
             await self.api.async_update()
         except SYNOLOGY_CONNECTION_EXCEPTIONS as err:
             raise UpdateFailed(f"Error communicating with API: {err}") from err
-        return None
 
 
 class SynologyDSMCameraUpdateCoordinator(
diff --git a/homeassistant/components/system_bridge/binary_sensor.py b/homeassistant/components/system_bridge/binary_sensor.py
index bb83d90235f..5c23c3110d8 100644
--- a/homeassistant/components/system_bridge/binary_sensor.py
+++ b/homeassistant/components/system_bridge/binary_sensor.py
@@ -23,6 +23,10 @@ from .coordinator import SystemBridgeDataUpdateCoordinator
 class SystemBridgeBinarySensorEntityDescription(BinarySensorEntityDescription):
     """Class describing System Bridge binary sensor entities."""
 
+    # SystemBridgeBinarySensor does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     value: Callable = round
 
 
diff --git a/homeassistant/components/system_bridge/manifest.json b/homeassistant/components/system_bridge/manifest.json
index 7462966ae39..c0f89c16339 100644
--- a/homeassistant/components/system_bridge/manifest.json
+++ b/homeassistant/components/system_bridge/manifest.json
@@ -10,6 +10,6 @@
   "iot_class": "local_push",
   "loggers": ["systembridgeconnector"],
   "quality_scale": "silver",
-  "requirements": ["systembridgeconnector==3.4.8"],
+  "requirements": ["systembridgeconnector==3.4.9"],
   "zeroconf": ["_system-bridge._tcp.local."]
 }
diff --git a/homeassistant/components/system_bridge/sensor.py b/homeassistant/components/system_bridge/sensor.py
index a6bf29ac546..9290ebeacd5 100644
--- a/homeassistant/components/system_bridge/sensor.py
+++ b/homeassistant/components/system_bridge/sensor.py
@@ -46,6 +46,10 @@ PIXELS: Final = "px"
 class SystemBridgeSensorEntityDescription(SensorEntityDescription):
     """Class describing System Bridge sensor entities."""
 
+    # SystemBridgeSensor does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     value: Callable = round
 
 
@@ -56,6 +60,23 @@ def battery_time_remaining(data: SystemBridgeCoordinatorData) -> datetime | None
     return None
 
 
+def cpu_power_package(data: SystemBridgeCoordinatorData) -> float | None:
+    """Return the CPU package power."""
+    if data.cpu.power_package is not None:
+        return data.cpu.power_package
+    return None
+
+
+def cpu_power_per_cpu(
+    data: SystemBridgeCoordinatorData,
+    cpu: int,
+) -> float | None:
+    """Return CPU power per CPU."""
+    if (value := getattr(data.cpu, f"power_per_cpu_{cpu}", None)) is not None:
+        return value
+    return None
+
+
 def cpu_speed(data: SystemBridgeCoordinatorData) -> float | None:
     """Return the CPU speed."""
     if data.cpu.frequency_current is not None:
@@ -129,6 +150,15 @@ BASE_SENSOR_TYPES: tuple[SystemBridgeSensorEntityDescription, ...] = (
             data.system.boot_time, tz=timezone.utc
         ),
     ),
+    SystemBridgeSensorEntityDescription(
+        key="cpu_power_package",
+        name="CPU Package Power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=2,
+        icon="mdi:chip",
+        value=cpu_power_package,
+    ),
     SystemBridgeSensorEntityDescription(
         key="cpu_speed",
         name="CPU speed",
@@ -498,8 +528,7 @@ async def async_setup_entry(
         ]
 
     for index in range(coordinator.data.cpu.count):
-        entities = [
-            *entities,
+        entities.append(
             SystemBridgeSensor(
                 coordinator,
                 SystemBridgeSensorEntityDescription(
@@ -512,8 +541,25 @@ async def async_setup_entry(
                     value=lambda data, k=index: getattr(data.cpu, f"usage_{k}", None),
                 ),
                 entry.data[CONF_PORT],
-            ),
-        ]
+            )
+        )
+        if hasattr(coordinator.data.cpu, f"power_per_cpu_{index}"):
+            entities.append(
+                SystemBridgeSensor(
+                    coordinator,
+                    SystemBridgeSensorEntityDescription(
+                        key=f"cpu_power_core_{index}",
+                        name=f"CPU Core {index} Power",
+                        entity_registry_enabled_default=False,
+                        native_unit_of_measurement=UnitOfPower.WATT,
+                        state_class=SensorStateClass.MEASUREMENT,
+                        suggested_display_precision=2,
+                        icon="mdi:chip",
+                        value=lambda data, k=index: cpu_power_per_cpu(data, k),
+                    ),
+                    entry.data[CONF_PORT],
+                )
+            )
 
     async_add_entities(entities)
 
diff --git a/homeassistant/components/tank_utility/manifest.json b/homeassistant/components/tank_utility/manifest.json
index dcd206e0c1c..3f4d7bbaa15 100644
--- a/homeassistant/components/tank_utility/manifest.json
+++ b/homeassistant/components/tank_utility/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/tank_utility",
   "iot_class": "cloud_polling",
   "loggers": ["tank_utility"],
-  "requirements": ["tank_utility==1.4.1"]
+  "requirements": ["tank-utility==1.4.1"]
 }
diff --git a/homeassistant/components/tankerkoenig/strings.json b/homeassistant/components/tankerkoenig/strings.json
index e0b9b3d53e8..b68359a5176 100644
--- a/homeassistant/components/tankerkoenig/strings.json
+++ b/homeassistant/components/tankerkoenig/strings.json
@@ -18,7 +18,7 @@
       },
       "select_station": {
         "title": "Select stations to add",
-        "description": "found {stations_count} stations in radius",
+        "description": "Found {stations_count} stations in radius",
         "data": {
           "stations": "Stations"
         }
diff --git a/homeassistant/components/tasmota/manifest.json b/homeassistant/components/tasmota/manifest.json
index a5a8ed2f0d2..f235256f772 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.6.5"]
+  "requirements": ["HATasmota==0.6.5"]
 }
diff --git a/homeassistant/components/telegram_bot/__init__.py b/homeassistant/components/telegram_bot/__init__.py
index 0bb1efc6b12..3d56cc7ed33 100644
--- a/homeassistant/components/telegram_bot/__init__.py
+++ b/homeassistant/components/telegram_bot/__init__.py
@@ -529,17 +529,24 @@ class TelegramNotificationService:
                 (text_b2, data_callback_b2), ...]
               - a string like: `/cmd1, /cmd2, /cmd3`
               - or a string like: `text_b1:/cmd1, text_b2:/cmd2`
+              - also supports urls instead of callback commands
             """
             buttons = []
             if isinstance(row_keyboard, str):
                 for key in row_keyboard.split(","):
                     if ":/" in key:
-                        # commands like: 'Label:/cmd' become ('Label', '/cmd')
-                        label = key.split(":/")[0]
-                        command = key[len(label) + 1 :]
-                        buttons.append(
-                            InlineKeyboardButton(label, callback_data=command)
-                        )
+                        # check if command or URL
+                        if key.startswith("https://"):
+                            label = key.split(",")[0]
+                            url = key[len(label) + 1 :]
+                            buttons.append(InlineKeyboardButton(label, url=url))
+                        else:
+                            # commands like: 'Label:/cmd' become ('Label', '/cmd')
+                            label = key.split(":/")[0]
+                            command = key[len(label) + 1 :]
+                            buttons.append(
+                                InlineKeyboardButton(label, callback_data=command)
+                            )
                     else:
                         # commands like: '/cmd' become ('CMD', '/cmd')
                         label = key.strip()[1:].upper()
@@ -547,9 +554,12 @@ class TelegramNotificationService:
             elif isinstance(row_keyboard, list):
                 for entry in row_keyboard:
                     text_btn, data_btn = entry
-                    buttons.append(
-                        InlineKeyboardButton(text_btn, callback_data=data_btn)
-                    )
+                    if data_btn.startswith("https://"):
+                        buttons.append(InlineKeyboardButton(text_btn, url=data_btn))
+                    else:
+                        buttons.append(
+                            InlineKeyboardButton(text_btn, callback_data=data_btn)
+                        )
             else:
                 raise TypeError(str(row_keyboard))
             return buttons
diff --git a/homeassistant/components/tellduslive/cover.py b/homeassistant/components/tellduslive/cover.py
index 57da852a356..4934bf811af 100644
--- a/homeassistant/components/tellduslive/cover.py
+++ b/homeassistant/components/tellduslive/cover.py
@@ -8,8 +8,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import TelldusLiveClient
 from .. import tellduslive
+from . import TelldusLiveClient
 from .entry import TelldusLiveEntity
 
 
diff --git a/homeassistant/components/template/config.py b/homeassistant/components/template/config.py
index 77eaec13da5..2261bde2659 100644
--- a/homeassistant/components/template/config.py
+++ b/homeassistant/components/template/config.py
@@ -5,6 +5,7 @@ import voluptuous as vol
 
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
 from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN
+from homeassistant.components.image import DOMAIN as IMAGE_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
@@ -16,6 +17,7 @@ from homeassistant.helpers.trigger import async_validate_trigger_config
 from . import (
     binary_sensor as binary_sensor_platform,
     button as button_platform,
+    image as image_platform,
     number as number_platform,
     select as select_platform,
     sensor as sensor_platform,
@@ -49,6 +51,9 @@ CONFIG_SECTION_SCHEMA = vol.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]
+        ),
     }
 )
 
diff --git a/homeassistant/components/template/const.py b/homeassistant/components/template/const.py
index 15a4b430190..9b371125750 100644
--- a/homeassistant/components/template/const.py
+++ b/homeassistant/components/template/const.py
@@ -16,6 +16,7 @@ PLATFORMS = [
     Platform.BUTTON,
     Platform.COVER,
     Platform.FAN,
+    Platform.IMAGE,
     Platform.LIGHT,
     Platform.LOCK,
     Platform.NUMBER,
diff --git a/homeassistant/components/template/image.py b/homeassistant/components/template/image.py
new file mode 100644
index 00000000000..95bbac576ad
--- /dev/null
+++ b/homeassistant/components/template/image.py
@@ -0,0 +1,155 @@
+"""Support for image which integrates with other components."""
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+import voluptuous as vol
+
+from homeassistant.components.image import (
+    DOMAIN as IMAGE_DOMAIN,
+    ImageEntity,
+)
+from homeassistant.const import CONF_UNIQUE_ID, CONF_URL, CONF_VERIFY_SSL
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import TemplateError
+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 dt as dt_util
+
+from . import TriggerUpdateCoordinator
+from .const import CONF_PICTURE
+from .template_entity import (
+    TemplateEntity,
+    make_template_entity_common_schema,
+)
+from .trigger_entity import TriggerEntity
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = "Template Image"
+
+GET_IMAGE_TIMEOUT = 10
+
+IMAGE_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_URL): cv.template,
+        vol.Optional(CONF_VERIFY_SSL, default=True): bool,
+    }
+).extend(make_template_entity_common_schema(DEFAULT_NAME).schema)
+
+
+async def _async_create_entities(
+    hass: HomeAssistant, definitions: list[dict[str, Any]], unique_id_prefix: str | None
+) -> list[StateImageEntity]:
+    """Create the template image."""
+    entities = []
+    for definition in definitions:
+        unique_id = definition.get(CONF_UNIQUE_ID)
+        if unique_id and unique_id_prefix:
+            unique_id = f"{unique_id_prefix}-{unique_id}"
+        entities.append(StateImageEntity(hass, definition, unique_id))
+    return entities
+
+
+async def async_setup_platform(
+    hass: HomeAssistant,
+    config: ConfigType,
+    async_add_entities: AddEntitiesCallback,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> None:
+    """Set up the template image."""
+    if discovery_info is None:
+        _LOGGER.warning(
+            "Template image entities can only be configured under template:"
+        )
+        return
+
+    if "coordinator" in discovery_info:
+        async_add_entities(
+            TriggerImageEntity(hass, discovery_info["coordinator"], config)
+            for config in discovery_info["entities"]
+        )
+        return
+
+    async_add_entities(
+        await _async_create_entities(
+            hass, discovery_info["entities"], discovery_info["unique_id"]
+        )
+    )
+
+
+class StateImageEntity(TemplateEntity, ImageEntity):
+    """Representation of a template image."""
+
+    _attr_should_poll = False
+    _attr_image_url: str | None = None
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config: dict[str, Any],
+        unique_id: str | None,
+    ) -> None:
+        """Initialize the image."""
+        TemplateEntity.__init__(self, hass, config=config, unique_id=unique_id)
+        ImageEntity.__init__(self, hass, config[CONF_VERIFY_SSL])
+        self._url_template = config[CONF_URL]
+
+    @property
+    def entity_picture(self) -> str | None:
+        """Return entity picture."""
+        # mypy doesn't know about fget: https://github.com/python/mypy/issues/6185
+        if self._entity_picture_template:
+            return TemplateEntity.entity_picture.fget(self)  # type: ignore[attr-defined]
+        return ImageEntity.entity_picture.fget(self)  # type: ignore[attr-defined]
+
+    @callback
+    def _update_url(self, result):
+        if isinstance(result, TemplateError):
+            self._attr_image_url = None
+            return
+        self._attr_image_last_updated = dt_util.utcnow()
+        self._cached_image = None
+        self._attr_image_url = result
+
+    async def async_added_to_hass(self) -> None:
+        """Register callbacks."""
+        self.add_template_attribute("_url", self._url_template, None, self._update_url)
+        await super().async_added_to_hass()
+
+
+class TriggerImageEntity(TriggerEntity, ImageEntity):
+    """Image entity based on trigger data."""
+
+    _attr_image_url: str | None = None
+
+    domain = IMAGE_DOMAIN
+    extra_template_keys = (CONF_URL,)
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        coordinator: TriggerUpdateCoordinator,
+        config: dict,
+    ) -> None:
+        """Initialize the entity."""
+        TriggerEntity.__init__(self, hass, coordinator, config)
+        ImageEntity.__init__(self, hass, config[CONF_VERIFY_SSL])
+
+    @property
+    def entity_picture(self) -> str | None:
+        """Return entity picture."""
+        # mypy doesn't know about fget: https://github.com/python/mypy/issues/6185
+        if CONF_PICTURE in self._config:
+            return TriggerEntity.entity_picture.fget(self)  # type: ignore[attr-defined]
+        return ImageEntity.entity_picture.fget(self)  # type: ignore[attr-defined]
+
+    @callback
+    def _process_data(self) -> None:
+        """Process new data."""
+        super()._process_data()
+        self._attr_image_last_updated = dt_util.utcnow()
+        self._cached_image = None
+        self._attr_image_url = self._rendered.get(CONF_URL)
diff --git a/homeassistant/components/template/template_entity.py b/homeassistant/components/template/template_entity.py
index 87c8ec651d2..0d6d5a99748 100644
--- a/homeassistant/components/template/template_entity.py
+++ b/homeassistant/components/template/template_entity.py
@@ -18,6 +18,7 @@ from homeassistant.helpers.template import Template
 from homeassistant.helpers.template_entity import (  # noqa: F401 pylint: disable=unused-import
     TEMPLATE_ENTITY_BASE_SCHEMA,
     TemplateEntity,
+    make_template_entity_base_schema,
 )
 
 from .const import (
@@ -47,6 +48,17 @@ TEMPLATE_ENTITY_COMMON_SCHEMA = vol.Schema(
     }
 ).extend(TEMPLATE_ENTITY_BASE_SCHEMA.schema)
 
+
+def make_template_entity_common_schema(default_name: str) -> vol.Schema:
+    """Return a schema with default name."""
+    return vol.Schema(
+        {
+            vol.Optional(CONF_ATTRIBUTES): vol.Schema({cv.string: cv.template}),
+            vol.Optional(CONF_AVAILABILITY): cv.template,
+        }
+    ).extend(make_template_entity_base_schema(default_name).schema)
+
+
 TEMPLATE_ENTITY_ATTRIBUTES_SCHEMA_LEGACY = vol.Schema(
     {
         vol.Optional(CONF_ATTRIBUTE_TEMPLATES, default={}): vol.Schema(
diff --git a/homeassistant/components/template/trigger_entity.py b/homeassistant/components/template/trigger_entity.py
index 72165ddbf59..7d1a844fb3d 100644
--- a/homeassistant/components/template/trigger_entity.py
+++ b/homeassistant/components/template/trigger_entity.py
@@ -18,13 +18,13 @@ class TriggerEntity(TriggerBaseEntity, CoordinatorEntity[TriggerUpdateCoordinato
         config: dict,
     ) -> None:
         """Initialize the entity."""
-        super(CoordinatorEntity, self).__init__(coordinator)
-        super().__init__(hass, config)
+        CoordinatorEntity.__init__(self, coordinator)
+        TriggerBaseEntity.__init__(self, hass, config)
 
     async def async_added_to_hass(self) -> None:
         """Handle being added to Home Assistant."""
-        await super().async_added_to_hass()
-        await super(CoordinatorEntity, self).async_added_to_hass()
+        await TriggerBaseEntity.async_added_to_hass(self)
+        await CoordinatorEntity.async_added_to_hass(self)  # type: ignore[arg-type]
         if self.coordinator.data is not None:
             self._process_data()
 
diff --git a/homeassistant/components/template/weather.py b/homeassistant/components/template/weather.py
index 9c1680d1a5d..81a6badfc34 100644
--- a/homeassistant/components/template/weather.py
+++ b/homeassistant/components/template/weather.py
@@ -72,6 +72,10 @@ CONF_PRESSURE_UNIT = "pressure_unit"
 CONF_WIND_SPEED_UNIT = "wind_speed_unit"
 CONF_VISIBILITY_UNIT = "visibility_unit"
 CONF_PRECIPITATION_UNIT = "precipitation_unit"
+CONF_WIND_GUST_SPEED_TEMPLATE = "wind_gust_speed_template"
+CONF_CLOUD_COVERAGE_TEMPLATE = "cloud_coverage_template"
+CONF_DEW_POINT_TEMPLATE = "dew_point_template"
+CONF_APPARENT_TEMPERATURE_TEMPLATE = "apparent_temperature_template"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
@@ -92,6 +96,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
         vol.Optional(CONF_WIND_SPEED_UNIT): vol.In(SpeedConverter.VALID_UNITS),
         vol.Optional(CONF_VISIBILITY_UNIT): vol.In(DistanceConverter.VALID_UNITS),
         vol.Optional(CONF_PRECIPITATION_UNIT): vol.In(DistanceConverter.VALID_UNITS),
+        vol.Optional(CONF_WIND_GUST_SPEED_TEMPLATE): cv.template,
+        vol.Optional(CONF_CLOUD_COVERAGE_TEMPLATE): cv.template,
+        vol.Optional(CONF_DEW_POINT_TEMPLATE): cv.template,
+        vol.Optional(CONF_APPARENT_TEMPERATURE_TEMPLATE): cv.template,
     }
 )
 
@@ -143,6 +151,12 @@ class WeatherTemplate(TemplateEntity, WeatherEntity):
         self._ozone_template = config.get(CONF_OZONE_TEMPLATE)
         self._visibility_template = config.get(CONF_VISIBILITY_TEMPLATE)
         self._forecast_template = config.get(CONF_FORECAST_TEMPLATE)
+        self._wind_gust_speed_template = config.get(CONF_WIND_GUST_SPEED_TEMPLATE)
+        self._cloud_coverage_template = config.get(CONF_CLOUD_COVERAGE_TEMPLATE)
+        self._dew_point_template = config.get(CONF_DEW_POINT_TEMPLATE)
+        self._apparent_temperature_template = config.get(
+            CONF_APPARENT_TEMPERATURE_TEMPLATE
+        )
 
         self._attr_native_precipitation_unit = config.get(CONF_PRECIPITATION_UNIT)
         self._attr_native_pressure_unit = config.get(CONF_PRESSURE_UNIT)
@@ -161,6 +175,10 @@ class WeatherTemplate(TemplateEntity, WeatherEntity):
         self._wind_bearing = None
         self._ozone = None
         self._visibility = None
+        self._wind_gust_speed = None
+        self._cloud_coverage = None
+        self._dew_point = None
+        self._apparent_temperature = None
         self._forecast: list[Forecast] = []
 
     @property
@@ -203,6 +221,26 @@ class WeatherTemplate(TemplateEntity, WeatherEntity):
         """Return the air pressure."""
         return self._pressure
 
+    @property
+    def native_wind_gust_speed(self) -> float | None:
+        """Return the wind gust speed."""
+        return self._wind_gust_speed
+
+    @property
+    def cloud_coverage(self) -> float | None:
+        """Return the cloud coverage."""
+        return self._cloud_coverage
+
+    @property
+    def native_dew_point(self) -> float | None:
+        """Return the dew point."""
+        return self._dew_point
+
+    @property
+    def native_apparent_temperature(self) -> float | None:
+        """Return the apparent temperature."""
+        return self._apparent_temperature
+
     @property
     def forecast(self) -> list[Forecast]:
         """Return the forecast."""
@@ -264,6 +302,26 @@ class WeatherTemplate(TemplateEntity, WeatherEntity):
                 "_visibility",
                 self._visibility_template,
             )
+        if self._wind_gust_speed_template:
+            self.add_template_attribute(
+                "_wind_gust_speed",
+                self._wind_gust_speed_template,
+            )
+        if self._cloud_coverage_template:
+            self.add_template_attribute(
+                "_cloud_coverage",
+                self._cloud_coverage_template,
+            )
+        if self._dew_point_template:
+            self.add_template_attribute(
+                "_dew_point",
+                self._dew_point_template,
+            )
+        if self._apparent_temperature_template:
+            self.add_template_attribute(
+                "_apparent_temperature",
+                self._apparent_temperature_template,
+            )
         if self._forecast_template:
             self.add_template_attribute(
                 "_forecast",
diff --git a/homeassistant/components/tensorflow/image_processing.py b/homeassistant/components/tensorflow/image_processing.py
index 60e9dc54b80..a149ea92371 100644
--- a/homeassistant/components/tensorflow/image_processing.py
+++ b/homeassistant/components/tensorflow/image_processing.py
@@ -7,8 +7,8 @@ import os
 import sys
 import time
 
-from PIL import Image, ImageDraw, UnidentifiedImageError
 import numpy as np
+from PIL import Image, ImageDraw, UnidentifiedImageError
 import tensorflow as tf  # pylint: disable=import-error
 import voluptuous as vol
 
diff --git a/homeassistant/components/tensorflow/manifest.json b/homeassistant/components/tensorflow/manifest.json
index 2178930199d..672bd899962 100644
--- a/homeassistant/components/tensorflow/manifest.json
+++ b/homeassistant/components/tensorflow/manifest.json
@@ -10,6 +10,6 @@
     "tf-models-official==2.5.0",
     "pycocotools==2.0.1",
     "numpy==1.23.2",
-    "pillow==9.5.0"
+    "Pillow==9.5.0"
   ]
 }
diff --git a/homeassistant/components/text/device_action.py b/homeassistant/components/text/device_action.py
index 89fbbc7fbc7..9d06d4b7441 100644
--- a/homeassistant/components/text/device_action.py
+++ b/homeassistant/components/text/device_action.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -19,15 +20,22 @@ from .const import ATTR_VALUE, DOMAIN, SERVICE_SET_VALUE
 
 ATYP_SET_VALUE = "set_value"
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): ATYP_SET_VALUE,
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(ATTR_VALUE): cv.string,
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -44,7 +52,7 @@ async def async_get_actions(
             {
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: ATYP_SET_VALUE,
             }
         )
diff --git a/homeassistant/components/thermoworks_smoke/manifest.json b/homeassistant/components/thermoworks_smoke/manifest.json
index 6e112d78e48..43ce96dd012 100644
--- a/homeassistant/components/thermoworks_smoke/manifest.json
+++ b/homeassistant/components/thermoworks_smoke/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/thermoworks_smoke",
   "iot_class": "cloud_polling",
   "loggers": ["thermoworks_smoke"],
-  "requirements": ["stringcase==1.2.0", "thermoworks_smoke==0.1.8"]
+  "requirements": ["stringcase==1.2.0", "thermoworks-smoke==0.1.8"]
 }
diff --git a/homeassistant/components/thread/dataset_store.py b/homeassistant/components/thread/dataset_store.py
index 643981e763b..55623f7e3a4 100644
--- a/homeassistant/components/thread/dataset_store.py
+++ b/homeassistant/components/thread/dataset_store.py
@@ -3,13 +3,13 @@ from __future__ import annotations
 
 import dataclasses
 from datetime import datetime
-from functools import cached_property
 import logging
 from typing import Any, cast
 
 from python_otbr_api import tlv_parser
 from python_otbr_api.tlv_parser import MeshcopTLVType
 
+from homeassistant.backports.functools import cached_property
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.singleton import singleton
diff --git a/homeassistant/components/threshold/binary_sensor.py b/homeassistant/components/threshold/binary_sensor.py
index 538655ec0ce..09f928303bf 100644
--- a/homeassistant/components/threshold/binary_sensor.py
+++ b/homeassistant/components/threshold/binary_sensor.py
@@ -22,7 +22,12 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import Event, HomeAssistant, callback
-from homeassistant.helpers import config_validation as cv, entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -73,6 +78,29 @@ async def async_setup_entry(
     entity_id = er.async_validate_entity_id(
         registry, config_entry.options[CONF_ENTITY_ID]
     )
+
+    source_entity = registry.async_get(entity_id)
+    dev_reg = dr.async_get(hass)
+    # Resolve source entity device
+    if (
+        (source_entity is not None)
+        and (source_entity.device_id is not None)
+        and (
+            (
+                device := dev_reg.async_get(
+                    device_id=source_entity.device_id,
+                )
+            )
+            is not None
+        )
+    ):
+        device_info = DeviceInfo(
+            identifiers=device.identifiers,
+            connections=device.connections,
+        )
+    else:
+        device_info = None
+
     hysteresis = config_entry.options[CONF_HYSTERESIS]
     lower = config_entry.options[CONF_LOWER]
     name = config_entry.title
@@ -82,7 +110,15 @@ async def async_setup_entry(
     async_add_entities(
         [
             ThresholdSensor(
-                hass, entity_id, name, lower, upper, hysteresis, device_class, unique_id
+                hass,
+                entity_id,
+                name,
+                lower,
+                upper,
+                hysteresis,
+                device_class,
+                unique_id,
+                device_info=device_info,
             )
         ]
     )
@@ -138,9 +174,11 @@ class ThresholdSensor(BinarySensorEntity):
         hysteresis: float,
         device_class: BinarySensorDeviceClass | None,
         unique_id: str | None,
+        device_info: DeviceInfo | None = None,
     ) -> None:
         """Initialize the Threshold sensor."""
         self._attr_unique_id = unique_id
+        self._attr_device_info = device_info
         self._entity_id = entity_id
         self._name = name
         if lower is not None:
diff --git a/homeassistant/components/tomorrowio/sensor.py b/homeassistant/components/tomorrowio/sensor.py
index 2b7d466d2f0..046dc79f2c6 100644
--- a/homeassistant/components/tomorrowio/sensor.py
+++ b/homeassistant/components/tomorrowio/sensor.py
@@ -72,6 +72,10 @@ from .const import (
 class TomorrowioSensorEntityDescription(SensorEntityDescription):
     """Describes a Tomorrow.io sensor entity."""
 
+    # TomorrowioSensor does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     unit_imperial: str | None = None
     unit_metric: str | None = None
     multiplication_factor: Callable[[float], float] | float | None = None
diff --git a/homeassistant/components/totalconnect/manifest.json b/homeassistant/components/totalconnect/manifest.json
index 8e0d58b7b77..a81e7518132 100644
--- a/homeassistant/components/totalconnect/manifest.json
+++ b/homeassistant/components/totalconnect/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/totalconnect",
   "iot_class": "cloud_polling",
   "loggers": ["total_connect_client"],
-  "requirements": ["total_connect_client==2023.2"]
+  "requirements": ["total-connect-client==2023.2"]
 }
diff --git a/homeassistant/components/tplink/__init__.py b/homeassistant/components/tplink/__init__.py
index 48090d75706..2edea30835f 100644
--- a/homeassistant/components/tplink/__init__.py
+++ b/homeassistant/components/tplink/__init__.py
@@ -19,7 +19,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr, discovery_flow
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    discovery_flow,
+)
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
 
@@ -27,6 +31,7 @@ from .const import DOMAIN, PLATFORMS
 from .coordinator import TPLinkDataUpdateCoordinator
 
 DISCOVERY_INTERVAL = timedelta(minutes=15)
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 
 @callback
diff --git a/homeassistant/components/tplink/manifest.json b/homeassistant/components/tplink/manifest.json
index 6683e7e4583..eaa1acc11bf 100644
--- a/homeassistant/components/tplink/manifest.json
+++ b/homeassistant/components/tplink/manifest.json
@@ -137,5 +137,5 @@
   "iot_class": "local_polling",
   "loggers": ["kasa"],
   "quality_scale": "platinum",
-  "requirements": ["python-kasa==0.5.1"]
+  "requirements": ["python-kasa[speedups]==0.5.2"]
 }
diff --git a/homeassistant/components/tplink_omada/manifest.json b/homeassistant/components/tplink_omada/manifest.json
index 280ae56bbd5..795e6adf5b7 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.2.4"]
+  "requirements": ["tplink_omada_client==1.2.4"]
 }
diff --git a/homeassistant/components/traccar/__init__.py b/homeassistant/components/traccar/__init__.py
index 1679965b070..c428ce7a5b1 100644
--- a/homeassistant/components/traccar/__init__.py
+++ b/homeassistant/components/traccar/__init__.py
@@ -11,7 +11,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_entry_flow
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.typing import ConfigType
 
 from .const import (
     ATTR_ACCURACY,
@@ -55,12 +54,6 @@ WEBHOOK_SCHEMA = vol.Schema(
 )
 
 
-async def async_setup(hass: HomeAssistant, hass_config: ConfigType) -> bool:
-    """Set up the Traccar component."""
-    hass.data[DOMAIN] = {"devices": set(), "unsub_device_tracker": {}}
-    return True
-
-
 async def handle_webhook(hass, webhook_id, request):
     """Handle incoming webhook with Traccar request."""
     try:
@@ -94,6 +87,7 @@ async def handle_webhook(hass, webhook_id, request):
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Configure based on config entry."""
+    hass.data.setdefault(DOMAIN, {"devices": set(), "unsub_device_tracker": {}})
     webhook.async_register(
         hass, DOMAIN, "Traccar", entry.data[CONF_WEBHOOK_ID], handle_webhook
     )
diff --git a/homeassistant/components/tradfri/sensor.py b/homeassistant/components/tradfri/sensor.py
index 81cce80aa73..1b3839ce2d7 100644
--- a/homeassistant/components/tradfri/sensor.py
+++ b/homeassistant/components/tradfri/sensor.py
@@ -24,6 +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.typing import UNDEFINED
 
 from .base_class import TradfriBaseEntity
 from .const import (
@@ -202,7 +203,7 @@ class TradfriSensor(TradfriBaseEntity, SensorEntity):
 
         self._attr_unique_id = f"{self._attr_unique_id}-{description.key}"
 
-        if description.name:
+        if description.name is not UNDEFINED:
             self._attr_name = f"{self._attr_name}: {description.name}"
 
         self._refresh()  # Set initial state
diff --git a/homeassistant/components/transmission/__init__.py b/homeassistant/components/transmission/__init__.py
index d8623e7bbe5..43a37179b03 100644
--- a/homeassistant/components/transmission/__init__.py
+++ b/homeassistant/components/transmission/__init__.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 from datetime import timedelta
 from functools import partial
 import logging
+import re
 from typing import Any
 
 import transmission_rpc
@@ -18,15 +19,20 @@ from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import (
     CONF_HOST,
     CONF_ID,
+    CONF_NAME,
     CONF_PASSWORD,
     CONF_PORT,
     CONF_SCAN_INTERVAL,
     CONF_USERNAME,
     Platform,
 )
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import config_validation as cv, selector
+from homeassistant.helpers import (
+    config_validation as cv,
+    entity_registry as er,
+    selector,
+)
 from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.event import async_track_time_interval
 
@@ -91,9 +97,41 @@ CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
 
 PLATFORMS = [Platform.SENSOR, Platform.SWITCH]
 
+MIGRATION_NAME_TO_KEY = {
+    # Sensors
+    "Down Speed": "download",
+    "Up Speed": "upload",
+    "Status": "status",
+    "Active Torrents": "active_torrents",
+    "Paused Torrents": "paused_torrents",
+    "Total Torrents": "total_torrents",
+    "Completed Torrents": "completed_torrents",
+    "Started Torrents": "started_torrents",
+    # Switches
+    "Switch": "on_off",
+    "Turtle Mode": "turtle_mode",
+}
+
 
 async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Set up the Transmission Component."""
+
+    @callback
+    def update_unique_id(
+        entity_entry: er.RegistryEntry,
+    ) -> dict[str, Any] | None:
+        """Update unique ID of entity entry."""
+        match = re.search(
+            f"{config_entry.data[CONF_HOST]}-{config_entry.data[CONF_NAME]} (?P<name>.+)",
+            entity_entry.unique_id,
+        )
+
+        if match and (key := MIGRATION_NAME_TO_KEY.get(match.group("name"))):
+            return {"new_unique_id": f"{config_entry.entry_id}-{key}"}
+        return None
+
+    await er.async_migrate_entries(hass, config_entry.entry_id, update_unique_id)
+
     client = TransmissionClient(hass, config_entry)
     hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = client
 
diff --git a/homeassistant/components/transmission/const.py b/homeassistant/components/transmission/const.py
index 0e29bbbff5f..da861d2698c 100644
--- a/homeassistant/components/transmission/const.py
+++ b/homeassistant/components/transmission/const.py
@@ -1,7 +1,7 @@
 """Constants for the Transmission Bittorent Client component."""
 DOMAIN = "transmission"
 
-SWITCH_TYPES = {"on_off": "Switch", "turtle_mode": "Turtle Mode"}
+SWITCH_TYPES = {"on_off": "Switch", "turtle_mode": "Turtle mode"}
 
 ORDER_NEWEST_FIRST = "newest_first"
 ORDER_OLDEST_FIRST = "oldest_first"
diff --git a/homeassistant/components/transmission/sensor.py b/homeassistant/components/transmission/sensor.py
index 184d05faeb0..3cee556044f 100644
--- a/homeassistant/components/transmission/sensor.py
+++ b/homeassistant/components/transmission/sensor.py
@@ -38,14 +38,22 @@ async def async_setup_entry(
     name = config_entry.data[CONF_NAME]
 
     dev = [
-        TransmissionSpeedSensor(tm_client, name, "Down Speed", "download"),
-        TransmissionSpeedSensor(tm_client, name, "Up Speed", "upload"),
-        TransmissionStatusSensor(tm_client, name, "Status"),
-        TransmissionTorrentsSensor(tm_client, name, "Active Torrents", "active"),
-        TransmissionTorrentsSensor(tm_client, name, "Paused Torrents", "paused"),
-        TransmissionTorrentsSensor(tm_client, name, "Total Torrents", "total"),
-        TransmissionTorrentsSensor(tm_client, name, "Completed Torrents", "completed"),
-        TransmissionTorrentsSensor(tm_client, name, "Started Torrents", "started"),
+        TransmissionSpeedSensor(tm_client, name, "Down speed", "download"),
+        TransmissionSpeedSensor(tm_client, name, "Up speed", "upload"),
+        TransmissionStatusSensor(tm_client, name, "Status", "status"),
+        TransmissionTorrentsSensor(
+            tm_client, name, "Active torrents", "active_torrents"
+        ),
+        TransmissionTorrentsSensor(
+            tm_client, name, "Paused torrents", "paused_torrents"
+        ),
+        TransmissionTorrentsSensor(tm_client, name, "Total torrents", "total_torrents"),
+        TransmissionTorrentsSensor(
+            tm_client, name, "Completed torrents", "completed_torrents"
+        ),
+        TransmissionTorrentsSensor(
+            tm_client, name, "Started torrents", "started_torrents"
+        ),
     ]
 
     async_add_entities(dev, True)
@@ -54,15 +62,16 @@ async def async_setup_entry(
 class TransmissionSensor(SensorEntity):
     """A base class for all Transmission sensors."""
 
+    _attr_has_entity_name = True
     _attr_should_poll = False
 
-    def __init__(self, tm_client, client_name, sensor_name, sub_type=None):
+    def __init__(self, tm_client, client_name, sensor_name, key):
         """Initialize the sensor."""
         self._tm_client: TransmissionClient = tm_client
-        self._client_name = client_name
-        self._name = sensor_name
-        self._sub_type = sub_type
+        self._attr_name = sensor_name
+        self._key = key
         self._state = None
+        self._attr_unique_id = f"{tm_client.config_entry.entry_id}-{key}"
         self._attr_device_info = DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, tm_client.config_entry.entry_id)},
@@ -70,16 +79,6 @@ class TransmissionSensor(SensorEntity):
             name=client_name,
         )
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return f"{self._client_name} {self._name}"
-
-    @property
-    def unique_id(self):
-        """Return the unique id of the entity."""
-        return f"{self._tm_client.api.host}-{self.name}"
-
     @property
     def native_value(self):
         """Return the state of the sensor."""
@@ -118,7 +117,7 @@ class TransmissionSpeedSensor(TransmissionSensor):
         if data := self._tm_client.api.data:
             b_spd = (
                 float(data.download_speed)
-                if self._sub_type == "download"
+                if self._key == "download"
                 else float(data.upload_speed)
             )
             self._state = b_spd
@@ -151,12 +150,15 @@ class TransmissionStatusSensor(TransmissionSensor):
 class TransmissionTorrentsSensor(TransmissionSensor):
     """Representation of a Transmission torrents sensor."""
 
-    SUBTYPE_MODES = {
-        "started": ("downloading"),
-        "completed": ("seeding"),
-        "paused": ("stopped"),
-        "active": ("seeding", "downloading"),
-        "total": None,
+    MODES: dict[str, list[str] | None] = {
+        "started_torrents": ["downloading"],
+        "completed_torrents": ["seeding"],
+        "paused_torrents": ["stopped"],
+        "active_torrents": [
+            "seeding",
+            "downloading",
+        ],
+        "total_torrents": None,
     }
 
     @property
@@ -171,7 +173,7 @@ class TransmissionTorrentsSensor(TransmissionSensor):
             torrents=self._tm_client.api.torrents,
             order=self._tm_client.config_entry.options[CONF_ORDER],
             limit=self._tm_client.config_entry.options[CONF_LIMIT],
-            statuses=self.SUBTYPE_MODES[self._sub_type],
+            statuses=self.MODES[self._key],
         )
         return {
             STATE_ATTR_TORRENT_INFO: info,
@@ -180,7 +182,7 @@ class TransmissionTorrentsSensor(TransmissionSensor):
     def update(self) -> None:
         """Get the latest data from Transmission and updates the state."""
         torrents = _filter_torrents(
-            self._tm_client.api.torrents, statuses=self.SUBTYPE_MODES[self._sub_type]
+            self._tm_client.api.torrents, statuses=self.MODES[self._key]
         )
         self._state = len(torrents)
 
diff --git a/homeassistant/components/transmission/switch.py b/homeassistant/components/transmission/switch.py
index 3af3fe57e3c..89f89e079fa 100644
--- a/homeassistant/components/transmission/switch.py
+++ b/homeassistant/components/transmission/switch.py
@@ -36,17 +36,18 @@ async def async_setup_entry(
 class TransmissionSwitch(SwitchEntity):
     """Representation of a Transmission switch."""
 
+    _attr_has_entity_name = True
     _attr_should_poll = False
 
     def __init__(self, switch_type, switch_name, tm_client, client_name):
         """Initialize the Transmission switch."""
-        self._name = switch_name
-        self.client_name = client_name
+        self._attr_name = switch_name
         self.type = switch_type
         self._tm_client = tm_client
         self._state = STATE_OFF
         self._data = None
         self.unsub_update = None
+        self._attr_unique_id = f"{tm_client.config_entry.entry_id}-{switch_type}"
         self._attr_device_info = DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, tm_client.config_entry.entry_id)},
@@ -54,16 +55,6 @@ class TransmissionSwitch(SwitchEntity):
             name=client_name,
         )
 
-    @property
-    def name(self):
-        """Return the name of the switch."""
-        return f"{self.client_name} {self._name}"
-
-    @property
-    def unique_id(self):
-        """Return the unique id of the entity."""
-        return f"{self._tm_client.api.host}-{self.name}"
-
     @property
     def is_on(self):
         """Return true if device is on."""
diff --git a/homeassistant/components/tts/__init__.py b/homeassistant/components/tts/__init__.py
index 254abbd0d63..4402722e37f 100644
--- a/homeassistant/components/tts/__init__.py
+++ b/homeassistant/components/tts/__init__.py
@@ -44,7 +44,7 @@ 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 ConfigType
+from homeassistant.helpers.typing import UNDEFINED, ConfigType
 from homeassistant.util import dt as dt_util, language as language_util
 
 from .const import (
@@ -52,7 +52,6 @@ from .const import (
     ATTR_LANGUAGE,
     ATTR_MESSAGE,
     ATTR_OPTIONS,
-    CONF_BASE_URL,
     CONF_CACHE,
     CONF_CACHE_DIR,
     CONF_TIME_MEMORY,
@@ -76,7 +75,6 @@ __all__ = [
     "CONF_LANG",
     "DEFAULT_CACHE_DIR",
     "generate_media_source_id",
-    "get_base_url",
     "PLATFORM_SCHEMA_BASE",
     "PLATFORM_SCHEMA",
     "Provider",
@@ -93,8 +91,6 @@ ATTR_VOICE = "voice"
 
 CONF_LANG = "language"
 
-BASE_URL_KEY = "tts_base_url"
-
 SERVICE_CLEAR_CACHE = "clear_cache"
 
 _RE_LEGACY_VOICE_FILE = re.compile(
@@ -214,15 +210,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     use_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)
-    base_url: str | None = conf.get(CONF_BASE_URL)
-    if base_url is not None:
-        _LOGGER.warning(
-            "TTS base_url option is deprecated. Configure internal/external URL"
-            " instead"
-        )
-    hass.data[BASE_URL_KEY] = base_url
 
-    tts = SpeechManager(hass, use_cache, cache_dir, time_memory, base_url)
+    tts = SpeechManager(hass, use_cache, cache_dir, time_memory)
 
     try:
         await tts.async_init_cache()
@@ -413,7 +402,6 @@ class SpeechManager:
         use_cache: bool,
         cache_dir: str,
         time_memory: int,
-        base_url: str | None,
     ) -> None:
         """Initialize a speech store."""
         self.hass = hass
@@ -422,7 +410,6 @@ class SpeechManager:
         self.use_cache = use_cache
         self.cache_dir = cache_dir
         self.time_memory = time_memory
-        self.base_url = base_url
         self.file_cache: dict[str, str] = {}
         self.mem_cache: dict[str, TTSCache] = {}
 
@@ -610,7 +597,7 @@ class SpeechManager:
 
         async def get_tts_data() -> str:
             """Handle data available."""
-            if engine_instance.name is None:
+            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):
@@ -886,7 +873,7 @@ class TextToSpeechUrlView(HomeAssistantView):
             _LOGGER.error("Error on init tts: %s", err)
             return self.json({"error": err}, HTTPStatus.BAD_REQUEST)
 
-        base = self.tts.base_url or get_url(self.tts.hass)
+        base = get_url(self.tts.hass)
         url = base + path
 
         return self.json({"url": url, "path": path})
@@ -914,11 +901,6 @@ class TextToSpeechView(HomeAssistantView):
         return web.Response(body=data, content_type=content)
 
 
-def get_base_url(hass: HomeAssistant) -> str:
-    """Get base URL."""
-    return hass.data[BASE_URL_KEY] or get_url(hass)
-
-
 @websocket_api.websocket_command(
     {
         "type": "tts/engine/list",
diff --git a/homeassistant/components/tts/const.py b/homeassistant/components/tts/const.py
index 3427b761fa6..f721731330c 100644
--- a/homeassistant/components/tts/const.py
+++ b/homeassistant/components/tts/const.py
@@ -4,7 +4,6 @@ ATTR_LANGUAGE = "language"
 ATTR_MESSAGE = "message"
 ATTR_OPTIONS = "options"
 
-CONF_BASE_URL = "base_url"
 CONF_CACHE = "cache"
 CONF_CACHE_DIR = "cache_dir"
 CONF_FIELDS = "fields"
diff --git a/homeassistant/components/tts/legacy.py b/homeassistant/components/tts/legacy.py
index 619c9374622..4734c3f22d1 100644
--- a/homeassistant/components/tts/legacy.py
+++ b/homeassistant/components/tts/legacy.py
@@ -9,7 +9,6 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any, cast
 
 import voluptuous as vol
-import yarl
 
 from homeassistant.components.media_player import (
     ATTR_MEDIA_ANNOUNCE,
@@ -31,7 +30,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.service import async_set_service_schema
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.setup import async_prepare_setup_platform
-from homeassistant.util.network import normalize_url
 from homeassistant.util.yaml import load_yaml
 
 from .const import (
@@ -39,7 +37,6 @@ from .const import (
     ATTR_LANGUAGE,
     ATTR_MESSAGE,
     ATTR_OPTIONS,
-    CONF_BASE_URL,
     CONF_CACHE,
     CONF_CACHE_DIR,
     CONF_FIELDS,
@@ -72,16 +69,6 @@ def _deprecated_platform(value: str) -> str:
     return value
 
 
-def _valid_base_url(value: str) -> str:
-    """Validate base url, return value."""
-    url = yarl.URL(cv.url(value))
-
-    if url.path != "/":
-        raise vol.Invalid("Path should be empty")
-
-    return normalize_url(value)
-
-
 PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_PLATFORM): vol.All(cv.string, _deprecated_platform),
@@ -90,7 +77,6 @@ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend(
         vol.Optional(CONF_TIME_MEMORY, default=DEFAULT_TIME_MEMORY): vol.All(
             vol.Coerce(int), vol.Range(min=60, max=57600)
         ),
-        vol.Optional(CONF_BASE_URL): _valid_base_url,
         vol.Optional(CONF_SERVICE_NAME): cv.string,
     }
 )
diff --git a/homeassistant/components/tts/media_source.py b/homeassistant/components/tts/media_source.py
index 9fc0d40dae0..837a15a4f88 100644
--- a/homeassistant/components/tts/media_source.py
+++ b/homeassistant/components/tts/media_source.py
@@ -18,7 +18,6 @@ from homeassistant.components.media_source import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.network import get_url
 
 from .const import DATA_TTS_MANAGER, DOMAIN
 from .helper import get_engine_instance
@@ -124,9 +123,6 @@ class TTSMediaSource(MediaSource):
 
         mime_type = mimetypes.guess_type(url)[0] or "audio/mpeg"
 
-        if manager.base_url and manager.base_url != get_url(self.hass):
-            url = f"{manager.base_url}{url}"
-
         return PlayMedia(url, mime_type)
 
     async def async_browse_media(
@@ -165,7 +161,6 @@ class TTSMediaSource(MediaSource):
             raise BrowseError("Unknown provider")
 
         if isinstance(engine_instance, TextToSpeechEntity):
-            assert engine_instance.platform is not None
             engine_domain = engine_instance.platform.domain
         else:
             engine_domain = engine
diff --git a/homeassistant/components/tuya/alarm_control_panel.py b/homeassistant/components/tuya/alarm_control_panel.py
index d5122862e2c..c2c9c207c02 100644
--- a/homeassistant/components/tuya/alarm_control_panel.py
+++ b/homeassistant/components/tuya/alarm_control_panel.py
@@ -89,6 +89,7 @@ class TuyaAlarmEntity(TuyaEntity, AlarmControlPanelEntity):
     """Tuya Alarm Entity."""
 
     _attr_icon = "mdi:security"
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/tuya/camera.py b/homeassistant/components/tuya/camera.py
index 182d0dfd85d..72216057aff 100644
--- a/homeassistant/components/tuya/camera.py
+++ b/homeassistant/components/tuya/camera.py
@@ -52,6 +52,7 @@ class TuyaCameraEntity(TuyaEntity, CameraEntity):
 
     _attr_supported_features = CameraEntityFeature.STREAM
     _attr_brand = "Tuya"
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/tuya/climate.py b/homeassistant/components/tuya/climate.py
index 564bfab8b14..6b3b84ba349 100644
--- a/homeassistant/components/tuya/climate.py
+++ b/homeassistant/components/tuya/climate.py
@@ -125,6 +125,7 @@ class TuyaClimateEntity(TuyaEntity, ClimateEntity):
     _set_humidity: IntegerTypeData | None = None
     _set_temperature: IntegerTypeData | None = None
     entity_description: TuyaClimateEntityDescription
+    _attr_name = None
 
     def __init__(
         self,
@@ -205,7 +206,7 @@ class TuyaClimateEntity(TuyaEntity, ClimateEntity):
             self._attr_target_temperature_step = self._set_temperature.step_scaled
 
         # Determine HVAC modes
-        self._attr_hvac_modes: list[str] = []
+        self._attr_hvac_modes: list[HVACMode] = []
         self._hvac_to_tuya = {}
         if enum_type := self.find_dpcode(
             DPCode.MODE, dptype=DPType.ENUM, prefer_function=True
diff --git a/homeassistant/components/tuya/diagnostics.py b/homeassistant/components/tuya/diagnostics.py
index 67bbad0aceb..454416970ea 100644
--- a/homeassistant/components/tuya/diagnostics.py
+++ b/homeassistant/components/tuya/diagnostics.py
@@ -155,7 +155,7 @@ def _async_device_as_dict(hass: HomeAssistant, device: TuyaDevice) -> dict[str,
 
         for entity_entry in hass_entities:
             state = hass.states.get(entity_entry.entity_id)
-            state_dict = None
+            state_dict: dict[str, Any] | None = None
             if state:
                 state_dict = dict(state.as_dict())
 
diff --git a/homeassistant/components/tuya/fan.py b/homeassistant/components/tuya/fan.py
index 59cfee3506c..210cc5c7518 100644
--- a/homeassistant/components/tuya/fan.py
+++ b/homeassistant/components/tuya/fan.py
@@ -65,6 +65,7 @@ class TuyaFanEntity(TuyaEntity, FanEntity):
     _speed: IntegerTypeData | None = None
     _speeds: EnumTypeData | None = None
     _switch: DPCode | None = None
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/tuya/humidifier.py b/homeassistant/components/tuya/humidifier.py
index a9564b94ddc..6d09ba4314c 100644
--- a/homeassistant/components/tuya/humidifier.py
+++ b/homeassistant/components/tuya/humidifier.py
@@ -28,6 +28,7 @@ class TuyaHumidifierEntityDescription(HumidifierEntityDescription):
     # DPCode, to use. If None, the key will be used as DPCode
     dpcode: DPCode | tuple[DPCode, ...] | None = None
 
+    current_humidity: DPCode | None = None
     humidity: DPCode | None = None
 
 
@@ -37,6 +38,7 @@ HUMIDIFIERS: dict[str, TuyaHumidifierEntityDescription] = {
     "cs": TuyaHumidifierEntityDescription(
         key=DPCode.SWITCH,
         dpcode=(DPCode.SWITCH, DPCode.SWITCH_SPRAY),
+        current_humidity=DPCode.HUMIDITY_INDOOR,
         humidity=DPCode.DEHUMIDITY_SET_VALUE,
         device_class=HumidifierDeviceClass.DEHUMIDIFIER,
     ),
@@ -45,6 +47,7 @@ HUMIDIFIERS: dict[str, TuyaHumidifierEntityDescription] = {
     "jsq": TuyaHumidifierEntityDescription(
         key=DPCode.SWITCH,
         dpcode=(DPCode.SWITCH, DPCode.SWITCH_SPRAY),
+        current_humidity=DPCode.HUMIDITY_CURRENT,
         humidity=DPCode.HUMIDITY_SET,
         device_class=HumidifierDeviceClass.HUMIDIFIER,
     ),
@@ -79,9 +82,11 @@ async def async_setup_entry(
 class TuyaHumidifierEntity(TuyaEntity, HumidifierEntity):
     """Tuya (de)humidifier Device."""
 
+    _current_humidity: IntegerTypeData | None = None
     _set_humidity: IntegerTypeData | None = None
     _switch_dpcode: DPCode | None = None
     entity_description: TuyaHumidifierEntityDescription
+    _attr_name = None
 
     def __init__(
         self,
@@ -89,7 +94,7 @@ class TuyaHumidifierEntity(TuyaEntity, HumidifierEntity):
         device_manager: TuyaDeviceManager,
         description: TuyaHumidifierEntityDescription,
     ) -> None:
-        """Init Tuya (de)humidier."""
+        """Init Tuya (de)humidifier."""
         super().__init__(device, device_manager)
         self.entity_description = description
         self._attr_unique_id = f"{super().unique_id}{description.key}"
@@ -107,6 +112,13 @@ class TuyaHumidifierEntity(TuyaEntity, HumidifierEntity):
             self._attr_min_humidity = int(int_type.min_scaled)
             self._attr_max_humidity = int(int_type.max_scaled)
 
+        # Determine current humidity DPCode
+        if int_type := self.find_dpcode(
+            description.current_humidity,
+            dptype=DPType.INTEGER,
+        ):
+            self._current_humidity = int_type
+
         # Determine mode support and provided modes
         if enum_type := self.find_dpcode(
             DPCode.MODE, dptype=DPType.ENUM, prefer_function=True
@@ -138,6 +150,19 @@ class TuyaHumidifierEntity(TuyaEntity, HumidifierEntity):
 
         return round(self._set_humidity.scale_value(humidity))
 
+    @property
+    def current_humidity(self) -> int | None:
+        """Return the current humidity."""
+        if self._current_humidity is None:
+            return None
+
+        if (
+            current_humidity := self.device.status.get(self._current_humidity.dpcode)
+        ) is None:
+            return None
+
+        return round(self._current_humidity.scale_value(current_humidity))
+
     def turn_on(self, **kwargs):
         """Turn the device on."""
         self._send_command([{"code": self._switch_dpcode, "value": True}])
diff --git a/homeassistant/components/tuya/light.py b/homeassistant/components/tuya/light.py
index 44b3494ca77..3ab4c3568c4 100644
--- a/homeassistant/components/tuya/light.py
+++ b/homeassistant/components/tuya/light.py
@@ -79,6 +79,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
     "dc": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -90,6 +91,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
     "dd": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -102,6 +104,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
     "dj": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=(DPCode.BRIGHT_VALUE_V2, DPCode.BRIGHT_VALUE),
             color_temp=(DPCode.TEMP_VALUE_V2, DPCode.TEMP_VALUE),
@@ -120,6 +123,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
     "fsd": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -128,6 +132,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
         # Some ceiling fan lights use LIGHT for DPCode instead of SWITCH_LED
         TuyaLightEntityDescription(
             key=DPCode.LIGHT,
+            name=None,
         ),
     ),
     # Ambient Light
@@ -135,6 +140,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
     "fwd": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -146,6 +152,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
     "gyd": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -157,6 +164,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
     "jsq": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_data=DPCode.COLOUR_DATA_HSV,
@@ -195,6 +203,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
     "mbd": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_data=DPCode.COLOUR_DATA,
@@ -206,6 +215,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
     "qjdcz": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_data=DPCode.COLOUR_DATA,
@@ -296,6 +306,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
     "tyndj": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -307,6 +318,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
     "xdd": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -322,6 +334,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
     "ykq": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_CONTROLLER,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_CONTROLLER,
             color_temp=DPCode.TEMP_CONTROLLER,
@@ -332,6 +345,7 @@ LIGHTS: dict[str, tuple[TuyaLightEntityDescription, ...]] = {
     "fs": (
         TuyaLightEntityDescription(
             key=DPCode.LIGHT,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
diff --git a/homeassistant/components/tuya/siren.py b/homeassistant/components/tuya/siren.py
index a60e24eca86..c2dc8cea99b 100644
--- a/homeassistant/components/tuya/siren.py
+++ b/homeassistant/components/tuya/siren.py
@@ -27,7 +27,6 @@ SIRENS: dict[str, tuple[SirenEntityDescription, ...]] = {
     "dgnbj": (
         SirenEntityDescription(
             key=DPCode.ALARM_SWITCH,
-            name="Siren",
         ),
     ),
     # Siren Alarm
@@ -35,7 +34,6 @@ SIRENS: dict[str, tuple[SirenEntityDescription, ...]] = {
     "sgbj": (
         SirenEntityDescription(
             key=DPCode.ALARM_SWITCH,
-            name="Siren",
         ),
     ),
     # Smart Camera
@@ -43,7 +41,6 @@ SIRENS: dict[str, tuple[SirenEntityDescription, ...]] = {
     "sp": (
         SirenEntityDescription(
             key=DPCode.SIREN_SWITCH,
-            name="Siren",
         ),
     ),
 }
@@ -83,6 +80,7 @@ class TuyaSirenEntity(TuyaEntity, SirenEntity):
     """Tuya Siren Entity."""
 
     _attr_supported_features = SirenEntityFeature.TURN_ON | SirenEntityFeature.TURN_OFF
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/tuya/vacuum.py b/homeassistant/components/tuya/vacuum.py
index 7827fb061ea..a2961a55d78 100644
--- a/homeassistant/components/tuya/vacuum.py
+++ b/homeassistant/components/tuya/vacuum.py
@@ -78,6 +78,7 @@ class TuyaVacuumEntity(TuyaEntity, StateVacuumEntity):
 
     _fan_speed: EnumTypeData | None = None
     _battery_level: IntegerTypeData | None = None
+    _attr_name = None
 
     def __init__(self, device: TuyaDevice, device_manager: TuyaDeviceManager) -> None:
         """Init Tuya vacuum."""
diff --git a/homeassistant/components/twentemilieu/calendar.py b/homeassistant/components/twentemilieu/calendar.py
index e4ecbd9d866..f4d1e51b171 100644
--- a/homeassistant/components/twentemilieu/calendar.py
+++ b/homeassistant/components/twentemilieu/calendar.py
@@ -32,6 +32,7 @@ class TwenteMilieuCalendar(TwenteMilieuEntity, CalendarEntity):
 
     _attr_has_entity_name = True
     _attr_icon = "mdi:delete-empty"
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/twitch/manifest.json b/homeassistant/components/twitch/manifest.json
index c11be26c45a..5613360c594 100644
--- a/homeassistant/components/twitch/manifest.json
+++ b/homeassistant/components/twitch/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "twitch",
   "name": "Twitch",
-  "codeowners": [],
+  "codeowners": ["@joostlek"],
   "documentation": "https://www.home-assistant.io/integrations/twitch",
   "iot_class": "cloud_polling",
   "loggers": ["twitch"],
diff --git a/homeassistant/components/ubus/device_tracker.py b/homeassistant/components/ubus/device_tracker.py
index 48d5b4bd6f6..f49a06be9dd 100644
--- a/homeassistant/components/ubus/device_tracker.py
+++ b/homeassistant/components/ubus/device_tracker.py
@@ -75,13 +75,13 @@ class UbusDeviceScanner(DeviceScanner):
 
     def __init__(self, config):
         """Initialize the scanner."""
-        host = config[CONF_HOST]
+        self.host = config[CONF_HOST]
         self.username = config[CONF_USERNAME]
         self.password = config[CONF_PASSWORD]
 
         self.parse_api_pattern = re.compile(r"(?P<param>\w*) = (?P<value>.*);")
         self.last_results = {}
-        self.url = f"http://{host}/ubus"
+        self.url = f"http://{self.host}/ubus"
 
         self.ubus = Ubus(self.url, self.username, self.password)
         self.hostapd = []
@@ -108,6 +108,10 @@ class UbusDeviceScanner(DeviceScanner):
         name = self.mac2name.get(device.upper(), None)
         return name
 
+    async def async_get_extra_attributes(self, device: str) -> dict[str, str]:
+        """Return the host to distinguish between multiple routers."""
+        return {"host": self.host}
+
     @_refresh_on_access_denied
     def _update_info(self):
         """Ensure the information from the router is up to date.
diff --git a/homeassistant/components/unifi/__init__.py b/homeassistant/components/unifi/__init__.py
index a7e8aede361..4d11a690f35 100644
--- a/homeassistant/components/unifi/__init__.py
+++ b/homeassistant/components/unifi/__init__.py
@@ -6,7 +6,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, ConfigEntryNotReady
-from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType
 
@@ -19,6 +19,8 @@ SAVE_DELAY = 10
 STORAGE_KEY = "unifi_data"
 STORAGE_VERSION = 1
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(UNIFI_DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Integration doesn't support configuration through configuration.yaml."""
diff --git a/homeassistant/components/unifi/manifest.json b/homeassistant/components/unifi/manifest.json
index f48191e471a..9bfb01e5a88 100644
--- a/homeassistant/components/unifi/manifest.json
+++ b/homeassistant/components/unifi/manifest.json
@@ -8,7 +8,7 @@
   "iot_class": "local_push",
   "loggers": ["aiounifi"],
   "quality_scale": "platinum",
-  "requirements": ["aiounifi==48"],
+  "requirements": ["aiounifi==49"],
   "ssdp": [
     {
       "manufacturer": "Ubiquiti Networks",
diff --git a/homeassistant/components/unifiprotect/__init__.py b/homeassistant/components/unifiprotect/__init__.py
index 96d31872d0b..174f60fd135 100644
--- a/homeassistant/components/unifiprotect/__init__.py
+++ b/homeassistant/components/unifiprotect/__init__.py
@@ -12,7 +12,11 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr, issue_registry as ir
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    issue_registry as ir,
+)
 from homeassistant.helpers.issue_registry import IssueSeverity
 from homeassistant.helpers.typing import ConfigType
 
@@ -40,6 +44,8 @@ _LOGGER = logging.getLogger(__name__)
 
 SCAN_INTERVAL = timedelta(seconds=DEFAULT_SCAN_INTERVAL)
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the UniFi Protect."""
diff --git a/homeassistant/components/unifiprotect/camera.py b/homeassistant/components/unifiprotect/camera.py
index 00dbbe77e77..a4da77fe50b 100644
--- a/homeassistant/components/unifiprotect/camera.py
+++ b/homeassistant/components/unifiprotect/camera.py
@@ -167,9 +167,8 @@ class ProtectCamera(ProtectDeviceEntity, Camera):
         if not self.channel.is_rtsp_enabled:
             disable_stream = False
 
-        rtsp_url = self.channel.rtsp_url
-        if self._secure:
-            rtsp_url = self.channel.rtsps_url
+        channel = self.channel
+        rtsp_url = channel.rtsps_url if self._secure else channel.rtsp_url
 
         # _async_set_stream_source called by __init__
         self._stream_source = (  # pylint: disable=attribute-defined-outside-init
diff --git a/homeassistant/components/unifiprotect/entity.py b/homeassistant/components/unifiprotect/entity.py
index e123a4bf1bc..15bd17554ad 100644
--- a/homeassistant/components/unifiprotect/entity.py
+++ b/homeassistant/components/unifiprotect/entity.py
@@ -23,6 +23,7 @@ from pyunifiprotect.data import (
 from homeassistant.core import callback
 import homeassistant.helpers.device_registry as dr
 from homeassistant.helpers.entity import DeviceInfo, Entity, EntityDescription
+from homeassistant.helpers.typing import UNDEFINED
 
 from .const import (
     ATTR_EVENT_ID,
@@ -201,7 +202,11 @@ class ProtectDeviceEntity(Entity):
         else:
             self.entity_description = description
             self._attr_unique_id = f"{self.device.mac}_{description.key}"
-            name = description.name or ""
+            name = (
+                description.name
+                if description.name and description.name is not UNDEFINED
+                else ""
+            )
             self._attr_name = f"{self.device.display_name} {name.title()}"
             if isinstance(description, ProtectRequiredKeysMixin):
                 self._async_get_ufp_enabled = description.get_ufp_enabled
diff --git a/homeassistant/components/unifiprotect/utils.py b/homeassistant/components/unifiprotect/utils.py
index 061f6745f32..e0c56cfd5fc 100644
--- a/homeassistant/components/unifiprotect/utils.py
+++ b/homeassistant/components/unifiprotect/utils.py
@@ -38,6 +38,8 @@ from .const import (
     ModelType,
 )
 
+_SENTINEL = object()
+
 
 def get_nested_attr(obj: Any, attr: str) -> Any:
     """Fetch a nested attribute."""
@@ -46,9 +48,8 @@ def get_nested_attr(obj: Any, attr: str) -> Any:
     else:
         value = obj
         for key in attr.split("."):
-            if not hasattr(value, key):
+            if (value := getattr(value, key, _SENTINEL)) is _SENTINEL:
                 return None
-            value = getattr(value, key)
 
     return value.value if isinstance(value, Enum) else value
 
diff --git a/homeassistant/components/universal/media_player.py b/homeassistant/components/universal/media_player.py
index fd73ad33e16..68ce8e9b96c 100644
--- a/homeassistant/components/universal/media_player.py
+++ b/homeassistant/components/universal/media_player.py
@@ -95,6 +95,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 ATTR_ACTIVE_CHILD = "active_child"
 
+CONF_ACTIVE_CHILD_TEMPLATE = "active_child_template"
 CONF_ATTRS = "attributes"
 CONF_CHILDREN = "children"
 CONF_COMMANDS = "commands"
@@ -128,6 +129,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
         vol.Optional(CONF_BROWSE_MEDIA_ENTITY): cv.string,
         vol.Optional(CONF_UNIQUE_ID): cv.string,
         vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
+        vol.Optional(CONF_ACTIVE_CHILD_TEMPLATE): cv.template,
         vol.Optional(CONF_STATE_TEMPLATE): cv.template,
     },
     extra=vol.REMOVE_EXTRA,
@@ -161,6 +163,8 @@ class UniversalMediaPlayer(MediaPlayerEntity):
         self.hass = hass
         self._name = config.get(CONF_NAME)
         self._children = config.get(CONF_CHILDREN)
+        self._active_child_template = config.get(CONF_ACTIVE_CHILD_TEMPLATE)
+        self._active_child_template_result = None
         self._cmds = config.get(CONF_COMMANDS)
         self._attrs = {}
         for key, val in config.get(CONF_ATTRS).items():
@@ -186,23 +190,35 @@ class UniversalMediaPlayer(MediaPlayerEntity):
 
         @callback
         def _async_on_template_update(event, updates):
-            """Update ha state when dependencies update."""
-            result = updates.pop().result
+            """Update state when template state changes."""
+            for data in updates:
+                template = data.template
+                result = data.result
 
-            if isinstance(result, TemplateError):
-                self._state_template_result = None
-            else:
-                self._state_template_result = result
+                if template == self._state_template:
+                    self._state_template_result = (
+                        None if isinstance(result, TemplateError) else result
+                    )
+                if template == self._active_child_template:
+                    self._active_child_template_result = (
+                        None if isinstance(result, TemplateError) else result
+                    )
 
             if event:
                 self.async_set_context(event.context)
 
             self.async_schedule_update_ha_state(True)
 
-        if self._state_template is not None:
+        track_templates: list[TrackTemplate] = []
+        if self._state_template:
+            track_templates.append(TrackTemplate(self._state_template, None))
+        if self._active_child_template:
+            track_templates.append(TrackTemplate(self._active_child_template, None))
+
+        if track_templates:
             result = async_track_template_result(
                 self.hass,
-                [TrackTemplate(self._state_template, None)],
+                track_templates,
                 _async_on_template_update,
             )
             self.hass.bus.async_listen_once(
@@ -644,6 +660,9 @@ class UniversalMediaPlayer(MediaPlayerEntity):
 
     async def async_update(self) -> None:
         """Update state in HA."""
+        if self._active_child_template_result:
+            self._child_state = self.hass.states.get(self._active_child_template_result)
+            return
         self._child_state = None
         for child_name in self._children:
             if (child_state := self.hass.states.get(child_name)) and (
diff --git a/homeassistant/components/upb/manifest.json b/homeassistant/components/upb/manifest.json
index 00cebe1e0d9..240660ac89f 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.4"]
+  "requirements": ["upb-lib==0.5.4"]
 }
diff --git a/homeassistant/components/update/__init__.py b/homeassistant/components/update/__init__.py
index 3c8a30d5b4f..e0244034865 100644
--- a/homeassistant/components/update/__init__.py
+++ b/homeassistant/components/update/__init__.py
@@ -236,9 +236,6 @@ class UpdateEntity(RestoreEntity):
         Update entities return the brand icon based on the integration
         domain by default.
         """
-        if self.platform is None:
-            return None
-
         return (
             f"https://brands.home-assistant.io/_/{self.platform.platform_name}/icon.png"
         )
diff --git a/homeassistant/components/update/strings.json b/homeassistant/components/update/strings.json
index 4d730d71721..518b8605aa7 100644
--- a/homeassistant/components/update/strings.json
+++ b/homeassistant/components/update/strings.json
@@ -12,7 +12,7 @@
       "name": "[%key:component::update::title%]"
     },
     "firmware": {
-      "name": "firmware"
+      "name": "Firmware"
     }
   },
   "issues": {
diff --git a/homeassistant/components/uptime/sensor.py b/homeassistant/components/uptime/sensor.py
index f3b215356e5..56d570110b0 100644
--- a/homeassistant/components/uptime/sensor.py
+++ b/homeassistant/components/uptime/sensor.py
@@ -26,6 +26,7 @@ class UptimeSensor(SensorEntity):
 
     _attr_device_class = SensorDeviceClass.TIMESTAMP
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(self, entry: ConfigEntry) -> None:
diff --git a/homeassistant/components/usb/__init__.py b/homeassistant/components/usb/__init__.py
index dcb4009145f..b2358a4b0bd 100644
--- a/homeassistant/components/usb/__init__.py
+++ b/homeassistant/components/usb/__init__.py
@@ -300,8 +300,7 @@ class USBDiscovery:
 
         return _async_remove_callback
 
-    @hass_callback
-    def _async_process_discovered_usb_device(self, device: USBDevice) -> None:
+    async def _async_process_discovered_usb_device(self, device: USBDevice) -> None:
         """Process a USB discovery."""
         _LOGGER.debug("Discovered USB Device: %s", device)
         device_tuple = dataclasses.astuple(device)
@@ -313,14 +312,7 @@ class USBDiscovery:
         if not matched:
             return
 
-        service_info = UsbServiceInfo(
-            device=device.device,
-            vid=device.vid,
-            pid=device.pid,
-            serial_number=device.serial_number,
-            manufacturer=device.manufacturer,
-            description=device.description,
-        )
+        service_info: UsbServiceInfo | None = None
 
         sorted_by_most_targeted = sorted(matched, key=lambda item: -len(item))
         most_matched_fields = len(sorted_by_most_targeted[0])
@@ -331,6 +323,18 @@ class USBDiscovery:
             if len(matcher) < most_matched_fields:
                 break
 
+            if service_info is None:
+                service_info = UsbServiceInfo(
+                    device=await self.hass.async_add_executor_job(
+                        get_serial_by_id, device.device
+                    ),
+                    vid=device.vid,
+                    pid=device.pid,
+                    serial_number=device.serial_number,
+                    manufacturer=device.manufacturer,
+                    description=device.description,
+                )
+
             discovery_flow.async_create_flow(
                 self.hass,
                 matcher["domain"],
@@ -338,17 +342,18 @@ class USBDiscovery:
                 service_info,
             )
 
-    @hass_callback
-    def _async_process_ports(self, ports: list[ListPortInfo]) -> None:
+    async def _async_process_ports(self, ports: list[ListPortInfo]) -> None:
         """Process each discovered port."""
         for port in ports:
             if port.vid is None and port.pid is None:
                 continue
-            self._async_process_discovered_usb_device(usb_device_from_port(port))
+            await self._async_process_discovered_usb_device(usb_device_from_port(port))
 
     async def _async_scan_serial(self) -> None:
         """Scan serial ports."""
-        self._async_process_ports(await self.hass.async_add_executor_job(comports))
+        await self._async_process_ports(
+            await self.hass.async_add_executor_job(comports)
+        )
         if self.initial_scan_done:
             return
 
diff --git a/homeassistant/components/usgs_earthquakes_feed/manifest.json b/homeassistant/components/usgs_earthquakes_feed/manifest.json
index 09ff6c106df..6dbe43cb4e3 100644
--- a/homeassistant/components/usgs_earthquakes_feed/manifest.json
+++ b/homeassistant/components/usgs_earthquakes_feed/manifest.json
@@ -6,5 +6,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aio_geojson_usgs_earthquakes"],
-  "requirements": ["aio_geojson_usgs_earthquakes==0.2"]
+  "requirements": ["aio-geojson-usgs-earthquakes==0.2"]
 }
diff --git a/homeassistant/components/utility_meter/__init__.py b/homeassistant/components/utility_meter/__init__.py
index 11e58fca775..ffe6d7f5433 100644
--- a/homeassistant/components/utility_meter/__init__.py
+++ b/homeassistant/components/utility_meter/__init__.py
@@ -10,7 +10,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
+from homeassistant.helpers import (
+    device_registry as dr,
+    discovery,
+    entity_registry as er,
+)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
@@ -182,7 +186,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Utility Meter from a config entry."""
     entity_registry = er.async_get(hass)
-    hass.data[DATA_UTILITY][entry.entry_id] = {}
+    hass.data[DATA_UTILITY][entry.entry_id] = {
+        "source": entry.options[CONF_SOURCE_SENSOR],
+    }
     hass.data[DATA_UTILITY][entry.entry_id][DATA_TARIFF_SENSORS] = []
 
     try:
@@ -218,8 +224,23 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
 async def config_entry_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Update listener, called when the config entry options are changed."""
+    old_source = hass.data[DATA_UTILITY][entry.entry_id]["source"]
     await hass.config_entries.async_reload(entry.entry_id)
 
+    if old_source == entry.options[CONF_SOURCE_SENSOR]:
+        return
+
+    entity_registry = er.async_get(hass)
+    device_registry = dr.async_get(hass)
+
+    old_source_entity = entity_registry.async_get(old_source)
+    if not old_source_entity or not old_source_entity.device_id:
+        return
+
+    device_registry.async_update_device(
+        old_source_entity.device_id, remove_config_entry_id=entry.entry_id
+    )
+
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
diff --git a/homeassistant/components/utility_meter/select.py b/homeassistant/components/utility_meter/select.py
index 55845569af0..cf2a6da9e08 100644
--- a/homeassistant/components/utility_meter/select.py
+++ b/homeassistant/components/utility_meter/select.py
@@ -7,11 +7,22 @@ from homeassistant.components.select import SelectEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_UNIQUE_ID
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import (
+    device_registry as dr,
+    entity_registry as er,
+)
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .const import CONF_METER, CONF_TARIFFS, DATA_UTILITY, TARIFF_ICON
+from .const import (
+    CONF_METER,
+    CONF_SOURCE_SENSOR,
+    CONF_TARIFFS,
+    DATA_UTILITY,
+    TARIFF_ICON,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -26,7 +37,36 @@ async def async_setup_entry(
     tariffs: list[str] = config_entry.options[CONF_TARIFFS]
 
     unique_id = config_entry.entry_id
-    tariff_select = TariffSelect(name, tariffs, unique_id)
+
+    registry = er.async_get(hass)
+    source_entity = registry.async_get(config_entry.options[CONF_SOURCE_SENSOR])
+    dev_reg = dr.async_get(hass)
+    # Resolve source entity device
+    if (
+        (source_entity is not None)
+        and (source_entity.device_id is not None)
+        and (
+            (
+                device := dev_reg.async_get(
+                    device_id=source_entity.device_id,
+                )
+            )
+            is not None
+        )
+    ):
+        device_info = DeviceInfo(
+            identifiers=device.identifiers,
+            connections=device.connections,
+        )
+    else:
+        device_info = None
+
+    tariff_select = TariffSelect(
+        name,
+        tariffs,
+        unique_id,
+        device_info=device_info,
+    )
     async_add_entities([tariff_select])
 
 
@@ -63,10 +103,17 @@ async def async_setup_platform(
 class TariffSelect(SelectEntity, RestoreEntity):
     """Representation of a Tariff selector."""
 
-    def __init__(self, name, tariffs, unique_id):
+    def __init__(
+        self,
+        name,
+        tariffs,
+        unique_id,
+        device_info: DeviceInfo | None = None,
+    ) -> None:
         """Initialize a tariff selector."""
         self._attr_name = name
         self._attr_unique_id = unique_id
+        self._attr_device_info = device_info
         self._current_tariff: str | None = None
         self._tariffs = tariffs
         self._attr_icon = TARIFF_ICON
diff --git a/homeassistant/components/utility_meter/sensor.py b/homeassistant/components/utility_meter/sensor.py
index 7ad5afaa503..f52b78b5a52 100644
--- a/homeassistant/components/utility_meter/sensor.py
+++ b/homeassistant/components/utility_meter/sensor.py
@@ -28,8 +28,13 @@ from homeassistant.const import (
     UnitOfEnergy,
 )
 from homeassistant.core import Event, HomeAssistant, State, callback
-from homeassistant.helpers import entity_platform, entity_registry as er
+from homeassistant.helpers import (
+    device_registry as dr,
+    entity_platform,
+    entity_registry as er,
+)
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import (
     async_track_point_in_time,
@@ -120,6 +125,28 @@ async def async_setup_entry(
         registry, config_entry.options[CONF_SOURCE_SENSOR]
     )
 
+    source_entity = registry.async_get(source_entity_id)
+    dev_reg = dr.async_get(hass)
+    # Resolve source entity device
+    if (
+        (source_entity is not None)
+        and (source_entity.device_id is not None)
+        and (
+            (
+                device := dev_reg.async_get(
+                    device_id=source_entity.device_id,
+                )
+            )
+            is not None
+        )
+    ):
+        device_info = DeviceInfo(
+            identifiers=device.identifiers,
+            connections=device.connections,
+        )
+    else:
+        device_info = None
+
     cron_pattern = None
     delta_values = config_entry.options[CONF_METER_DELTA_VALUES]
     meter_offset = timedelta(days=config_entry.options[CONF_METER_OFFSET])
@@ -149,6 +176,7 @@ async def async_setup_entry(
             tariff_entity=tariff_entity,
             tariff=None,
             unique_id=entry_id,
+            device_info=device_info,
         )
         meters.append(meter_sensor)
         hass.data[DATA_UTILITY][entry_id][DATA_TARIFF_SENSORS].append(meter_sensor)
@@ -168,6 +196,7 @@ async def async_setup_entry(
                 tariff_entity=tariff_entity,
                 tariff=tariff,
                 unique_id=f"{entry_id}_{tariff}",
+                device_info=device_info,
             )
             meters.append(meter_sensor)
             hass.data[DATA_UTILITY][entry_id][DATA_TARIFF_SENSORS].append(meter_sensor)
@@ -341,9 +370,11 @@ class UtilityMeterSensor(RestoreSensor):
         tariff,
         unique_id,
         suggested_entity_id=None,
+        device_info=None,
     ):
         """Initialize the Utility Meter sensor."""
         self._attr_unique_id = unique_id
+        self._attr_device_info = device_info
         self.entity_id = suggested_entity_id
         self._parent_meter = parent_meter
         self._sensor_source_id = source_entity
diff --git a/homeassistant/components/vacuum/device_action.py b/homeassistant/components/vacuum/device_action.py
index 9b53c761247..0f212235673 100644
--- a/homeassistant/components/vacuum/device_action.py
+++ b/homeassistant/components/vacuum/device_action.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -19,14 +20,21 @@ from . import DOMAIN, SERVICE_RETURN_TO_BASE, SERVICE_START
 
 ACTION_TYPES = {"clean", "dock"}
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -42,7 +50,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         actions.append({**base_action, CONF_TYPE: "clean"})
@@ -58,8 +66,6 @@ async def async_call_action_from_config(
     context: Context | None,
 ) -> None:
     """Execute a device action."""
-    config = ACTION_SCHEMA(config)
-
     service_data = {ATTR_ENTITY_ID: config[CONF_ENTITY_ID]}
 
     if config[CONF_TYPE] == "clean":
diff --git a/homeassistant/components/vacuum/device_condition.py b/homeassistant/components/vacuum/device_condition.py
index cf5b0934663..8b7227e788e 100644
--- a/homeassistant/components/vacuum/device_condition.py
+++ b/homeassistant/components/vacuum/device_condition.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 import voluptuous as vol
 
 from homeassistant.const import (
-    ATTR_ENTITY_ID,
     CONF_CONDITION,
     CONF_DEVICE_ID,
     CONF_DOMAIN,
@@ -26,7 +25,7 @@ CONDITION_TYPES = {"is_cleaning", "is_docked"}
 
 CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
     }
 )
@@ -48,7 +47,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions += [{**base_condition, CONF_TYPE: cond} for cond in CONDITION_TYPES]
@@ -66,9 +65,15 @@ def async_condition_from_config(
     else:
         test_states = [STATE_CLEANING, STATE_RETURNING]
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[CONF_ENTITY_ID])
+
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        state = hass.states.get(config[ATTR_ENTITY_ID])
-        return state is not None and state.state in test_states
+        return (
+            entity_id is not None
+            and (state := hass.states.get(entity_id)) is not None
+            and state.state in test_states
+        )
 
     return test_is_state
diff --git a/homeassistant/components/vacuum/device_trigger.py b/homeassistant/components/vacuum/device_trigger.py
index 6a2646922b6..95c1938ccfa 100644
--- a/homeassistant/components/vacuum/device_trigger.py
+++ b/homeassistant/components/vacuum/device_trigger.py
@@ -24,7 +24,7 @@ TRIGGER_TYPES = {"cleaning", "docked"}
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -48,7 +48,7 @@ async def async_get_triggers(
                 CONF_PLATFORM: "device",
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: trigger,
             }
             for trigger in TRIGGER_TYPES
diff --git a/homeassistant/components/velbus/config_flow.py b/homeassistant/components/velbus/config_flow.py
index e0394e4787c..5c35303f859 100644
--- a/homeassistant/components/velbus/config_flow.py
+++ b/homeassistant/components/velbus/config_flow.py
@@ -74,9 +74,7 @@ class VelbusConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         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 = await self.hass.async_add_executor_job(
-            usb.get_serial_by_id, discovery_info.device
-        )
+        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
diff --git a/homeassistant/components/venstar/__init__.py b/homeassistant/components/venstar/__init__.py
index 3f31c417a02..48760a8bfc0 100644
--- a/homeassistant/components/venstar/__init__.py
+++ b/homeassistant/components/venstar/__init__.py
@@ -123,8 +123,6 @@ class VenstarDataUpdateCoordinator(update_coordinator.DataUpdateCoordinator[None
                 f"Exception during Venstar runtime update: {ex}"
             ) from ex
 
-        return None
-
 
 class VenstarEntity(CoordinatorEntity[VenstarDataUpdateCoordinator]):
     """Representation of a Venstar entity."""
diff --git a/homeassistant/components/verisure/alarm_control_panel.py b/homeassistant/components/verisure/alarm_control_panel.py
index 9615404a9a6..284b8d6b00a 100644
--- a/homeassistant/components/verisure/alarm_control_panel.py
+++ b/homeassistant/components/verisure/alarm_control_panel.py
@@ -35,6 +35,7 @@ class VerisureAlarm(
 
     _attr_code_format = CodeFormat.NUMBER
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_supported_features = (
         AlarmControlPanelEntityFeature.ARM_HOME
         | AlarmControlPanelEntityFeature.ARM_AWAY
diff --git a/homeassistant/components/verisure/config_flow.py b/homeassistant/components/verisure/config_flow.py
index 9392cdd9bc1..1fcf0eb9de2 100644
--- a/homeassistant/components/verisure/config_flow.py
+++ b/homeassistant/components/verisure/config_flow.py
@@ -329,7 +329,7 @@ class VerisureOptionsFlowHandler(OptionsFlow):
                     ): int,
                     vol.Optional(
                         CONF_LOCK_DEFAULT_CODE,
-                        default=self.entry.options.get(CONF_LOCK_DEFAULT_CODE),
+                        default=self.entry.options.get(CONF_LOCK_DEFAULT_CODE, ""),
                     ): str,
                 }
             ),
diff --git a/homeassistant/components/verisure/sensor.py b/homeassistant/components/verisure/sensor.py
index 7c9639b6542..a4f4d1b4e43 100644
--- a/homeassistant/components/verisure/sensor.py
+++ b/homeassistant/components/verisure/sensor.py
@@ -47,7 +47,6 @@ class VerisureThermometer(
 
     _attr_device_class = SensorDeviceClass.TEMPERATURE
     _attr_has_entity_name = True
-    _attr_translation_key = "temperature"
     _attr_native_unit_of_measurement = UnitOfTemperature.CELSIUS
     _attr_state_class = SensorStateClass.MEASUREMENT
 
@@ -99,7 +98,6 @@ class VerisureHygrometer(
 
     _attr_device_class = SensorDeviceClass.HUMIDITY
     _attr_has_entity_name = True
-    _attr_translation_key = "humidity"
     _attr_native_unit_of_measurement = PERCENTAGE
     _attr_state_class = SensorStateClass.MEASUREMENT
 
diff --git a/homeassistant/components/verisure/strings.json b/homeassistant/components/verisure/strings.json
index 17feb4a7fe9..85b3f4015b5 100644
--- a/homeassistant/components/verisure/strings.json
+++ b/homeassistant/components/verisure/strings.json
@@ -62,14 +62,6 @@
       "ethernet": {
         "name": "Ethernet status"
       }
-    },
-    "sensor": {
-      "humidity": {
-        "name": "[%key:component::sensor::entity_component::humidity::name%]"
-      },
-      "temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      }
     }
   }
 }
diff --git a/homeassistant/components/verisure/switch.py b/homeassistant/components/verisure/switch.py
index 62e9bdf6cf8..6c3dcd81295 100644
--- a/homeassistant/components/verisure/switch.py
+++ b/homeassistant/components/verisure/switch.py
@@ -32,6 +32,7 @@ class VerisureSmartplug(CoordinatorEntity[VerisureDataUpdateCoordinator], Switch
     """Representation of a Verisure smartplug."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self, coordinator: VerisureDataUpdateCoordinator, serial_number: str
diff --git a/homeassistant/components/voip/manifest.json b/homeassistant/components/voip/manifest.json
index 345480da363..594abc69c13 100644
--- a/homeassistant/components/voip/manifest.json
+++ b/homeassistant/components/voip/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/voip",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["voip-utils==0.0.7"]
+  "requirements": ["voip-utils==0.1.0"]
 }
diff --git a/homeassistant/components/voip/select.py b/homeassistant/components/voip/select.py
index 7383e1b886a..94a3aacc0fd 100644
--- a/homeassistant/components/voip/select.py
+++ b/homeassistant/components/voip/select.py
@@ -4,7 +4,10 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from homeassistant.components.assist_pipeline.select import AssistPipelineSelect
+from homeassistant.components.assist_pipeline.select import (
+    AssistPipelineSelect,
+    VadSensitivitySelect,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -28,13 +31,18 @@ async def async_setup_entry(
     @callback
     def async_add_device(device: VoIPDevice) -> None:
         """Add device."""
-        async_add_entities([VoipPipelineSelect(hass, device)])
+        async_add_entities(
+            [VoipPipelineSelect(hass, device), VoipVadSensitivitySelect(hass, device)]
+        )
 
     domain_data.devices.async_add_new_device_listener(async_add_device)
 
-    async_add_entities(
-        [VoipPipelineSelect(hass, device) for device in domain_data.devices]
-    )
+    entities: list[VoIPEntity] = []
+    for device in domain_data.devices:
+        entities.append(VoipPipelineSelect(hass, device))
+        entities.append(VoipVadSensitivitySelect(hass, device))
+
+    async_add_entities(entities)
 
 
 class VoipPipelineSelect(VoIPEntity, AssistPipelineSelect):
@@ -44,3 +52,12 @@ class VoipPipelineSelect(VoIPEntity, AssistPipelineSelect):
         """Initialize a pipeline selector."""
         VoIPEntity.__init__(self, device)
         AssistPipelineSelect.__init__(self, hass, device.voip_id)
+
+
+class VoipVadSensitivitySelect(VoIPEntity, VadSensitivitySelect):
+    """VAD sensitivity selector for VoIP devices."""
+
+    def __init__(self, hass: HomeAssistant, device: VoIPDevice) -> None:
+        """Initialize a VAD sensitivity selector."""
+        VoIPEntity.__init__(self, device)
+        VadSensitivitySelect.__init__(self, hass, device.voip_id)
diff --git a/homeassistant/components/voip/strings.json b/homeassistant/components/voip/strings.json
index 2bef9a18008..8bcbb06d4e2 100644
--- a/homeassistant/components/voip/strings.json
+++ b/homeassistant/components/voip/strings.json
@@ -26,6 +26,14 @@
         "state": {
           "preferred": "[%key:component::assist_pipeline::entity::select::pipeline::state::preferred%]"
         }
+      },
+      "vad_sensitivity": {
+        "name": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::name%]",
+        "state": {
+          "default": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::state::default%]",
+          "aggressive": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::state::aggressive%]",
+          "relaxed": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::state::relaxed%]"
+        }
       }
     }
   },
diff --git a/homeassistant/components/voip/voip.py b/homeassistant/components/voip/voip.py
index 80e24d6eb83..3d0681a8475 100644
--- a/homeassistant/components/voip/voip.py
+++ b/homeassistant/components/voip/voip.py
@@ -11,7 +11,13 @@ import time
 from typing import TYPE_CHECKING
 
 import async_timeout
-from voip_utils import CallInfo, RtpDatagramProtocol, SdpInfo, VoipDatagramProtocol
+from voip_utils import (
+    CallInfo,
+    RtcpState,
+    RtpDatagramProtocol,
+    SdpInfo,
+    VoipDatagramProtocol,
+)
 
 from homeassistant.components import stt, tts
 from homeassistant.components.assist_pipeline import (
@@ -23,12 +29,21 @@ from homeassistant.components.assist_pipeline import (
     async_pipeline_from_audio_stream,
     select as pipeline_select,
 )
-from homeassistant.components.assist_pipeline.vad import VoiceCommandSegmenter
+from homeassistant.components.assist_pipeline.vad import (
+    VadSensitivity,
+    VoiceCommandSegmenter,
+)
 from homeassistant.const import __version__
 from homeassistant.core import Context, HomeAssistant
 from homeassistant.util.ulid import ulid
 
-from .const import CHANNELS, DOMAIN, RATE, RTP_AUDIO_SETTINGS, WIDTH
+from .const import (
+    CHANNELS,
+    DOMAIN,
+    RATE,
+    RTP_AUDIO_SETTINGS,
+    WIDTH,
+)
 
 if TYPE_CHECKING:
     from .devices import VoIPDevice, VoIPDevices
@@ -37,7 +52,10 @@ _LOGGER = logging.getLogger(__name__)
 
 
 def make_protocol(
-    hass: HomeAssistant, devices: VoIPDevices, call_info: CallInfo
+    hass: HomeAssistant,
+    devices: VoIPDevices,
+    call_info: CallInfo,
+    rtcp_state: RtcpState | None = None,
 ) -> VoipDatagramProtocol:
     """Plays a pre-recorded message if pipeline is misconfigured."""
     voip_device = devices.async_get_or_create(call_info)
@@ -61,8 +79,15 @@ def make_protocol(
             hass,
             "problem.pcm",
             opus_payload_type=call_info.opus_payload_type,
+            rtcp_state=rtcp_state,
         )
 
+    vad_sensitivity = pipeline_select.get_vad_sensitivity(
+        hass,
+        DOMAIN,
+        voip_device.voip_id,
+    )
+
     # Pipeline is properly configured
     return PipelineRtpDatagramProtocol(
         hass,
@@ -70,6 +95,8 @@ def make_protocol(
         voip_device,
         Context(user_id=devices.config_entry.data["user"]),
         opus_payload_type=call_info.opus_payload_type,
+        silence_seconds=VadSensitivity.to_seconds(vad_sensitivity),
+        rtcp_state=rtcp_state,
     )
 
 
@@ -85,13 +112,14 @@ class HassVoipDatagramProtocol(VoipDatagramProtocol):
                 session_name="voip_hass",
                 version=__version__,
             ),
-            valid_protocol_factory=lambda call_info: make_protocol(
-                hass, devices, call_info
+            valid_protocol_factory=lambda call_info, rtcp_state: make_protocol(
+                hass, devices, call_info, rtcp_state
             ),
-            invalid_protocol_factory=lambda call_info: PreRecordMessageProtocol(
+            invalid_protocol_factory=lambda call_info, rtcp_state: PreRecordMessageProtocol(
                 hass,
                 "not_configured.pcm",
                 opus_payload_type=call_info.opus_payload_type,
+                rtcp_state=rtcp_state,
             ),
         )
         self.hass = hass
@@ -130,6 +158,8 @@ class PipelineRtpDatagramProtocol(RtpDatagramProtocol):
         error_tone_enabled: bool = True,
         tone_delay: float = 0.2,
         tts_extra_timeout: float = 1.0,
+        silence_seconds: float = 1.0,
+        rtcp_state: RtcpState | None = None,
     ) -> None:
         """Set up pipeline RTP server."""
         super().__init__(
@@ -137,6 +167,7 @@ class PipelineRtpDatagramProtocol(RtpDatagramProtocol):
             width=WIDTH,
             channels=CHANNELS,
             opus_payload_type=opus_payload_type,
+            rtcp_state=rtcp_state,
         )
 
         self.hass = hass
@@ -151,6 +182,7 @@ class PipelineRtpDatagramProtocol(RtpDatagramProtocol):
         self.error_tone_enabled = error_tone_enabled
         self.tone_delay = tone_delay
         self.tts_extra_timeout = tts_extra_timeout
+        self.silence_seconds = silence_seconds
 
         self._audio_queue: asyncio.Queue[bytes] = asyncio.Queue()
         self._context = context
@@ -199,7 +231,7 @@ class PipelineRtpDatagramProtocol(RtpDatagramProtocol):
 
         try:
             # Wait for speech before starting pipeline
-            segmenter = VoiceCommandSegmenter()
+            segmenter = VoiceCommandSegmenter(silence_seconds=self.silence_seconds)
             chunk_buffer: deque[bytes] = deque(
                 maxlen=self.buffered_chunks_before_speech,
             )
@@ -251,6 +283,7 @@ class PipelineRtpDatagramProtocol(RtpDatagramProtocol):
                         self.hass, DOMAIN, self.voip_device.voip_id
                     ),
                     conversation_id=self._conversation_id,
+                    device_id=self.voip_device.device_id,
                     tts_audio_output="raw",
                 )
 
@@ -435,6 +468,7 @@ class PreRecordMessageProtocol(RtpDatagramProtocol):
         opus_payload_type: int,
         message_delay: float = 1.0,
         loop_delay: float = 2.0,
+        rtcp_state: RtcpState | None = None,
     ) -> None:
         """Set up RTP server."""
         super().__init__(
@@ -442,6 +476,7 @@ class PreRecordMessageProtocol(RtpDatagramProtocol):
             width=WIDTH,
             channels=CHANNELS,
             opus_payload_type=opus_payload_type,
+            rtcp_state=rtcp_state,
         )
         self.hass = hass
         self.file_name = file_name
diff --git a/homeassistant/components/w800rf32/__init__.py b/homeassistant/components/w800rf32/__init__.py
index 88aaa934a7b..29701ec82ab 100644
--- a/homeassistant/components/w800rf32/__init__.py
+++ b/homeassistant/components/w800rf32/__init__.py
@@ -1,8 +1,8 @@
 """Support for w800rf32 devices."""
 import logging
 
-import W800rf32 as w800
 import voluptuous as vol
+import W800rf32 as w800
 
 from homeassistant.const import (
     CONF_DEVICE,
diff --git a/homeassistant/components/w800rf32/binary_sensor.py b/homeassistant/components/w800rf32/binary_sensor.py
index 04007469992..6d1ce5c61c0 100644
--- a/homeassistant/components/w800rf32/binary_sensor.py
+++ b/homeassistant/components/w800rf32/binary_sensor.py
@@ -3,8 +3,8 @@ from __future__ import annotations
 
 import logging
 
-import W800rf32 as w800
 import voluptuous as vol
+import W800rf32 as w800
 
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASSES_SCHEMA,
diff --git a/homeassistant/components/water_heater/device_action.py b/homeassistant/components/water_heater/device_action.py
index 8ae75527abc..5b0fe46934c 100644
--- a/homeassistant/components/water_heater/device_action.py
+++ b/homeassistant/components/water_heater/device_action.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -21,14 +22,21 @@ from . import DOMAIN
 
 ACTION_TYPES = {"turn_on", "turn_off"}
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -43,7 +51,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         actions.append({**base_action, CONF_TYPE: "turn_on"})
diff --git a/homeassistant/components/weather/__init__.py b/homeassistant/components/weather/__init__.py
index 0a99b6aaaf7..c4a6a0ad777 100644
--- a/homeassistant/components/weather/__init__.py
+++ b/homeassistant/components/weather/__init__.py
@@ -30,6 +30,9 @@ from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
 from .const import (
+    ATTR_WEATHER_APPARENT_TEMPERATURE,
+    ATTR_WEATHER_CLOUD_COVERAGE,
+    ATTR_WEATHER_DEW_POINT,
     ATTR_WEATHER_HUMIDITY,
     ATTR_WEATHER_OZONE,
     ATTR_WEATHER_PRECIPITATION_UNIT,
@@ -40,6 +43,7 @@ from .const import (
     ATTR_WEATHER_VISIBILITY,
     ATTR_WEATHER_VISIBILITY_UNIT,
     ATTR_WEATHER_WIND_BEARING,
+    ATTR_WEATHER_WIND_GUST_SPEED,
     ATTR_WEATHER_WIND_SPEED,
     ATTR_WEATHER_WIND_SPEED_UNIT,
     DOMAIN,
@@ -68,19 +72,27 @@ ATTR_CONDITION_WINDY = "windy"
 ATTR_CONDITION_WINDY_VARIANT = "windy-variant"
 ATTR_FORECAST = "forecast"
 ATTR_FORECAST_CONDITION: Final = "condition"
+ATTR_FORECAST_HUMIDITY: Final = "humidity"
 ATTR_FORECAST_NATIVE_PRECIPITATION: Final = "native_precipitation"
 ATTR_FORECAST_PRECIPITATION: Final = "precipitation"
 ATTR_FORECAST_PRECIPITATION_PROBABILITY: Final = "precipitation_probability"
 ATTR_FORECAST_NATIVE_PRESSURE: Final = "native_pressure"
 ATTR_FORECAST_PRESSURE: Final = "pressure"
+ATTR_FORECAST_NATIVE_APPARENT_TEMP: Final = "native_apparent_temperature"
+ATTR_FORECAST_APPARENT_TEMP: Final = "apparent_temperature"
 ATTR_FORECAST_NATIVE_TEMP: Final = "native_temperature"
 ATTR_FORECAST_TEMP: Final = "temperature"
 ATTR_FORECAST_NATIVE_TEMP_LOW: Final = "native_templow"
 ATTR_FORECAST_TEMP_LOW: Final = "templow"
 ATTR_FORECAST_TIME: Final = "datetime"
 ATTR_FORECAST_WIND_BEARING: Final = "wind_bearing"
+ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: Final = "native_wind_gust_speed"
+ATTR_FORECAST_WIND_GUST_SPEED: Final = "wind_gust_speed"
 ATTR_FORECAST_NATIVE_WIND_SPEED: Final = "native_wind_speed"
 ATTR_FORECAST_WIND_SPEED: Final = "wind_speed"
+ATTR_FORECAST_NATIVE_DEW_POINT: Final = "native_dew_point"
+ATTR_FORECAST_DEW_POINT: Final = "dew_point"
+ATTR_FORECAST_CLOUD_COVERAGE: Final = "cloud_coverage"
 
 ENTITY_ID_FORMAT = DOMAIN + ".{}"
 
@@ -117,7 +129,9 @@ class Forecast(TypedDict, total=False):
 
     condition: str | None
     datetime: Required[str]
+    humidity: float | None
     precipitation_probability: int | None
+    cloud_coverage: int | None
     native_precipitation: float | None
     precipitation: None
     native_pressure: float | None
@@ -126,9 +140,12 @@ class Forecast(TypedDict, total=False):
     temperature: None
     native_templow: float | None
     templow: None
+    native_apparent_temperature: float | None
     wind_bearing: float | str | None
+    native_wind_gust_speed: float | None
     native_wind_speed: float | None
     wind_speed: None
+    native_dew_point: float | None
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
@@ -166,6 +183,7 @@ class WeatherEntity(Entity):
     _attr_forecast: list[Forecast] | None = None
     _attr_humidity: float | None = None
     _attr_ozone: float | None = None
+    _attr_cloud_coverage: int | None = None
     _attr_precision: float
     _attr_pressure: None = (
         None  # Provide backwards compatibility. Use _attr_native_pressure
@@ -199,13 +217,16 @@ class WeatherEntity(Entity):
 
     _attr_native_pressure: float | None = None
     _attr_native_pressure_unit: str | None = None
+    _attr_native_apparent_temperature: float | None = None
     _attr_native_temperature: float | None = None
     _attr_native_temperature_unit: str | None = None
     _attr_native_visibility: float | None = None
     _attr_native_visibility_unit: str | None = None
     _attr_native_precipitation_unit: str | None = None
+    _attr_native_wind_gust_speed: float | None = None
     _attr_native_wind_speed: float | None = None
     _attr_native_wind_speed_unit: str | None = None
+    _attr_native_dew_point: float | None = None
 
     _weather_option_temperature_unit: str | None = None
     _weather_option_pressure_unit: str | None = None
@@ -272,6 +293,11 @@ class WeatherEntity(Entity):
             return
         self.async_registry_entry_updated()
 
+    @property
+    def native_apparent_temperature(self) -> float | None:
+        """Return the apparent temperature in native units."""
+        return self._attr_native_temperature
+
     @final
     @property
     def temperature(self) -> float | None:
@@ -297,6 +323,11 @@ class WeatherEntity(Entity):
 
         return self._attr_native_temperature_unit
 
+    @property
+    def native_dew_point(self) -> float | None:
+        """Return the dew point temperature in native units."""
+        return self._attr_native_dew_point
+
     @final
     @property
     def temperature_unit(self) -> str | None:
@@ -393,6 +424,11 @@ class WeatherEntity(Entity):
         """Return the humidity in native units."""
         return self._attr_humidity
 
+    @property
+    def native_wind_gust_speed(self) -> float | None:
+        """Return the wind gust speed in native units."""
+        return self._attr_native_wind_gust_speed
+
     @final
     @property
     def wind_speed(self) -> float | None:
@@ -462,6 +498,11 @@ class WeatherEntity(Entity):
         """Return the ozone level."""
         return self._attr_ozone
 
+    @property
+    def cloud_coverage(self) -> float | None:
+        """Return the Cloud coverage in %."""
+        return self._attr_cloud_coverage
+
     @final
     @property
     def visibility(self) -> float | None:
@@ -577,7 +618,7 @@ class WeatherEntity(Entity):
 
     @final
     @property
-    def state_attributes(self) -> dict[str, Any]:
+    def state_attributes(self) -> dict[str, Any]:  # noqa: C901
         """Return the state attributes, converted.
 
         Attributes are configured from native units to user-configured units.
@@ -600,6 +641,34 @@ class WeatherEntity(Entity):
             except (TypeError, ValueError):
                 data[ATTR_WEATHER_TEMPERATURE] = temperature
 
+        if (apparent_temperature := self.native_apparent_temperature) is not None:
+            from_unit = self.native_temperature_unit or self._default_temperature_unit
+            to_unit = self._temperature_unit
+            try:
+                apparent_temperature_f = float(apparent_temperature)
+                value_apparent_temp = UNIT_CONVERSIONS[ATTR_WEATHER_TEMPERATURE_UNIT](
+                    apparent_temperature_f, from_unit, to_unit
+                )
+                data[ATTR_WEATHER_APPARENT_TEMPERATURE] = round_temperature(
+                    value_apparent_temp, precision
+                )
+            except (TypeError, ValueError):
+                data[ATTR_WEATHER_APPARENT_TEMPERATURE] = apparent_temperature
+
+        if (dew_point := self.native_dew_point) is not None:
+            from_unit = self.native_temperature_unit or self._default_temperature_unit
+            to_unit = self._temperature_unit
+            try:
+                dew_point_f = float(dew_point)
+                value_dew_point = UNIT_CONVERSIONS[ATTR_WEATHER_TEMPERATURE_UNIT](
+                    dew_point_f, from_unit, to_unit
+                )
+                data[ATTR_WEATHER_DEW_POINT] = round_temperature(
+                    value_dew_point, precision
+                )
+            except (TypeError, ValueError):
+                data[ATTR_WEATHER_DEW_POINT] = dew_point
+
         data[ATTR_WEATHER_TEMPERATURE_UNIT] = self._temperature_unit
 
         if (humidity := self.humidity) is not None:
@@ -608,6 +677,9 @@ class WeatherEntity(Entity):
         if (ozone := self.ozone) is not None:
             data[ATTR_WEATHER_OZONE] = ozone
 
+        if (cloud_coverage := self.cloud_coverage) is not None:
+            data[ATTR_WEATHER_CLOUD_COVERAGE] = cloud_coverage
+
         if (pressure := self.native_pressure) is not None:
             from_unit = self.native_pressure_unit or self._default_pressure_unit
             to_unit = self._pressure_unit
@@ -625,6 +697,20 @@ class WeatherEntity(Entity):
         if (wind_bearing := self.wind_bearing) is not None:
             data[ATTR_WEATHER_WIND_BEARING] = wind_bearing
 
+        if (wind_gust_speed := self.native_wind_gust_speed) is not None:
+            from_unit = self.native_wind_speed_unit or self._default_wind_speed_unit
+            to_unit = self._wind_speed_unit
+            try:
+                wind_gust_speed_f = float(wind_gust_speed)
+                value_wind_gust_speed = UNIT_CONVERSIONS[ATTR_WEATHER_WIND_SPEED_UNIT](
+                    wind_gust_speed_f, from_unit, to_unit
+                )
+                data[ATTR_WEATHER_WIND_GUST_SPEED] = round(
+                    value_wind_gust_speed, ROUNDING_PRECISION
+                )
+            except (TypeError, ValueError):
+                data[ATTR_WEATHER_WIND_GUST_SPEED] = wind_gust_speed
+
         if (wind_speed := self.native_wind_speed) is not None:
             from_unit = self.native_wind_speed_unit or self._default_wind_speed_unit
             to_unit = self._wind_speed_unit
@@ -686,6 +772,26 @@ class WeatherEntity(Entity):
                             value_temp, precision
                         )
 
+                if (
+                    forecast_apparent_temp := forecast_entry.pop(
+                        ATTR_FORECAST_NATIVE_APPARENT_TEMP,
+                        forecast_entry.get(ATTR_FORECAST_NATIVE_APPARENT_TEMP),
+                    )
+                ) is not None:
+                    with suppress(TypeError, ValueError):
+                        forecast_apparent_temp = float(forecast_apparent_temp)
+                        value_apparent_temp = UNIT_CONVERSIONS[
+                            ATTR_WEATHER_TEMPERATURE_UNIT
+                        ](
+                            forecast_apparent_temp,
+                            from_temp_unit,
+                            to_temp_unit,
+                        )
+
+                        forecast_entry[ATTR_FORECAST_APPARENT_TEMP] = round_temperature(
+                            value_apparent_temp, precision
+                        )
+
                 if (
                     forecast_temp_low := forecast_entry.pop(
                         ATTR_FORECAST_NATIVE_TEMP_LOW,
@@ -706,6 +812,26 @@ class WeatherEntity(Entity):
                             value_temp_low, precision
                         )
 
+                if (
+                    forecast_dew_point := forecast_entry.pop(
+                        ATTR_FORECAST_NATIVE_DEW_POINT,
+                        None,
+                    )
+                ) is not None:
+                    with suppress(TypeError, ValueError):
+                        forecast_dew_point_f = float(forecast_dew_point)
+                        value_dew_point = UNIT_CONVERSIONS[
+                            ATTR_WEATHER_TEMPERATURE_UNIT
+                        ](
+                            forecast_dew_point_f,
+                            from_temp_unit,
+                            to_temp_unit,
+                        )
+
+                        forecast_entry[ATTR_FORECAST_DEW_POINT] = round_temperature(
+                            value_dew_point, precision
+                        )
+
                 if (
                     forecast_pressure := forecast_entry.pop(
                         ATTR_FORECAST_NATIVE_PRESSURE,
@@ -727,6 +853,27 @@ class WeatherEntity(Entity):
                             ROUNDING_PRECISION,
                         )
 
+                if (
+                    forecast_wind_gust_speed := forecast_entry.pop(
+                        ATTR_FORECAST_NATIVE_WIND_GUST_SPEED,
+                        None,
+                    )
+                ) is not None:
+                    from_wind_speed_unit = (
+                        self.native_wind_speed_unit or self._default_wind_speed_unit
+                    )
+                    to_wind_speed_unit = self._wind_speed_unit
+                    with suppress(TypeError, ValueError):
+                        forecast_wind_gust_speed_f = float(forecast_wind_gust_speed)
+                        forecast_entry[ATTR_FORECAST_WIND_GUST_SPEED] = round(
+                            UNIT_CONVERSIONS[ATTR_WEATHER_WIND_SPEED_UNIT](
+                                forecast_wind_gust_speed_f,
+                                from_wind_speed_unit,
+                                to_wind_speed_unit,
+                            ),
+                            ROUNDING_PRECISION,
+                        )
+
                 if (
                     forecast_wind_speed := forecast_entry.pop(
                         ATTR_FORECAST_NATIVE_WIND_SPEED,
@@ -770,6 +917,18 @@ class WeatherEntity(Entity):
                             ROUNDING_PRECISION,
                         )
 
+                if (
+                    forecast_humidity := forecast_entry.pop(
+                        ATTR_FORECAST_HUMIDITY,
+                        None,
+                    )
+                ) is not None:
+                    with suppress(TypeError, ValueError):
+                        forecast_humidity_f = float(forecast_humidity)
+                        forecast_entry[ATTR_FORECAST_HUMIDITY] = round(
+                            forecast_humidity_f
+                        )
+
                 forecast.append(forecast_entry)
 
             data[ATTR_FORECAST] = forecast
diff --git a/homeassistant/components/weather/const.py b/homeassistant/components/weather/const.py
index 2dcfd8a2ddc..b995ce2b729 100644
--- a/homeassistant/components/weather/const.py
+++ b/homeassistant/components/weather/const.py
@@ -20,16 +20,20 @@ from homeassistant.util.unit_conversion import (
 
 ATTR_WEATHER_HUMIDITY = "humidity"
 ATTR_WEATHER_OZONE = "ozone"
+ATTR_WEATHER_DEW_POINT = "dew_point"
 ATTR_WEATHER_PRESSURE = "pressure"
 ATTR_WEATHER_PRESSURE_UNIT = "pressure_unit"
+ATTR_WEATHER_APPARENT_TEMPERATURE = "apparent_temperature"
 ATTR_WEATHER_TEMPERATURE = "temperature"
 ATTR_WEATHER_TEMPERATURE_UNIT = "temperature_unit"
 ATTR_WEATHER_VISIBILITY = "visibility"
 ATTR_WEATHER_VISIBILITY_UNIT = "visibility_unit"
 ATTR_WEATHER_WIND_BEARING = "wind_bearing"
+ATTR_WEATHER_WIND_GUST_SPEED = "wind_gust_speed"
 ATTR_WEATHER_WIND_SPEED = "wind_speed"
 ATTR_WEATHER_WIND_SPEED_UNIT = "wind_speed_unit"
 ATTR_WEATHER_PRECIPITATION_UNIT = "precipitation_unit"
+ATTR_WEATHER_CLOUD_COVERAGE = "cloud_coverage"
 
 DOMAIN: Final = "weather"
 
diff --git a/homeassistant/components/weather/strings.json b/homeassistant/components/weather/strings.json
index 461f715c8db..53eca9c7f91 100644
--- a/homeassistant/components/weather/strings.json
+++ b/homeassistant/components/weather/strings.json
@@ -30,6 +30,9 @@
         "ozone": {
           "name": "Ozone"
         },
+        "cloud_coverage": {
+          "name": "Cloud coverage"
+        },
         "precipitation_unit": {
           "name": "Precipitation unit"
         },
@@ -39,6 +42,12 @@
         "pressure_unit": {
           "name": "Pressure unit"
         },
+        "apparent_temperature": {
+          "name": "Apparent temperature"
+        },
+        "dew_point": {
+          "name": "Dew point temperature"
+        },
         "temperature": {
           "name": "Temperature"
         },
@@ -54,6 +63,9 @@
         "wind_bearing": {
           "name": "Wind bearing"
         },
+        "wind_gust_speed": {
+          "name": "Wind gust speed"
+        },
         "wind_speed": {
           "name": "Wind speed"
         },
diff --git a/homeassistant/components/webhook/__init__.py b/homeassistant/components/webhook/__init__.py
index e9e5bdf51e8..9711c30b19e 100644
--- a/homeassistant/components/webhook/__init__.py
+++ b/homeassistant/components/webhook/__init__.py
@@ -163,7 +163,7 @@ async def async_handle_webhook(
                 _LOGGER.warning(
                     "Deprecation warning: "
                     "Webhook '%s' does not provide a value for local_only. "
-                    "This webhook will be blocked after the 2023.7.0 release. "
+                    "This webhook will be blocked after the 2023.11.0 release. "
                     "Use `local_only: false` to keep this webhook operating as-is",
                     webhook_id,
                 )
diff --git a/homeassistant/components/webhook/trigger.py b/homeassistant/components/webhook/trigger.py
index 8c6051cc4a1..78728793f5d 100644
--- a/homeassistant/components/webhook/trigger.py
+++ b/homeassistant/components/webhook/trigger.py
@@ -98,7 +98,7 @@ async def async_attach_trigger(
             hass,
             DOMAIN,
             issue_id,
-            breaks_in_ha_version="2023.7.0",
+            breaks_in_ha_version="2023.11.0",
             is_fixable=False,
             severity=IssueSeverity.WARNING,
             learn_more_url="https://www.home-assistant.io/docs/automation/trigger/#webhook-trigger",
diff --git a/homeassistant/components/webostv/media_player.py b/homeassistant/components/webostv/media_player.py
index 06e7e202b36..c2851cb4c6e 100644
--- a/homeassistant/components/webostv/media_player.py
+++ b/homeassistant/components/webostv/media_player.py
@@ -115,13 +115,15 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
     """Representation of a LG webOS Smart TV."""
 
     _attr_device_class = MediaPlayerDeviceClass.TV
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, entry: ConfigEntry, client: WebOsClient) -> None:
         """Initialize the webos device."""
         self._entry = entry
         self._client = client
         self._attr_assumed_state = True
-        self._attr_name = entry.title
+        self._device_name = entry.title
         self._attr_unique_id = entry.unique_id
         self._sources = entry.options.get(CONF_SOURCES)
 
@@ -237,7 +239,7 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, cast(str, self.unique_id))},
             manufacturer="LG",
-            name=self.name,
+            name=self._device_name,
         )
 
         if self._client.system_info is not None or self.state != MediaPlayerState.OFF:
@@ -376,7 +378,9 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
     async def async_select_source(self, source: str) -> None:
         """Select input source."""
         if (source_dict := self._source_list.get(source)) is None:
-            _LOGGER.warning("Source %s not found for %s", source, self.name)
+            _LOGGER.warning(
+                "Source %s not found for %s", source, self._friendly_name_internal()
+            )
             return
         if source_dict.get("title"):
             await self._client.launch_app(source_dict["id"])
diff --git a/homeassistant/components/websocket_api/auth.py b/homeassistant/components/websocket_api/auth.py
index 9c074588a17..d0831f2e90e 100644
--- a/homeassistant/components/websocket_api/auth.py
+++ b/homeassistant/components/websocket_api/auth.py
@@ -12,6 +12,7 @@ from homeassistant.auth.models import RefreshToken, User
 from homeassistant.components.http.ban import process_success_login, process_wrong_login
 from homeassistant.const import __version__
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant
+from homeassistant.util.json import JsonValueType
 
 from .connection import ActiveConnection
 from .error import Disconnect
@@ -67,10 +68,10 @@ class AuthPhase:
         self._logger = logger
         self._request = request
 
-    async def async_handle(self, msg: dict[str, str]) -> ActiveConnection:
+    async def async_handle(self, msg: JsonValueType) -> ActiveConnection:
         """Handle authentication."""
         try:
-            msg = AUTH_MESSAGE_SCHEMA(msg)
+            valid_msg = AUTH_MESSAGE_SCHEMA(msg)
         except vol.Invalid as err:
             error_msg = (
                 f"Auth message incorrectly formatted: {humanize_error(msg, err)}"
@@ -79,20 +80,19 @@ class AuthPhase:
             self._send_message(auth_invalid_message(error_msg))
             raise Disconnect from err
 
-        if "access_token" in msg:
-            self._logger.debug("Received access_token")
-            refresh_token = await self._hass.auth.async_validate_access_token(
-                msg["access_token"]
+        if (access_token := valid_msg.get("access_token")) and (
+            refresh_token := await self._hass.auth.async_validate_access_token(
+                access_token
+            )
+        ):
+            conn = await self._async_finish_auth(refresh_token.user, refresh_token)
+            conn.subscriptions[
+                "auth"
+            ] = self._hass.auth.async_register_revoke_token_callback(
+                refresh_token.id, self._cancel_ws
             )
-            if refresh_token is not None:
-                conn = await self._async_finish_auth(refresh_token.user, refresh_token)
-                conn.subscriptions[
-                    "auth"
-                ] = self._hass.auth.async_register_revoke_token_callback(
-                    refresh_token.id, self._cancel_ws
-                )
 
-                return conn
+            return conn
 
         self._send_message(auth_invalid_message("Invalid access token or password"))
         await process_wrong_login(self._request)
diff --git a/homeassistant/components/websocket_api/commands.py b/homeassistant/components/websocket_api/commands.py
index bdb087069f8..143d0617d51 100644
--- a/homeassistant/components/websocket_api/commands.py
+++ b/homeassistant/components/websocket_api/commands.py
@@ -671,12 +671,20 @@ async def handle_execute_script(
     """Handle execute script command."""
     # Circular dep
     # pylint: disable-next=import-outside-toplevel
-    from homeassistant.helpers.script import Script
+    from homeassistant.helpers.script import Script, async_validate_actions_config
+
+    script_config = await async_validate_actions_config(hass, msg["sequence"])
 
     context = connection.context(msg)
-    script_obj = Script(hass, msg["sequence"], f"{const.DOMAIN} script", const.DOMAIN)
-    await script_obj.async_run(msg.get("variables"), context=context)
-    connection.send_result(msg["id"], {"context": context})
+    script_obj = Script(hass, script_config, f"{const.DOMAIN} script", const.DOMAIN)
+    response = await script_obj.async_run(msg.get("variables"), context=context)
+    connection.send_result(
+        msg["id"],
+        {
+            "context": context,
+            "response": response,
+        },
+    )
 
 
 @callback
@@ -719,14 +727,14 @@ async def handle_validate_config(
 
     for key, schema, validator in (
         ("trigger", cv.TRIGGER_SCHEMA, trigger.async_validate_trigger_config),
-        ("condition", cv.CONDITION_SCHEMA, condition.async_validate_condition_config),
+        ("condition", cv.CONDITIONS_SCHEMA, condition.async_validate_conditions_config),
         ("action", cv.SCRIPT_SCHEMA, script.async_validate_actions_config),
     ):
         if key not in msg:
             continue
 
         try:
-            await validator(hass, schema(msg[key]))  # type: ignore[operator]
+            await validator(hass, schema(msg[key]))
         except vol.Invalid as err:
             result[key] = {"valid": False, "error": str(err)}
         else:
diff --git a/homeassistant/components/websocket_api/connection.py b/homeassistant/components/websocket_api/connection.py
index 1f6fd302968..319188dae21 100644
--- a/homeassistant/components/websocket_api/connection.py
+++ b/homeassistant/components/websocket_api/connection.py
@@ -13,6 +13,7 @@ from homeassistant.auth.models import RefreshToken, User
 from homeassistant.components.http import current_request
 from homeassistant.core import Context, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError, Unauthorized
+from homeassistant.util.json import JsonValueType
 
 from . import const, messages
 from .util import describe_request
@@ -56,6 +57,10 @@ class ActiveConnection:
         self.binary_handlers: list[BinaryHandler | None] = []
         current_connection.set(self)
 
+    def __repr__(self) -> str:
+        """Return the representation."""
+        return f"<ActiveConnection {self.get_description(None)}>"
+
     def set_supported_features(self, features: dict[str, float]) -> None:
         """Set supported features."""
         self.supported_features = features
@@ -140,7 +145,7 @@ class ActiveConnection:
             self.binary_handlers[index] = None
 
     @callback
-    def async_handle(self, msg: dict[str, Any]) -> None:
+    def async_handle(self, msg: JsonValueType) -> None:
         """Handle a single incoming message."""
         if (
             # Not using isinstance as we don't care about children
@@ -153,10 +158,11 @@ class ActiveConnection:
                 or type(type_) is not str  # pylint: disable=unidiomatic-typecheck
             )
         ):
-            self.logger.error("Received invalid command", msg)
+            self.logger.error("Received invalid command: %s", msg)
+            id_ = msg.get("id") if isinstance(msg, dict) else 0
             self.send_message(
                 messages.error_message(
-                    msg.get("id"),
+                    id_,  # type: ignore[arg-type]
                     const.ERR_INVALID_FORMAT,
                     "Message incorrectly formatted.",
                 )
@@ -172,7 +178,7 @@ class ActiveConnection:
             return
 
         if not (handler_schema := self.handlers.get(type_)):
-            self.logger.info(f"Received unknown command: {type_}")
+            self.logger.info("Received unknown command: %s", type_)
             self.send_message(
                 messages.error_message(
                     cur_id, const.ERR_UNKNOWN_COMMAND, "Unknown command."
@@ -193,7 +199,24 @@ class ActiveConnection:
     def async_handle_close(self) -> None:
         """Handle closing down connection."""
         for unsub in self.subscriptions.values():
-            unsub()
+            try:
+                unsub()
+            except Exception:  # pylint: disable=broad-except
+                # If one fails, make sure we still try the rest
+                self.logger.exception(
+                    "Error unsubscribing from subscription: %s", unsub
+                )
+        self.subscriptions.clear()
+        self.send_message = self._connect_closed_error
+        current_request.set(None)
+        current_connection.set(None)
+
+    @callback
+    def _connect_closed_error(
+        self, msg: str | dict[str, Any] | Callable[[], str]
+    ) -> None:
+        """Send a message when the connection is closed."""
+        self.logger.debug("Tried to send message %s on closed connection", msg)
 
     @callback
     def async_handle_exception(self, msg: dict[str, Any], err: Exception) -> None:
diff --git a/homeassistant/components/websocket_api/const.py b/homeassistant/components/websocket_api/const.py
index 9eb04ecbc51..4b9a0943d9a 100644
--- a/homeassistant/components/websocket_api/const.py
+++ b/homeassistant/components/websocket_api/const.py
@@ -1,9 +1,7 @@
 """Websocket constants."""
 from __future__ import annotations
 
-import asyncio
 from collections.abc import Awaitable, Callable
-from concurrent import futures
 from typing import TYPE_CHECKING, Any, Final
 
 from homeassistant.core import HomeAssistant
@@ -42,10 +40,6 @@ ERR_TEMPLATE_ERROR: Final = "template_error"
 
 TYPE_RESULT: Final = "result"
 
-# Define the possible errors that occur when connections are cancelled.
-# Originally, this was just asyncio.CancelledError, but issue #9546 showed
-# that futures.CancelledErrors can also occur in some situations.
-CANCELLATION_ERRORS: Final = (asyncio.CancelledError, futures.CancelledError)
 
 # Event types
 SIGNAL_WEBSOCKET_CONNECTED: Final = "websocket_connected"
diff --git a/homeassistant/components/websocket_api/http.py b/homeassistant/components/websocket_api/http.py
index 5ca5ea62578..6ac0e10a76c 100644
--- a/homeassistant/components/websocket_api/http.py
+++ b/homeassistant/components/websocket_api/http.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 import asyncio
 from collections import deque
 from collections.abc import Callable
-from contextlib import suppress
 import datetime as dt
 import logging
 from typing import TYPE_CHECKING, Any, Final
@@ -21,7 +20,6 @@ from homeassistant.util.json import json_loads
 
 from .auth import AuthPhase, auth_required_message
 from .const import (
-    CANCELLATION_ERRORS,
     DATA_CONNECTIONS,
     MAX_PENDING_MSG,
     PENDING_MSG_PEAK,
@@ -58,8 +56,7 @@ class WebSocketAdapter(logging.LoggerAdapter):
 
     def process(self, msg: str, kwargs: Any) -> tuple[str, Any]:
         """Add connid to websocket log messages."""
-        if not self.extra or "connid" not in self.extra:
-            return msg, kwargs
+        assert self.extra is not None
         return f'[{self.extra["connid"]}] {msg}', kwargs
 
 
@@ -68,78 +65,99 @@ class WebSocketHandler:
 
     def __init__(self, hass: HomeAssistant, request: web.Request) -> None:
         """Initialize an active connection."""
-        self.hass = hass
-        self.request = request
-        self.wsock = web.WebSocketResponse(heartbeat=55)
+        self._hass = hass
+        self._request: web.Request = request
+        self._wsock = web.WebSocketResponse(heartbeat=55)
         self._handle_task: asyncio.Task | None = None
         self._writer_task: asyncio.Task | None = None
         self._closing: bool = False
+        self._authenticated: bool = False
         self._logger = WebSocketAdapter(_WS_LOGGER, {"connid": id(self)})
         self._peak_checker_unsub: Callable[[], None] | None = None
-        self.connection: ActiveConnection | None = None
+        self._connection: ActiveConnection | None = None
 
         # The WebSocketHandler has a single consumer and path
         # to where messages are queued. This allows the implementation
         # to use a deque and an asyncio.Future to avoid the overhead of
         # an asyncio.Queue.
-        self._message_queue: deque = deque()
+        self._message_queue: deque[str | Callable[[], str] | None] = deque()
         self._ready_future: asyncio.Future[None] | None = None
 
+    def __repr__(self) -> str:
+        """Return the representation."""
+        return (
+            "<WebSocketHandler "
+            f"closing={self._closing} "
+            f"authenticated={self._authenticated} "
+            f"description={self.description}>"
+        )
+
     @property
     def description(self) -> str:
         """Return a description of the connection."""
-        if self.connection is not None:
-            return self.connection.get_description(self.request)
-        return describe_request(self.request)
+        if connection := self._connection:
+            return connection.get_description(self._request)
+        if request := self._request:
+            return describe_request(request)
+        return "finished connection"
 
     async def _writer(self) -> None:
         """Write outgoing messages."""
         # Variables are set locally to avoid lookups in the loop
         message_queue = self._message_queue
         logger = self._logger
-        send_str = self.wsock.send_str
-        loop = self.hass.loop
+        wsock = self._wsock
+        send_str = wsock.send_str
+        loop = self._hass.loop
         debug = logger.debug
+        is_enabled_for = logger.isEnabledFor
+        logging_debug = logging.DEBUG
         # Exceptions if Socket disconnected or cancelled by connection handler
         try:
-            with suppress(RuntimeError, ConnectionResetError, *CANCELLATION_ERRORS):
-                while not self.wsock.closed:
-                    if (messages_remaining := len(message_queue)) == 0:
-                        self._ready_future = loop.create_future()
-                        await self._ready_future
-                        messages_remaining = len(message_queue)
+            while not wsock.closed:
+                if (messages_remaining := len(message_queue)) == 0:
+                    self._ready_future = loop.create_future()
+                    await self._ready_future
+                    messages_remaining = len(message_queue)
 
+                # A None message is used to signal the end of the connection
+                if (process := message_queue.popleft()) is None:
+                    return
+
+                debug_enabled = is_enabled_for(logging_debug)
+                messages_remaining -= 1
+                message = process if isinstance(process, str) else process()
+
+                if (
+                    not messages_remaining
+                    or not (connection := self._connection)
+                    or not connection.can_coalesce
+                ):
+                    if debug_enabled:
+                        debug("%s: Sending %s", self.description, message)
+                    await send_str(message)
+                    continue
+
+                messages: list[str] = [message]
+                while messages_remaining:
                     # A None message is used to signal the end of the connection
                     if (process := message_queue.popleft()) is None:
                         return
-
+                    messages.append(process if isinstance(process, str) else process())
                     messages_remaining -= 1
-                    message = process if isinstance(process, str) else process()
 
-                    if (
-                        not messages_remaining
-                        or not self.connection
-                        or not self.connection.can_coalesce
-                    ):
-                        debug("Sending %s", message)
-                        await send_str(message)
-                        continue
-
-                    messages: list[str] = [message]
-                    while messages_remaining:
-                        # A None message is used to signal the end of the connection
-                        if (process := message_queue.popleft()) is None:
-                            return
-                        messages.append(
-                            process if isinstance(process, str) else process()
-                        )
-                        messages_remaining -= 1
-
-                    joined_messages = ",".join(messages)
-                    coalesced_messages = f"[{joined_messages}]"
-                    debug("Sending %s", coalesced_messages)
-                    await send_str(coalesced_messages)
+                joined_messages = ",".join(messages)
+                coalesced_messages = f"[{joined_messages}]"
+                if debug_enabled:
+                    debug("%s: Sending %s", self.description, coalesced_messages)
+                await send_str(coalesced_messages)
+        except asyncio.CancelledError:
+            debug("%s: Writer cancelled", self.description)
+            raise
+        except (RuntimeError, ConnectionResetError) as ex:
+            debug("%s: Unexpected error in writer: %s", self.description, ex)
         finally:
+            debug("%s: Writer done", self.description)
             # Clean up the peak checker when we shut down the writer
             self._cancel_peak_checker()
 
@@ -195,7 +213,7 @@ class WebSocketHandler:
 
         if not peak_checker_active:
             self._peak_checker_unsub = async_call_later(
-                self.hass, PENDING_MSG_PEAK_TIME, self._check_write_peak
+                self._hass, PENDING_MSG_PEAK_TIME, self._check_write_peak
             )
 
     @callback
@@ -231,8 +249,14 @@ class WebSocketHandler:
 
     async def async_handle(self) -> web.WebSocketResponse:
         """Handle a websocket response."""
-        request = self.request
-        wsock = self.wsock
+        request = self._request
+        wsock = self._wsock
+        logger = self._logger
+        debug = logger.debug
+        hass = self._hass
+        is_enabled_for = logger.isEnabledFor
+        logging_debug = logging.DEBUG
+
         try:
             async with async_timeout.timeout(10):
                 await wsock.prepare(request)
@@ -240,7 +264,7 @@ class WebSocketHandler:
             self._logger.warning("Timeout preparing request from %s", request.remote)
             return wsock
 
-        self._logger.debug("Connected from %s", request.remote)
+        debug("%s: Connected from %s", self.description, request.remote)
         self._handle_task = asyncio.current_task()
 
         @callback
@@ -248,17 +272,13 @@ class WebSocketHandler:
             """Cancel this connection."""
             self._cancel()
 
-        unsub_stop = self.hass.bus.async_listen(
-            EVENT_HOMEASSISTANT_STOP, handle_hass_stop
-        )
+        unsub_stop = hass.bus.async_listen(EVENT_HOMEASSISTANT_STOP, handle_hass_stop)
 
         # As the webserver is now started before the start
         # event we do not want to block for websocket responses
         self._writer_task = asyncio.create_task(self._writer())
 
-        auth = AuthPhase(
-            self._logger, self.hass, self._send_message, self._cancel, request
-        )
+        auth = AuthPhase(logger, hass, self._send_message, self._cancel, request)
         connection = None
         disconnect_warn = None
 
@@ -281,21 +301,22 @@ class WebSocketHandler:
                 raise Disconnect
 
             try:
-                msg_data = msg.json(loads=json_loads)
+                auth_msg_data = json_loads(msg.data)
             except ValueError as err:
                 disconnect_warn = "Received invalid JSON."
                 raise Disconnect from err
 
-            self._logger.debug("Received %s", msg_data)
-            self.connection = connection = await auth.async_handle(msg_data)
-            self.hass.data[DATA_CONNECTIONS] = (
-                self.hass.data.get(DATA_CONNECTIONS, 0) + 1
-            )
-            async_dispatcher_send(self.hass, SIGNAL_WEBSOCKET_CONNECTED)
+            if is_enabled_for(logging_debug):
+                debug("%s: Received %s", self.description, auth_msg_data)
+            connection = await auth.async_handle(auth_msg_data)
+            self._connection = connection
+            hass.data[DATA_CONNECTIONS] = hass.data.get(DATA_CONNECTIONS, 0) + 1
+            async_dispatcher_send(hass, SIGNAL_WEBSOCKET_CONNECTED)
 
+            self._authenticated = True
             #
             #
-            # Our websocket implementation is backed by an asyncio.Queue
+            # Our websocket implementation is backed by a deque
             #
             # As back-pressure builds, the queue will back up and use more memory
             # until we disconnect the client when the queue size reaches
@@ -329,6 +350,8 @@ class WebSocketHandler:
             # reach the code to set the limit, so we have to set it directly.
             #
             wsock._writer._limit = 2**20  # type: ignore[union-attr] # pylint: disable=protected-access
+            async_handle_str = connection.async_handle
+            async_handle_binary = connection.async_handle_binary
 
             # Command phase
             while not wsock.closed:
@@ -343,7 +366,7 @@ class WebSocketHandler:
                         break
                     handler = msg.data[0]
                     payload = msg.data[1:]
-                    connection.async_handle_binary(handler, payload)
+                    async_handle_binary(handler, payload)
                     continue
 
                 if msg.type != WSMsgType.TEXT:
@@ -351,31 +374,38 @@ class WebSocketHandler:
                     break
 
                 try:
-                    msg_data = msg.json(loads=json_loads)
+                    command_msg_data = json_loads(msg.data)
                 except ValueError:
                     disconnect_warn = "Received invalid JSON."
                     break
 
-                self._logger.debug("Received %s", msg_data)
-                if not isinstance(msg_data, list):
-                    connection.async_handle(msg_data)
+                if is_enabled_for(logging_debug):
+                    debug("%s: Received %s", self.description, command_msg_data)
+
+                if not isinstance(command_msg_data, list):
+                    async_handle_str(command_msg_data)
                     continue
 
-                for split_msg in msg_data:
-                    connection.async_handle(split_msg)
+                for split_msg in command_msg_data:
+                    async_handle_str(split_msg)
 
         except asyncio.CancelledError:
-            self._logger.info("Connection closed by client")
+            debug("%s: Connection cancelled", self.description)
+            raise
 
-        except Disconnect:
-            pass
+        except Disconnect as ex:
+            debug("%s: Connection closed by client: %s", self.description, ex)
 
         except Exception:  # pylint: disable=broad-except
-            self._logger.exception("Unexpected error inside websocket API")
+            self._logger.exception(
+                "%s: Unexpected error inside websocket API", self.description
+            )
 
         finally:
             unsub_stop()
 
+            self._cancel_peak_checker()
+
             if connection is not None:
                 connection.async_handle_close()
 
@@ -385,20 +415,37 @@ class WebSocketHandler:
             if self._ready_future and not self._ready_future.done():
                 self._ready_future.set_result(None)
 
+            # If the writer gets canceled we still need to close the websocket
+            # so we have another finally block to make sure we close the websocket
+            # if the writer gets canceled.
             try:
-                # Make sure all error messages are written before closing
                 await self._writer_task
-                await wsock.close()
             finally:
-                if disconnect_warn is None:
-                    self._logger.debug("Disconnected")
-                else:
-                    self._logger.warning("Disconnected: %s", disconnect_warn)
+                try:
+                    # Make sure all error messages are written before closing
+                    await wsock.close()
+                finally:
+                    if disconnect_warn is None:
+                        debug("%s: Disconnected", self.description)
+                    else:
+                        self._logger.warning(
+                            "%s: Disconnected: %s", self.description, disconnect_warn
+                        )
 
-                if connection is not None:
-                    self.hass.data[DATA_CONNECTIONS] -= 1
-                    self.connection = None
+                    if connection is not None:
+                        hass.data[DATA_CONNECTIONS] -= 1
+                        self._connection = None
 
-                async_dispatcher_send(self.hass, SIGNAL_WEBSOCKET_DISCONNECTED)
+                    async_dispatcher_send(hass, SIGNAL_WEBSOCKET_DISCONNECTED)
+
+                    # Break reference cycles to make sure GC can happen sooner
+                    self._wsock = None  # type: ignore[assignment]
+                    self._request = None  # type: ignore[assignment]
+                    self._hass = None  # type: ignore[assignment]
+                    self._logger = None  # type: ignore[assignment]
+                    self._message_queue = None  # type: ignore[assignment]
+                    self._handle_task = None
+                    self._writer_task = None
+                    self._ready_future = None
 
         return wsock
diff --git a/homeassistant/components/wemo/__init__.py b/homeassistant/components/wemo/__init__.py
index b208a30f5ec..4488e881938 100644
--- a/homeassistant/components/wemo/__init__.py
+++ b/homeassistant/components/wemo/__init__.py
@@ -154,14 +154,14 @@ class WemoDispatcher:
         self, hass: HomeAssistant, wemo: pywemo.WeMoDevice
     ) -> None:
         """Add a WeMo device to hass if it has not already been added."""
-        if wemo.serialnumber in self._added_serial_numbers:
+        if wemo.serial_number in self._added_serial_numbers:
             return
 
         try:
             coordinator = await async_register_device(hass, self._config_entry, wemo)
         except pywemo.PyWeMoException as err:
-            if wemo.serialnumber not in self._failed_serial_numbers:
-                self._failed_serial_numbers.add(wemo.serialnumber)
+            if wemo.serial_number not in self._failed_serial_numbers:
+                self._failed_serial_numbers.add(wemo.serial_number)
                 _LOGGER.error(
                     "Unable to add WeMo %s %s: %s", repr(wemo), wemo.host, err
                 )
@@ -194,8 +194,8 @@ class WemoDispatcher:
                     coordinator,
                 )
 
-        self._added_serial_numbers.add(wemo.serialnumber)
-        self._failed_serial_numbers.discard(wemo.serialnumber)
+        self._added_serial_numbers.add(wemo.serial_number)
+        self._failed_serial_numbers.discard(wemo.serial_number)
 
 
 class WemoDiscovery:
diff --git a/homeassistant/components/wemo/config_flow.py b/homeassistant/components/wemo/config_flow.py
index 73f4303cfd6..e4626b4deaf 100644
--- a/homeassistant/components/wemo/config_flow.py
+++ b/homeassistant/components/wemo/config_flow.py
@@ -1,11 +1,20 @@
 """Config flow for Wemo."""
 
-import pywemo
+from __future__ import annotations
 
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_entry_flow
+from dataclasses import fields
+from typing import Any, get_type_hints
+
+import pywemo
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigEntry, OptionsFlow
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers.config_entry_flow import DiscoveryFlowHandler
 
 from .const import DOMAIN
+from .wemo_device import Options, OptionsValidationError
 
 
 async def _async_has_devices(hass: HomeAssistant) -> bool:
@@ -13,4 +22,58 @@ async def _async_has_devices(hass: HomeAssistant) -> bool:
     return bool(await hass.async_add_executor_job(pywemo.discover_devices))
 
 
-config_entry_flow.register_discovery_flow(DOMAIN, "Wemo", _async_has_devices)
+class WemoFlow(DiscoveryFlowHandler, domain=DOMAIN):
+    """Discovery flow with options for Wemo."""
+
+    def __init__(self) -> None:
+        """Init discovery flow."""
+        super().__init__(DOMAIN, "Wemo", _async_has_devices)
+
+    @staticmethod
+    @callback
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
+        """Get the options flow for this handler."""
+        return WemoOptionsFlow(config_entry)
+
+
+class WemoOptionsFlow(OptionsFlow):
+    """Options flow for the WeMo component."""
+
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize options flow."""
+        self.config_entry = config_entry
+
+    async def async_step_init(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Manage options for the WeMo component."""
+        errors: dict[str, str] | None = None
+        if user_input is not None:
+            try:
+                Options(**user_input)
+            except OptionsValidationError as err:
+                errors = {err.field_key: err.error_key}
+            else:
+                return self.async_create_entry(title="", data=user_input)
+
+        return self.async_show_form(
+            step_id="init",
+            data_schema=_schema_for_options(Options(**self.config_entry.options)),
+            errors=errors,
+        )
+
+
+def _schema_for_options(options: Options) -> vol.Schema:
+    """Return the Voluptuous schema for the Options instance.
+
+    All values are optional. The default value is set to the current value and
+    the type hint is set to the value of the field type annotation.
+    """
+    return vol.Schema(
+        {
+            vol.Optional(
+                field.name, default=getattr(options, field.name)
+            ): get_type_hints(options)[field.name]
+            for field in fields(options)
+        }
+    )
diff --git a/homeassistant/components/wemo/entity.py b/homeassistant/components/wemo/entity.py
index c8ed9cdde08..1debc32a39b 100644
--- a/homeassistant/components/wemo/entity.py
+++ b/homeassistant/components/wemo/entity.py
@@ -53,7 +53,7 @@ class WemoEntity(CoordinatorEntity[DeviceCoordinator]):
     @property
     def unique_id(self) -> str:
         """Return the id of this WeMo device."""
-        serial_number: str = self.wemo.serialnumber
+        serial_number: str = self.wemo.serial_number
         if suffix := self.unique_id_suffix:
             return f"{serial_number}_{suffix}"
         return serial_number
diff --git a/homeassistant/components/wemo/sensor.py b/homeassistant/components/wemo/sensor.py
index 634d4a9e41d..15e396cc660 100644
--- a/homeassistant/components/wemo/sensor.py
+++ b/homeassistant/components/wemo/sensor.py
@@ -28,6 +28,9 @@ from .wemo_device import DeviceCoordinator
 class AttributeSensorDescription(SensorEntityDescription):
     """SensorEntityDescription for WeMo AttributeSensor entities."""
 
+    # AttributeSensor does not support UNDEFINED,
+    # restrict the type to str | None.
+    name: str | None = None
     state_conversion: Callable[[StateType], StateType] | None = None
     unique_id_suffix: str | None = None
 
diff --git a/homeassistant/components/wemo/strings.json b/homeassistant/components/wemo/strings.json
index 3419b2cb3d1..b218f758985 100644
--- a/homeassistant/components/wemo/strings.json
+++ b/homeassistant/components/wemo/strings.json
@@ -10,6 +10,20 @@
       "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
   },
+  "options": {
+    "step": {
+      "init": {
+        "data": {
+          "enable_subscription": "Subscribe to device local push updates",
+          "enable_long_press": "Register for device long-press events"
+        }
+      }
+    },
+    "error": {
+      "long_press_requires_subscription": "Local push update subscriptions must be enabled to use long-press events",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    }
+  },
   "device_automation": {
     "trigger_type": {
       "long_press": "Wemo button was pressed for 2 seconds"
diff --git a/homeassistant/components/wemo/wemo_device.py b/homeassistant/components/wemo/wemo_device.py
index 56ed9b8e1e6..65431fb7657 100644
--- a/homeassistant/components/wemo/wemo_device.py
+++ b/homeassistant/components/wemo/wemo_device.py
@@ -1,10 +1,14 @@
 """Home Assistant wrapper for a pyWeMo device."""
+from __future__ import annotations
+
 import asyncio
+from dataclasses import dataclass, fields
 from datetime import timedelta
 import logging
+from typing import Literal
 
 from pywemo import Insight, LongPressMixin, WeMoDevice
-from pywemo.exceptions import ActionException
+from pywemo.exceptions import ActionException, PyWeMoException
 from pywemo.subscribe import EVENT_TYPE_LONG_PRESS
 
 from homeassistant.config_entries import ConfigEntry
@@ -29,10 +33,62 @@ from .const import DOMAIN, WEMO_SUBSCRIPTION_EVENT
 
 _LOGGER = logging.getLogger(__name__)
 
+# Literal values must match options.error keys from strings.json.
+ErrorStringKey = Literal["long_press_requires_subscription"]
+# Literal values must match options.step.init.data keys from strings.json.
+OptionsFieldKey = Literal["enable_subscription", "enable_long_press"]
+
+
+class OptionsValidationError(Exception):
+    """Error validating options."""
+
+    def __init__(
+        self, field_key: OptionsFieldKey, error_key: ErrorStringKey, message: str
+    ) -> None:
+        """Store field and error_key so the exception handler can used them.
+
+        The field_key and error_key strings must be the same as in strings.json.
+
+        Args:
+          field_key: Name of the options.step.init.data key that corresponds to this error.
+            field_key must also match one of the field names inside the Options class.
+          error_key: Name of the options.error key that corresponds to this error.
+          message: Message for the Exception class.
+        """
+        super().__init__(message)
+        self.field_key = field_key
+        self.error_key = error_key
+
+
+@dataclass(frozen=True)
+class Options:
+    """Configuration options for the DeviceCoordinator class.
+
+    Note: The field names must match the keys (OptionsFieldKey)
+    from options.step.init.data in strings.json.
+    """
+
+    # Subscribe to device local push updates.
+    enable_subscription: bool = True
+
+    # Register for device long-press events.
+    enable_long_press: bool = True
+
+    def __post_init__(self) -> None:
+        """Validate parameters."""
+        if not self.enable_subscription and self.enable_long_press:
+            raise OptionsValidationError(
+                "enable_subscription",
+                "long_press_requires_subscription",
+                "Local push update subscriptions must be enabled to use long-press events",
+            )
+
 
 class DeviceCoordinator(DataUpdateCoordinator[None]):
     """Home Assistant wrapper for a pyWeMo device."""
 
+    options: Options | None = None
+
     def __init__(self, hass: HomeAssistant, wemo: WeMoDevice, device_id: str) -> None:
         """Initialize DeviceCoordinator."""
         super().__init__(
@@ -45,7 +101,7 @@ class DeviceCoordinator(DataUpdateCoordinator[None]):
         self.wemo = wemo
         self.device_id = device_id
         self.device_info = _create_device_info(wemo)
-        self.supports_long_press = wemo.supports_long_press()
+        self.supports_long_press = isinstance(wemo, LongPressMixin)
         self.update_lock = asyncio.Lock()
 
     def subscription_callback(
@@ -61,13 +117,56 @@ class DeviceCoordinator(DataUpdateCoordinator[None]):
                     CONF_NAME: self.wemo.name,
                     CONF_TYPE: event_type,
                     CONF_PARAMS: params,
-                    CONF_UNIQUE_ID: self.wemo.serialnumber,
+                    CONF_UNIQUE_ID: self.wemo.serial_number,
                 },
             )
         else:
             updated = self.wemo.subscription_update(event_type, params)
             self.hass.create_task(self._async_subscription_callback(updated))
 
+    async def _async_set_enable_subscription(self, enable_subscription: bool) -> None:
+        """Turn on/off push updates from the device."""
+        registry = self.hass.data[DOMAIN]["registry"]
+        if enable_subscription:
+            registry.on(self.wemo, None, self.subscription_callback)
+            await self.hass.async_add_executor_job(registry.register, self.wemo)
+        elif self.options is not None:
+            await self.hass.async_add_executor_job(registry.unregister, self.wemo)
+
+    async def _async_set_enable_long_press(self, enable_long_press: bool) -> None:
+        """Turn on/off long-press events from the device."""
+        if not (isinstance(self.wemo, LongPressMixin) and self.supports_long_press):
+            return
+        try:
+            if enable_long_press:
+                await self.hass.async_add_executor_job(
+                    self.wemo.ensure_long_press_virtual_device
+                )
+            elif self.options is not None:
+                await self.hass.async_add_executor_job(
+                    self.wemo.remove_long_press_virtual_device
+                )
+        except PyWeMoException:
+            _LOGGER.exception(
+                "Failed to enable long press support for device: %s", self.wemo.name
+            )
+            self.supports_long_press = False
+
+    async def async_set_options(
+        self, hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> None:
+        """Update the configuration options for the device."""
+        options = Options(**config_entry.options)
+        _LOGGER.debug(
+            "async_set_options old(%s) new(%s)", repr(self.options), repr(options)
+        )
+        for field in fields(options):
+            new_value = getattr(options, field.name)
+            if self.options is None or getattr(self.options, field.name) != new_value:
+                # The value changed, call the _async_set_* method for the option.
+                await getattr(self, f"_async_set_{field.name}")(new_value)
+        self.options = options
+
     async def _async_subscription_callback(self, updated: bool) -> None:
         """Update the state by the Wemo device."""
         # If an update is in progress, we don't do anything.
@@ -131,14 +230,14 @@ def _create_device_info(wemo: WeMoDevice) -> DeviceInfo:
     _dev_info = _device_info(wemo)
     if wemo.model_name == "DLI emulated Belkin Socket":
         _dev_info[ATTR_CONFIGURATION_URL] = f"http://{wemo.host}"
-        _dev_info[ATTR_IDENTIFIERS] = {(DOMAIN, wemo.serialnumber[:-1])}
+        _dev_info[ATTR_IDENTIFIERS] = {(DOMAIN, wemo.serial_number[:-1])}
     return _dev_info
 
 
 def _device_info(wemo: WeMoDevice) -> DeviceInfo:
     return DeviceInfo(
         connections={(CONNECTION_UPNP, wemo.udn)},
-        identifiers={(DOMAIN, wemo.serialnumber)},
+        identifiers={(DOMAIN, wemo.serial_number)},
         manufacturer="Belkin",
         model=wemo.model_name,
         name=wemo.name,
@@ -160,20 +259,11 @@ async def async_register_device(
 
     device = DeviceCoordinator(hass, wemo, entry.id)
     hass.data[DOMAIN].setdefault("devices", {})[entry.id] = device
-    registry = hass.data[DOMAIN]["registry"]
-    registry.on(wemo, None, device.subscription_callback)
-    await hass.async_add_executor_job(registry.register, wemo)
 
-    if isinstance(wemo, LongPressMixin):
-        try:
-            await hass.async_add_executor_job(wemo.ensure_long_press_virtual_device)
-        # Temporarily handling all exceptions for #52996 & pywemo/pywemo/issues/276
-        # Replace this with `except: PyWeMoException` after upstream has been fixed.
-        except Exception:  # pylint: disable=broad-except
-            _LOGGER.exception(
-                "Failed to enable long press support for device: %s", wemo.name
-            )
-            device.supports_long_press = False
+    config_entry.async_on_unload(
+        config_entry.add_update_listener(device.async_set_options)
+    )
+    await device.async_set_options(hass, config_entry)
 
     return device
 
diff --git a/homeassistant/components/whirlpool/sensor.py b/homeassistant/components/whirlpool/sensor.py
index 5b83c35cca4..de415035c76 100644
--- a/homeassistant/components/whirlpool/sensor.py
+++ b/homeassistant/components/whirlpool/sensor.py
@@ -296,9 +296,9 @@ class WasherDryerTimeClass(RestoreSensor):
             )
 
             if (
-                isinstance(self._attr_native_value, datetime)
+                self._attr_native_value is None
+                or isinstance(self._attr_native_value, datetime)
                 and abs(new_timestamp - self._attr_native_value) > timedelta(seconds=60)
-                or self._attr_native_value is None
             ):
                 self._attr_native_value = new_timestamp
                 self._async_write_ha_state()
diff --git a/homeassistant/components/wirelesstag/sensor.py b/homeassistant/components/wirelesstag/sensor.py
index cb5f3c59f57..e4505e59666 100644
--- a/homeassistant/components/wirelesstag/sensor.py
+++ b/homeassistant/components/wirelesstag/sensor.py
@@ -105,7 +105,7 @@ class WirelessTagSensor(WirelessTagBaseSensor, SensorEntity):
         # sensor.wirelesstag_bedroom_temperature
         # and not as sensor.bedroom for temperature and
         # sensor.bedroom_2 for humidity
-        self._entity_id = (
+        self.entity_id = (
             f"sensor.{WIRELESSTAG_DOMAIN}_{self.underscored_name}_{self._sensor_type}"
         )
 
@@ -119,11 +119,6 @@ class WirelessTagSensor(WirelessTagBaseSensor, SensorEntity):
             )
         )
 
-    @property
-    def entity_id(self):
-        """Overridden version."""
-        return self._entity_id
-
     @property
     def underscored_name(self):
         """Provide name savvy to be used in entity_id name of self."""
diff --git a/homeassistant/components/wiz/__init__.py b/homeassistant/components/wiz/__init__.py
index 4a6b1dfb44a..26d4e33a7a6 100644
--- a/homeassistant/components/wiz/__init__.py
+++ b/homeassistant/components/wiz/__init__.py
@@ -12,6 +12,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
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_track_time_interval
@@ -41,6 +42,8 @@ PLATFORMS = [
 
 REQUEST_REFRESH_DELAY = 0.35
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, hass_config: ConfigType) -> bool:
     """Set up the wiz integration."""
diff --git a/homeassistant/components/wiz/light.py b/homeassistant/components/wiz/light.py
index 084acbe73e7..216c5d9335e 100644
--- a/homeassistant/components/wiz/light.py
+++ b/homeassistant/components/wiz/light.py
@@ -71,6 +71,8 @@ async def async_setup_entry(
 class WizBulbEntity(WizToggleEntity, LightEntity):
     """Representation of WiZ Light bulb."""
 
+    _attr_name = None
+
     def __init__(self, wiz_data: WizData, name: str) -> None:
         """Initialize an WiZLight."""
         super().__init__(wiz_data, name)
diff --git a/homeassistant/components/wled/light.py b/homeassistant/components/wled/light.py
index 2c684013765..1eb8074bbc1 100644
--- a/homeassistant/components/wled/light.py
+++ b/homeassistant/components/wled/light.py
@@ -118,7 +118,9 @@ class WLEDSegmentLight(WLEDEntity, LightEntity):
 
         # Segment 0 uses a simpler name, which is more natural for when using
         # a single segment / using WLED with one big LED strip.
-        if segment != 0:
+        if segment == 0:
+            self._attr_name = None
+        else:
             self._attr_name = f"Segment {segment}"
 
         self._attr_unique_id = (
diff --git a/homeassistant/components/wolflink/manifest.json b/homeassistant/components/wolflink/manifest.json
index d01ca126781..0d793385a3b 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_smartset"],
-  "requirements": ["wolf_smartset==0.1.11"]
+  "requirements": ["wolf-smartset==0.1.11"]
 }
diff --git a/homeassistant/components/workday/binary_sensor.py b/homeassistant/components/workday/binary_sensor.py
index a68a8215cb4..51560161faa 100644
--- a/homeassistant/components/workday/binary_sensor.py
+++ b/homeassistant/components/workday/binary_sensor.py
@@ -92,7 +92,7 @@ async def async_setup_platform(
         hass,
         DOMAIN,
         "deprecated_yaml",
-        breaks_in_ha_version="2023.7.0",
+        breaks_in_ha_version="2023.11.0",
         is_fixable=False,
         severity=IssueSeverity.WARNING,
         translation_key="deprecated_yaml",
@@ -178,6 +178,7 @@ class IsWorkdaySensor(BinarySensorEntity):
     """Implementation of a Workday sensor."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/workday/config_flow.py b/homeassistant/components/workday/config_flow.py
index 7f0c7906621..7153dac1bcb 100644
--- a/homeassistant/components/workday/config_flow.py
+++ b/homeassistant/components/workday/config_flow.py
@@ -247,7 +247,10 @@ class WorkdayConfigFlow(ConfigFlow, domain=DOMAIN):
             step_id="options",
             data_schema=new_schema,
             errors=errors,
-            description_placeholders={"name": self.data[CONF_NAME]},
+            description_placeholders={
+                "name": self.data[CONF_NAME],
+                "country": self.data[CONF_COUNTRY],
+            },
         )
 
 
@@ -304,6 +307,10 @@ class WorkdayOptionsFlowHandler(OptionsFlowWithConfigEntry):
             step_id="init",
             data_schema=new_schema,
             errors=errors,
+            description_placeholders={
+                "name": self.options[CONF_NAME],
+                "country": self.options[CONF_COUNTRY],
+            },
         )
 
 
diff --git a/homeassistant/components/workday/strings.json b/homeassistant/components/workday/strings.json
index b81e027bb05..e6753b39dce 100644
--- a/homeassistant/components/workday/strings.json
+++ b/homeassistant/components/workday/strings.json
@@ -12,7 +12,7 @@
         }
       },
       "options": {
-        "description": "Set workday options for {name}",
+        "description": "Set additional options for {name} configured for country {country}",
         "data": {
           "excludes": "Excludes",
           "days_offset": "Offset",
@@ -39,6 +39,7 @@
   "options": {
     "step": {
       "init": {
+        "description": "Change additional options for {name} configured for country {country}",
         "data": {
           "excludes": "[%key:component::workday::config::step::options::data::excludes%]",
           "days_offset": "[%key:component::workday::config::step::options::data::days_offset%]",
diff --git a/homeassistant/components/worxlandroid/sensor.py b/homeassistant/components/worxlandroid/sensor.py
index d15a33e9e17..834a0b95f42 100644
--- a/homeassistant/components/worxlandroid/sensor.py
+++ b/homeassistant/components/worxlandroid/sensor.py
@@ -129,9 +129,8 @@ class WorxLandroidSensor(SensorEntity):
             elif self.sensor == "state":
                 self._state = self.get_state(data)
 
-        else:
-            if self.sensor == "error":
-                self._state = "no"
+        elif self.sensor == "error":
+            self._state = "no"
 
     @staticmethod
     def get_error(obj):
diff --git a/homeassistant/components/ws66i/media_player.py b/homeassistant/components/ws66i/media_player.py
index 1101c0c9fbc..0bf58c249ae 100644
--- a/homeassistant/components/ws66i/media_player.py
+++ b/homeassistant/components/ws66i/media_player.py
@@ -44,6 +44,9 @@ async def async_setup_entry(
 class Ws66iZone(CoordinatorEntity[Ws66iDataUpdateCoordinator], MediaPlayerEntity):
     """Representation of a WS66i amplifier zone."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
+
     def __init__(
         self,
         device: WS66i,
@@ -62,7 +65,6 @@ class Ws66iZone(CoordinatorEntity[Ws66iDataUpdateCoordinator], MediaPlayerEntity
         self._status: ZoneStatus = coordinator.data[data_idx]
         self._attr_source_list = ws66i_data.sources.name_list
         self._attr_unique_id = f"{entry_id}_{self._zone_id}"
-        self._attr_name = f"Zone {self._zone_id}"
         self._attr_supported_features = (
             MediaPlayerEntityFeature.VOLUME_MUTE
             | MediaPlayerEntityFeature.VOLUME_SET
@@ -73,7 +75,7 @@ class Ws66iZone(CoordinatorEntity[Ws66iDataUpdateCoordinator], MediaPlayerEntity
         )
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, str(self.unique_id))},
-            name=self.name,
+            name=f"Zone {self._zone_id}",
             manufacturer="Soundavo",
             model="WS66i 6-Zone Amplifier",
         )
diff --git a/homeassistant/components/wyoming/data.py b/homeassistant/components/wyoming/data.py
index 3ef93810b6e..c2d71835c65 100644
--- a/homeassistant/components/wyoming/data.py
+++ b/homeassistant/components/wyoming/data.py
@@ -53,23 +53,24 @@ async def load_wyoming_info(
 
     for _ in range(retries + 1):
         try:
-            async with AsyncTcpClient(host, port) as client:
-                with async_timeout.timeout(timeout):
-                    # Describe -> Info
-                    await client.write_event(Describe().event())
-                    while True:
-                        event = await client.read_event()
-                        if event is None:
-                            raise WyomingError(
-                                "Connection closed unexpectedly",
-                            )
+            async with AsyncTcpClient(host, port) as client, async_timeout.timeout(
+                timeout
+            ):
+                # Describe -> Info
+                await client.write_event(Describe().event())
+                while True:
+                    event = await client.read_event()
+                    if event is None:
+                        raise WyomingError(
+                            "Connection closed unexpectedly",
+                        )
 
-                        if Info.is_type(event.type):
-                            wyoming_info = Info.from_event(event)
-                            break  # while
+                    if Info.is_type(event.type):
+                        wyoming_info = Info.from_event(event)
+                        break  # while
 
-                    if wyoming_info is not None:
-                        break  # for
+                if wyoming_info is not None:
+                    break  # for
         except (asyncio.TimeoutError, OSError, WyomingError):
             # Sleep and try again
             await asyncio.sleep(retry_wait)
diff --git a/homeassistant/components/xbox/__init__.py b/homeassistant/components/xbox/__init__.py
index 4263059f0fa..7f1f11ba25d 100644
--- a/homeassistant/components/xbox/__init__.py
+++ b/homeassistant/components/xbox/__init__.py
@@ -6,7 +6,6 @@ from dataclasses import dataclass
 from datetime import timedelta
 import logging
 
-import voluptuous as vol
 from xbox.webapi.api.client import XboxLiveClient
 from xbox.webapi.api.provider.catalog.const import SYSTEM_PFN_ID_MAP
 from xbox.webapi.api.provider.catalog.models import AlternateIdType, Product
@@ -20,17 +19,14 @@ from xbox.webapi.api.provider.smartglass.models import (
     SmartglassConsoleStatus,
 )
 
-from homeassistant.components import application_credentials
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import (
     aiohttp_client,
     config_entry_oauth2_flow,
     config_validation as cv,
 )
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from . import api
@@ -38,20 +34,7 @@ from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
-CONFIG_SCHEMA = vol.Schema(
-    vol.All(
-        cv.deprecated(DOMAIN),
-        {
-            DOMAIN: vol.Schema(
-                {
-                    vol.Required(CONF_CLIENT_ID): cv.string,
-                    vol.Required(CONF_CLIENT_SECRET): cv.string,
-                }
-            )
-        },
-    ),
-    extra=vol.ALLOW_EXTRA,
-)
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -61,40 +44,6 @@ PLATFORMS = [
 ]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the xbox component."""
-    hass.data[DOMAIN] = {}
-
-    if DOMAIN not in config:
-        return True
-
-    await application_credentials.async_import_client_credential(
-        hass,
-        DOMAIN,
-        application_credentials.ClientCredential(
-            config[DOMAIN][CONF_CLIENT_ID], config[DOMAIN][CONF_CLIENT_SECRET]
-        ),
-    )
-    async_create_issue(
-        hass,
-        DOMAIN,
-        "deprecated_yaml",
-        breaks_in_ha_version="2022.9.0",
-        is_fixable=False,
-        severity=IssueSeverity.WARNING,
-        translation_key="deprecated_yaml",
-    )
-    _LOGGER.warning(
-        "Configuration of Xbox integration in YAML is deprecated and "
-        "will be removed in Home Assistant 2022.9.; Your existing configuration "
-        "(including OAuth Application Credentials) has been imported into "
-        "the UI automatically and can be safely removed from your "
-        "configuration.yaml file"
-    )
-
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up xbox from a config entry."""
     implementation = (
@@ -118,7 +67,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = XboxUpdateCoordinator(hass, client, consoles)
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data[DOMAIN][entry.entry_id] = {
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
         "client": XboxLiveClient(auth),
         "consoles": consoles,
         "coordinator": coordinator,
diff --git a/homeassistant/components/xbox/strings.json b/homeassistant/components/xbox/strings.json
index 68af0176fa8..accd6775941 100644
--- a/homeassistant/components/xbox/strings.json
+++ b/homeassistant/components/xbox/strings.json
@@ -13,11 +13,5 @@
     "create_entry": {
       "default": "[%key:common::config_flow::create_entry::authenticated%]"
     }
-  },
-  "issues": {
-    "deprecated_yaml": {
-      "title": "The Xbox YAML configuration is being removed",
-      "description": "Configuring the Xbox in configuration.yaml is being removed in Home Assistant 2022.9.\n\nYour existing OAuth Application Credentials and access settings have been imported into the UI automatically. Remove the YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/xiaomi_aqara/__init__.py b/homeassistant/components/xiaomi_aqara/__init__.py
index 16c3fa54731..ef36bd67778 100644
--- a/homeassistant/components/xiaomi_aqara/__init__.py
+++ b/homeassistant/components/xiaomi_aqara/__init__.py
@@ -79,6 +79,8 @@ SERVICE_SCHEMA_REMOVE_DEVICE = vol.Schema(
     {vol.Required(ATTR_DEVICE_ID): vol.All(cv.string, vol.Length(min=14, max=14))}
 )
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Xiaomi component."""
diff --git a/homeassistant/components/xiaomi_miio/__init__.py b/homeassistant/components/xiaomi_miio/__init__.py
index b6810cf4cf2..541b077f6f0 100644
--- a/homeassistant/components/xiaomi_miio/__init__.py
+++ b/homeassistant/components/xiaomi_miio/__init__.py
@@ -105,7 +105,12 @@ HUMIDIFIER_PLATFORMS = [
     Platform.SWITCH,
 ]
 LIGHT_PLATFORMS = [Platform.LIGHT]
-VACUUM_PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR, Platform.VACUUM]
+VACUUM_PLATFORMS = [
+    Platform.BINARY_SENSOR,
+    Platform.SENSOR,
+    Platform.BUTTON,
+    Platform.VACUUM,
+]
 AIR_MONITOR_PLATFORMS = [Platform.AIR_QUALITY, Platform.SENSOR]
 
 MODEL_TO_CLASS_MAP = {
diff --git a/homeassistant/components/xiaomi_miio/button.py b/homeassistant/components/xiaomi_miio/button.py
index 4a84873d24c..9ed9b780911 100644
--- a/homeassistant/components/xiaomi_miio/button.py
+++ b/homeassistant/components/xiaomi_miio/button.py
@@ -3,6 +3,8 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 
+from miio.integrations.vacuum.roborock.vacuum import Consumable
+
 from homeassistant.components.button import (
     ButtonDeviceClass,
     ButtonEntity,
@@ -19,22 +21,33 @@ from .const import (
     KEY_DEVICE,
     MODEL_AIRFRESH_A1,
     MODEL_AIRFRESH_T2017,
+    MODELS_VACUUM,
 )
 from .device import XiaomiCoordinatedMiioEntity
 
+# Fans
 ATTR_RESET_DUST_FILTER = "reset_dust_filter"
 ATTR_RESET_UPPER_FILTER = "reset_upper_filter"
 
+# Vacuums
+METHOD_VACUUM_RESET_CONSUMABLE = "consumable_reset"
+ATTR_RESET_VACUUM_MAIN_BRUSH = "reset_vacuum_main_brush"
+ATTR_RESET_VACUUM_SIDE_BRUSH = "reset_vacuum_side_brush"
+ATTR_RESET_VACUUM_FILTER = "reset_vacuum_filter"
+ATTR_RESET_VACUUM_SENSOR_DIRTY = "reset_vacuum_sensor_dirty"
+
 
 @dataclass
 class XiaomiMiioButtonDescription(ButtonEntityDescription):
     """A class that describes button entities."""
 
     method_press: str = ""
+    method_press_params: Consumable | None = None
     method_press_error_message: str = ""
 
 
 BUTTON_TYPES = (
+    # Fans
     XiaomiMiioButtonDescription(
         key=ATTR_RESET_DUST_FILTER,
         name="Reset dust filter",
@@ -51,6 +64,50 @@ BUTTON_TYPES = (
         method_press_error_message="Resetting the upper filter lifetime failed.",
         entity_category=EntityCategory.CONFIG,
     ),
+    # Vacuums
+    XiaomiMiioButtonDescription(
+        key=ATTR_RESET_VACUUM_MAIN_BRUSH,
+        name="Reset main brush",
+        icon="mdi:brush",
+        method_press=METHOD_VACUUM_RESET_CONSUMABLE,
+        method_press_params=Consumable.MainBrush,
+        method_press_error_message="Resetting the main brush lifetime failed.",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    XiaomiMiioButtonDescription(
+        key=ATTR_RESET_VACUUM_SIDE_BRUSH,
+        name="Reset side brush",
+        icon="mdi:brush",
+        method_press=METHOD_VACUUM_RESET_CONSUMABLE,
+        method_press_params=Consumable.SideBrush,
+        method_press_error_message="Resetting the side brush lifetime failed.",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    XiaomiMiioButtonDescription(
+        key=ATTR_RESET_VACUUM_FILTER,
+        name="Reset filter",
+        icon="mdi:air-filter",
+        method_press=METHOD_VACUUM_RESET_CONSUMABLE,
+        method_press_params=Consumable.Filter,
+        method_press_error_message="Resetting the filter lifetime failed.",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    XiaomiMiioButtonDescription(
+        key=ATTR_RESET_VACUUM_SENSOR_DIRTY,
+        name="Reset sensor dirty",
+        icon="mdi:eye-outline",
+        method_press=METHOD_VACUUM_RESET_CONSUMABLE,
+        method_press_params=Consumable.SensorDirty,
+        method_press_error_message="Resetting the sensor lifetime failed.",
+        entity_category=EntityCategory.CONFIG,
+    ),
+)
+
+BUTTONS_FOR_VACUUM = (
+    ATTR_RESET_VACUUM_MAIN_BRUSH,
+    ATTR_RESET_VACUUM_SIDE_BRUSH,
+    ATTR_RESET_VACUUM_FILTER,
+    ATTR_RESET_VACUUM_SENSOR_DIRTY,
 )
 
 MODEL_TO_BUTTON_MAP: dict[str, tuple[str, ...]] = {
@@ -59,6 +116,7 @@ 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},
 }
 
 
@@ -114,4 +172,5 @@ class XiaomiGenericCoordinatedButton(XiaomiCoordinatedMiioEntity, ButtonEntity):
         await self._try_command(
             self.entity_description.method_press_error_message,
             method,
+            self.entity_description.method_press_params,
         )
diff --git a/homeassistant/components/xiaomi_miio/humidifier.py b/homeassistant/components/xiaomi_miio/humidifier.py
index 6fde33309e4..82ede87848e 100644
--- a/homeassistant/components/xiaomi_miio/humidifier.py
+++ b/homeassistant/components/xiaomi_miio/humidifier.py
@@ -14,6 +14,7 @@ from miio.integrations.humidifier.zhimi.airhumidifier_miot import (
 )
 
 from homeassistant.components.humidifier import (
+    ATTR_HUMIDITY,
     HumidifierDeviceClass,
     HumidifierEntity,
     HumidifierEntityFeature,
@@ -46,6 +47,7 @@ ATTR_TARGET_HUMIDITY = "target_humidity"
 AVAILABLE_ATTRIBUTES = {
     ATTR_MODE: "mode",
     ATTR_TARGET_HUMIDITY: "target_humidity",
+    ATTR_HUMIDITY: "humidity",
 }
 
 AVAILABLE_MODES_CA1_CB1 = [
@@ -199,6 +201,7 @@ class XiaomiAirHumidifier(XiaomiGenericHumidifier, HumidifierEntity):
             }
         )
         self._target_humidity = self._attributes[ATTR_TARGET_HUMIDITY]
+        self._attr_current_humidity = self._attributes[ATTR_HUMIDITY]
         self._mode = self._attributes[ATTR_MODE]
 
     @property
@@ -217,6 +220,7 @@ class XiaomiAirHumidifier(XiaomiGenericHumidifier, HumidifierEntity):
             }
         )
         self._target_humidity = self._attributes[ATTR_TARGET_HUMIDITY]
+        self._attr_current_humidity = self._attributes[ATTR_HUMIDITY]
         self._mode = self._attributes[ATTR_MODE]
         self.async_write_ha_state()
 
diff --git a/homeassistant/components/xiaomi_miio/vacuum.py b/homeassistant/components/xiaomi_miio/vacuum.py
index 10fd1f2406b..34a7b949646 100644
--- a/homeassistant/components/xiaomi_miio/vacuum.py
+++ b/homeassistant/components/xiaomi_miio/vacuum.py
@@ -187,6 +187,7 @@ class MiroboVacuum(
 ):
     """Representation of a Xiaomi Vacuum cleaner robot."""
 
+    _attr_name = None
     _attr_supported_features = (
         VacuumEntityFeature.STATE
         | VacuumEntityFeature.PAUSE
diff --git a/homeassistant/components/xmpp/manifest.json b/homeassistant/components/xmpp/manifest.json
index dd7df91223c..99b3ff126d3 100644
--- a/homeassistant/components/xmpp/manifest.json
+++ b/homeassistant/components/xmpp/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/xmpp",
   "iot_class": "cloud_push",
   "loggers": ["pyasn1", "slixmpp"],
-  "requirements": ["slixmpp==1.8.3"]
+  "requirements": ["slixmpp==1.8.4"]
 }
diff --git a/homeassistant/components/yamaha_musiccast/media_player.py b/homeassistant/components/yamaha_musiccast/media_player.py
index 05518a6c3c9..cf6feb44fbd 100644
--- a/homeassistant/components/yamaha_musiccast/media_player.py
+++ b/homeassistant/components/yamaha_musiccast/media_player.py
@@ -155,6 +155,27 @@ class MusicCastMediaPlayer(MusicCastDeviceEntity, MediaPlayerEntity):
             return MediaPlayerState.PLAYING
         return MediaPlayerState.OFF
 
+    @property
+    def source_mapping(self):
+        """Return a mapping of the actual source names to their labels configured in the MusicCast App."""
+        ret = {}
+        for inp in self.coordinator.data.zones[self._zone_id].input_list:
+            label = self.coordinator.data.input_names.get(inp, "")
+            if inp != label and (
+                label in self.coordinator.data.zones[self._zone_id].input_list
+                or list(self.coordinator.data.input_names.values()).count(label) > 1
+            ):
+                label += f" ({inp})"
+            if label == "":
+                label = inp
+            ret[inp] = label
+        return ret
+
+    @property
+    def reverse_source_mapping(self):
+        """Return a mapping from the source label to the source name."""
+        return {v: k for k, v in self.source_mapping.items()}
+
     @property
     def volume_level(self):
         """Return the volume level of the media player (0..1)."""
@@ -491,17 +512,19 @@ class MusicCastMediaPlayer(MusicCastDeviceEntity, MediaPlayerEntity):
 
     async def async_select_source(self, source: str) -> None:
         """Select input source."""
-        await self.coordinator.musiccast.select_source(self._zone_id, source)
+        await self.coordinator.musiccast.select_source(
+            self._zone_id, self.reverse_source_mapping.get(source, source)
+        )
 
     @property
     def source(self):
         """Name of the current input source."""
-        return self.coordinator.data.zones[self._zone_id].input
+        return self.source_mapping.get(self.coordinator.data.zones[self._zone_id].input)
 
     @property
     def source_list(self):
         """List of available input sources."""
-        return self.coordinator.data.zones[self._zone_id].input_list
+        return list(self.source_mapping.values())
 
     @property
     def media_duration(self):
diff --git a/homeassistant/components/yeelight/manifest.json b/homeassistant/components/yeelight/manifest.json
index c6f54b45f1e..cf1bafe24fb 100644
--- a/homeassistant/components/yeelight/manifest.json
+++ b/homeassistant/components/yeelight/manifest.json
@@ -17,7 +17,7 @@
   "iot_class": "local_push",
   "loggers": ["async_upnp_client", "yeelight"],
   "quality_scale": "platinum",
-  "requirements": ["yeelight==0.7.10", "async-upnp-client==0.33.2"],
+  "requirements": ["yeelight==0.7.11", "async-upnp-client==0.33.2"],
   "zeroconf": [
     {
       "type": "_miio._udp.local.",
diff --git a/homeassistant/components/yeelightsunflower/light.py b/homeassistant/components/yeelightsunflower/light.py
index 29a6118fc03..c50c176c157 100644
--- a/homeassistant/components/yeelightsunflower/light.py
+++ b/homeassistant/components/yeelightsunflower/light.py
@@ -74,17 +74,16 @@ class SunflowerBulb(LightEntity):
         # when no arguments, just turn light on (full brightness)
         if not kwargs:
             self._light.turn_on()
-        else:
-            if ATTR_HS_COLOR in kwargs and ATTR_BRIGHTNESS in kwargs:
-                rgb = color_util.color_hs_to_RGB(*kwargs[ATTR_HS_COLOR])
-                bright = int(kwargs[ATTR_BRIGHTNESS] / 255 * 100)
-                self._light.set_all(rgb[0], rgb[1], rgb[2], bright)
-            elif ATTR_HS_COLOR in kwargs:
-                rgb = color_util.color_hs_to_RGB(*kwargs[ATTR_HS_COLOR])
-                self._light.set_rgb_color(rgb[0], rgb[1], rgb[2])
-            elif ATTR_BRIGHTNESS in kwargs:
-                bright = int(kwargs[ATTR_BRIGHTNESS] / 255 * 100)
-                self._light.set_brightness(bright)
+        elif ATTR_HS_COLOR in kwargs and ATTR_BRIGHTNESS in kwargs:
+            rgb = color_util.color_hs_to_RGB(*kwargs[ATTR_HS_COLOR])
+            bright = int(kwargs[ATTR_BRIGHTNESS] / 255 * 100)
+            self._light.set_all(rgb[0], rgb[1], rgb[2], bright)
+        elif ATTR_HS_COLOR in kwargs:
+            rgb = color_util.color_hs_to_RGB(*kwargs[ATTR_HS_COLOR])
+            self._light.set_rgb_color(rgb[0], rgb[1], rgb[2])
+        elif ATTR_BRIGHTNESS in kwargs:
+            bright = int(kwargs[ATTR_BRIGHTNESS] / 255 * 100)
+            self._light.set_brightness(bright)
 
     def turn_off(self, **kwargs: Any) -> None:
         """Instruct the light to turn off."""
diff --git a/homeassistant/components/yi/camera.py b/homeassistant/components/yi/camera.py
index 0537c268aa4..632260a899c 100644
--- a/homeassistant/components/yi/camera.py
+++ b/homeassistant/components/yi/camera.py
@@ -29,7 +29,7 @@ _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_BRAND = "YI Home Camera"
 DEFAULT_PASSWORD = ""
-DEFAULT_PATH = "/tmp/sd/record"  # nosec
+DEFAULT_PATH = "/tmp/sd/record"  # noqa: S108
 DEFAULT_PORT = 21
 DEFAULT_USERNAME = "root"
 DEFAULT_ARGUMENTS = "-pred 1"
diff --git a/homeassistant/components/youtube/__init__.py b/homeassistant/components/youtube/__init__.py
index b120359c0d7..c62c533be06 100644
--- a/homeassistant/components/youtube/__init__.py
+++ b/homeassistant/components/youtube/__init__.py
@@ -7,7 +7,6 @@ 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.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.config_entry_oauth2_flow import (
     OAuth2Session,
     async_get_config_entry_implementation,
@@ -24,7 +23,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up YouTube from a config entry."""
     implementation = await async_get_config_entry_implementation(hass, entry)
     session = OAuth2Session(hass, entry, implementation)
-    auth = AsyncConfigEntryAuth(hass, async_get_clientsession(hass), session)
+    auth = AsyncConfigEntryAuth(hass, session)
     try:
         await auth.check_and_refresh_token()
     except ClientResponseError as err:
diff --git a/homeassistant/components/youtube/api.py b/homeassistant/components/youtube/api.py
index b0d0bde2baa..64abf1a6753 100644
--- a/homeassistant/components/youtube/api.py
+++ b/homeassistant/components/youtube/api.py
@@ -1,8 +1,6 @@
 """API for YouTube bound to Home Assistant OAuth."""
-from aiohttp import ClientSession
 from google.auth.exceptions import RefreshError
 from google.oauth2.credentials import Credentials
-from google.oauth2.utils import OAuthClientAuthHandler
 from googleapiclient.discovery import Resource, build
 
 from homeassistant.const import CONF_ACCESS_TOKEN
@@ -10,19 +8,17 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_entry_oauth2_flow
 
 
-class AsyncConfigEntryAuth(OAuthClientAuthHandler):
+class AsyncConfigEntryAuth:
     """Provide Google authentication tied to an OAuth2 based config entry."""
 
     def __init__(
         self,
         hass: HomeAssistant,
-        websession: ClientSession,
         oauth2_session: config_entry_oauth2_flow.OAuth2Session,
     ) -> None:
         """Initialize YouTube Auth."""
         self.oauth_session = oauth2_session
         self.hass = hass
-        super().__init__(websession)
 
     @property
     def access_token(self) -> str:
diff --git a/homeassistant/components/youtube/config_flow.py b/homeassistant/components/youtube/config_flow.py
index 92695f80a2e..fa3bc6c8237 100644
--- a/homeassistant/components/youtube/config_flow.py
+++ b/homeassistant/components/youtube/config_flow.py
@@ -1,7 +1,7 @@
 """Config flow for YouTube integration."""
 from __future__ import annotations
 
-from collections.abc import Mapping
+from collections.abc import AsyncGenerator, Mapping
 import logging
 from typing import Any
 
@@ -31,6 +31,24 @@ from .const import (
 )
 
 
+async def _get_subscriptions(hass: HomeAssistant, resource: Resource) -> AsyncGenerator:
+    amount_of_subscriptions = 50
+    received_amount_of_subscriptions = 0
+    next_page_token = None
+    while received_amount_of_subscriptions < amount_of_subscriptions:
+        # pylint: disable=no-member
+        subscription_request: HttpRequest = resource.subscriptions().list(
+            part="snippet", mine=True, maxResults=50, pageToken=next_page_token
+        )
+        res = await hass.async_add_executor_job(subscription_request.execute)
+        amount_of_subscriptions = res["pageInfo"]["totalResults"]
+        if "nextPageToken" in res:
+            next_page_token = res["nextPageToken"]
+        for item in res["items"]:
+            received_amount_of_subscriptions += 1
+            yield item
+
+
 async def get_resource(hass: HomeAssistant, token: str) -> Resource:
     """Get Youtube resource async."""
 
@@ -152,17 +170,12 @@ class OAuth2FlowHandler(
         service = await get_resource(
             self.hass, self._data[CONF_TOKEN][CONF_ACCESS_TOKEN]
         )
-        # pylint: disable=no-member
-        subscription_request: HttpRequest = service.subscriptions().list(
-            part="snippet", mine=True, maxResults=50
-        )
-        response = await self.hass.async_add_executor_job(subscription_request.execute)
         selectable_channels = [
             SelectOptionDict(
                 value=subscription["snippet"]["resourceId"]["channelId"],
                 label=subscription["snippet"]["title"],
             )
-            for subscription in response["items"]
+            async for subscription in _get_subscriptions(self.hass, service)
         ]
         return self.async_show_form(
             step_id="channels",
@@ -191,17 +204,12 @@ class YouTubeOptionsFlowHandler(OptionsFlowWithConfigEntry):
         service = await get_resource(
             self.hass, self.config_entry.data[CONF_TOKEN][CONF_ACCESS_TOKEN]
         )
-        # pylint: disable=no-member
-        subscription_request: HttpRequest = service.subscriptions().list(
-            part="snippet", mine=True, maxResults=50
-        )
-        response = await self.hass.async_add_executor_job(subscription_request.execute)
         selectable_channels = [
             SelectOptionDict(
                 value=subscription["snippet"]["resourceId"]["channelId"],
                 label=subscription["snippet"]["title"],
             )
-            for subscription in response["items"]
+            async for subscription in _get_subscriptions(self.hass, service)
         ]
         return self.async_show_form(
             step_id="init",
diff --git a/homeassistant/components/youtube/coordinator.py b/homeassistant/components/youtube/coordinator.py
index d3430d8329c..72629544895 100644
--- a/homeassistant/components/youtube/coordinator.py
+++ b/homeassistant/components/youtube/coordinator.py
@@ -53,16 +53,31 @@ class YouTubeDataUpdateCoordinator(DataUpdateCoordinator):
 
     async def _async_update_data(self) -> dict[str, Any]:
         service = await self._auth.get_resource()
-        channels = self.config_entry.options[CONF_CHANNELS]
-        channel_request: HttpRequest = service.channels().list(
-            part="snippet,statistics", id=",".join(channels), maxResults=50
-        )
-        response: dict = await self.hass.async_add_executor_job(channel_request.execute)
+        channels = await self._get_channels(service)
 
         return await self.hass.async_add_executor_job(
-            self._get_channel_data, service, response["items"]
+            self._get_channel_data, service, channels
         )
 
+    async def _get_channels(self, service: Resource) -> list[dict[str, Any]]:
+        data = []
+        received_channels = 0
+        channels = self.config_entry.options[CONF_CHANNELS]
+        while received_channels < len(channels):
+            # We're slicing the channels in chunks of 50 to avoid making the URI too long
+            end = min(received_channels + 50, len(channels))
+            channel_request: HttpRequest = service.channels().list(
+                part="snippet,statistics",
+                id=",".join(channels[received_channels:end]),
+                maxResults=50,
+            )
+            response: dict = await self.hass.async_add_executor_job(
+                channel_request.execute
+            )
+            data.extend(response["items"])
+            received_channels += len(response["items"])
+        return data
+
     def _get_channel_data(
         self, service: Resource, channels: list[dict[str, Any]]
     ) -> dict[str, Any]:
diff --git a/homeassistant/components/zabbix/sensor.py b/homeassistant/components/zabbix/sensor.py
index a5172d5ef95..2fd2d48faba 100644
--- a/homeassistant/components/zabbix/sensor.py
+++ b/homeassistant/components/zabbix/sensor.py
@@ -67,17 +67,14 @@ def setup_platform(
             for hostid in hostids:
                 _LOGGER.debug("Creating Zabbix Sensor: %s", str(hostid))
                 sensors.append(ZabbixSingleHostTriggerCountSensor(zapi, [hostid], name))
+        elif not hostids:
+            # Single sensor that provides the total count of triggers.
+            _LOGGER.debug("Creating Zabbix Sensor")
+            sensors.append(ZabbixTriggerCountSensor(zapi, name))
         else:
-            if not hostids:
-                # Single sensor that provides the total count of triggers.
-                _LOGGER.debug("Creating Zabbix Sensor")
-                sensors.append(ZabbixTriggerCountSensor(zapi, name))
-            else:
-                # Single sensor that sums total issues for all hosts
-                _LOGGER.debug("Creating Zabbix Sensor group: %s", str(hostids))
-                sensors.append(
-                    ZabbixMultipleHostTriggerCountSensor(zapi, hostids, name)
-                )
+            # Single sensor that sums total issues for all hosts
+            _LOGGER.debug("Creating Zabbix Sensor group: %s", str(hostids))
+            sensors.append(ZabbixMultipleHostTriggerCountSensor(zapi, hostids, name))
 
     else:
         # Single sensor that provides the total count of triggers.
diff --git a/homeassistant/components/zamg/manifest.json b/homeassistant/components/zamg/manifest.json
index 72a7f8de946..3ff7612d47e 100644
--- a/homeassistant/components/zamg/manifest.json
+++ b/homeassistant/components/zamg/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/zamg",
   "iot_class": "cloud_polling",
-  "requirements": ["zamg==0.2.2"]
+  "requirements": ["zamg==0.2.4"]
 }
diff --git a/homeassistant/components/zeroconf/__init__.py b/homeassistant/components/zeroconf/__init__.py
index f12752dc5c3..f77909b1bdd 100644
--- a/homeassistant/components/zeroconf/__init__.py
+++ b/homeassistant/components/zeroconf/__init__.py
@@ -7,10 +7,9 @@ from contextlib import suppress
 from dataclasses import dataclass
 from fnmatch import translate
 from functools import lru_cache
-from ipaddress import IPv4Address, IPv6Address, ip_address
+from ipaddress import IPv4Address, IPv6Address
 import logging
 import re
-import socket
 import sys
 from typing import Any, Final, cast
 
@@ -25,8 +24,6 @@ from zeroconf.asyncio import AsyncServiceInfo
 
 from homeassistant import config_entries
 from homeassistant.components import network
-from homeassistant.components.network import MDNS_TARGET_IP, async_get_source_ip
-from homeassistant.components.network.models import Adapter
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP, __version__
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.data_entry_flow import BaseServiceInfo
@@ -243,32 +240,6 @@ def _build_homekit_model_lookups(
     return homekit_model_lookup, homekit_model_matchers
 
 
-def _get_announced_addresses(
-    adapters: list[Adapter],
-    first_ip: bytes | None = None,
-) -> list[bytes]:
-    """Return a list of IP addresses to announce via zeroconf.
-
-    If first_ip is not None, it will be the first address in the list.
-    """
-    addresses = {
-        addr.packed
-        for addr in [
-            ip_address(ip["address"])
-            for adapter in adapters
-            if adapter["enabled"]
-            for ip in cast(list, adapter["ipv6"]) + cast(list, adapter["ipv4"])
-        ]
-        if not (addr.is_unspecified or addr.is_loopback)
-    }
-    if first_ip:
-        address_list = [first_ip]
-        address_list.extend(addresses - set({first_ip}))
-    else:
-        address_list = list(addresses)
-    return address_list
-
-
 def _filter_disallowed_characters(name: str) -> str:
     """Filter disallowed characters from a string.
 
@@ -307,24 +278,13 @@ async def _async_register_hass_zc_service(
     # Set old base URL based on external or internal
     params["base_url"] = params["external_url"] or params["internal_url"]
 
-    adapters = await network.async_get_adapters(hass)
-
-    # Puts the default IPv4 address first in the list to preserve compatibility,
-    # because some mDNS implementations ignores anything but the first announced
-    # address.
-    host_ip = await async_get_source_ip(hass, target_ip=MDNS_TARGET_IP)
-    host_ip_pton = None
-    if host_ip:
-        host_ip_pton = socket.inet_pton(socket.AF_INET, host_ip)
-    address_list = _get_announced_addresses(adapters, host_ip_pton)
-
     _suppress_invalid_properties(params)
 
     info = AsyncServiceInfo(
         ZEROCONF_TYPE,
         name=f"{valid_location_name}.{ZEROCONF_TYPE}",
         server=f"{uuid}.local.",
-        addresses=address_list,
+        parsed_addresses=await network.async_get_announce_addresses(hass),
         port=hass.http.server_port,
         properties=params,
     )
@@ -581,26 +541,9 @@ def _stringify_ip_address(ip_addr: IPv4Address | IPv6Address) -> str:
 
 def info_from_service(service: AsyncServiceInfo) -> ZeroconfServiceInfo | None:
     """Return prepared info from mDNS entries."""
-    properties: dict[str, Any] = {"_raw": {}}
-
-    for key, value in service.properties.items():
-        # See https://ietf.org/rfc/rfc6763.html#section-6.4 and
-        # https://ietf.org/rfc/rfc6763.html#section-6.5 for expected encodings
-        # for property keys and values
-        try:
-            key = key.decode("ascii")
-        except UnicodeDecodeError:
-            _LOGGER.debug(
-                "Ignoring invalid key provided by [%s]: %s", service.name, key
-            )
-            continue
-
-        properties["_raw"][key] = value
-
-        with suppress(UnicodeDecodeError):
-            if isinstance(value, bytes):
-                properties[key] = value.decode("utf-8")
-
+    # See https://ietf.org/rfc/rfc6763.html#section-6.4 and
+    # https://ietf.org/rfc/rfc6763.html#section-6.5 for expected encodings
+    # for property keys and values
     if not (ip_addresses := service.ip_addresses_by_version(IPVersion.All)):
         return None
     host: str | None = None
@@ -610,6 +553,12 @@ def info_from_service(service: AsyncServiceInfo) -> ZeroconfServiceInfo | None:
             break
     if not host:
         return None
+    properties: dict[str, Any] = {
+        k.decode("ascii", "replace"): None
+        if v is None
+        else v.decode("utf-8", "replace")
+        for k, v in service.properties.items()
+    }
 
     assert service.server is not None, "server cannot be none if there are addresses"
     return ZeroconfServiceInfo(
diff --git a/homeassistant/components/zeroconf/manifest.json b/homeassistant/components/zeroconf/manifest.json
index 85cf503bb0d..1c5d25dfb3d 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.64.0"]
+  "requirements": ["zeroconf==0.70.0"]
 }
diff --git a/homeassistant/components/zerproc/__init__.py b/homeassistant/components/zerproc/__init__.py
index 43a768c3844..edd41d1a8e3 100644
--- a/homeassistant/components/zerproc/__init__.py
+++ b/homeassistant/components/zerproc/__init__.py
@@ -1,23 +1,13 @@
 """Zerproc lights integration."""
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.typing import ConfigType
 
 from .const import DATA_ADDRESSES, DATA_DISCOVERY_SUBSCRIPTION, DOMAIN
 
 PLATFORMS = [Platform.LIGHT]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Zerproc platform."""
-    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:
     """Set up Zerproc from a config entry."""
     if DOMAIN not in hass.data:
diff --git a/homeassistant/components/zha/binary_sensor.py b/homeassistant/components/zha/binary_sensor.py
index 1c29f619719..48fbf1f0bb2 100644
--- a/homeassistant/components/zha/binary_sensor.py
+++ b/homeassistant/components/zha/binary_sensor.py
@@ -236,6 +236,15 @@ class IASZone(BinarySensor):
         )
 
 
+@STRICT_MATCH(cluster_handler_names=CLUSTER_HANDLER_ZONE, models={"WL4200", "WL4200S"})
+class SinopeLeakStatus(BinarySensor):
+    """Sinope water leak sensor."""
+
+    SENSOR_ATTR = "leak_status"
+    _attr_name = "Moisture"
+    _attr_device_class = BinarySensorDeviceClass.MOISTURE
+
+
 @MULTI_MATCH(
     cluster_handler_names="tuya_manufacturer",
     manufacturers={
diff --git a/homeassistant/components/zha/button.py b/homeassistant/components/zha/button.py
index 6564f3bc39a..010c0f63e27 100644
--- a/homeassistant/components/zha/button.py
+++ b/homeassistant/components/zha/button.py
@@ -105,7 +105,7 @@ class ZHAIdentifyButton(ZHAButton):
             return None
         return cls(unique_id, zha_device, cluster_handlers, **kwargs)
 
-    _attr_device_class: ButtonDeviceClass = ButtonDeviceClass.UPDATE
+    _attr_device_class = ButtonDeviceClass.IDENTIFY
     _attr_entity_category = EntityCategory.DIAGNOSTIC
     _attr_name = "Identify"
     _command_name = "identify"
diff --git a/homeassistant/components/zha/config_flow.py b/homeassistant/components/zha/config_flow.py
index 91bc2ac42a2..ba50839ee44 100644
--- a/homeassistant/components/zha/config_flow.py
+++ b/homeassistant/components/zha/config_flow.py
@@ -552,10 +552,9 @@ class ZhaConfigFlowHandler(BaseZhaFlow, config_entries.ConfigFlow, domain=DOMAIN
         vid = discovery_info.vid
         pid = discovery_info.pid
         serial_number = discovery_info.serial_number
-        device = discovery_info.device
         manufacturer = discovery_info.manufacturer
         description = discovery_info.description
-        dev_path = await self.hass.async_add_executor_job(usb.get_serial_by_id, device)
+        dev_path = discovery_info.device
 
         await self._set_unique_id_or_update_path(
             unique_id=f"{vid}:{pid}_{serial_number}_{manufacturer}_{description}",
diff --git a/homeassistant/components/zha/core/cluster_handlers/__init__.py b/homeassistant/components/zha/core/cluster_handlers/__init__.py
index 7863b043455..dcf8f2a525e 100644
--- a/homeassistant/components/zha/core/cluster_handlers/__init__.py
+++ b/homeassistant/components/zha/core/cluster_handlers/__init__.py
@@ -3,11 +3,12 @@ from __future__ import annotations
 
 import asyncio
 from enum import Enum
-from functools import partialmethod, wraps
+from functools import partialmethod
 import logging
 from typing import TYPE_CHECKING, Any, TypedDict
 
 import zigpy.exceptions
+import zigpy.util
 import zigpy.zcl
 from zigpy.zcl.foundation import (
     CommandSchema,
@@ -45,6 +46,8 @@ if TYPE_CHECKING:
 
 _LOGGER = logging.getLogger(__name__)
 
+retry_request = zigpy.util.retryable_request(tries=3)
+
 
 class AttrReportConfig(TypedDict, total=True):
     """Configuration to report for the attributes."""
@@ -73,35 +76,6 @@ def parse_and_log_command(cluster_handler, tsn, command_id, args):
     return name
 
 
-def decorate_command(cluster_handler, command):
-    """Wrap a cluster command to make it safe."""
-
-    @wraps(command)
-    async def wrapper(*args, **kwds):
-        try:
-            result = await command(*args, **kwds)
-            cluster_handler.debug(
-                "executed '%s' command with args: '%s' kwargs: '%s' result: %s",
-                command.__name__,
-                args,
-                kwds,
-                result,
-            )
-            return result
-
-        except (zigpy.exceptions.ZigbeeException, asyncio.TimeoutError) as ex:
-            cluster_handler.debug(
-                "command failed: '%s' args: '%s' kwargs '%s' exception: '%s'",
-                command.__name__,
-                args,
-                kwds,
-                str(ex),
-            )
-            return ex
-
-    return wrapper
-
-
 class ClusterHandlerStatus(Enum):
     """Status of a cluster handler."""
 
@@ -119,7 +93,7 @@ class ClusterHandler(LogMixin):
     # Dict of attributes to read on cluster handler initialization.
     # Dict keys -- attribute ID or names, with bool value indicating whether a cached
     # attribute read is acceptable.
-    ZCL_INIT_ATTRS: dict[int | str, bool] = {}
+    ZCL_INIT_ATTRS: dict[str, bool] = {}
 
     def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None:
         """Initialize ClusterHandler."""
@@ -396,7 +370,7 @@ class ClusterHandler(LogMixin):
         """Handle commands received to this cluster."""
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute updates on this cluster."""
         self.async_send_signal(
             f"{self.unique_id}_{SIGNAL_ATTR_UPDATED}",
@@ -462,7 +436,7 @@ class ClusterHandler(LogMixin):
     async def _get_attributes(
         self,
         raise_exceptions: bool,
-        attributes: list[int | str],
+        attributes: list[str],
         from_cache: bool = True,
         only_cache: bool = True,
     ) -> dict[int | str, Any]:
@@ -510,7 +484,8 @@ class ClusterHandler(LogMixin):
         if hasattr(self._cluster, name) and callable(getattr(self._cluster, name)):
             command = getattr(self._cluster, name)
             command.__name__ = name
-            return decorate_command(self, command)
+
+            return retry_request(command)
         return self.__getattribute__(name)
 
 
@@ -568,7 +543,7 @@ class ClientClusterHandler(ClusterHandler):
     """ClusterHandler for Zigbee client (output) clusters."""
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle an attribute updated on this cluster."""
 
         try:
diff --git a/homeassistant/components/zha/core/cluster_handlers/closures.py b/homeassistant/components/zha/core/cluster_handlers/closures.py
index ab58405b974..4262a16800d 100644
--- a/homeassistant/components/zha/core/cluster_handlers/closures.py
+++ b/homeassistant/components/zha/core/cluster_handlers/closures.py
@@ -1,11 +1,13 @@
 """Closures cluster handlers module for Zigbee Home Automation."""
+from typing import Any
+
 from zigpy.zcl.clusters import closures
 
 from homeassistant.core import callback
 
-from . import AttrReportConfig, ClientClusterHandler, ClusterHandler
 from .. import registries
 from ..const import REPORT_CONFIG_IMMEDIATE, SIGNAL_ATTR_UPDATED
+from . import AttrReportConfig, ClientClusterHandler, ClusterHandler
 
 
 @registries.ZIGBEE_CLUSTER_HANDLER_REGISTRY.register(closures.DoorLock.cluster_id)
@@ -48,7 +50,7 @@ class DoorLockClusterHandler(ClusterHandler):
             )
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute update from lock cluster."""
         attr_name = self._get_attribute_name(attrid)
         self.debug(
@@ -144,7 +146,7 @@ class WindowCovering(ClusterHandler):
             )
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute update from window_covering cluster."""
         attr_name = self._get_attribute_name(attrid)
         self.debug(
diff --git a/homeassistant/components/zha/core/cluster_handlers/general.py b/homeassistant/components/zha/core/cluster_handlers/general.py
index d4014bbf697..622c9e4340e 100644
--- a/homeassistant/components/zha/core/cluster_handlers/general.py
+++ b/homeassistant/components/zha/core/cluster_handlers/general.py
@@ -14,12 +14,6 @@ from zigpy.zcl.foundation import Status
 from homeassistant.core import callback
 from homeassistant.helpers.event import async_call_later
 
-from . import (
-    AttrReportConfig,
-    ClientClusterHandler,
-    ClusterHandler,
-    parse_and_log_command,
-)
 from .. import registries
 from ..const import (
     REPORT_CONFIG_ASAP,
@@ -33,6 +27,12 @@ from ..const import (
     SIGNAL_SET_LEVEL,
     SIGNAL_UPDATE_DEVICE,
 )
+from . import (
+    AttrReportConfig,
+    ClientClusterHandler,
+    ClusterHandler,
+    parse_and_log_command,
+)
 from .helpers import is_hue_motion_sensor
 
 if TYPE_CHECKING:
@@ -297,7 +297,7 @@ class LevelControlClusterHandler(ClusterHandler):
             )
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute updates on this cluster."""
         self.debug("received attribute: %s update with value: %s", attrid, value)
         if attrid == self.CURRENT_LEVEL:
@@ -358,7 +358,7 @@ class OnOffClusterHandler(ClusterHandler):
         super().__init__(cluster, endpoint)
         self._off_listener = None
 
-        if self.cluster.endpoint.model in (
+        if self.cluster.endpoint.model not in (
             "TS011F",
             "TS0121",
             "TS0001",
@@ -366,13 +366,19 @@ class OnOffClusterHandler(ClusterHandler):
             "TS0003",
             "TS0004",
         ):
-            self.ZCL_INIT_ATTRS = (  # pylint: disable=invalid-name
-                self.ZCL_INIT_ATTRS.copy()
-            )
-            self.ZCL_INIT_ATTRS["backlight_mode"] = True
-            self.ZCL_INIT_ATTRS["power_on_state"] = True
-            if self.cluster.endpoint.model == "TS011F":
-                self.ZCL_INIT_ATTRS["child_lock"] = True
+            return
+
+        try:
+            self.cluster.find_attribute("backlight_mode")
+        except KeyError:
+            return
+
+        self.ZCL_INIT_ATTRS = self.ZCL_INIT_ATTRS.copy()  # pylint: disable=invalid-name
+        self.ZCL_INIT_ATTRS["backlight_mode"] = True
+        self.ZCL_INIT_ATTRS["power_on_state"] = True
+
+        if self.cluster.endpoint.model == "TS011F":
+            self.ZCL_INIT_ATTRS["child_lock"] = True
 
     @classmethod
     def matches(cls, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> bool:
@@ -438,7 +444,7 @@ class OnOffClusterHandler(ClusterHandler):
         self.cluster.update_attribute(self.ON_OFF, t.Bool.false)
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute updates on this cluster."""
         if attrid == self.ON_OFF:
             self.async_send_signal(
diff --git a/homeassistant/components/zha/core/cluster_handlers/homeautomation.py b/homeassistant/components/zha/core/cluster_handlers/homeautomation.py
index 981ed08ba00..8ca014f453e 100644
--- a/homeassistant/components/zha/core/cluster_handlers/homeautomation.py
+++ b/homeassistant/components/zha/core/cluster_handlers/homeautomation.py
@@ -5,7 +5,6 @@ import enum
 
 from zigpy.zcl.clusters import homeautomation
 
-from . import AttrReportConfig, ClusterHandler
 from .. import registries
 from ..const import (
     CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT,
@@ -13,6 +12,7 @@ from ..const import (
     REPORT_CONFIG_OP,
     SIGNAL_ATTR_UPDATED,
 )
+from . import AttrReportConfig, ClusterHandler
 
 
 @registries.ZIGBEE_CLUSTER_HANDLER_REGISTRY.register(
diff --git a/homeassistant/components/zha/core/cluster_handlers/hvac.py b/homeassistant/components/zha/core/cluster_handlers/hvac.py
index 94154564e8c..cbc56f5acc5 100644
--- a/homeassistant/components/zha/core/cluster_handlers/hvac.py
+++ b/homeassistant/components/zha/core/cluster_handlers/hvac.py
@@ -14,7 +14,6 @@ from zigpy.zcl.foundation import Status
 
 from homeassistant.core import callback
 
-from . import AttrReportConfig, ClusterHandler
 from .. import registries
 from ..const import (
     REPORT_CONFIG_MAX_INT,
@@ -22,6 +21,7 @@ from ..const import (
     REPORT_CONFIG_OP,
     SIGNAL_ATTR_UPDATED,
 )
+from . import AttrReportConfig, ClusterHandler
 
 AttributeUpdateRecord = namedtuple("AttributeUpdateRecord", "attr_id, attr_name, value")
 REPORT_CONFIG_CLIMATE = (REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 25)
@@ -67,7 +67,7 @@ class FanClusterHandler(ClusterHandler):
         await self.get_attribute_value("fan_mode", from_cache=False)
 
     @callback
-    def attribute_updated(self, attrid: int, value: Any) -> None:
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute update from fan cluster."""
         attr_name = self._get_attribute_name(attrid)
         self.debug(
@@ -109,7 +109,7 @@ class ThermostatClusterHandler(ClusterHandler):
         AttrReportConfig(attr="pi_cooling_demand", config=REPORT_CONFIG_CLIMATE_DEMAND),
         AttrReportConfig(attr="pi_heating_demand", config=REPORT_CONFIG_CLIMATE_DEMAND),
     )
-    ZCL_INIT_ATTRS: dict[int | str, bool] = {
+    ZCL_INIT_ATTRS: dict[str, bool] = {
         "abs_min_heat_setpoint_limit": True,
         "abs_max_heat_setpoint_limit": True,
         "abs_min_cool_setpoint_limit": True,
@@ -234,7 +234,7 @@ class ThermostatClusterHandler(ClusterHandler):
         return self.cluster.get("unoccupied_heating_setpoint")
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute update cluster."""
         attr_name = self._get_attribute_name(attrid)
         self.debug(
diff --git a/homeassistant/components/zha/core/cluster_handlers/lighting.py b/homeassistant/components/zha/core/cluster_handlers/lighting.py
index 56f3c701aa1..5f54ce381cc 100644
--- a/homeassistant/components/zha/core/cluster_handlers/lighting.py
+++ b/homeassistant/components/zha/core/cluster_handlers/lighting.py
@@ -1,13 +1,13 @@
 """Lighting cluster handlers module for Zigbee Home Automation."""
 from __future__ import annotations
 
-from functools import cached_property
-
 from zigpy.zcl.clusters import lighting
 
-from . import AttrReportConfig, ClientClusterHandler, ClusterHandler
+from homeassistant.backports.functools import cached_property
+
 from .. import registries
 from ..const import REPORT_CONFIG_DEFAULT
+from . import AttrReportConfig, ClientClusterHandler, ClusterHandler
 
 
 @registries.ZIGBEE_CLUSTER_HANDLER_REGISTRY.register(lighting.Ballast.cluster_id)
diff --git a/homeassistant/components/zha/core/cluster_handlers/lightlink.py b/homeassistant/components/zha/core/cluster_handlers/lightlink.py
index 437a4b4ecf8..bac4d8c09a9 100644
--- a/homeassistant/components/zha/core/cluster_handlers/lightlink.py
+++ b/homeassistant/components/zha/core/cluster_handlers/lightlink.py
@@ -5,8 +5,8 @@ import zigpy.exceptions
 from zigpy.zcl.clusters import lightlink
 from zigpy.zcl.foundation import GENERAL_COMMANDS, GeneralCommand
 
-from . import ClusterHandler, ClusterHandlerStatus
 from .. import registries
+from . import ClusterHandler, ClusterHandlerStatus
 
 
 @registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(lightlink.LightLink.cluster_id)
diff --git a/homeassistant/components/zha/core/cluster_handlers/manufacturerspecific.py b/homeassistant/components/zha/core/cluster_handlers/manufacturerspecific.py
index d20888e1f55..e46031cce14 100644
--- a/homeassistant/components/zha/core/cluster_handlers/manufacturerspecific.py
+++ b/homeassistant/components/zha/core/cluster_handlers/manufacturerspecific.py
@@ -10,7 +10,6 @@ import zigpy.zcl
 
 from homeassistant.core import callback
 
-from . import AttrReportConfig, ClientClusterHandler, ClusterHandler
 from .. import registries
 from ..const import (
     ATTR_ATTRIBUTE_ID,
@@ -24,6 +23,7 @@ from ..const import (
     SIGNAL_ATTR_UPDATED,
     UNKNOWN,
 )
+from . import AttrReportConfig, ClientClusterHandler, ClusterHandler
 
 if TYPE_CHECKING:
     from ..endpoint import Endpoint
@@ -198,7 +198,7 @@ class SmartThingsAcceleration(ClusterHandler):
         )
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute updates on this cluster."""
         try:
             attr_name = self._cluster.attributes[attrid].name
@@ -229,7 +229,7 @@ class InovelliNotificationClusterHandler(ClientClusterHandler):
     """Inovelli Notification cluster handler."""
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle an attribute updated on this cluster."""
 
     @callback
@@ -363,7 +363,7 @@ class IkeaAirPurifierClusterHandler(ClusterHandler):
         await self.get_attribute_value("fan_mode", from_cache=False)
 
     @callback
-    def attribute_updated(self, attrid: int, value: Any) -> None:
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute update from fan cluster."""
         attr_name = self._get_attribute_name(attrid)
         self.debug(
diff --git a/homeassistant/components/zha/core/cluster_handlers/measurement.py b/homeassistant/components/zha/core/cluster_handlers/measurement.py
index 8b882a299f6..beeb6296e32 100644
--- a/homeassistant/components/zha/core/cluster_handlers/measurement.py
+++ b/homeassistant/components/zha/core/cluster_handlers/measurement.py
@@ -6,7 +6,6 @@ from typing import TYPE_CHECKING
 import zigpy.zcl
 from zigpy.zcl.clusters import measurement
 
-from . import AttrReportConfig, ClusterHandler
 from .. import registries
 from ..const import (
     REPORT_CONFIG_DEFAULT,
@@ -14,6 +13,7 @@ from ..const import (
     REPORT_CONFIG_MAX_INT,
     REPORT_CONFIG_MIN_INT,
 )
+from . import AttrReportConfig, ClusterHandler
 from .helpers import is_hue_motion_sensor
 
 if TYPE_CHECKING:
diff --git a/homeassistant/components/zha/core/cluster_handlers/protocol.py b/homeassistant/components/zha/core/cluster_handlers/protocol.py
index 6398a8875b6..1643fe031cd 100644
--- a/homeassistant/components/zha/core/cluster_handlers/protocol.py
+++ b/homeassistant/components/zha/core/cluster_handlers/protocol.py
@@ -1,8 +1,8 @@
 """Protocol cluster handlers module for Zigbee Home Automation."""
 from zigpy.zcl.clusters import protocol
 
-from . import ClusterHandler
 from .. import registries
+from . import ClusterHandler
 
 
 @registries.ZIGBEE_CLUSTER_HANDLER_REGISTRY.register(
diff --git a/homeassistant/components/zha/core/cluster_handlers/security.py b/homeassistant/components/zha/core/cluster_handlers/security.py
index 7e4951ad672..28e2d863662 100644
--- a/homeassistant/components/zha/core/cluster_handlers/security.py
+++ b/homeassistant/components/zha/core/cluster_handlers/security.py
@@ -15,7 +15,6 @@ from zigpy.zcl.clusters.security import IasAce as AceCluster, IasZone
 
 from homeassistant.core import callback
 
-from . import ClusterHandler, ClusterHandlerStatus
 from .. import registries
 from ..const import (
     SIGNAL_ATTR_UPDATED,
@@ -25,6 +24,7 @@ from ..const import (
     WARNING_DEVICE_STROBE_HIGH,
     WARNING_DEVICE_STROBE_YES,
 )
+from . import ClusterHandler, ClusterHandlerStatus
 
 if TYPE_CHECKING:
     from ..endpoint import Endpoint
@@ -388,7 +388,7 @@ class IASZoneClusterHandler(ClusterHandler):
         self.debug("finished IASZoneClusterHandler configuration")
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute updates on this cluster."""
         if attrid == IasZone.attributes_by_name["zone_status"].id:
             self.async_send_signal(
diff --git a/homeassistant/components/zha/core/cluster_handlers/smartenergy.py b/homeassistant/components/zha/core/cluster_handlers/smartenergy.py
index 1cb647ea313..8fd38425dff 100644
--- a/homeassistant/components/zha/core/cluster_handlers/smartenergy.py
+++ b/homeassistant/components/zha/core/cluster_handlers/smartenergy.py
@@ -8,7 +8,6 @@ from typing import TYPE_CHECKING
 import zigpy.zcl
 from zigpy.zcl.clusters import smartenergy
 
-from . import AttrReportConfig, ClusterHandler
 from .. import registries
 from ..const import (
     REPORT_CONFIG_ASAP,
@@ -16,6 +15,7 @@ from ..const import (
     REPORT_CONFIG_OP,
     SIGNAL_ATTR_UPDATED,
 )
+from . import AttrReportConfig, ClusterHandler
 
 if TYPE_CHECKING:
     from ..endpoint import Endpoint
diff --git a/homeassistant/components/zha/core/device.py b/homeassistant/components/zha/core/device.py
index 311e876bbc0..51ab65e3318 100644
--- a/homeassistant/components/zha/core/device.py
+++ b/homeassistant/components/zha/core/device.py
@@ -5,7 +5,6 @@ import asyncio
 from collections.abc import Callable
 from datetime import timedelta
 from enum import Enum
-from functools import cached_property
 import logging
 import random
 import time
@@ -23,6 +22,7 @@ from zigpy.zcl.clusters.general import Groups, Identify
 from zigpy.zcl.foundation import Status as ZclStatus, ZCLCommandDef
 import zigpy.zdo.types as zdo_types
 
+from homeassistant.backports.functools import cached_property
 from homeassistant.const import ATTR_COMMAND, ATTR_DEVICE_ID, ATTR_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
diff --git a/homeassistant/components/zha/core/discovery.py b/homeassistant/components/zha/core/discovery.py
index e8b6f5f8304..0ca1c136271 100644
--- a/homeassistant/components/zha/core/discovery.py
+++ b/homeassistant/components/zha/core/discovery.py
@@ -16,7 +16,6 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.entity_registry import async_entries_for_device
 from homeassistant.helpers.typing import ConfigType
 
-from . import const as zha_const, registries as zha_regs
 from .. import (  # noqa: F401 pylint: disable=unused-import,
     alarm_control_panel,
     binary_sensor,
@@ -33,6 +32,7 @@ from .. import (  # noqa: F401 pylint: disable=unused-import,
     siren,
     switch,
 )
+from . import const as zha_const, registries as zha_regs
 
 # importing cluster handlers updates registries
 from .cluster_handlers import (  # noqa: F401 pylint: disable=unused-import,
diff --git a/homeassistant/components/zha/cover.py b/homeassistant/components/zha/cover.py
index fce37904126..4d76ea27897 100644
--- a/homeassistant/components/zha/cover.py
+++ b/homeassistant/components/zha/cover.py
@@ -318,16 +318,12 @@ class KeenVent(Shade):
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Open the cover."""
         position = self._position or 100
-        tasks = [
+        await asyncio.gather(
             self._level_cluster_handler.move_to_level_with_on_off(
                 position * 255 / 100, 1
             ),
             self._on_off_cluster_handler.on(),
-        ]
-        results = await asyncio.gather(*tasks, return_exceptions=True)
-        if any(isinstance(result, Exception) for result in results):
-            self.debug("couldn't open cover")
-            return
+        )
 
         self._is_open = True
         self._position = position
diff --git a/homeassistant/components/zha/device_tracker.py b/homeassistant/components/zha/device_tracker.py
index d473eadeebe..885cd788f70 100644
--- a/homeassistant/components/zha/device_tracker.py
+++ b/homeassistant/components/zha/device_tracker.py
@@ -118,10 +118,12 @@ class ZHADeviceScannerEntity(ScannerEntity, ZhaEntity):
         # We opt ZHA device tracker back into overriding this method because
         # it doesn't track IP-based devices.
         # Call Super because ScannerEntity overrode it.
-        return super(ZhaEntity, self).device_info
+        # mypy doesn't know about fget: https://github.com/python/mypy/issues/6185
+        return ZhaEntity.device_info.fget(self)  # type: ignore[attr-defined]
 
     @property
     def unique_id(self) -> str:
         """Return unique ID."""
         # Call Super because ScannerEntity overrode it.
-        return super(ZhaEntity, self).unique_id
+        # mypy doesn't know about fget: https://github.com/python/mypy/issues/6185
+        return ZhaEntity.unique_id.fget(self)  # type: ignore[attr-defined]
diff --git a/homeassistant/components/zha/light.py b/homeassistant/components/zha/light.py
index 705176ceda4..9e71691aaa5 100644
--- a/homeassistant/components/zha/light.py
+++ b/homeassistant/components/zha/light.py
@@ -622,7 +622,7 @@ class BaseLight(LogMixin, light.LightEntity):
             )
             if self._debounced_member_refresh is not None:
                 self.debug("transition complete - refreshing group member states")
-                assert self.platform and self.platform.config_entry
+                assert self.platform.config_entry
                 self.platform.config_entry.async_create_background_task(
                     self.hass,
                     self._debounced_member_refresh.async_call(),
diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json
index 6e93fca6042..293822987c3 100644
--- a/homeassistant/components/zha/manifest.json
+++ b/homeassistant/components/zha/manifest.json
@@ -20,15 +20,15 @@
     "zigpy_znp"
   ],
   "requirements": [
-    "bellows==0.35.5",
+    "bellows==0.35.8",
     "pyserial==3.5",
     "pyserial-asyncio==0.6",
-    "zha-quirks==0.0.100",
+    "zha-quirks==0.0.101",
     "zigpy-deconz==0.21.0",
-    "zigpy==0.55.0",
-    "zigpy-xbee==0.18.0",
+    "zigpy==0.56.1",
+    "zigpy-xbee==0.18.1",
     "zigpy-zigate==0.11.0",
-    "zigpy-znp==0.11.1"
+    "zigpy-znp==0.11.2"
   ],
   "usb": [
     {
diff --git a/homeassistant/components/zha/number.py b/homeassistant/components/zha/number.py
index d24d0c56668..29d6cafe3c8 100644
--- a/homeassistant/components/zha/number.py
+++ b/homeassistant/components/zha/number.py
@@ -15,6 +15,7 @@ from homeassistant.const import EntityCategory, Platform, UnitOfMass, UnitOfTemp
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import UndefinedType
 
 from .core import discovery
 from .core.const import (
@@ -334,7 +335,7 @@ class ZhaNumber(ZhaEntity, NumberEntity):
         return super().native_step
 
     @property
-    def name(self) -> str | None:
+    def name(self) -> str | UndefinedType | None:
         """Return the name of the number entity."""
         description = self._analog_output_cluster_handler.description
         if description is not None and len(description) > 0:
@@ -401,6 +402,7 @@ class ZHANumberConfigurationEntity(ZhaEntity, NumberEntity):
         cluster_handler = cluster_handlers[0]
         if (
             cls._zcl_attribute in cluster_handler.cluster.unsupported_attributes
+            or cls._zcl_attribute not in cluster_handler.cluster.attributes_by_name
             or cluster_handler.cluster.get(cls._zcl_attribute) is None
         ):
             _LOGGER.debug(
diff --git a/homeassistant/components/zha/radio_manager.py b/homeassistant/components/zha/radio_manager.py
index 9fbfa03b928..29214083d27 100644
--- a/homeassistant/components/zha/radio_manager.py
+++ b/homeassistant/components/zha/radio_manager.py
@@ -250,11 +250,12 @@ class ZhaRadioManager:
 
             assert self.current_settings is not None
 
+        metadata = self.current_settings.network_info.metadata["ezsp"]
+
         if (
             self.current_settings.node_info.ieee == self.chosen_backup.node_info.ieee
-            or not self.current_settings.network_info.metadata["ezsp"][
-                "can_write_custom_eui64"
-            ]
+            or metadata["can_rewrite_custom_eui64"]
+            or not metadata["can_burn_userdata_custom_eui64"]
         ):
             # No point in prompting the user if the backup doesn't have a new IEEE
             # address or if there is no way to overwrite the IEEE address a second time
diff --git a/homeassistant/components/zha/select.py b/homeassistant/components/zha/select.py
index 2453f40af44..27b71484f3e 100644
--- a/homeassistant/components/zha/select.py
+++ b/homeassistant/components/zha/select.py
@@ -176,6 +176,7 @@ class ZCLEnumSelectEntity(ZhaEntity, SelectEntity):
         cluster_handler = cluster_handlers[0]
         if (
             cls._select_attr in cluster_handler.cluster.unsupported_attributes
+            or cls._select_attr not in cluster_handler.cluster.attributes_by_name
             or cluster_handler.cluster.get(cls._select_attr) is None
         ):
             _LOGGER.debug(
diff --git a/homeassistant/components/zha/sensor.py b/homeassistant/components/zha/sensor.py
index 918458a32ad..d13dd871865 100644
--- a/homeassistant/components/zha/sensor.py
+++ b/homeassistant/components/zha/sensor.py
@@ -148,7 +148,10 @@ class Sensor(ZhaEntity, SensorEntity):
         Return entity if it is a supported configuration, otherwise return None
         """
         cluster_handler = cluster_handlers[0]
-        if cls.SENSOR_ATTR in cluster_handler.cluster.unsupported_attributes:
+        if (
+            cls.SENSOR_ATTR in cluster_handler.cluster.unsupported_attributes
+            or cls.SENSOR_ATTR not in cluster_handler.cluster.attributes_by_name
+        ):
             return None
 
         return cls(unique_id, zha_device, cluster_handlers, **kwargs)
@@ -275,8 +278,14 @@ class ElectricalMeasurement(Sensor):
             attrs["measurement_type"] = self._cluster_handler.measurement_type
 
         max_attr_name = f"{self.SENSOR_ATTR}_max"
-        if (max_v := self._cluster_handler.cluster.get(max_attr_name)) is not None:
-            attrs[max_attr_name] = str(self.formatter(max_v))
+
+        try:
+            max_v = self._cluster_handler.cluster.get(max_attr_name)
+        except KeyError:
+            pass
+        else:
+            if max_v is not None:
+                attrs[max_attr_name] = str(self.formatter(max_v))
 
         return attrs
 
diff --git a/homeassistant/components/zha/strings.json b/homeassistant/components/zha/strings.json
index 94b3951f014..cbdc9cf8477 100644
--- a/homeassistant/components/zha/strings.json
+++ b/homeassistant/components/zha/strings.json
@@ -23,8 +23,8 @@
         "description": "Enter the serial port settings",
         "data": {
           "path": "Serial device path",
-          "baudrate": "port speed",
-          "flow_control": "data flow control"
+          "baudrate": "Port speed",
+          "flow_control": "Data flow control"
         }
       },
       "verify_radio": {
@@ -237,12 +237,12 @@
       "button_5": "Fifth button",
       "button_6": "Sixth button",
       "face_any": "With any/specified face(s) activated",
-      "face_1": "with face 1 activated",
-      "face_2": "with face 2 activated",
-      "face_3": "with face 3 activated",
-      "face_4": "with face 4 activated",
-      "face_5": "with face 5 activated",
-      "face_6": "with face 6 activated"
+      "face_1": "With face 1 activated",
+      "face_2": "With face 2 activated",
+      "face_3": "With face 3 activated",
+      "face_4": "With face 4 activated",
+      "face_5": "With face 5 activated",
+      "face_6": "With face 6 activated"
     }
   }
 }
diff --git a/homeassistant/components/zha/switch.py b/homeassistant/components/zha/switch.py
index 99db68760a8..451d96a122b 100644
--- a/homeassistant/components/zha/switch.py
+++ b/homeassistant/components/zha/switch.py
@@ -192,6 +192,7 @@ class ZHASwitchConfigurationEntity(ZhaEntity, SwitchEntity):
         cluster_handler = cluster_handlers[0]
         if (
             cls._zcl_attribute in cluster_handler.cluster.unsupported_attributes
+            or cls._zcl_attribute not in cluster_handler.cluster.attributes_by_name
             or cluster_handler.cluster.get(cls._zcl_attribute) is None
         ):
             _LOGGER.debug(
diff --git a/homeassistant/components/zhong_hong/manifest.json b/homeassistant/components/zhong_hong/manifest.json
index 637f468b89b..77f85c9dfcd 100644
--- a/homeassistant/components/zhong_hong/manifest.json
+++ b/homeassistant/components/zhong_hong/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/zhong_hong",
   "iot_class": "local_push",
   "loggers": ["zhong_hong_hvac"],
-  "requirements": ["zhong_hong_hvac==1.0.9"]
+  "requirements": ["zhong-hong-hvac==1.0.9"]
 }
diff --git a/homeassistant/components/ziggo_mediabox_xl/media_player.py b/homeassistant/components/ziggo_mediabox_xl/media_player.py
index a0f789f1708..20a78c80ac5 100644
--- a/homeassistant/components/ziggo_mediabox_xl/media_player.py
+++ b/homeassistant/components/ziggo_mediabox_xl/media_player.py
@@ -62,11 +62,10 @@ def setup_platform(
             # Check if a connection can be established to the device.
             if mediabox.test_connection():
                 connection_successful = True
+            elif manual_config:
+                _LOGGER.info("Can't connect to %s", host)
             else:
-                if manual_config:
-                    _LOGGER.info("Can't connect to %s", host)
-                else:
-                    _LOGGER.error("Can't connect to %s", host)
+                _LOGGER.error("Can't connect to %s", host)
             # When the device is in eco mode it's not connected to the network
             # so it needs to be added anyway if it's configured manually.
             if manual_config or connection_successful:
diff --git a/homeassistant/components/zone/__init__.py b/homeassistant/components/zone/__init__.py
index b7212e91091..35d835c8f16 100644
--- a/homeassistant/components/zone/__init__.py
+++ b/homeassistant/components/zone/__init__.py
@@ -99,6 +99,8 @@ STORAGE_VERSION = 1
 
 ENTITY_ID_SORTER = attrgetter("entity_id")
 
+ZONE_ENTITY_IDS = "zone_entity_ids"
+
 
 @bind_hass
 def async_active_zone(
@@ -111,9 +113,15 @@ def async_active_zone(
     # Sort entity IDs so that we are deterministic if equal distance to 2 zones
     min_dist = None
     closest = None
-
-    for zone in sorted(hass.states.async_all(DOMAIN), key=ENTITY_ID_SORTER):
-        if zone.state == STATE_UNAVAILABLE or zone.attributes.get(ATTR_PASSIVE):
+    # This can be called before async_setup by device tracker
+    zone_entity_ids: list[str] = hass.data.get(ZONE_ENTITY_IDS, [])
+    for entity_id in zone_entity_ids:
+        zone = hass.states.get(entity_id)
+        if (
+            not zone
+            or zone.state == STATE_UNAVAILABLE
+            or zone.attributes.get(ATTR_PASSIVE)
+        ):
             continue
 
         zone_dist = distance(
@@ -141,6 +149,27 @@ def async_active_zone(
     return closest
 
 
+@callback
+def async_setup_track_zone_entity_ids(hass: HomeAssistant) -> None:
+    """Set up track of entity IDs for zones."""
+    zone_entity_ids: list[str] = hass.states.async_entity_ids(DOMAIN)
+    hass.data[ZONE_ENTITY_IDS] = zone_entity_ids
+
+    @callback
+    def _async_add_zone_entity_id(event_: Event) -> None:
+        """Add zone entity ID."""
+        zone_entity_ids.append(event_.data[ATTR_ENTITY_ID])
+        zone_entity_ids.sort()
+
+    @callback
+    def _async_remove_zone_entity_id(event_: Event) -> None:
+        """Remove zone entity ID."""
+        zone_entity_ids.remove(event_.data[ATTR_ENTITY_ID])
+
+    event.async_track_state_added_domain(hass, DOMAIN, _async_add_zone_entity_id)
+    event.async_track_state_removed_domain(hass, DOMAIN, _async_remove_zone_entity_id)
+
+
 def in_zone(zone: State, latitude: float, longitude: float, radius: float = 0) -> bool:
     """Test if given latitude, longitude is in given zone.
 
@@ -184,6 +213,8 @@ class ZoneStorageCollection(collection.DictStorageCollection):
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up configured zones as well as Home Assistant zone if necessary."""
+    async_setup_track_zone_entity_ids(hass)
+
     component = entity_component.EntityComponent[Zone](_LOGGER, DOMAIN, hass)
     id_manager = collection.IDManager()
 
diff --git a/homeassistant/components/zwave_js/__init__.py b/homeassistant/components/zwave_js/__init__.py
index 814e3e86a7a..b847b76ca17 100644
--- a/homeassistant/components/zwave_js/__init__.py
+++ b/homeassistant/components/zwave_js/__init__.py
@@ -33,7 +33,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.issue_registry import (
@@ -115,6 +119,8 @@ DATA_CLIENT_LISTEN_TASK = "client_listen_task"
 DATA_DRIVER_EVENTS = "driver_events"
 DATA_START_CLIENT_TASK = "start_client_task"
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Z-Wave JS component."""
diff --git a/homeassistant/components/zwave_js/config_flow.py b/homeassistant/components/zwave_js/config_flow.py
index e6411e3b879..071b562ceea 100644
--- a/homeassistant/components/zwave_js/config_flow.py
+++ b/homeassistant/components/zwave_js/config_flow.py
@@ -415,7 +415,6 @@ class ConfigFlow(BaseZwaveJSFlow, config_entries.ConfigFlow, domain=DOMAIN):
         vid = discovery_info.vid
         pid = discovery_info.pid
         serial_number = discovery_info.serial_number
-        device = discovery_info.device
         manufacturer = discovery_info.manufacturer
         description = discovery_info.description
         # Zooz uses this vid/pid, but so do 2652 sticks
@@ -430,7 +429,7 @@ class ConfigFlow(BaseZwaveJSFlow, config_entries.ConfigFlow, domain=DOMAIN):
             f"{vid}:{pid}_{serial_number}_{manufacturer}_{description}"
         )
         self._abort_if_unique_id_configured()
-        dev_path = await self.hass.async_add_executor_job(usb.get_serial_by_id, device)
+        dev_path = discovery_info.device
         self.usb_path = dev_path
         self._title = usb.human_readable_device_name(
             dev_path,
diff --git a/homeassistant/components/zwave_js/discovery.py b/homeassistant/components/zwave_js/discovery.py
index c6aa14bceb6..947e5157a8a 100644
--- a/homeassistant/components/zwave_js/discovery.py
+++ b/homeassistant/components/zwave_js/discovery.py
@@ -137,7 +137,7 @@ class ZWaveValueDiscoverySchema(DataclassMustHaveAtLeastOne):
 
     The Z-Wave Value must match these conditions.
     Use the Z-Wave specifications to find out the values for these parameters:
-    https://github.com/zwave-js/node-zwave-js/tree/master/specs
+    https://github.com/zwave-js/specs/tree/master
     """
 
     # [optional] the value's command class must match ANY of these values
@@ -168,7 +168,7 @@ class ZWaveDiscoverySchema:
 
     The Z-Wave node and it's (primary) value for an entity must match these conditions.
     Use the Z-Wave specifications to find out the values for these parameters:
-    https://github.com/zwave-js/node-zwave-js/tree/master/specs
+    https://github.com/zwave-js/specs/tree/master
     """
 
     # specify the hass platform for which this scheme applies (e.g. light, sensor)
@@ -256,11 +256,15 @@ DISCOVERY_SCHEMAS = [
     # Honeywell 39358 In-Wall Fan Control using switch multilevel CC
     ZWaveDiscoverySchema(
         platform=Platform.FAN,
+        hint="has_fan_value_mapping",
         manufacturer_id={0x0039},
         product_id={0x3131},
         product_type={0x4944},
         primary_value=SWITCH_MULTILEVEL_CURRENT_VALUE_SCHEMA,
         required_values=[SWITCH_MULTILEVEL_TARGET_VALUE_SCHEMA],
+        data_template=FixedFanValueMappingDataTemplate(
+            FanValueMapping(speeds=[(1, 32), (33, 66), (67, 99)]),
+        ),
     ),
     # GE/Jasco - In-Wall Smart Fan Control - 12730 / ZW4002
     ZWaveDiscoverySchema(
@@ -274,12 +278,12 @@ DISCOVERY_SCHEMAS = [
             FanValueMapping(speeds=[(1, 33), (34, 67), (68, 99)]),
         ),
     ),
-    # GE/Jasco - In-Wall Smart Fan Control - 14287 / ZW4002
+    # GE/Jasco - In-Wall Smart Fan Control - 14287 / 55258 / ZW4002
     ZWaveDiscoverySchema(
         platform=Platform.FAN,
         hint="has_fan_value_mapping",
         manufacturer_id={0x0063},
-        product_id={0x3131},
+        product_id={0x3131, 0x3337},
         product_type={0x4944},
         primary_value=SWITCH_MULTILEVEL_CURRENT_VALUE_SCHEMA,
         data_template=FixedFanValueMappingDataTemplate(
diff --git a/homeassistant/components/zwave_js/entity.py b/homeassistant/components/zwave_js/entity.py
index ba086b3e8bf..2a0f5ff4e72 100644
--- a/homeassistant/components/zwave_js/entity.py
+++ b/homeassistant/components/zwave_js/entity.py
@@ -14,6 +14,7 @@ from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import DeviceInfo, Entity
+from homeassistant.helpers.typing import UNDEFINED
 
 from .const import DOMAIN, LOGGER
 from .discovery import ZwaveDiscoveryInfo
@@ -161,6 +162,7 @@ class ZWaveBaseEntity(Entity):
             hasattr(self, "entity_description")
             and self.entity_description
             and self.entity_description.name
+            and self.entity_description.name is not UNDEFINED
         ):
             name = self.entity_description.name
 
diff --git a/homeassistant/components/zwave_js/sensor.py b/homeassistant/components/zwave_js/sensor.py
index 316c0b81eeb..468d8f0cbda 100644
--- a/homeassistant/components/zwave_js/sensor.py
+++ b/homeassistant/components/zwave_js/sensor.py
@@ -48,7 +48,7 @@ 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.typing import StateType
+from homeassistant.helpers.typing import UNDEFINED, StateType
 
 from .const import (
     ATTR_METER_TYPE,
@@ -610,7 +610,7 @@ class ZwaveSensor(ZWaveBaseEntity, SensorEntity):
 
         # Entity class attributes
         self._attr_force_update = True
-        if not entity_description.name:
+        if not entity_description.name or entity_description.name is UNDEFINED:
             self._attr_name = self.generate_name(include_value_name=True)
 
     @property
@@ -769,8 +769,9 @@ class ZWaveConfigParameterSensor(ZWaveListSensor):
     @property
     def device_class(self) -> SensorDeviceClass | None:
         """Return sensor device class."""
-        if (device_class := super(ZwaveSensor, self).device_class) is not None:
-            return device_class
+        # mypy doesn't know about fget: https://github.com/python/mypy/issues/6185
+        if (device_class := ZwaveSensor.device_class.fget(self)) is not None:  # type: ignore[attr-defined]
+            return device_class  # type: ignore[no-any-return]
         if (
             self._primary_value.configuration_value_type
             == ConfigurationValueType.ENUMERATED
diff --git a/homeassistant/components/zwave_me/manifest.json b/homeassistant/components/zwave_me/manifest.json
index 5870874efa8..d5c5a69cb96 100644
--- a/homeassistant/components/zwave_me/manifest.json
+++ b/homeassistant/components/zwave_me/manifest.json
@@ -6,7 +6,7 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/zwave_me",
   "iot_class": "local_push",
-  "requirements": ["zwave_me_ws==0.4.3", "url-normalize==1.4.3"],
+  "requirements": ["zwave-me-ws==0.4.3", "url-normalize==1.4.3"],
   "zeroconf": [
     {
       "type": "_hap._tcp.local.",
diff --git a/homeassistant/config.py b/homeassistant/config.py
index 4ef1da1e647..eed296baf0e 100644
--- a/homeassistant/config.py
+++ b/homeassistant/config.py
@@ -96,10 +96,6 @@ default_config:
 frontend:
   themes: !include_dir_merge_named themes
 
-# Text-to-speech
-tts:
-  - platform: google_translate
-
 automation: !include {AUTOMATION_CONFIG_PATH}
 script: !include {SCRIPT_CONFIG_PATH}
 scene: !include {SCENE_CONFIG_PATH}
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index adbb2f80f64..a52b869b830 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -29,6 +29,7 @@ from .exceptions import (
     HomeAssistantError,
 )
 from .helpers import device_registry, entity_registry, storage
+from .helpers.debounce import Debouncer
 from .helpers.dispatcher import async_dispatcher_send
 from .helpers.event import (
     RANDOM_MICROSECOND_MAX,
@@ -88,6 +89,8 @@ PATH_CONFIG = ".config_entries.json"
 
 SAVE_DELAY = 1
 
+DISCOVERY_COOLDOWN = 1
+
 _R = TypeVar("_R")
 
 
@@ -745,9 +748,10 @@ class ConfigEntry:
         """Get any active flows of certain sources for this entry."""
         return (
             flow
-            for flow in hass.config_entries.flow.async_progress_by_handler(self.domain)
+            for flow in hass.config_entries.flow.async_progress_by_handler(
+                self.domain, match_context={"entry_id": self.entry_id}
+            )
             if flow["context"].get("source") in sources
-            and flow["context"].get("entry_id") == self.entry_id
         )
 
     @callback
@@ -807,6 +811,13 @@ class ConfigEntriesFlowManager(data_entry_flow.FlowManager):
         self._hass_config = hass_config
         self._pending_import_flows: dict[str, dict[str, asyncio.Future[None]]] = {}
         self._initialize_tasks: dict[str, list[asyncio.Task]] = {}
+        self._discovery_debouncer = Debouncer(
+            hass,
+            _LOGGER,
+            cooldown=DISCOVERY_COOLDOWN,
+            immediate=True,
+            function=self._async_discovery,
+        )
 
     async def async_wait_import_flow_initialized(self, handler: str) -> None:
         """Wait till all import flows in progress are initialized."""
@@ -882,6 +893,7 @@ class ConfigEntriesFlowManager(data_entry_flow.FlowManager):
         for task_list in self._initialize_tasks.values():
             for task in task_list:
                 task.cancel()
+        await self._discovery_debouncer.async_shutdown()
 
     async def async_finish_flow(
         self, flow: data_entry_flow.FlowHandler, result: data_entry_flow.FlowResult
@@ -978,16 +990,7 @@ class ConfigEntriesFlowManager(data_entry_flow.FlowManager):
 
         # Create notification.
         if source in DISCOVERY_SOURCES:
-            self.hass.bus.async_fire(EVENT_FLOW_DISCOVERED)
-            persistent_notification.async_create(
-                self.hass,
-                title="New devices discovered",
-                message=(
-                    "We have discovered new devices on your network. "
-                    "[Check it out](/config/integrations)."
-                ),
-                notification_id=DISCOVERY_NOTIFICATION_ID,
-            )
+            await self._discovery_debouncer.async_call()
         elif source == SOURCE_REAUTH:
             persistent_notification.async_create(
                 self.hass,
@@ -999,6 +1002,20 @@ class ConfigEntriesFlowManager(data_entry_flow.FlowManager):
                 notification_id=RECONFIGURE_NOTIFICATION_ID,
             )
 
+    @callback
+    def _async_discovery(self) -> None:
+        """Handle discovery."""
+        self.hass.bus.async_fire(EVENT_FLOW_DISCOVERED)
+        persistent_notification.async_create(
+            self.hass,
+            title="New devices discovered",
+            message=(
+                "We have discovered new devices on your network. "
+                "[Check it out](/config/integrations)."
+            ),
+            notification_id=DISCOVERY_NOTIFICATION_ID,
+        )
+
 
 class ConfigEntries:
     """Manage the configuration entries.
@@ -1086,16 +1103,9 @@ class ConfigEntries:
         # If the configuration entry is removed during reauth, it should
         # abort any reauth flow that is active for the removed entry.
         for progress_flow in self.hass.config_entries.flow.async_progress_by_handler(
-            entry.domain
+            entry.domain, match_context={"entry_id": entry_id, "source": SOURCE_REAUTH}
         ):
-            context = progress_flow.get("context")
-            if (
-                context
-                and context["source"] == SOURCE_REAUTH
-                and "entry_id" in context
-                and context["entry_id"] == entry_id
-                and "flow_id" in progress_flow
-            ):
+            if "flow_id" in progress_flow:
                 self.hass.config_entries.flow.async_abort(progress_flow["flow_id"])
 
         # After we have fully removed an "ignore" config entry we can try and rediscover
@@ -1577,17 +1587,20 @@ class ConfigFlow(data_entry_flow.FlowHandler):
             return None
 
         if raise_on_progress:
-            for progress in self._async_in_progress(include_uninitialized=True):
-                if progress["context"].get("unique_id") == unique_id:
-                    raise data_entry_flow.AbortFlow("already_in_progress")
+            if self._async_in_progress(
+                include_uninitialized=True, match_context={"unique_id": unique_id}
+            ):
+                raise data_entry_flow.AbortFlow("already_in_progress")
 
         self.context["unique_id"] = unique_id
 
         # Abort discoveries done using the default discovery unique id
         if unique_id != DEFAULT_DISCOVERY_UNIQUE_ID:
-            for progress in self._async_in_progress(include_uninitialized=True):
-                if progress["context"].get("unique_id") == DEFAULT_DISCOVERY_UNIQUE_ID:
-                    self.hass.config_entries.flow.async_abort(progress["flow_id"])
+            for progress in self._async_in_progress(
+                include_uninitialized=True,
+                match_context={"unique_id": DEFAULT_DISCOVERY_UNIQUE_ID},
+            ):
+                self.hass.config_entries.flow.async_abort(progress["flow_id"])
 
         for entry in self._async_current_entries(include_ignore=True):
             if entry.unique_id == unique_id:
@@ -1633,13 +1646,17 @@ class ConfigFlow(data_entry_flow.FlowHandler):
 
     @callback
     def _async_in_progress(
-        self, include_uninitialized: bool = False
+        self,
+        include_uninitialized: bool = False,
+        match_context: dict[str, Any] | None = None,
     ) -> list[data_entry_flow.FlowResult]:
         """Return other in progress flows for current domain."""
         return [
             flw
             for flw in self.hass.config_entries.flow.async_progress_by_handler(
-                self.handler, include_uninitialized=include_uninitialized
+                self.handler,
+                include_uninitialized=include_uninitialized,
+                match_context=match_context,
             )
             if flw["flow_id"] != self.flow_id
         ]
@@ -1713,11 +1730,10 @@ class ConfigFlow(data_entry_flow.FlowHandler):
         """Abort the config flow."""
         # Remove reauth notification if no reauth flows are in progress
         if self.source == SOURCE_REAUTH and not any(
-            ent["context"]["source"] == SOURCE_REAUTH
+            ent["flow_id"] != self.flow_id
             for ent in self.hass.config_entries.flow.async_progress_by_handler(
-                self.handler
+                self.handler, match_context={"source": SOURCE_REAUTH}
             )
-            if ent["flow_id"] != self.flow_id
         ):
             persistent_notification.async_dismiss(
                 self.hass, RECONFIGURE_NOTIFICATION_ID
diff --git a/homeassistant/const.py b/homeassistant/const.py
index 71edc76d9dc..7b85163fba7 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -7,8 +7,8 @@ from .backports.enum import StrEnum
 
 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2023
-MINOR_VERSION: Final = 6
-PATCH_VERSION: Final = "3"
+MINOR_VERSION: Final = 7
+PATCH_VERSION: Final = "0"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 10, 0)
@@ -37,6 +37,7 @@ class Platform(StrEnum):
     FAN = "fan"
     GEO_LOCATION = "geo_location"
     HUMIDIFIER = "humidifier"
+    IMAGE = "image"
     IMAGE_PROCESSING = "image_processing"
     LIGHT = "light"
     LOCK = "lock"
@@ -220,8 +221,9 @@ CONF_RECIPIENT: Final = "recipient"
 CONF_REGION: Final = "region"
 CONF_REPEAT: Final = "repeat"
 CONF_RESOURCE: Final = "resource"
-CONF_RESOURCES: Final = "resources"
 CONF_RESOURCE_TEMPLATE: Final = "resource_template"
+CONF_RESOURCES: Final = "resources"
+CONF_RESPONSE_VARIABLE: Final = "response_variable"
 CONF_RGB: Final = "rgb"
 CONF_ROOM: Final = "room"
 CONF_SCAN_INTERVAL: Final = "scan_interval"
diff --git a/homeassistant/core.py b/homeassistant/core.py
index 1966045f569..47b52d9ff76 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -82,14 +82,16 @@ from .exceptions import (
 )
 from .helpers.aiohttp_compat import restore_original_aiohttp_cancel_behavior
 from .helpers.json import json_dumps
-from .util import dt as dt_util, location, ulid as ulid_util
+from .util import dt as dt_util, location
 from .util.async_ import (
     cancelling,
     run_callback_threadsafe,
     shutdown_run_callback_threadsafe,
 )
+from .util.json import JsonObjectType
 from .util.read_only_dict import ReadOnlyDict
 from .util.timeout import TimeoutManager
+from .util.ulid import ulid, ulid_at_time
 from .util.unit_system import (
     _CONF_UNIT_SYSTEM_IMPERIAL,
     _CONF_UNIT_SYSTEM_US_CUSTOMARY,
@@ -130,8 +132,7 @@ DOMAIN = "homeassistant"
 # How long to wait to log tasks that are blocking
 BLOCK_LOG_TIMEOUT = 60
 
-# How long we wait for the result of a service call
-SERVICE_CALL_LIMIT = 10  # seconds
+ServiceResponse = JsonObjectType | None
 
 
 class ConfigSource(StrEnum):
@@ -874,7 +875,7 @@ class Context:
         id: str | None = None,  # pylint: disable=redefined-builtin
     ) -> None:
         """Init the context."""
-        self.id = id or ulid_util.ulid()
+        self.id = id or ulid()
         self.user_id = user_id
         self.parent_id = parent_id
         self.origin_event: Event | None = None
@@ -926,10 +927,14 @@ class Event:
         self.data = data or {}
         self.origin = origin
         self.time_fired = time_fired or dt_util.utcnow()
-        self.context: Context = context or Context(
-            id=ulid_util.ulid_at_time(dt_util.utc_to_timestamp(self.time_fired))
-        )
+        if not context:
+            context = Context(
+                id=ulid_at_time(dt_util.utc_to_timestamp(self.time_fired))
+            )
+        self.context = context
         self._as_dict: ReadOnlyDict[str, Any] | None = None
+        if not context.origin_event:
+            context.origin_event = self
 
     def as_dict(self) -> ReadOnlyDict[str, Any]:
         """Create a dict representation of this Event.
@@ -973,6 +978,8 @@ class EventBus:
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize a new event bus."""
         self._listeners: dict[str, list[_FilterableJob]] = {}
+        self._match_all_listeners: list[_FilterableJob] = []
+        self._listeners[MATCH_ALL] = self._match_all_listeners
         self._hass = hass
 
     @callback
@@ -1019,20 +1026,19 @@ class EventBus:
             )
 
         listeners = self._listeners.get(event_type, [])
+        match_all_listeners = self._match_all_listeners
 
-        # EVENT_HOMEASSISTANT_CLOSE should go only to this listeners
-        match_all_listeners = self._listeners.get(MATCH_ALL)
-        if match_all_listeners is not None and event_type != EVENT_HOMEASSISTANT_CLOSE:
+        if not listeners and not match_all_listeners:
+            return
+
+        # EVENT_HOMEASSISTANT_CLOSE should not be sent to MATCH_ALL listeners
+        if event_type != EVENT_HOMEASSISTANT_CLOSE:
             listeners = match_all_listeners + listeners
 
         event = Event(event_type, event_data, origin, time_fired, context)
-        if not event.context.origin_event:
-            event.context.origin_event = event
 
-        _LOGGER.debug("Bus:Handling %s", event)
-
-        if not listeners:
-            return
+        if _LOGGER.isEnabledFor(logging.DEBUG):
+            _LOGGER.debug("Bus:Handling %s", event)
 
         for job, event_filter, run_immediately in listeners:
             if event_filter is not None:
@@ -1195,7 +1201,7 @@ class EventBus:
             self._listeners[event_type].remove(filterable_job)
 
             # delete event_type list if empty
-            if not self._listeners[event_type]:
+            if not self._listeners[event_type] and event_type != MATCH_ALL:
                 self._listeners.pop(event_type)
         except (KeyError, ValueError):
             # KeyError is key event_type listener did not exist
@@ -1630,7 +1636,7 @@ class StateMachine:
             # https://github.com/python/cpython/blob/c90a862cdcf55dc1753c6466e5fa4a467a13ae24/Modules/_datetimemodule.c#L6323
             timestamp = time.time()
             now = dt_util.utc_from_timestamp(timestamp)
-            context = Context(id=ulid_util.ulid_at_time(timestamp))
+            context = Context(id=ulid_at_time(timestamp))
         else:
             now = dt_util.utcnow()
 
@@ -1655,28 +1661,43 @@ class StateMachine:
         )
 
 
+class SupportsResponse(StrEnum):
+    """Service call response configuration."""
+
+    NONE = "none"
+    """The service does not support responses (the default)."""
+
+    OPTIONAL = "optional"
+    """The service optionally returns response data when asked by the caller."""
+
+    ONLY = "only"
+    """The service is read-only and the caller must always ask for response data."""
+
+
 class Service:
     """Representation of a callable service."""
 
-    __slots__ = ["job", "schema", "domain", "service"]
+    __slots__ = ["job", "schema", "domain", "service", "supports_response"]
 
     def __init__(
         self,
-        func: Callable[[ServiceCall], Coroutine[Any, Any, None] | None],
+        func: Callable[[ServiceCall], Coroutine[Any, Any, ServiceResponse] | None],
         schema: vol.Schema | None,
         domain: str,
         service: str,
         context: Context | None = None,
+        supports_response: SupportsResponse = SupportsResponse.NONE,
     ) -> None:
         """Initialize a service."""
         self.job = HassJob(func, f"service {domain}.{service}")
         self.schema = schema
+        self.supports_response = supports_response
 
 
 class ServiceCall:
     """Representation of a call to a service."""
 
-    __slots__ = ["domain", "service", "data", "context"]
+    __slots__ = ["domain", "service", "data", "context", "return_response"]
 
     def __init__(
         self,
@@ -1684,12 +1705,14 @@ class ServiceCall:
         service: str,
         data: dict[str, Any] | None = None,
         context: Context | None = None,
+        return_response: bool = False,
     ) -> None:
         """Initialize a service call."""
         self.domain = domain.lower()
         self.service = service.lower()
         self.data = ReadOnlyDict(data or {})
         self.context = context or Context()
+        self.return_response = return_response
 
     def __repr__(self) -> str:
         """Return the representation of the service."""
@@ -1730,11 +1753,25 @@ class ServiceRegistry:
         """
         return service.lower() in self._services.get(domain.lower(), [])
 
+    def supports_response(self, domain: str, service: str) -> SupportsResponse:
+        """Return whether or not the service supports response data.
+
+        This exists so that callers can return more helpful error messages given
+        the context. Will return NONE if the service does not exist as there is
+        other error handling when calling the service if it does not exist.
+        """
+        if not (handler := self._services[domain][service]):
+            return SupportsResponse.NONE
+        return handler.supports_response
+
     def register(
         self,
         domain: str,
         service: str,
-        service_func: Callable[[ServiceCall], Coroutine[Any, Any, None] | None],
+        service_func: Callable[
+            [ServiceCall],
+            Coroutine[Any, Any, ServiceResponse] | None,
+        ],
         schema: vol.Schema | None = None,
     ) -> None:
         """Register a service.
@@ -1750,8 +1787,11 @@ class ServiceRegistry:
         self,
         domain: str,
         service: str,
-        service_func: Callable[[ServiceCall], Coroutine[Any, Any, None] | None],
+        service_func: Callable[
+            [ServiceCall], Coroutine[Any, Any, ServiceResponse] | None
+        ],
         schema: vol.Schema | None = None,
+        supports_response: SupportsResponse = SupportsResponse.NONE,
     ) -> None:
         """Register a service.
 
@@ -1761,7 +1801,9 @@ class ServiceRegistry:
         """
         domain = domain.lower()
         service = service.lower()
-        service_obj = Service(service_func, schema, domain, service)
+        service_obj = Service(
+            service_func, schema, domain, service, supports_response=supports_response
+        )
 
         if domain in self._services:
             self._services[domain][service] = service_obj
@@ -1807,16 +1849,22 @@ class ServiceRegistry:
         service_data: dict[str, Any] | None = None,
         blocking: bool = False,
         context: Context | None = None,
-        limit: float | None = SERVICE_CALL_LIMIT,
         target: dict[str, Any] | None = None,
-    ) -> bool | None:
+        return_response: bool = False,
+    ) -> ServiceResponse:
         """Call a service.
 
         See description of async_call for details.
         """
         return asyncio.run_coroutine_threadsafe(
             self.async_call(
-                domain, service, service_data, blocking, context, limit, target
+                domain,
+                service,
+                service_data,
+                blocking,
+                context,
+                target,
+                return_response,
             ),
             self._hass.loop,
         ).result()
@@ -1828,16 +1876,16 @@ class ServiceRegistry:
         service_data: dict[str, Any] | None = None,
         blocking: bool = False,
         context: Context | None = None,
-        limit: float | None = SERVICE_CALL_LIMIT,
         target: dict[str, Any] | None = None,
-    ) -> bool | None:
+        return_response: bool = False,
+    ) -> ServiceResponse:
         """Call a service.
 
         Specify blocking=True to wait until service is executed.
-        Waits a maximum of limit, which may be None for no timeout.
 
-        If blocking = True, will return boolean if service executed
-        successfully within limit.
+        If return_response=True, indicates that the caller can consume return values
+        from the service, if any. Return values are a dict that can be returned by the
+        standard JSON serialization process. Return values can only be used with blocking=True.
 
         This method will fire an event to indicate the service has been called.
 
@@ -1856,6 +1904,20 @@ class ServiceRegistry:
         except KeyError:
             raise ServiceNotFound(domain, service) from None
 
+        if return_response:
+            if not blocking:
+                raise ValueError(
+                    "Invalid argument return_response=True when blocking=False"
+                )
+            if handler.supports_response == SupportsResponse.NONE:
+                raise ValueError(
+                    "Invalid argument return_response=True when handler does not support responses"
+                )
+        elif handler.supports_response == SupportsResponse.ONLY:
+            raise ValueError(
+                "Service call requires responses but caller did not ask for responses"
+            )
+
         if target:
             service_data.update(target)
 
@@ -1873,7 +1935,9 @@ class ServiceRegistry:
         else:
             processed_data = service_data
 
-        service_call = ServiceCall(domain, service, processed_data, context)
+        service_call = ServiceCall(
+            domain, service, processed_data, context, return_response
+        )
 
         self._hass.bus.async_fire(
             EVENT_CALL_SERVICE,
@@ -1890,35 +1954,18 @@ class ServiceRegistry:
             self._run_service_in_background(coro, service_call)
             return None
 
-        task = self._hass.async_create_task(coro)
-        try:
-            await asyncio.wait({task}, timeout=limit)
-        except asyncio.CancelledError:
-            # Task calling us was cancelled, so cancel service call task, and wait for
-            # it to be cancelled, within reason, before leaving.
-            _LOGGER.debug("Service call was cancelled: %s", service_call)
-            task.cancel()
-            await asyncio.wait({task}, timeout=SERVICE_CALL_LIMIT)
-            raise
-
-        if task.cancelled():
-            # Service call task was cancelled some other way, such as during shutdown.
-            _LOGGER.debug("Service was cancelled: %s", service_call)
-            raise asyncio.CancelledError
-        if task.done():
-            # Propagate any exceptions that might have happened during service call.
-            task.result()
-            # Service call completed successfully!
-            return True
-        # Service call task did not complete before timeout expired.
-        # Let it keep running in background.
-        self._run_service_in_background(task, service_call)
-        _LOGGER.debug("Service did not complete before timeout: %s", service_call)
-        return False
+        response_data = await coro
+        if not return_response:
+            return None
+        if not isinstance(response_data, dict):
+            raise HomeAssistantError(
+                f"Service response data expected a dictionary, was {type(response_data)}"
+            )
+        return response_data
 
     def _run_service_in_background(
         self,
-        coro_or_task: Coroutine[Any, Any, None] | asyncio.Task[None],
+        coro_or_task: Coroutine[Any, Any, Any] | asyncio.Task[Any],
         service_call: ServiceCall,
     ) -> None:
         """Run service call in background, catching and logging any exceptions."""
@@ -1944,18 +1991,21 @@ class ServiceRegistry:
 
     async def _execute_service(
         self, handler: Service, service_call: ServiceCall
-    ) -> None:
+    ) -> ServiceResponse:
         """Execute a service."""
         if handler.job.job_type == HassJobType.Coroutinefunction:
-            await cast(Callable[[ServiceCall], Awaitable[None]], handler.job.target)(
+            return await cast(
+                Callable[[ServiceCall], Awaitable[ServiceResponse]],
+                handler.job.target,
+            )(service_call)
+        if handler.job.job_type == HassJobType.Callback:
+            return cast(Callable[[ServiceCall], ServiceResponse], handler.job.target)(
                 service_call
             )
-        elif handler.job.job_type == HassJobType.Callback:
-            cast(Callable[[ServiceCall], None], handler.job.target)(service_call)
-        else:
-            await self._hass.async_add_executor_job(
-                cast(Callable[[ServiceCall], None], handler.job.target), service_call
-            )
+        return await self._hass.async_add_executor_job(
+            cast(Callable[[ServiceCall], ServiceResponse], handler.job.target),
+            service_call,
+        )
 
 
 class Config:
diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py
index e213814f52c..6f125ce359a 100644
--- a/homeassistant/data_entry_flow.py
+++ b/homeassistant/data_entry_flow.py
@@ -164,16 +164,19 @@ class FlowManager(abc.ABC):
 
     @callback
     def async_has_matching_flow(
-        self, handler: str, context: dict[str, Any], data: Any
+        self, handler: str, match_context: dict[str, Any], data: Any
     ) -> bool:
         """Check if an existing matching flow is in progress.
 
         A flow with the same handler, context, and data.
+
+        If match_context is passed, only return flows with a context that is a
+        superset of match_context.
         """
         return any(
             flow
-            for flow in self._async_progress_by_handler(handler)
-            if flow.context["source"] == context["source"] and flow.init_data == data
+            for flow in self._async_progress_by_handler(handler, match_context)
+            if flow.init_data == data
         )
 
     @callback
@@ -192,11 +195,19 @@ class FlowManager(abc.ABC):
 
     @callback
     def async_progress_by_handler(
-        self, handler: str, include_uninitialized: bool = False
+        self,
+        handler: str,
+        include_uninitialized: bool = False,
+        match_context: dict[str, Any] | None = None,
     ) -> list[FlowResult]:
-        """Return the flows in progress by handler as a partial FlowResult."""
+        """Return the flows in progress by handler as a partial FlowResult.
+
+        If match_context is specified, only return flows with a context that
+        is a superset of match_context.
+        """
         return _async_flow_handler_to_flow_result(
-            self._async_progress_by_handler(handler), include_uninitialized
+            self._async_progress_by_handler(handler, match_context),
+            include_uninitialized,
         )
 
     @callback
@@ -217,11 +228,26 @@ class FlowManager(abc.ABC):
         )
 
     @callback
-    def _async_progress_by_handler(self, handler: str) -> list[FlowHandler]:
-        """Return the flows in progress by handler."""
+    def _async_progress_by_handler(
+        self, handler: str, match_context: dict[str, Any] | None
+    ) -> list[FlowHandler]:
+        """Return the flows in progress by handler.
+
+        If match_context is specified, only return flows with a context that
+        is a superset of match_context.
+        """
+        match_context_items = match_context.items() if match_context else None
         return [
-            self._progress[flow_id]
+            progress
             for flow_id in self._handler_progress_index.get(handler, {})
+            if (progress := self._progress[flow_id])
+            and (
+                not match_context_items
+                or (
+                    (context := progress.context)
+                    and match_context_items <= context.items()
+                )
+            )
         ]
 
     async def async_init(
diff --git a/homeassistant/generated/config_flows.py b/homeassistant/generated/config_flows.py
index ca81e7befaf..3145c5cdc49 100644
--- a/homeassistant/generated/config_flows.py
+++ b/homeassistant/generated/config_flows.py
@@ -95,12 +95,14 @@ FLOWS = {
         "dialogflow",
         "directv",
         "discord",
+        "discovergy",
         "dlink",
         "dlna_dmr",
         "dlna_dms",
         "dnsip",
         "doorbird",
         "dormakaba_dkey",
+        "dremel_3d_printer",
         "dsmr",
         "dsmr_reader",
         "dunehd",
@@ -171,6 +173,7 @@ FLOWS = {
         "google_generative_ai_conversation",
         "google_mail",
         "google_sheets",
+        "google_translate",
         "google_travel_time",
         "govee_ble",
         "gpslogger",
@@ -251,6 +254,7 @@ FLOWS = {
         "locative",
         "logi_circle",
         "lookin",
+        "loqed",
         "luftdaten",
         "lutron_caseta",
         "lyric",
@@ -284,6 +288,7 @@ FLOWS = {
         "mutesync",
         "myq",
         "mysensors",
+        "mystrom",
         "nam",
         "nanoleaf",
         "neato",
@@ -316,6 +321,7 @@ FLOWS = {
         "openai_conversation",
         "openexchangerates",
         "opengarage",
+        "openhome",
         "opentherm_gw",
         "openuv",
         "openweathermap",
@@ -350,6 +356,7 @@ FLOWS = {
         "pvpc_hourly_pricing",
         "qbittorrent",
         "qingping",
+        "qnap",
         "qnap_qsw",
         "rachio",
         "radarr",
@@ -362,6 +369,7 @@ FLOWS = {
         "rdw",
         "recollect_waste",
         "renault",
+        "renson",
         "reolink",
         "rfxtrx",
         "rhasspy",
@@ -385,7 +393,6 @@ FLOWS = {
         "screenlogic",
         "season",
         "sense",
-        "senseme",
         "sensibo",
         "sensirion_ble",
         "sensorpro",
diff --git a/homeassistant/generated/dhcp.py b/homeassistant/generated/dhcp.py
index ce5536e62a4..6c8910cd7f9 100644
--- a/homeassistant/generated/dhcp.py
+++ b/homeassistant/generated/dhcp.py
@@ -501,14 +501,6 @@ DHCP: list[dict[str, str | bool]] = [
         "hostname": "sense-*",
         "macaddress": "A4D578*",
     },
-    {
-        "domain": "senseme",
-        "registered_devices": True,
-    },
-    {
-        "domain": "senseme",
-        "macaddress": "20F85E*",
-    },
     {
         "domain": "sensibo",
         "hostname": "sensibo*",
diff --git a/homeassistant/generated/integrations.json b/homeassistant/generated/integrations.json
index 6f13633e306..26833d62368 100644
--- a/homeassistant/generated/integrations.json
+++ b/homeassistant/generated/integrations.json
@@ -1091,6 +1091,12 @@
       "config_flow": true,
       "iot_class": "cloud_push"
     },
+    "discovergy": {
+      "name": "Discovergy",
+      "integration_type": "hub",
+      "config_flow": true,
+      "iot_class": "cloud_polling"
+    },
     "dlib_face_detect": {
       "name": "Dlib Face Detect",
       "integration_type": "hub",
@@ -1172,6 +1178,12 @@
       "integration_type": "hub",
       "config_flow": false
     },
+    "dremel_3d_printer": {
+      "name": "Dremel 3D Printer",
+      "integration_type": "device",
+      "config_flow": true,
+      "iot_class": "local_polling"
+    },
     "dsmr": {
       "name": "DSMR Slimme Meter",
       "integration_type": "hub",
@@ -2072,7 +2084,7 @@
         },
         "google_translate": {
           "integration_type": "hub",
-          "config_flow": false,
+          "config_flow": true,
           "iot_class": "cloud_push",
           "name": "Google Translate text-to-speech"
         },
@@ -3073,6 +3085,12 @@
       "config_flow": true,
       "iot_class": "local_push"
     },
+    "loqed": {
+      "name": "LOQED Touch Smart Lock",
+      "integration_type": "hub",
+      "config_flow": true,
+      "iot_class": "local_push"
+    },
     "luftdaten": {
       "name": "Sensor.Community",
       "integration_type": "device",
@@ -3544,7 +3562,7 @@
     "mystrom": {
       "name": "myStrom",
       "integration_type": "hub",
-      "config_flow": false,
+      "config_flow": true,
       "iot_class": "local_polling"
     },
     "mythicbeastsdns": {
@@ -3942,7 +3960,7 @@
     "openhome": {
       "name": "Linn / OpenHome",
       "integration_type": "hub",
-      "config_flow": false,
+      "config_flow": true,
       "iot_class": "local_polling"
     },
     "opensensemap": {
@@ -4374,8 +4392,8 @@
       "name": "QNAP",
       "integrations": {
         "qnap": {
-          "integration_type": "hub",
-          "config_flow": false,
+          "integration_type": "device",
+          "config_flow": true,
           "iot_class": "local_polling",
           "name": "QNAP"
         },
@@ -4545,6 +4563,12 @@
       "config_flow": true,
       "iot_class": "cloud_polling"
     },
+    "renson": {
+      "name": "Renson",
+      "integration_type": "hub",
+      "config_flow": true,
+      "iot_class": "local_polling"
+    },
     "reolink": {
       "name": "Reolink IP NVR/camera",
       "integration_type": "hub",
@@ -4811,12 +4835,6 @@
       "config_flow": true,
       "iot_class": "cloud_polling"
     },
-    "senseme": {
-      "name": "SenseME",
-      "integration_type": "hub",
-      "config_flow": true,
-      "iot_class": "local_push"
-    },
     "sensibo": {
       "name": "Sensibo",
       "integration_type": "hub",
diff --git a/homeassistant/generated/languages.py b/homeassistant/generated/languages.py
index b4aebb0f1a4..feedd373fd9 100644
--- a/homeassistant/generated/languages.py
+++ b/homeassistant/generated/languages.py
@@ -3,6 +3,8 @@
 To update, run python3 -m script.languages [frontend_tag]
 """
 
+DEFAULT_LANGUAGE = "en"
+
 LANGUAGES = {
     "af",
     "ar",
@@ -66,3 +68,46 @@ LANGUAGES = {
     "zh-Hans",
     "zh-Hant",
 }
+
+NATIVE_ENTITY_IDS = {
+    "af",
+    "bs",
+    "ca",
+    "cs",
+    "cy",
+    "da",
+    "de",
+    "en",
+    "en-GB",
+    "eo",
+    "es",
+    "es-419",
+    "et",
+    "eu",
+    "fi",
+    "fr",
+    "fy",
+    "gl",
+    "gsw",
+    "hr",
+    "hu",
+    "id",
+    "is",
+    "it",
+    "ka",
+    "lb",
+    "lt",
+    "lv",
+    "nb",
+    "nl",
+    "nn",
+    "pl",
+    "pt",
+    "pt-BR",
+    "ro",
+    "sk",
+    "sl",
+    "sr-Latn",
+    "sv",
+    "tr",
+}
diff --git a/homeassistant/generated/ssdp.py b/homeassistant/generated/ssdp.py
index 3a2097a1d30..8e7319917f0 100644
--- a/homeassistant/generated/ssdp.py
+++ b/homeassistant/generated/ssdp.py
@@ -224,6 +224,20 @@ SSDP = {
             "manufacturer": "The OctoPrint Project",
         },
     ],
+    "openhome": [
+        {
+            "st": "urn:av-openhome-org:service:Product:1",
+        },
+        {
+            "st": "urn:av-openhome-org:service:Product:2",
+        },
+        {
+            "st": "urn:av-openhome-org:service:Product:3",
+        },
+        {
+            "st": "urn:av-openhome-org:service:Product:4",
+        },
+    ],
     "roku": [
         {
             "deviceType": "urn:roku-com:device:player:1-0",
diff --git a/homeassistant/generated/zeroconf.py b/homeassistant/generated/zeroconf.py
index 93ccb404ae4..6b5676c4a25 100644
--- a/homeassistant/generated/zeroconf.py
+++ b/homeassistant/generated/zeroconf.py
@@ -448,6 +448,10 @@ ZEROCONF = {
             "domain": "bosch_shc",
             "name": "bosch shc*",
         },
+        {
+            "domain": "loqed",
+            "name": "loqed*",
+        },
         {
             "domain": "nam",
             "name": "nam-*",
diff --git a/homeassistant/helpers/collection.py b/homeassistant/helpers/collection.py
index a0c47a04903..80b40cf4fa0 100644
--- a/homeassistant/helpers/collection.py
+++ b/homeassistant/helpers/collection.py
@@ -8,8 +8,9 @@ from dataclasses import dataclass
 from itertools import groupby
 import logging
 from operator import attrgetter
-from typing import Any, Generic, TypedDict, TypeVar
+from typing import Any, Generic, TypedDict
 
+from typing_extensions import TypeVar
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
@@ -35,6 +36,7 @@ CHANGE_REMOVED = "removed"
 _ItemT = TypeVar("_ItemT")
 _StoreT = TypeVar("_StoreT", bound="SerializedStorageCollection")
 _StorageCollectionT = TypeVar("_StorageCollectionT", bound="StorageCollection")
+_EntityT = TypeVar("_EntityT", bound=Entity, default=Entity)
 
 
 @dataclass(slots=True)
@@ -421,7 +423,7 @@ def sync_entity_lifecycle(
     hass: HomeAssistant,
     domain: str,
     platform: str,
-    entity_component: EntityComponent,
+    entity_component: EntityComponent[_EntityT],
     collection: StorageCollection | YamlCollection,
     entity_class: type[CollectionEntity],
 ) -> None:
diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index 6551b7e4709..cea8a866f5c 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -59,6 +59,7 @@ from homeassistant.const import (
     CONF_PARALLEL,
     CONF_PLATFORM,
     CONF_REPEAT,
+    CONF_RESPONSE_VARIABLE,
     CONF_SCAN_INTERVAL,
     CONF_SCENE,
     CONF_SEQUENCE,
@@ -86,6 +87,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import (
+    DOMAIN as HOMEASSISTANT_DOMAIN,
     HomeAssistant,
     async_get_hass,
     split_entity_id,
@@ -722,7 +724,7 @@ def socket_timeout(value: Any | None) -> object:
             return float_value
         raise vol.Invalid("Invalid socket timeout value. float > 0.0 required.")
     except Exception as err:
-        raise vol.Invalid(f"Invalid socket timeout: {err}")
+        raise vol.Invalid(f"Invalid socket timeout: {err}") from err
 
 
 # pylint: disable=no-value-for-parameter
@@ -759,7 +761,7 @@ def uuid4_hex(value: Any) -> str:
     try:
         result = UUID(value, version=4)
     except (ValueError, AttributeError, TypeError) as error:
-        raise vol.Invalid("Invalid Version4 UUID", error_message=str(error))
+        raise vol.Invalid("Invalid Version4 UUID", error_message=str(error)) from error
 
     if result.hex != value.lower():
         # UUID() will create a uuid4 if input is invalid
@@ -1074,6 +1076,78 @@ def empty_config_schema(domain: str) -> Callable[[dict], dict]:
     return validator
 
 
+def _no_yaml_config_schema(
+    domain: str,
+    issue_base: str,
+    translation_key: str,
+    translation_placeholders: dict[str, str],
+) -> Callable[[dict], dict]:
+    """Return a config schema which logs if attempted to setup from YAML."""
+
+    module = inspect.getmodule(inspect.stack(context=0)[2].frame)
+    if module is not None:
+        module_name = module.__name__
+    else:
+        # If Python is unable to access the sources files, the call stack frame
+        # will be missing information, so let's guard.
+        # https://github.com/home-assistant/core/issues/24982
+        module_name = __name__
+    logger_func = logging.getLogger(module_name).error
+
+    def raise_issue() -> None:
+        # pylint: disable-next=import-outside-toplevel
+        from .issue_registry import IssueSeverity, async_create_issue
+
+        with contextlib.suppress(LookupError):
+            hass = async_get_hass()
+            async_create_issue(
+                hass,
+                HOMEASSISTANT_DOMAIN,
+                f"{issue_base}_{domain}",
+                is_fixable=False,
+                issue_domain=domain,
+                severity=IssueSeverity.ERROR,
+                translation_key=translation_key,
+                translation_placeholders={"domain": domain} | translation_placeholders,
+            )
+
+    def validator(config: dict) -> dict:
+        if domain in config:
+            logger_func(
+                (
+                    "The %s integration does not support YAML setup, please remove it "
+                    "from your configuration file"
+                ),
+                domain,
+            )
+            raise_issue()
+        return config
+
+    return validator
+
+
+def config_entry_only_config_schema(domain: str) -> Callable[[dict], dict]:
+    """Return a config schema which logs if attempted to setup from YAML."""
+
+    return _no_yaml_config_schema(
+        domain,
+        "config_entry_only",
+        "config_entry_only",
+        {"add_integration": f"/config/integrations/dashboard/add?domain={domain}"},
+    )
+
+
+def platform_only_config_schema(domain: str) -> Callable[[dict], dict]:
+    """Return a config schema which logs if attempted to setup from YAML."""
+
+    return _no_yaml_config_schema(
+        domain,
+        "platform_only",
+        "platform_only",
+        {},
+    )
+
+
 PLATFORM_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_PLATFORM): string,
@@ -1152,7 +1226,7 @@ def script_action(value: Any) -> dict:
     try:
         action = determine_script_action(value)
     except ValueError as err:
-        raise vol.Invalid(str(err))
+        raise vol.Invalid(str(err)) from err
 
     return ACTION_TYPE_SCHEMAS[action](value)
 
@@ -1192,6 +1266,7 @@ SERVICE_SCHEMA = vol.All(
             ),
             vol.Optional(CONF_ENTITY_ID): comp_entity_ids,
             vol.Optional(CONF_TARGET): vol.Any(TARGET_SERVICE_FIELDS, dynamic_template),
+            vol.Optional(CONF_RESPONSE_VARIABLE): str,
             # The frontend stores data here. Don't use in core.
             vol.Remove("metadata"): dict,
         }
@@ -1452,6 +1527,7 @@ CONDITION_SCHEMA: vol.Schema = vol.Schema(
     )
 )
 
+CONDITIONS_SCHEMA = vol.All(ensure_list, [CONDITION_SCHEMA])
 
 dynamic_template_condition_action = vol.All(
     # Wrap a shorthand template condition action in a template condition
@@ -1614,7 +1690,12 @@ _SCRIPT_STOP_SCHEMA = vol.Schema(
     {
         **SCRIPT_ACTION_BASE_SCHEMA,
         vol.Required(CONF_STOP): vol.Any(None, string),
-        vol.Optional(CONF_ERROR, default=False): boolean,
+        vol.Exclusive(CONF_ERROR, "error_or_response"): boolean,
+        vol.Exclusive(
+            CONF_RESPONSE_VARIABLE,
+            "error_or_response",
+            msg="not allowed to add a response to an error stop action",
+        ): str,
     }
 )
 
diff --git a/homeassistant/helpers/debounce.py b/homeassistant/helpers/debounce.py
index 2df8965de34..4e5d152135a 100644
--- a/homeassistant/helpers/debounce.py
+++ b/homeassistant/helpers/debounce.py
@@ -90,11 +90,11 @@ class Debouncer(Generic[_R_co]):
             if self._timer_task:
                 return
 
-            task = self.hass.async_run_hass_job(self._job)
-            if task:
-                await task
-
-            self._schedule_timer()
+            try:
+                if task := self.hass.async_run_hass_job(self._job):
+                    await task
+            finally:
+                self._schedule_timer()
 
     async def _handle_timer_finish(self) -> None:
         """Handle a finished timer."""
@@ -112,14 +112,13 @@ class Debouncer(Generic[_R_co]):
                 return
 
             try:
-                task = self.hass.async_run_hass_job(self._job)
-                if task:
+                if task := self.hass.async_run_hass_job(self._job):
                     await task
             except Exception:  # pylint: disable=broad-except
                 self.logger.exception("Unexpected exception from %s", self.function)
-
-            # Schedule a new timer to prevent new runs during cooldown
-            self._schedule_timer()
+            finally:
+                # Schedule a new timer to prevent new runs during cooldown
+                self._schedule_timer()
 
     async def async_shutdown(self) -> None:
         """Cancel any scheduled call, and prevent new runs."""
diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py
index 29e64639722..7df01fc8fd2 100644
--- a/homeassistant/helpers/device_registry.py
+++ b/homeassistant/helpers/device_registry.py
@@ -292,6 +292,7 @@ class DeviceRegistry:
 
     devices: DeviceRegistryItems[DeviceEntry]
     deleted_devices: DeviceRegistryItems[DeletedDeviceEntry]
+    _device_data: dict[str, DeviceEntry]
 
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the device registry."""
@@ -306,8 +307,12 @@ class DeviceRegistry:
 
     @callback
     def async_get(self, device_id: str) -> DeviceEntry | None:
-        """Get device."""
-        return self.devices.get(device_id)
+        """Get device.
+
+        We retrieve the DeviceEntry from the underlying dict to avoid
+        the overhead of the UserDict __getitem__.
+        """
+        return self._device_data.get(device_id)
 
     @callback
     def async_get_device(
@@ -641,6 +646,7 @@ class DeviceRegistry:
 
         self.devices = devices
         self.deleted_devices = deleted_devices
+        self._device_data = devices.data
 
     @callback
     def async_schedule_save(self) -> None:
diff --git a/homeassistant/helpers/entity.py b/homeassistant/helpers/entity.py
index ef526f956cd..3d22e2538a3 100644
--- a/homeassistant/helpers/entity.py
+++ b/homeassistant/helpers/entity.py
@@ -12,10 +12,11 @@ import logging
 import math
 import sys
 from timeit import default_timer as timer
-from typing import TYPE_CHECKING, Any, Final, Literal, TypedDict, final
+from typing import TYPE_CHECKING, Any, Final, Literal, TypedDict, TypeVar, final
 
 import voluptuous as vol
 
+from homeassistant.backports.functools import cached_property
 from homeassistant.config import DATA_CUSTOMIZE
 from homeassistant.const import (
     ATTR_ASSUMED_STATE,
@@ -44,11 +45,14 @@ from .event import (
     async_track_device_registry_updated_event,
     async_track_entity_registry_updated_event,
 )
-from .typing import StateType
+from .typing import UNDEFINED, StateType, UndefinedType
 
 if TYPE_CHECKING:
     from .entity_platform import EntityPlatform
 
+
+_T = TypeVar("_T")
+
 _LOGGER = logging.getLogger(__name__)
 SLOW_UPDATE_WARNING = 10
 DATA_ENTITY_SOURCE = "entity_info"
@@ -222,7 +226,7 @@ class EntityDescription:
     force_update: bool = False
     icon: str | None = None
     has_entity_name: bool = False
-    name: str | None = None
+    name: str | UndefinedType | None = UNDEFINED
     translation_key: str | None = None
     unit_of_measurement: str | None = None
 
@@ -235,13 +239,15 @@ class Entity(ABC):
     # this class. These may be used to customize the behavior of the entity.
     entity_id: str = None  # type: ignore[assignment]
 
-    # Owning hass instance. Will be set by EntityPlatform
+    # Owning hass instance. Set by EntityPlatform by calling add_to_platform_start
     # While not purely typed, it makes typehinting more useful for us
     # and removes the need for constant None checks or asserts.
     hass: HomeAssistant = None  # type: ignore[assignment]
 
-    # Owning platform instance. Will be set by EntityPlatform
-    platform: EntityPlatform | None = None
+    # Owning platform instance. Set by EntityPlatform by calling add_to_platform_start
+    # While not purely typed, it makes typehinting more useful for us
+    # and removes the need for constant None checks or asserts.
+    platform: EntityPlatform = None  # type: ignore[assignment]
 
     # Entity description instance for this Entity
     entity_description: EntityDescription
@@ -256,6 +262,12 @@ class Entity(ABC):
     # it should be using async_write_ha_state.
     _async_update_ha_state_reported = False
 
+    # If we reported this entity is implicitly using device name
+    _implicit_device_name_reported = False
+
+    # If we reported this entity was added without its platform set
+    _no_platform_reported = False
+
     # Protect for multiple updates
     _update_staged = False
 
@@ -314,6 +326,52 @@ class Entity(ABC):
         """Return a unique ID."""
         return self._attr_unique_id
 
+    def _report_implicit_device_name(self) -> None:
+        """Report entities which use implicit device name."""
+        if self._implicit_device_name_reported:
+            return
+        report_issue = self._suggest_report_issue()
+        _LOGGER.warning(
+            (
+                "Entity %s (%s) is implicitly using device name by not setting its "
+                "name. Instead, the name should be set to None, please %s"
+            ),
+            self.entity_id,
+            type(self),
+            report_issue,
+        )
+        self._implicit_device_name_reported = True
+
+    @property
+    def use_device_name(self) -> bool:
+        """Return if this entity does not have its own name.
+
+        Should be True if the entity represents the single main feature of a device.
+        """
+        if hasattr(self, "_attr_name"):
+            return not self._attr_name
+
+        if name_translation_key := self._name_translation_key:
+            if name_translation_key in self.platform.platform_translations:
+                return False
+
+        if hasattr(self, "entity_description"):
+            if not (name := self.entity_description.name):
+                return True
+            if name is UNDEFINED and not self._default_to_device_class_name():
+                # Backwards compatibility with leaving EntityDescription.name unassigned
+                # for device name.
+                # Deprecated in HA Core 2023.6, remove in HA Core 2023.9
+                self._report_implicit_device_name()
+                return True
+            return False
+        if self.name is UNDEFINED and not self._default_to_device_class_name():
+            # Backwards compatibility with not overriding name property for device name.
+            # Deprecated in HA Core 2023.6, remove in HA Core 2023.9
+            self._report_implicit_device_name()
+            return True
+        return not self.name
+
     @property
     def has_entity_name(self) -> bool:
         """Return if the name of the entity is describing only the entity itself."""
@@ -323,23 +381,101 @@ class Entity(ABC):
             return self.entity_description.has_entity_name
         return False
 
-    @property
-    def name(self) -> str | None:
+    def _device_class_name_helper(
+        self,
+        component_translations: dict[str, Any],
+    ) -> str | None:
+        """Return a translated name of the entity based on its device class."""
+        if not self.has_entity_name:
+            return None
+        device_class_key = self.device_class or "_"
+        platform = self.platform
+        name_translation_key = (
+            f"component.{platform.domain}.entity_component.{device_class_key}.name"
+        )
+        return component_translations.get(name_translation_key)
+
+    @cached_property
+    def _object_id_device_class_name(self) -> str | None:
+        """Return a translated name of the entity based on its device class."""
+        return self._device_class_name_helper(
+            self.platform.object_id_component_translations
+        )
+
+    @cached_property
+    def _device_class_name(self) -> str | None:
+        """Return a translated name of the entity based on its device class."""
+        return self._device_class_name_helper(self.platform.component_translations)
+
+    def _default_to_device_class_name(self) -> bool:
+        """Return True if an unnamed entity should be named by its device class."""
+        return False
+
+    @cached_property
+    def _name_translation_key(self) -> str | None:
+        """Return translation key for entity name."""
+        if self.translation_key is None:
+            return None
+        platform = self.platform
+        return (
+            f"component.{platform.platform_name}.entity.{platform.domain}"
+            f".{self.translation_key}.name"
+        )
+
+    def _name_internal(
+        self,
+        device_class_name: str | None,
+        platform_translations: dict[str, Any],
+    ) -> str | UndefinedType | None:
         """Return the name of the entity."""
         if hasattr(self, "_attr_name"):
             return self._attr_name
-        if self.translation_key is not None and self.has_entity_name:
-            assert self.platform
-            name_translation_key = (
-                f"component.{self.platform.platform_name}.entity.{self.platform.domain}"
-                f".{self.translation_key}.name"
-            )
-            if name_translation_key in self.platform.entity_translations:
-                name: str = self.platform.entity_translations[name_translation_key]
-                return name
+        if (
+            self.has_entity_name
+            and (name_translation_key := self._name_translation_key)
+            and (name := platform_translations.get(name_translation_key))
+        ):
+            if TYPE_CHECKING:
+                assert isinstance(name, str)
+            return name
         if hasattr(self, "entity_description"):
-            return self.entity_description.name
-        return None
+            description_name = self.entity_description.name
+            if description_name is UNDEFINED and self._default_to_device_class_name():
+                return device_class_name
+            return description_name
+
+        # The entity has no name set by _attr_name, translation_key or entity_description
+        # Check if the entity should be named by its device class
+        if self._default_to_device_class_name():
+            return device_class_name
+        return UNDEFINED
+
+    @property
+    def suggested_object_id(self) -> str | None:
+        """Return input for object id."""
+        # The check for self.platform guards against integrations not using an
+        # EntityComponent and can be removed in HA Core 2024.1
+        # mypy doesn't know about fget: https://github.com/python/mypy/issues/6185
+        if self.__class__.name.fget is Entity.name.fget and self.platform:  # type: ignore[attr-defined]
+            name = self._name_internal(
+                self._object_id_device_class_name,
+                self.platform.object_id_platform_translations,
+            )
+        else:
+            name = self.name
+        return None if name is UNDEFINED else name
+
+    @property
+    def name(self) -> str | UndefinedType | None:
+        """Return the name of the entity."""
+        # The check for self.platform guards against integrations not using an
+        # EntityComponent and can be removed in HA Core 2024.1
+        if not self.platform:
+            return self._name_internal(None, {})
+        return self._name_internal(
+            self._device_class_name,
+            self.platform.platform_translations,
+        )
 
     @property
     def state(self) -> StateType:
@@ -582,6 +718,22 @@ class Entity(ABC):
         if self.hass is None:
             raise RuntimeError(f"Attribute hass is None for {self}")
 
+        # The check for self.platform guards against integrations not using an
+        # EntityComponent and can be removed in HA Core 2024.1
+        if self.platform is None and not self._no_platform_reported:  # type: ignore[unreachable]
+            report_issue = self._suggest_report_issue()  # type: ignore[unreachable]
+            _LOGGER.warning(
+                (
+                    "Entity %s (%s) does not have a platform, this may be caused by "
+                    "adding it manually instead of with an EntityComponent helper"
+                    ", please %s"
+                ),
+                self.entity_id,
+                type(self),
+                report_issue,
+            )
+            self._no_platform_reported = True
+
         if self.entity_id is None:
             raise NoEntitySpecifiedError(
                 f"No entity id specified for entity {self.name}"
@@ -607,16 +759,20 @@ class Entity(ABC):
         If has_entity_name is False, this returns self.name
         If has_entity_name is True, this returns device.name + self.name
         """
+        name = self.name
+        if name is UNDEFINED:
+            name = None
+
         if not self.has_entity_name or not self.registry_entry:
-            return self.name
+            return name
 
         device_registry = dr.async_get(self.hass)
         if not (device_id := self.registry_entry.device_id) or not (
             device_entry := device_registry.async_get(device_id)
         ):
-            return self.name
+            return name
 
-        if not (name := self.name):
+        if self.use_device_name:
             return device_entry.name_by_user or device_entry.name
         return f"{device_entry.name_by_user or device_entry.name} {name}"
 
@@ -634,7 +790,6 @@ class Entity(ABC):
         if entry and entry.disabled_by:
             if not self._disabled_reported:
                 self._disabled_reported = True
-                assert self.platform is not None
                 _LOGGER.warning(
                     (
                         "Entity %s is incorrectly being triggered for updates while it"
@@ -840,7 +995,7 @@ class Entity(ABC):
         self._call_on_remove_callbacks()
 
         self.hass = None  # type: ignore[assignment]
-        self.platform = None
+        self.platform = None  # type: ignore[assignment]
         self.parallel_updates = None
 
     async def add_to_platform_finish(self) -> None:
@@ -859,6 +1014,8 @@ class Entity(ABC):
         If the entity doesn't have a non disabled entry in the entity registry,
         or if force_remove=True, its state will be removed.
         """
+        # The check for self.platform guards against integrations not using an
+        # EntityComponent and can be removed in HA Core 2024.1
         if self.platform and self._platform_state != EntityPlatformState.ADDED:
             raise HomeAssistantError(
                 f"Entity {self.entity_id} async_remove called twice"
@@ -906,19 +1063,18 @@ class Entity(ABC):
 
         Not to be extended by integrations.
         """
-        if self.platform:
-            info = {
-                "domain": self.platform.platform_name,
-                "custom_component": "custom_components" in type(self).__module__,
-            }
+        info = {
+            "domain": self.platform.platform_name,
+            "custom_component": "custom_components" in type(self).__module__,
+        }
 
-            if self.platform.config_entry:
-                info["source"] = SOURCE_CONFIG_ENTRY
-                info["config_entry"] = self.platform.config_entry.entry_id
-            else:
-                info["source"] = SOURCE_PLATFORM_CONFIG
+        if self.platform.config_entry:
+            info["source"] = SOURCE_CONFIG_ENTRY
+            info["config_entry"] = self.platform.config_entry.entry_id
+        else:
+            info["source"] = SOURCE_PLATFORM_CONFIG
 
-            self.hass.data[DATA_ENTITY_SOURCE][self.entity_id] = info
+        self.hass.data[DATA_ENTITY_SOURCE][self.entity_id] = info
 
         if self.registry_entry is not None:
             # This is an assert as it should never happen, but helps in tests
@@ -938,6 +1094,8 @@ class Entity(ABC):
 
         Not to be extended by integrations.
         """
+        # The check for self.platform guards against integrations not using an
+        # EntityComponent and can be removed in HA Core 2024.1
         if self.platform:
             self.hass.data[DATA_ENTITY_SOURCE].pop(self.entity_id)
 
@@ -972,7 +1130,6 @@ class Entity(ABC):
 
         await self.async_remove(force_remove=True)
 
-        assert self.platform is not None
         self.entity_id = self.registry_entry.entity_id
         await self.platform.async_add_entities([self])
 
@@ -984,6 +1141,19 @@ class Entity(ABC):
         self._unsub_device_updates()
         self._unsub_device_updates = None
 
+    @callback
+    def _async_device_registry_updated(self, event: Event) -> None:
+        """Handle device registry update."""
+        data = event.data
+
+        if data["action"] != "update":
+            return
+
+        if "name" not in data["changes"] and "name_by_user" not in data["changes"]:
+            return
+
+        self.async_write_ha_state()
+
     @callback
     def _async_subscribe_device_updates(self) -> None:
         """Subscribe to device registry updates."""
@@ -997,23 +1167,10 @@ class Entity(ABC):
         if not self.has_entity_name:
             return
 
-        @callback
-        def async_device_registry_updated(event: Event) -> None:
-            """Handle device registry update."""
-            data = event.data
-
-            if data["action"] != "update":
-                return
-
-            if "name" not in data["changes"] and "name_by_user" not in data["changes"]:
-                return
-
-            self.async_write_ha_state()
-
         self._unsub_device_updates = async_track_device_registry_updated_event(
             self.hass,
             device_id,
-            async_device_registry_updated,
+            self._async_device_registry_updated,
         )
         if (
             not self._on_remove
@@ -1025,13 +1182,13 @@ class Entity(ABC):
         """Return the representation."""
         return f"<entity {self.entity_id}={self._stringify_state(self.available)}>"
 
-    async def async_request_call(self, coro: Coroutine[Any, Any, Any]) -> None:
+    async def async_request_call(self, coro: Coroutine[Any, Any, _T]) -> _T:
         """Process request batched."""
         if self.parallel_updates:
             await self.parallel_updates.acquire()
 
         try:
-            await coro
+            return await coro
         finally:
             if self.parallel_updates:
                 self.parallel_updates.release()
@@ -1046,6 +1203,8 @@ class Entity(ABC):
                 "create a bug report at "
                 "https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue"
             )
+            # The check for self.platform guards against integrations not using an
+            # EntityComponent and can be removed in HA Core 2024.1
             if self.platform:
                 report_issue += (
                     f"+label%3A%22integration%3A+{self.platform.platform_name}%22"
diff --git a/homeassistant/helpers/entity_component.py b/homeassistant/helpers/entity_component.py
index dc101a10b05..af1b87ec0fa 100644
--- a/homeassistant/helpers/entity_component.py
+++ b/homeassistant/helpers/entity_component.py
@@ -7,8 +7,9 @@ from datetime import timedelta
 from itertools import chain
 import logging
 from types import ModuleType
-from typing import Any, Generic, TypeVar
+from typing import Any, Generic
 
+from typing_extensions import TypeVar
 import voluptuous as vol
 
 from homeassistant import config as conf_util
@@ -18,7 +19,14 @@ from homeassistant.const import (
     CONF_SCAN_INTERVAL,
     EVENT_HOMEASSISTANT_STOP,
 )
-from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
+from homeassistant.core import (
+    Event,
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+    callback,
+)
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import async_get_integration, bind_hass
 from homeassistant.setup import async_prepare_setup_platform
@@ -30,7 +38,7 @@ from .typing import ConfigType, DiscoveryInfoType
 DEFAULT_SCAN_INTERVAL = timedelta(seconds=15)
 DATA_INSTANCES = "entity_components"
 
-_EntityT = TypeVar("_EntityT", bound=entity.Entity)
+_EntityT = TypeVar("_EntityT", bound=entity.Entity, default=entity.Entity)
 
 
 @bind_hass
@@ -216,18 +224,21 @@ class EntityComponent(Generic[_EntityT]):
         schema: dict[str | vol.Marker, Any] | vol.Schema,
         func: str | Callable[..., Any],
         required_features: list[int] | None = None,
+        supports_response: SupportsResponse = SupportsResponse.NONE,
     ) -> None:
         """Register an entity service."""
         if isinstance(schema, dict):
             schema = cv.make_entity_service_schema(schema)
 
-        async def handle_service(call: ServiceCall) -> None:
+        async def handle_service(call: ServiceCall) -> ServiceResponse:
             """Handle the service."""
-            await service.entity_service_call(
+            return await service.entity_service_call(
                 self.hass, self._platforms.values(), func, call, required_features
             )
 
-        self.hass.services.async_register(self.domain, name, handle_service, schema)
+        self.hass.services.async_register(
+            self.domain, name, handle_service, schema, supports_response
+        )
 
     async def async_setup_platform(
         self,
diff --git a/homeassistant/helpers/entity_platform.py b/homeassistant/helpers/entity_platform.py
index f7793a4329c..675d368873a 100644
--- a/homeassistant/helpers/entity_platform.py
+++ b/homeassistant/helpers/entity_platform.py
@@ -31,6 +31,7 @@ from homeassistant.exceptions import (
     PlatformNotReady,
     RequiredParameterMissing,
 )
+from homeassistant.generated import languages
 from homeassistant.setup import async_start_setup
 from homeassistant.util.async_ import run_callback_threadsafe
 
@@ -45,7 +46,7 @@ from .device_registry import DeviceRegistry
 from .entity_registry import EntityRegistry, RegistryEntryDisabler, RegistryEntryHider
 from .event import async_call_later, async_track_time_interval
 from .issue_registry import IssueSeverity, async_create_issue
-from .typing import ConfigType, DiscoveryInfoType
+from .typing import UNDEFINED, ConfigType, DiscoveryInfoType
 
 if TYPE_CHECKING:
     from .entity import Entity
@@ -126,7 +127,10 @@ class EntityPlatform:
         self.entity_namespace = entity_namespace
         self.config_entry: config_entries.ConfigEntry | None = None
         self.entities: dict[str, Entity] = {}
-        self.entity_translations: dict[str, Any] = {}
+        self.component_translations: dict[str, Any] = {}
+        self.platform_translations: dict[str, Any] = {}
+        self.object_id_component_translations: dict[str, Any] = {}
+        self.object_id_platform_translations: dict[str, Any] = {}
         self._tasks: list[asyncio.Task[None]] = []
         # Stop tracking tasks after setup is completed
         self._setup_complete = False
@@ -293,14 +297,43 @@ class EntityPlatform:
         logger = self.logger
         hass = self.hass
         full_name = f"{self.domain}.{self.platform_name}"
+        object_id_language = (
+            hass.config.language
+            if hass.config.language in languages.NATIVE_ENTITY_IDS
+            else languages.DEFAULT_LANGUAGE
+        )
 
-        try:
-            self.entity_translations = await translation.async_get_translations(
-                hass, hass.config.language, "entity", {self.platform_name}
+        async def get_translations(
+            language: str, category: str, integration: str
+        ) -> dict[str, Any]:
+            """Get entity translations."""
+            try:
+                return await translation.async_get_translations(
+                    hass, language, category, {integration}
+                )
+            except Exception as err:  # pylint: disable=broad-exception-caught
+                _LOGGER.debug(
+                    "Could not load translations for %s",
+                    integration,
+                    exc_info=err,
+                )
+            return {}
+
+        self.component_translations = await get_translations(
+            hass.config.language, "entity_component", self.domain
+        )
+        self.platform_translations = await get_translations(
+            hass.config.language, "entity", self.platform_name
+        )
+        if object_id_language == hass.config.language:
+            self.object_id_component_translations = self.component_translations
+            self.object_id_platform_translations = self.platform_translations
+        else:
+            self.object_id_component_translations = await get_translations(
+                object_id_language, "entity_component", self.domain
             )
-        except Exception as err:  # pylint: disable=broad-exception-caught
-            _LOGGER.debug(
-                "Could not load translations for %s", self.platform_name, exc_info=err
+            self.object_id_platform_translations = await get_translations(
+                object_id_language, "entity", self.platform_name
             )
 
         logger.info("Setting up %s", full_name)
@@ -543,6 +576,10 @@ class EntityPlatform:
         suggested_object_id: str | None = None
         generate_new_entity_id = False
 
+        entity_name = entity.name
+        if entity_name is UNDEFINED:
+            entity_name = None
+
         # Get entity_id from unique ID registration
         if entity.unique_id is not None:
             registered_entity_id = entity_registry.async_get_entity_id(
@@ -636,12 +673,14 @@ class EntityPlatform:
             else:
                 if device and entity.has_entity_name:
                     device_name = device.name_by_user or device.name
-                    if not entity.name:
+                    if entity.use_device_name:
                         suggested_object_id = device_name
                     else:
-                        suggested_object_id = f"{device_name} {entity.name}"
+                        suggested_object_id = (
+                            f"{device_name} {entity.suggested_object_id}"
+                        )
                 if not suggested_object_id:
-                    suggested_object_id = entity.name
+                    suggested_object_id = entity.suggested_object_id
 
             if self.entity_namespace is not None:
                 suggested_object_id = f"{self.entity_namespace} {suggested_object_id}"
@@ -669,7 +708,7 @@ class EntityPlatform:
                 known_object_ids=self.entities.keys(),
                 original_device_class=entity.device_class,
                 original_icon=entity.icon,
-                original_name=entity.name,
+                original_name=entity_name,
                 suggested_object_id=suggested_object_id,
                 supported_features=entity.supported_features,
                 translation_key=entity.translation_key,
@@ -696,7 +735,7 @@ class EntityPlatform:
         # Generate entity ID
         if entity.entity_id is None or generate_new_entity_id:
             suggested_object_id = (
-                suggested_object_id or entity.name or DEVICE_DEFAULT_NAME
+                suggested_object_id or entity.suggested_object_id or DEVICE_DEFAULT_NAME
             )
 
             if self.entity_namespace is not None:
@@ -714,7 +753,7 @@ class EntityPlatform:
 
         if already_exists:
             self.logger.error(
-                f"Entity id already exists - ignoring: {entity.entity_id}"
+                "Entity id already exists - ignoring: %s", entity.entity_id
             )
             entity.add_to_platform_abort()
             return
@@ -723,7 +762,7 @@ class EntityPlatform:
             self.logger.debug(
                 "Not adding entity %s because it's disabled",
                 entry.name
-                or entity.name
+                or entity_name
                 or f'"{self.platform_name} {entity.unique_id}"',
             )
             entity.add_to_platform_abort()
diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py
index b6fc84b9627..cabac2617c2 100644
--- a/homeassistant/helpers/entity_registry.py
+++ b/homeassistant/helpers/entity_registry.py
@@ -11,7 +11,9 @@ from __future__ import annotations
 
 from collections import UserDict
 from collections.abc import Callable, Iterable, Mapping, ValuesView
+from datetime import datetime, timedelta
 import logging
+import time
 from typing import TYPE_CHECKING, Any, TypeVar, cast
 
 import attr
@@ -26,6 +28,7 @@ from homeassistant.const import (
     ATTR_SUPPORTED_FEATURES,
     ATTR_UNIT_OF_MEASUREMENT,
     EVENT_HOMEASSISTANT_START,
+    EVENT_HOMEASSISTANT_STOP,
     MAX_LENGTH_STATE_DOMAIN,
     MAX_LENGTH_STATE_ENTITY_ID,
     STATE_UNAVAILABLE,
@@ -61,9 +64,12 @@ SAVE_DELAY = 10
 _LOGGER = logging.getLogger(__name__)
 
 STORAGE_VERSION_MAJOR = 1
-STORAGE_VERSION_MINOR = 10
+STORAGE_VERSION_MINOR = 11
 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]
@@ -138,7 +144,10 @@ class RegistryEntry:
     entity_category: EntityCategory | None = attr.ib(default=None)
     hidden_by: RegistryEntryHider | None = attr.ib(default=None)
     icon: str | None = attr.ib(default=None)
-    id: str = attr.ib(factory=uuid_util.random_uuid_hex)
+    id: str = attr.ib(
+        default=None,
+        converter=attr.converters.default_if_none(factory=uuid_util.random_uuid_hex),  # type: ignore[misc]
+    )
     has_entity_name: bool = attr.ib(default=False)
     name: str | None = attr.ib(default=None)
     options: ReadOnlyEntityOptionsType = attr.ib(
@@ -297,6 +306,24 @@ class RegistryEntry:
         hass.states.async_set(self.entity_id, STATE_UNAVAILABLE, attrs)
 
 
+@attr.s(slots=True, frozen=True)
+class DeletedRegistryEntry:
+    """Deleted Entity Registry Entry."""
+
+    entity_id: str = attr.ib()
+    unique_id: str = attr.ib()
+    platform: str = attr.ib()
+    config_entry_id: str | None = attr.ib()
+    domain: str = attr.ib(init=False, repr=False)
+    id: str = attr.ib()
+    orphaned_timestamp: float | None = attr.ib()
+
+    @domain.default
+    def _domain_default(self) -> str:
+        """Compute domain value."""
+        return split_entity_id(self.entity_id)[0]
+
+
 class EntityRegistryStore(storage.Store[dict[str, list[dict[str, Any]]]]):
     """Store entity registry data."""
 
@@ -372,6 +399,10 @@ class EntityRegistryStore(storage.Store[dict[str, list[dict[str, Any]]]]):
             for entity in data["entities"]:
                 entity["aliases"] = []
 
+        if old_major_version == 1 and old_minor_version < 11:
+            # Version 1.11 adds deleted_entities
+            data["deleted_entities"] = data.get("deleted_entities", [])
+
         if old_major_version > 1:
             raise NotImplementedError
         return data
@@ -424,7 +455,9 @@ class EntityRegistryItems(UserDict[str, "RegistryEntry"]):
 class EntityRegistry:
     """Class to hold a registry of entities."""
 
+    deleted_entities: dict[tuple[str, str, str], DeletedRegistryEntry]
     entities: EntityRegistryItems
+    _entities_data: dict[str, RegistryEntry]
 
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the registry."""
@@ -469,9 +502,15 @@ class EntityRegistry:
         return entity_id in self.entities
 
     @callback
-    def async_get(self, entity_id: str) -> RegistryEntry | None:
-        """Get EntityEntry for an entity_id."""
-        return self.entities.get(entity_id)
+    def async_get(self, entity_id_or_uuid: str) -> RegistryEntry | None:
+        """Get EntityEntry for an entity_id or entity entry id.
+
+        We retrieve the RegistryEntry from the underlying dict to avoid
+        the overhead of the UserDict __getitem__.
+        """
+        return self._entities_data.get(entity_id_or_uuid) or self.entities.get_entry(
+            entity_id_or_uuid
+        )
 
     @callback
     def async_get_entity_id(
@@ -489,6 +528,9 @@ class EntityRegistry:
         - It's not registered
         - It's not known by the entity component adding the entity
         - It's not in the state machine
+
+        Note that an entity_id which belongs to a deleted entity is considered
+        available.
         """
         if known_object_ids is None:
             known_object_ids = {}
@@ -584,8 +626,16 @@ class EntityRegistry:
                 unit_of_measurement=unit_of_measurement,
             )
 
+        entity_registry_id: str | None = None
+        deleted_entity = self.deleted_entities.pop((domain, platform, unique_id), None)
+        if deleted_entity is not None:
+            # Restore id
+            entity_registry_id = deleted_entity.id
+
         entity_id = self.async_generate_entity_id(
-            domain, suggested_object_id or f"{platform}_{unique_id}", known_object_ids
+            domain,
+            suggested_object_id or f"{platform}_{unique_id}",
+            known_object_ids,
         )
 
         if disabled_by and not isinstance(disabled_by, RegistryEntryDisabler):
@@ -623,6 +673,7 @@ class EntityRegistry:
             entity_id=entity_id,
             hidden_by=hidden_by,
             has_entity_name=none_if_undefined(has_entity_name) or False,
+            id=entity_registry_id,
             options=initial_options,
             original_device_class=none_if_undefined(original_device_class),
             original_icon=none_if_undefined(original_icon),
@@ -646,7 +697,19 @@ class EntityRegistry:
     @callback
     def async_remove(self, entity_id: str) -> None:
         """Remove an entity from registry."""
-        self.entities.pop(entity_id)
+        entity = self.entities.pop(entity_id)
+        config_entry_id = entity.config_entry_id
+        key = (entity.domain, entity.platform, entity.unique_id)
+        # If the entity does not belong to a config entry, mark it as orphaned
+        orphaned_timestamp = None if config_entry_id else time.time()
+        self.deleted_entities[key] = DeletedRegistryEntry(
+            config_entry_id=config_entry_id,
+            entity_id=entity_id,
+            id=entity.id,
+            orphaned_timestamp=orphaned_timestamp,
+            platform=entity.platform,
+            unique_id=entity.unique_id,
+        )
         self.hass.bus.async_fire(
             EVENT_ENTITY_REGISTRY_UPDATED, {"action": "remove", "entity_id": entity_id}
         )
@@ -947,10 +1010,12 @@ class EntityRegistry:
 
     async def async_load(self) -> None:
         """Load the entity registry."""
-        async_setup_entity_restore(self.hass, self)
+        _async_setup_cleanup(self.hass, self)
+        _async_setup_entity_restore(self.hass, self)
 
         data = await self._store.async_load()
         entities = EntityRegistryItems()
+        deleted_entities: dict[tuple[str, str, str], DeletedRegistryEntry] = {}
 
         if data is not None:
             for entity in data["entities"]:
@@ -989,8 +1054,24 @@ class EntityRegistry:
                     unique_id=entity["unique_id"],
                     unit_of_measurement=entity["unit_of_measurement"],
                 )
+            for entity in data["deleted_entities"]:
+                key = (
+                    split_entity_id(entity["entity_id"])[0],
+                    entity["platform"],
+                    entity["unique_id"],
+                )
+                deleted_entities[key] = DeletedRegistryEntry(
+                    config_entry_id=entity["config_entry_id"],
+                    entity_id=entity["entity_id"],
+                    id=entity["id"],
+                    orphaned_timestamp=entity["orphaned_timestamp"],
+                    platform=entity["platform"],
+                    unique_id=entity["unique_id"],
+                )
 
+        self.deleted_entities = deleted_entities
         self.entities = entities
+        self._entities_data = entities.data
 
     @callback
     def async_schedule_save(self) -> None:
@@ -1030,18 +1111,54 @@ class EntityRegistry:
             }
             for entry in self.entities.values()
         ]
+        data["deleted_entities"] = [
+            {
+                "config_entry_id": entry.config_entry_id,
+                "entity_id": entry.entity_id,
+                "id": entry.id,
+                "orphaned_timestamp": entry.orphaned_timestamp,
+                "platform": entry.platform,
+                "unique_id": entry.unique_id,
+            }
+            for entry in self.deleted_entities.values()
+        ]
 
         return data
 
     @callback
-    def async_clear_config_entry(self, config_entry: str) -> None:
+    def async_clear_config_entry(self, config_entry_id: str) -> None:
         """Clear config entry from registry entries."""
+        now_time = time.time()
         for entity_id in [
             entity_id
             for entity_id, entry in self.entities.items()
-            if config_entry == entry.config_entry_id
+            if config_entry_id == entry.config_entry_id
         ]:
             self.async_remove(entity_id)
+        for key, deleted_entity in list(self.deleted_entities.items()):
+            if config_entry_id != deleted_entity.config_entry_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
+            )
+            self.async_schedule_save()
+
+    @callback
+    def async_purge_expired_orphaned_entities(self) -> None:
+        """Purge expired orphaned entities from the registry.
+
+        We need to purge these periodically to avoid the database
+        growing without bound.
+        """
+        now_time = time.time()
+        for key, deleted_entity in list(self.deleted_entities.items()):
+            if (orphaned_timestamp := deleted_entity.orphaned_timestamp) is None:
+                continue
+
+            if orphaned_timestamp + ORPHANED_ENTITY_KEEP_SECONDS < now_time:
+                self.deleted_entities.pop(key)
+                self.async_schedule_save()
 
     @callback
     def async_clear_area_id(self, area_id: str) -> None:
@@ -1128,7 +1245,31 @@ def async_config_entry_disabled_by_changed(
 
 
 @callback
-def async_setup_entity_restore(hass: HomeAssistant, registry: EntityRegistry) -> None:
+def _async_setup_cleanup(hass: HomeAssistant, registry: EntityRegistry) -> None:
+    """Clean up device registry when entities removed."""
+    from . import event  # pylint: disable=import-outside-toplevel
+
+    @callback
+    def cleanup(_: datetime) -> None:
+        """Clean up entity registry."""
+        # Periodic purge of orphaned entities to avoid the registry
+        # growing without bounds when there are lots of deleted entities
+        registry.async_purge_expired_orphaned_entities()
+
+    cancel = event.async_track_time_interval(
+        hass, cleanup, timedelta(seconds=CLEANUP_INTERVAL)
+    )
+
+    @callback
+    def _on_homeassistant_stop(event: Event) -> None:
+        """Cancel cleanup."""
+        cancel()
+
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _on_homeassistant_stop)
+
+
+@callback
+def _async_setup_entity_restore(hass: HomeAssistant, registry: EntityRegistry) -> None:
     """Set up the entity restore mechanism."""
 
     @callback
diff --git a/homeassistant/helpers/entity_values.py b/homeassistant/helpers/entity_values.py
index d489a4b1d37..fe4a4249c54 100644
--- a/homeassistant/helpers/entity_values.py
+++ b/homeassistant/helpers/entity_values.py
@@ -3,14 +3,24 @@ from __future__ import annotations
 
 from collections import OrderedDict
 import fnmatch
+from functools import lru_cache
 import re
 from typing import Any
 
 from homeassistant.core import split_entity_id
 
+_MAX_EXPECTED_ENTITIES = 16384
+
 
 class EntityValues:
-    """Class to store entity id based values."""
+    """Class to store entity id based values.
+
+    This class is expected to only be used infrequently
+    as it caches all entity ids up to _MAX_EXPECTED_ENTITIES.
+
+    The cache includes `self` so it is important to
+    only use this in places where usage of `EntityValues` is immortal.
+    """
 
     def __init__(
         self,
@@ -19,7 +29,6 @@ class EntityValues:
         glob: dict[str, dict[str, str]] | None = None,
     ) -> None:
         """Initialize an EntityConfigDict."""
-        self._cache: dict[str, dict[str, str]] = {}
         self._exact = exact
         self._domain = domain
 
@@ -32,13 +41,11 @@ class EntityValues:
 
         self._glob = compiled
 
+    @lru_cache(maxsize=_MAX_EXPECTED_ENTITIES)
     def get(self, entity_id: str) -> dict[str, str]:
         """Get config for an entity id."""
-        if entity_id in self._cache:
-            return self._cache[entity_id]
-
         domain, _ = split_entity_id(entity_id)
-        result = self._cache[entity_id] = {}
+        result: dict[str, str] = {}
 
         if self._domain is not None and domain in self._domain:
             result.update(self._domain[domain])
diff --git a/homeassistant/helpers/entityfilter.py b/homeassistant/helpers/entityfilter.py
index a9d3ccad138..1a449ec15f0 100644
--- a/homeassistant/helpers/entityfilter.py
+++ b/homeassistant/helpers/entityfilter.py
@@ -185,22 +185,6 @@ def _generate_filter_from_sets_and_pattern_lists(
     have_exclude = bool(exclude_e or exclude_d or exclude_eg)
     have_include = bool(include_e or include_d or include_eg)
 
-    def entity_included(domain: str, entity_id: str) -> bool:
-        """Return true if entity matches inclusion filters."""
-        return (
-            entity_id in include_e
-            or domain in include_d
-            or (bool(include_eg and include_eg.match(entity_id)))
-        )
-
-    def entity_excluded(domain: str, entity_id: str) -> bool:
-        """Return true if entity matches exclusion filters."""
-        return (
-            entity_id in exclude_e
-            or domain in exclude_d
-            or (bool(exclude_eg and exclude_eg.match(entity_id)))
-        )
-
     # Case 1 - No filter
     # - All entities included
     if not have_include and not have_exclude:
@@ -213,12 +197,16 @@ def _generate_filter_from_sets_and_pattern_lists(
     # - Otherwise: exclude
     if have_include and not have_exclude:
 
-        def entity_filter_2(entity_id: str) -> bool:
-            """Return filter function for case 2."""
-            domain = split_entity_id(entity_id)[0]
-            return entity_included(domain, entity_id)
+        def entity_included(entity_id: str) -> bool:
+            """Return true if entity matches inclusion filters."""
+            return (
+                entity_id in include_e
+                or split_entity_id(entity_id)[0] in include_d
+                or (bool(include_eg and include_eg.match(entity_id)))
+            )
 
-        return entity_filter_2
+        # Return filter function for case 2
+        return entity_included
 
     # Case 3 - Only excludes
     # - Entity listed in exclude: exclude
@@ -227,12 +215,15 @@ def _generate_filter_from_sets_and_pattern_lists(
     # - Otherwise: include
     if not have_include and have_exclude:
 
-        def entity_filter_3(entity_id: str) -> bool:
-            """Return filter function for case 3."""
-            domain = split_entity_id(entity_id)[0]
-            return not entity_excluded(domain, entity_id)
+        def entity_not_excluded(entity_id: str) -> bool:
+            """Return true if entity matches exclusion filters."""
+            return not (
+                entity_id in exclude_e
+                or split_entity_id(entity_id)[0] in exclude_d
+                or (exclude_eg and exclude_eg.match(entity_id))
+            )
 
-        return entity_filter_3
+        return entity_not_excluded
 
     # Case 4 - Domain and/or glob includes (may also have excludes)
     # - Entity listed in entities include: include
diff --git a/homeassistant/helpers/event.py b/homeassistant/helpers/event.py
index c7e34ac2eda..b7254c5c347 100644
--- a/homeassistant/helpers/event.py
+++ b/homeassistant/helpers/event.py
@@ -412,6 +412,7 @@ def _async_entity_registry_updated_filter(
 
 
 @bind_hass
+@callback
 def async_track_entity_registry_updated_event(
     hass: HomeAssistant,
     entity_ids: str | Iterable[str],
@@ -463,6 +464,7 @@ def _async_dispatch_device_id_event(
             )
 
 
+@callback
 def async_track_device_registry_updated_event(
     hass: HomeAssistant,
     device_ids: str | Iterable[str],
diff --git a/homeassistant/helpers/instance_id.py b/homeassistant/helpers/instance_id.py
index 8561d10794c..5bb8be5a9fe 100644
--- a/homeassistant/helpers/instance_id.py
+++ b/homeassistant/helpers/instance_id.py
@@ -1,6 +1,7 @@
 """Helper to create a unique instance ID."""
 from __future__ import annotations
 
+import logging
 import uuid
 
 from homeassistant.core import HomeAssistant
@@ -12,17 +13,30 @@ DATA_VERSION = 1
 
 LEGACY_UUID_FILE = ".uuid"
 
+_LOGGER = logging.getLogger(__name__)
+
 
 @singleton.singleton(DATA_KEY)
 async def async_get(hass: HomeAssistant) -> str:
     """Get unique ID for the hass instance."""
     store = storage.Store[dict[str, str]](hass, DATA_VERSION, DATA_KEY, True)
 
-    data: dict[str, str] | None = await storage.async_migrator(
-        hass,
-        hass.config.path(LEGACY_UUID_FILE),
-        store,
-    )
+    data: dict[str, str] | None = None
+    try:
+        data = await storage.async_migrator(
+            hass,
+            hass.config.path(LEGACY_UUID_FILE),
+            store,
+        )
+    except Exception:  # pylint: disable=broad-exception-caught
+        _LOGGER.exception(
+            (
+                "Could not read hass instance ID from '%s' or '%s', a new instance ID "
+                "will be generated"
+            ),
+            DATA_KEY,
+            LEGACY_UUID_FILE,
+        )
 
     if data is not None:
         return data["uuid"]
diff --git a/homeassistant/helpers/intent.py b/homeassistant/helpers/intent.py
index 8b07c2adc9a..f27cea8dd1e 100644
--- a/homeassistant/helpers/intent.py
+++ b/homeassistant/helpers/intent.py
@@ -57,6 +57,16 @@ def async_register(hass: HomeAssistant, handler: IntentHandler) -> None:
     intents[handler.intent_type] = handler
 
 
+@callback
+@bind_hass
+def async_remove(hass: HomeAssistant, intent_type: str) -> None:
+    """Remove an intent from Home Assistant."""
+    if (intents := hass.data.get(DATA_KEY)) is None:
+        return
+
+    intents.pop(intent_type, None)
+
+
 @bind_hass
 async def async_handle(
     hass: HomeAssistant,
@@ -483,15 +493,36 @@ class ServiceIntentHandler(IntentHandler):
     async def async_call_service(self, intent_obj: Intent, state: State) -> None:
         """Call service on entity."""
         hass = intent_obj.hass
-        await hass.services.async_call(
-            self.domain,
-            self.service,
-            {ATTR_ENTITY_ID: state.entity_id},
-            context=intent_obj.context,
-            blocking=True,
-            limit=self.service_timeout,
+        await self._run_then_background(
+            hass.async_create_task(
+                hass.services.async_call(
+                    self.domain,
+                    self.service,
+                    {ATTR_ENTITY_ID: state.entity_id},
+                    context=intent_obj.context,
+                    blocking=True,
+                ),
+                f"intent_call_service_{self.domain}_{self.service}",
+            )
         )
 
+    async def _run_then_background(self, task: asyncio.Task) -> None:
+        """Run task with timeout to (hopefully) catch validation errors.
+
+        After the timeout the task will continue to run in the background.
+        """
+        try:
+            await asyncio.wait({task}, timeout=self.service_timeout)
+        except asyncio.TimeoutError:
+            pass
+        except asyncio.CancelledError:
+            # Task calling us was cancelled, so cancel service call task, and wait for
+            # it to be cancelled, within reason, before leaving.
+            _LOGGER.debug("Service call was cancelled: %s", task.get_name())
+            task.cancel()
+            await asyncio.wait({task}, timeout=5)
+            raise
+
 
 class IntentCategory(Enum):
     """Category of an intent."""
diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py
index 9ba4e7a9d88..0dacb90e318 100644
--- a/homeassistant/helpers/script.py
+++ b/homeassistant/helpers/script.py
@@ -11,7 +11,7 @@ from functools import partial
 import itertools
 import logging
 from types import MappingProxyType
-from typing import Any, TypedDict, cast
+from typing import Any, TypedDict, TypeVar, cast
 
 import async_timeout
 import voluptuous as vol
@@ -46,6 +46,7 @@ from homeassistant.const import (
     CONF_MODE,
     CONF_PARALLEL,
     CONF_REPEAT,
+    CONF_RESPONSE_VARIABLE,
     CONF_SCENE,
     CONF_SEQUENCE,
     CONF_SERVICE,
@@ -64,11 +65,12 @@ from homeassistant.const import (
     SERVICE_TURN_ON,
 )
 from homeassistant.core import (
-    SERVICE_CALL_LIMIT,
     Context,
     Event,
     HassJob,
     HomeAssistant,
+    ServiceResponse,
+    SupportsResponse,
     callback,
 )
 from homeassistant.util import slugify
@@ -100,6 +102,8 @@ from .typing import ConfigType
 
 # mypy: allow-untyped-calls, allow-untyped-defs, no-check-untyped-defs
 
+_T = TypeVar("_T")
+
 SCRIPT_MODE_PARALLEL = "parallel"
 SCRIPT_MODE_QUEUED = "queued"
 SCRIPT_MODE_RESTART = "restart"
@@ -349,6 +353,11 @@ class _ConditionFail(_HaltScript):
 class _StopScript(_HaltScript):
     """Throw if script needs to stop."""
 
+    def __init__(self, message: str, response: Any) -> None:
+        """Initialize a halt exception."""
+        super().__init__(message)
+        self.response = response
+
 
 class _ScriptRun:
     """Manage Script sequence run."""
@@ -393,13 +402,14 @@ class _ScriptRun:
         )
         self._log("Executing step %s%s", self._script.last_action, _timeout)
 
-    async def async_run(self) -> None:
+    async def async_run(self) -> ServiceResponse:
         """Run script."""
         # Push the script to the script execution stack
         if (script_stack := script_stack_cv.get()) is None:
             script_stack = []
             script_stack_cv.set(script_stack)
         script_stack.append(id(self._script))
+        response = None
 
         try:
             self._log("Running %s", self._script.running_description)
@@ -417,11 +427,15 @@ class _ScriptRun:
                 raise
         except _ConditionFail:
             script_execution_set("aborted")
-        except _StopScript:
-            script_execution_set("finished")
+        except _StopScript as err:
+            script_execution_set("finished", err.response)
+            response = err.response
+
             # Let the _StopScript bubble up if this is a sub-script
             if not self._script.top_level:
-                raise
+                # We already consumed the response, do not pass it on
+                err.response = None
+                raise err
         except Exception:
             script_execution_set("error")
             raise
@@ -430,6 +444,8 @@ class _ScriptRun:
             script_stack.pop()
             self._finish()
 
+        return response
+
     async def _async_step(self, log_exceptions):
         continue_on_error = self._action.get(CONF_CONTINUE_ON_ERROR, False)
 
@@ -618,7 +634,7 @@ class _ScriptRun:
                 task.cancel()
             unsub()
 
-    async def _async_run_long_action(self, long_task: asyncio.Task) -> None:
+    async def _async_run_long_action(self, long_task: asyncio.Task[_T]) -> _T | None:
         """Run a long task while monitoring for stop request."""
 
         async def async_cancel_long_task() -> None:
@@ -646,10 +662,10 @@ class _ScriptRun:
             raise asyncio.CancelledError
         if long_task.done():
             # Propagate any exceptions that occurred.
-            long_task.result()
-        else:
-            # Stopped before long task completed, so cancel it.
-            await async_cancel_long_task()
+            return long_task.result()
+        # Stopped before long task completed, so cancel it.
+        await async_cancel_long_task()
+        return None
 
     async def _async_call_service_step(self):
         """Call the service specified in the action."""
@@ -659,33 +675,43 @@ class _ScriptRun:
             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")
         )
-        # If this might start a script then disable the call timeout.
-        # Otherwise use the normal service call limit.
-        if running_script:
-            limit = None
-        else:
-            limit = SERVICE_CALL_LIMIT
-
-        trace_set_result(params=params, running_script=running_script, limit=limit)
-        service_task = self._hass.async_create_task(
-            self._hass.services.async_call(
-                **params,
-                blocking=True,
-                context=self._context,
-                limit=limit,
-            )
+        trace_set_result(params=params, running_script=running_script)
+        response_data = await self._async_run_long_action(
+            self._hass.async_create_task(
+                self._hass.services.async_call(
+                    **params,
+                    blocking=True,
+                    context=self._context,
+                    return_response=return_response,
+                )
+            ),
         )
-        if limit is not None:
-            # There is a call limit, so just wait for it to finish.
-            await service_task
-            return
-
-        await self._async_run_long_action(service_task)
+        if response_variable:
+            self._variables[response_variable] = response_data
 
     async def _async_device_step(self):
         """Perform the device automation specified in the action."""
@@ -997,13 +1023,24 @@ class _ScriptRun:
     async def _async_stop_step(self):
         """Stop script execution."""
         stop = self._action[CONF_STOP]
-        error = self._action[CONF_ERROR]
+        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)
-        raise _StopScript(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("parallel")
     async def _async_parallel_step(self) -> None:
@@ -1442,7 +1479,7 @@ class Script:
         run_variables: _VarsType | None = None,
         context: Context | None = None,
         started_action: Callable[..., Any] | None = None,
-    ) -> None:
+    ) -> ServiceResponse:
         """Run script."""
         if context is None:
             self._log(
@@ -1453,7 +1490,7 @@ class Script:
         # Prevent spawning new script runs when Home Assistant is shutting down
         if DATA_NEW_SCRIPT_RUNS_NOT_ALLOWED in self._hass.data:
             self._log("Home Assistant is shutting down, starting script blocked")
-            return
+            return None
 
         # Prevent spawning new script runs if not allowed by script mode
         if self.is_running:
@@ -1461,7 +1498,7 @@ class Script:
                 if self._max_exceeded != "SILENT":
                     self._log("Already running", level=LOGSEVERITY[self._max_exceeded])
                 script_execution_set("failed_single")
-                return
+                return None
             if self.script_mode != SCRIPT_MODE_RESTART and self.runs == self.max_runs:
                 if self._max_exceeded != "SILENT":
                     self._log(
@@ -1469,7 +1506,7 @@ class Script:
                         level=LOGSEVERITY[self._max_exceeded],
                     )
                 script_execution_set("failed_max_runs")
-                return
+                return None
 
         # If this is a top level Script then make a copy of the variables in case they
         # are read-only, but more importantly, so as not to leak any variables created
@@ -1490,11 +1527,10 @@ class Script:
                 variables = {}
 
             variables["context"] = context
+        elif self._copy_variables_on_run:
+            variables = cast(dict, copy(run_variables))
         else:
-            if self._copy_variables_on_run:
-                variables = cast(dict, copy(run_variables))
-            else:
-                variables = cast(dict, run_variables)
+            variables = cast(dict, 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.
@@ -1506,7 +1542,7 @@ class Script:
         ):
             script_execution_set("disallowed_recursion_detected")
             self._log("Disallowed recursion detected", level=logging.WARNING)
-            return
+            return None
 
         if self.script_mode != SCRIPT_MODE_QUEUED:
             cls = _ScriptRun
@@ -1530,7 +1566,7 @@ class Script:
         self._changed()
 
         try:
-            await asyncio.shield(run.async_run())
+            return await asyncio.shield(run.async_run())
         except asyncio.CancelledError:
             await run.async_stop()
             self._changed()
diff --git a/homeassistant/helpers/selector.py b/homeassistant/helpers/selector.py
index afd38bf7636..84c0f769c7c 100644
--- a/homeassistant/helpers/selector.py
+++ b/homeassistant/helpers/selector.py
@@ -500,6 +500,34 @@ class ConstantSelector(Selector[ConstantSelectorConfig]):
         return self.config["value"]
 
 
+class ConversationAgentSelectorConfig(TypedDict, total=False):
+    """Class to represent a conversation agent selector config."""
+
+    language: str
+
+
+@SELECTORS.register("conversation_agent")
+class COnversationAgentSelector(Selector[ConversationAgentSelectorConfig]):
+    """Selector for a conversation agent."""
+
+    selector_type = "conversation_agent"
+
+    CONFIG_SCHEMA = vol.Schema(
+        {
+            vol.Optional("language"): str,
+        }
+    )
+
+    def __init__(self, config: ConversationAgentSelectorConfig) -> None:
+        """Instantiate a selector."""
+        super().__init__(config)
+
+    def __call__(self, data: Any) -> str:
+        """Validate the passed selection."""
+        agent: str = vol.Schema(str)(data)
+        return agent
+
+
 class DateSelectorConfig(TypedDict):
     """Class to represent a date selector config."""
 
diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py
index a9d7b906e73..fa0e57d501c 100644
--- a/homeassistant/helpers/service.py
+++ b/homeassistant/helpers/service.py
@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Awaitable, Callable, Iterable
+from collections.abc import Awaitable, Callable, Coroutine, Iterable
 import dataclasses
 from enum import Enum
 from functools import cache, partial, wraps
@@ -26,7 +26,14 @@ from homeassistant.const import (
     ENTITY_MATCH_ALL,
     ENTITY_MATCH_NONE,
 )
-from homeassistant.core import Context, HomeAssistant, ServiceCall, callback
+from homeassistant.core import (
+    Context,
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+    callback,
+)
 from homeassistant.exceptions import (
     HomeAssistantError,
     TemplateError,
@@ -629,6 +636,13 @@ async def async_get_all_descriptions(
                 if "target" in yaml_description:
                     description["target"] = yaml_description["target"]
 
+                if (
+                    response := hass.services.supports_response(domain, service)
+                ) != SupportsResponse.NONE:
+                    description["response"] = {
+                        "optional": response == SupportsResponse.OPTIONAL,
+                    }
+
                 descriptions_cache[cache_key] = description
 
             descriptions[domain][service] = description
@@ -672,23 +686,21 @@ def async_set_service_schema(
 async def entity_service_call(  # noqa: C901
     hass: HomeAssistant,
     platforms: Iterable[EntityPlatform],
-    func: str | Callable[..., Any],
+    func: str | Callable[..., Coroutine[Any, Any, ServiceResponse]],
     call: ServiceCall,
     required_features: Iterable[int] | None = None,
-) -> None:
+) -> ServiceResponse | None:
     """Handle an entity service call.
 
     Calls all platforms simultaneously.
     """
+    entity_perms: None | (Callable[[str, str], bool]) = None
     if call.context.user_id:
         user = await hass.auth.async_get_user(call.context.user_id)
         if user is None:
             raise UnknownUser(context=call.context)
-        entity_perms: None | (
-            Callable[[str, str], bool]
-        ) = user.permissions.check_entity
-    else:
-        entity_perms = None
+        if not user.is_admin:
+            entity_perms = user.permissions.check_entity
 
     target_all_entities = call.data.get(ATTR_ENTITY_ID) == ENTITY_MATCH_ALL
 
@@ -714,15 +726,15 @@ async def entity_service_call(  # noqa: C901
 
     if entity_perms is None:
         for platform in platforms:
+            platform_entities = platform.entities
             if target_all_entities:
-                entity_candidates.extend(platform.entities.values())
+                entity_candidates.extend(platform_entities.values())
             else:
                 assert all_referenced is not None
                 entity_candidates.extend(
                     [
-                        entity
-                        for entity in platform.entities.values()
-                        if entity.entity_id in all_referenced
+                        platform_entities[entity_id]
+                        for entity_id in all_referenced.intersection(platform_entities)
                     ]
                 )
 
@@ -742,21 +754,20 @@ async def entity_service_call(  # noqa: C901
         assert all_referenced is not None
 
         for platform in platforms:
-            platform_entities = []
-            for entity in platform.entities.values():
-                if entity.entity_id not in all_referenced:
-                    continue
-
-                if not entity_perms(entity.entity_id, POLICY_CONTROL):
+            platform_entities = platform.entities
+            platform_entity_candidates = []
+            entity_id_matches = all_referenced.intersection(platform_entities)
+            for entity_id in entity_id_matches:
+                if not entity_perms(entity_id, POLICY_CONTROL):
                     raise Unauthorized(
                         context=call.context,
-                        entity_id=entity.entity_id,
+                        entity_id=entity_id,
                         permission=POLICY_CONTROL,
                     )
 
-                platform_entities.append(entity)
+                platform_entity_candidates.append(platform_entities[entity_id])
 
-            entity_candidates.extend(platform_entities)
+            entity_candidates.extend(platform_entity_candidates)
 
     if not target_all_entities:
         assert referenced is not None
@@ -769,7 +780,7 @@ async def entity_service_call(  # noqa: C901
 
         referenced.log_missing(missing)
 
-    entities = []
+    entities: list[Entity] = []
 
     for entity in entity_candidates:
         if not entity.available:
@@ -794,7 +805,16 @@ async def entity_service_call(  # noqa: C901
         entities.append(entity)
 
     if not entities:
-        return
+        if call.return_response:
+            raise HomeAssistantError(
+                "Service call requested response data but did not match any entities"
+            )
+        return None
+
+    if call.return_response and len(entities) != 1:
+        raise HomeAssistantError(
+            "Service call requested response data but matched more than one entity"
+        )
 
     done, pending = await asyncio.wait(
         [
@@ -807,10 +827,12 @@ async def entity_service_call(  # noqa: C901
         ]
     )
     assert not pending
-    for future in done:
-        future.result()  # pop exception if have
 
-    tasks = []
+    response_data: ServiceResponse | None
+    for task in done:
+        response_data = task.result()  # pop exception if have
+
+    tasks: list[asyncio.Task[None]] = []
 
     for entity in entities:
         if not entity.should_poll:
@@ -827,28 +849,32 @@ async def entity_service_call(  # noqa: C901
         for future in done:
             future.result()  # pop exception if have
 
+    return response_data if call.return_response else None
+
 
 async def _handle_entity_call(
     hass: HomeAssistant,
     entity: Entity,
-    func: str | Callable[..., Any],
+    func: str | Callable[..., Coroutine[Any, Any, ServiceResponse]],
     data: dict | ServiceCall,
     context: Context,
-) -> None:
+) -> ServiceResponse:
     """Handle calling service method."""
     entity.async_set_context(context)
 
+    task: asyncio.Future[ServiceResponse] | None
     if isinstance(func, str):
-        result = hass.async_run_job(
+        task = hass.async_run_job(
             partial(getattr(entity, func), **data)  # type: ignore[arg-type]
         )
     else:
-        result = hass.async_run_job(func, entity, data)
+        task = hass.async_run_job(func, entity, data)
 
     # Guard because callback functions do not return a task when passed to
     # async_run_job.
-    if result is not None:
-        await result
+    result: ServiceResponse | None = None
+    if task is not None:
+        result = await task
 
     if asyncio.iscoroutine(result):
         _LOGGER.error(
@@ -859,7 +885,9 @@ async def _handle_entity_call(
             func,
             entity.entity_id,
         )
-        await result
+        result = await result
+
+    return result
 
 
 @bind_hass
diff --git a/homeassistant/helpers/singleton.py b/homeassistant/helpers/singleton.py
index f15806ae5ff..5579106bb55 100644
--- a/homeassistant/helpers/singleton.py
+++ b/homeassistant/helpers/singleton.py
@@ -38,7 +38,7 @@ def singleton(data_key: str) -> Callable[[_FuncType[_T]], _FuncType[_T]]:
         async def async_wrapped(hass: HomeAssistant) -> Any:
             if data_key not in hass.data:
                 evt = hass.data[data_key] = asyncio.Event()
-                result = await func(hass)  # type: ignore[misc]
+                result = await func(hass)
                 hass.data[data_key] = result
                 evt.set()
                 return cast(_T, result)
diff --git a/homeassistant/helpers/storage.py b/homeassistant/helpers/storage.py
index bd9b01cd6a6..128a36e3e14 100644
--- a/homeassistant/helpers/storage.py
+++ b/homeassistant/helpers/storage.py
@@ -34,11 +34,11 @@ _T = TypeVar("_T", bound=Mapping[str, Any] | Sequence[Any])
 async def async_migrator(
     hass: HomeAssistant,
     old_path: str,
-    store: Store,
+    store: Store[_T],
     *,
     old_conf_load_func: Callable | None = None,
     old_conf_migrate_func: Callable | None = None,
-) -> Any:
+) -> _T | None:
     """Migrate old data to a store and then load data.
 
     async def old_conf_migrate_func(old_data)
diff --git a/homeassistant/helpers/template_entity.py b/homeassistant/helpers/template_entity.py
index c4eb8a1343d..42d578555ab 100644
--- a/homeassistant/helpers/template_entity.py
+++ b/homeassistant/helpers/template_entity.py
@@ -65,6 +65,19 @@ TEMPLATE_ENTITY_BASE_SCHEMA = vol.Schema(
     }
 )
 
+
+def make_template_entity_base_schema(default_name: str) -> vol.Schema:
+    """Return a schema with default name."""
+    return vol.Schema(
+        {
+            vol.Optional(CONF_ICON): cv.template,
+            vol.Optional(CONF_NAME, default=default_name): cv.template,
+            vol.Optional(CONF_PICTURE): cv.template,
+            vol.Optional(CONF_UNIQUE_ID): cv.string,
+        }
+    )
+
+
 TEMPLATE_SENSOR_BASE_SCHEMA = vol.Schema(
     {
         vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
@@ -428,7 +441,7 @@ class TemplateEntity(Entity):
         """Run an action script."""
         if run_variables is None:
             run_variables = {}
-        return await script.async_run(
+        await script.async_run(
             run_variables={
                 "this": TemplateStateFromEntityId(self.hass, self.entity_id),
                 **run_variables,
diff --git a/homeassistant/helpers/trace.py b/homeassistant/helpers/trace.py
index 3a5fb83395a..c1d22157a31 100644
--- a/homeassistant/helpers/trace.py
+++ b/homeassistant/helpers/trace.py
@@ -8,6 +8,7 @@ from contextvars import ContextVar
 from functools import wraps
 from typing import Any, cast
 
+from homeassistant.core import ServiceResponse
 import homeassistant.util.dt as dt_util
 
 from .typing import TemplateVarsType
@@ -207,13 +208,15 @@ class StopReason:
     """Mutable container class for script_execution."""
 
     script_execution: str | None = None
+    response: ServiceResponse = None
 
 
-def script_execution_set(reason: str) -> None:
+def script_execution_set(reason: str, response: ServiceResponse = None) -> None:
     """Set stop reason."""
     if (data := script_execution_cv.get()) is None:
         return
     data.script_execution = reason
+    data.response = response
 
 
 def script_execution_get() -> str | None:
diff --git a/homeassistant/helpers/update_coordinator.py b/homeassistant/helpers/update_coordinator.py
index 5706e34dc9c..36dd7d27d4a 100644
--- a/homeassistant/helpers/update_coordinator.py
+++ b/homeassistant/helpers/update_coordinator.py
@@ -30,7 +30,7 @@ from .debounce import Debouncer
 REQUEST_REFRESH_DEFAULT_COOLDOWN = 10
 REQUEST_REFRESH_DEFAULT_IMMEDIATE = True
 
-_T = TypeVar("_T")
+_DataT = TypeVar("_DataT")
 _BaseDataUpdateCoordinatorT = TypeVar(
     "_BaseDataUpdateCoordinatorT", bound="BaseDataUpdateCoordinatorProtocol"
 )
@@ -53,7 +53,7 @@ class BaseDataUpdateCoordinatorProtocol(Protocol):
         """Listen for data updates."""
 
 
-class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_T]):
+class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_DataT]):
     """Class to manage fetching data from single endpoint."""
 
     def __init__(
@@ -63,7 +63,7 @@ class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_T]):
         *,
         name: str,
         update_interval: timedelta | None = None,
-        update_method: Callable[[], Awaitable[_T]] | None = None,
+        update_method: Callable[[], Awaitable[_DataT]] | None = None,
         request_refresh_debouncer: Debouncer[Coroutine[Any, Any, None]] | None = None,
     ) -> None:
         """Initialize global data updater."""
@@ -80,7 +80,7 @@ class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_T]):
         # to make sure the first update was successful.
         # Set type to just T to remove annoying checks that data is not None
         # when it was already checked during setup.
-        self.data: _T = None  # type: ignore[assignment]
+        self.data: _DataT = None  # type: ignore[assignment]
 
         # Pick a random microsecond to stagger the refreshes
         # and avoid a thundering herd.
@@ -235,7 +235,7 @@ class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_T]):
         """
         await self._debounced_refresh.async_call()
 
-    async def _async_update_data(self) -> _T:
+    async def _async_update_data(self) -> _DataT:
         """Fetch the latest data from the source."""
         if self.update_method is None:
             raise NotImplementedError("Update method not implemented")
@@ -383,7 +383,7 @@ class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_T]):
             self.async_update_listeners()
 
     @callback
-    def async_set_updated_data(self, data: _T) -> None:
+    def async_set_updated_data(self, data: _DataT) -> None:
         """Manually update data, notify listeners and reset refresh interval."""
         self._async_unsub_refresh()
         self._debounced_refresh.async_cancel()
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 3c4fc9a6746..1686f91bac3 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -1,12 +1,9 @@
-PyJWT==2.7.0
-PyNaCl==1.5.0
-PyTurboJPEG==1.6.7
 aiodiscover==1.4.16
+aiohttp-cors==0.7.0
 aiohttp==3.8.4
-aiohttp_cors==0.7.0
 astral==2.2
+async-timeout==4.0.2
 async-upnp-client==0.33.2
-async_timeout==4.0.2
 atomicwrites-homeassistant==1.4.1
 attrs==22.2.0
 awesomeversion==22.9.0
@@ -15,44 +12,47 @@ bleak-retry-connector==3.0.2
 bleak==0.20.2
 bluetooth-adapters==0.15.3
 bluetooth-auto-recovery==1.2.0
-bluetooth-data-tools==0.4.0
+bluetooth-data-tools==1.3.0
 certifi>=2021.5.30
 ciso8601==2.3.0
-cryptography==40.0.2
+cryptography==41.0.1
 dbus-fast==1.86.0
 fnv-hash-fast==0.3.1
 ha-av==10.1.0
-hass-nabucasa==0.67.1
+hass-nabucasa==0.69.0
 hassil==1.0.6
 home-assistant-bluetooth==1.10.0
-home-assistant-frontend==20230608.0
-home-assistant-intents==2023.6.5
+home-assistant-frontend==20230705.0
+home-assistant-intents==2023.6.28
 httpx==0.24.1
 ifaddr==0.2.0
 janus==1.0.0
-jinja2==3.1.2
-lru-dict==1.1.8
+Jinja2==3.1.2
+lru-dict==1.2.0
 mutagen==1.46.0
-orjson==3.8.12
+orjson==3.9.1
 paho-mqtt==1.6.1
-pillow==9.5.0
-pip>=21.0,<23.2
+Pillow==9.5.0
+pip>=21.3.1,<23.2
 psutil-home-assistant==0.0.1
-pyOpenSSL==23.1.0
+PyJWT==2.7.0
+PyNaCl==1.5.0
+pyOpenSSL==23.2.0
 pyserial==3.5
 python-slugify==4.0.1
+PyTurboJPEG==1.6.7
 pyudev==0.23.2
-pyyaml==6.0
+PyYAML==6.0
 requests==2.31.0
 scapy==2.5.0
-sqlalchemy==2.0.15
+SQLAlchemy==2.0.15
 typing_extensions>=4.6.3,<5.0
 ulid-transform==0.7.2
 voluptuous-serialize==2.6.0
 voluptuous==0.13.1
 webrtcvad==2.0.10
 yarl==1.9.2
-zeroconf==0.64.0
+zeroconf==0.70.0
 
 # Constrain pycryptodome to avoid vulnerability
 # see https://github.com/home-assistant/core/pull/16238
@@ -100,9 +100,9 @@ regex==2021.8.28
 # 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==3.6.2
+anyio==3.7.0
 h11==0.14.0
-httpcore==0.17.0
+httpcore==0.17.2
 
 # Ensure we have a hyperframe version that works in Python 3.10
 # 5.2.0 fixed a collections abc deprecation
@@ -175,10 +175,6 @@ pysnmplib==5.0.21
 # python
 pysnmp==1000000000.0.0
 
-# pyminiaudio 1.58 is missing files in the package
-# https://github.com/irmen/pyminiaudio/issues/67
-miniaudio==1.57
-
 # The get-mac package has been replaced with getmac. Installing get-mac alongside getmac
 # breaks getmac due to them both sharing the same python package name inside 'getmac'.
 get-mac==1000000000.0.0
diff --git a/homeassistant/setup.py b/homeassistant/setup.py
index fc5aa8291b7..bf405d5deda 100644
--- a/homeassistant/setup.py
+++ b/homeassistant/setup.py
@@ -174,7 +174,7 @@ async def _async_setup_component(
     """
     integration: loader.Integration | None = None
 
-    def log_error(msg: str) -> None:
+    def log_error(msg: str, exc_info: Exception | None = None) -> None:
         """Log helper."""
         if integration is None:
             custom = ""
@@ -182,7 +182,9 @@ async def _async_setup_component(
         else:
             custom = "" if integration.is_built_in else "custom integration "
             link = integration.documentation
-        _LOGGER.error("Setup failed for %s%s: %s", custom, domain, msg)
+        _LOGGER.error(
+            "Setup failed for %s%s: %s", custom, domain, msg, exc_info=exc_info
+        )
         async_notify_setup_error(hass, domain, link)
 
     try:
@@ -212,7 +214,7 @@ async def _async_setup_component(
     try:
         component = integration.get_component()
     except ImportError as err:
-        log_error(f"Unable to import component: {err}")
+        log_error(f"Unable to import component: {err}", err)
         return False
 
     processed_config = await conf_util.async_process_component_config(
@@ -240,11 +242,11 @@ async def _async_setup_component(
         async_create_issue(
             hass,
             HOMEASSISTANT_DOMAIN,
-            f"integration_key_no_support_{domain}",
+            f"config_entry_only_{domain}",
             is_fixable=False,
             severity=IssueSeverity.ERROR,
             issue_domain=domain,
-            translation_key="integration_key_no_support",
+            translation_key="config_entry_only",
             translation_placeholders={
                 "domain": domain,
                 "add_integration": f"/config/integrations/dashboard/add?domain={domain}",
diff --git a/homeassistant/util/dt.py b/homeassistant/util/dt.py
index 2dfc9a6f622..4f49ec44ca7 100644
--- a/homeassistant/util/dt.py
+++ b/homeassistant/util/dt.py
@@ -81,7 +81,8 @@ def set_default_time_zone(time_zone: dt.tzinfo) -> None:
 
     Async friendly.
     """
-    global DEFAULT_TIME_ZONE  # pylint: disable=global-statement
+    # pylint: disable-next=global-statement
+    global DEFAULT_TIME_ZONE  # noqa: PLW0603
 
     assert isinstance(time_zone, dt.tzinfo)
 
diff --git a/machine/build.yaml b/machine/build.yaml
index 340b8079b9f..2f8aa3fe5c3 100644
--- a/machine/build.yaml
+++ b/machine/build.yaml
@@ -1,5 +1,4 @@
-image: homeassistant/{machine}-homeassistant
-shadow_repository: ghcr.io/home-assistant
+image: ghcr.io/home-assistant/{machine}-homeassistant
 build_from:
   aarch64: "ghcr.io/home-assistant/aarch64-homeassistant:"
   armv7: "ghcr.io/home-assistant/armv7-homeassistant:"
@@ -9,6 +8,9 @@ build_from:
 codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io
+cosign:
+  base_identity: https://github.com/home-assistant/core/.*
+  identity: https://github.com/home-assistant/core/.*
 labels:
   io.hass.type: core
   org.opencontainers.image.source: https://github.com/home-assistant/core
diff --git a/machine/generic-x86-64 b/machine/generic-x86-64
index bbd72e93d51..874f0aecc10 100644
--- a/machine/generic-x86-64
+++ b/machine/generic-x86-64
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/amd64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
     libva-intel-driver
diff --git a/machine/intel-nuc b/machine/intel-nuc
index 9b8a2b3eef9..750b49727be 100644
--- a/machine/intel-nuc
+++ b/machine/intel-nuc
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/amd64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 # NOTE: intel-nuc will be replaced by generic-x86-64. Make sure to apply
 # changes in generic-x86-64 as well.
diff --git a/machine/khadas-vim3 b/machine/khadas-vim3
index af934f31f0e..c1d74d3528e 100644
--- a/machine/khadas-vim3
+++ b/machine/khadas-vim3
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/odroid-c2 b/machine/odroid-c2
index af934f31f0e..c1d74d3528e 100644
--- a/machine/odroid-c2
+++ b/machine/odroid-c2
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/odroid-c4 b/machine/odroid-c4
index af934f31f0e..c1d74d3528e 100644
--- a/machine/odroid-c4
+++ b/machine/odroid-c4
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/odroid-m1 b/machine/odroid-m1
index af934f31f0e..c1d74d3528e 100644
--- a/machine/odroid-m1
+++ b/machine/odroid-m1
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/odroid-n2 b/machine/odroid-n2
index af934f31f0e..c1d74d3528e 100644
--- a/machine/odroid-n2
+++ b/machine/odroid-n2
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/odroid-xu b/machine/odroid-xu
index 57f6d0cddb8..c1d74d3528e 100644
--- a/machine/odroid-xu
+++ b/machine/odroid-xu
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/qemuarm b/machine/qemuarm
index 54fc002097a..c1d74d3528e 100644
--- a/machine/qemuarm
+++ b/machine/qemuarm
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/armhf-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/qemuarm-64 b/machine/qemuarm-64
index af934f31f0e..c1d74d3528e 100644
--- a/machine/qemuarm-64
+++ b/machine/qemuarm-64
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/qemux86 b/machine/qemux86
index 23264cb6b18..c1d74d3528e 100644
--- a/machine/qemux86
+++ b/machine/qemux86
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/i386-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/qemux86-64 b/machine/qemux86-64
index 3e7a43d1335..c1d74d3528e 100644
--- a/machine/qemux86-64
+++ b/machine/qemux86-64
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/amd64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/raspberrypi b/machine/raspberrypi
index 876fcfce21e..3cce504661e 100644
--- a/machine/raspberrypi
+++ b/machine/raspberrypi
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/armhf-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/machine/raspberrypi2 b/machine/raspberrypi2
index 5d109e240b7..c49db40b408 100644
--- a/machine/raspberrypi2
+++ b/machine/raspberrypi2
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/machine/raspberrypi3 b/machine/raspberrypi3
index 5d109e240b7..c49db40b408 100644
--- a/machine/raspberrypi3
+++ b/machine/raspberrypi3
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/machine/raspberrypi3-64 b/machine/raspberrypi3-64
index 9205b90389a..c49db40b408 100644
--- a/machine/raspberrypi3-64
+++ b/machine/raspberrypi3-64
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/machine/raspberrypi4 b/machine/raspberrypi4
index 5d109e240b7..c49db40b408 100644
--- a/machine/raspberrypi4
+++ b/machine/raspberrypi4
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/machine/raspberrypi4-64 b/machine/raspberrypi4-64
index 9205b90389a..c49db40b408 100644
--- a/machine/raspberrypi4-64
+++ b/machine/raspberrypi4-64
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/machine/tinker b/machine/tinker
index 57f6d0cddb8..c1d74d3528e 100644
--- a/machine/tinker
+++ b/machine/tinker
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/yellow b/machine/yellow
index 9205b90389a..c49db40b408 100644
--- a/machine/yellow
+++ b/machine/yellow
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/mypy.ini b/mypy.ini
index 8628353ef6a..ab8b5a5df89 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -1482,6 +1482,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.image.*]
+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.image_processing.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -2192,6 +2202,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.ping.*]
+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.powerwall.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -2512,16 +2532,6 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
-[mypy-homeassistant.components.senseme.*]
-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.sensibo.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -2843,6 +2853,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.text.*]
+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.threshold.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
diff --git a/pylint/plugins/hass_enforce_type_hints.py b/pylint/plugins/hass_enforce_type_hints.py
index 1d7bac65c19..85b1b1370a1 100644
--- a/pylint/plugins/hass_enforce_type_hints.py
+++ b/pylint/plugins/hass_enforce_type_hints.py
@@ -573,7 +573,7 @@ _ENTITY_MATCH: list[TypeHintMatch] = [
     ),
     TypeHintMatch(
         function_name="name",
-        return_type=["str", None],
+        return_type=["str", "UndefinedType", None],
     ),
     TypeHintMatch(
         function_name="state",
@@ -1023,15 +1023,15 @@ _INHERITANCE_MATCH: dict[str, list[ClassTypeHintMatch]] = {
                 ),
                 TypeHintMatch(
                     function_name="hvac_mode",
-                    return_type=["HVACMode", "str", None],
+                    return_type=["HVACMode", None],
                 ),
                 TypeHintMatch(
                     function_name="hvac_modes",
-                    return_type=["list[HVACMode]", "list[str]"],
+                    return_type="list[HVACMode]",
                 ),
                 TypeHintMatch(
                     function_name="hvac_action",
-                    return_type=["HVACAction", "str", None],
+                    return_type=["HVACAction", None],
                 ),
                 TypeHintMatch(
                     function_name="current_temperature",
diff --git a/pylint/ruff.toml b/pylint/ruff.toml
new file mode 100644
index 00000000000..271881141a9
--- /dev/null
+++ b/pylint/ruff.toml
@@ -0,0 +1,7 @@
+# This extend our general Ruff rules specifically for tests
+extend = "../pyproject.toml"
+
+[isort]
+known-third-party = [
+    "pylint",
+]
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 563b07570a6..cd0e6eb47f0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools~=62.3", "wheel~=0.37.1"]
+requires = ["setuptools~=68.0", "wheel~=0.40.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name        = "homeassistant"
-version     = "2023.6.3"
+version     = "2023.7.0"
 license     = {text = "Apache-2.0"}
 description = "Open-source home automation platform running on Python 3."
 readme      = "README.rst"
@@ -19,13 +19,14 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Topic :: Home Automation",
 ]
 requires-python = ">=3.10.0"
 dependencies    = [
     "aiohttp==3.8.4",
     "astral==2.2",
-    "async_timeout==4.0.2",
+    "async-timeout==4.0.2",
     "attrs==22.2.0",
     "atomicwrites-homeassistant==1.4.1",
     "awesomeversion==22.9.0",
@@ -37,17 +38,17 @@ dependencies    = [
     "httpx==0.24.1",
     "home-assistant-bluetooth==1.10.0",
     "ifaddr==0.2.0",
-    "jinja2==3.1.2",
-    "lru-dict==1.1.8",
+    "Jinja2==3.1.2",
+    "lru-dict==1.2.0",
     "PyJWT==2.7.0",
     # PyJWT has loose dependency. We want the latest one.
-    "cryptography==40.0.2",
-    # pyOpenSSL 23.1.0 is required to work with cryptography 39+
-    "pyOpenSSL==23.1.0",
-    "orjson==3.8.12",
-    "pip>=21.0,<23.2",
+    "cryptography==41.0.1",
+    # pyOpenSSL 23.2.0 is required to work with cryptography 41+
+    "pyOpenSSL==23.2.0",
+    "orjson==3.9.1",
+    "pip>=21.3.1,<23.2",
     "python-slugify==4.0.1",
-    "pyyaml==6.0",
+    "PyYAML==6.0",
     "requests==2.31.0",
     "typing_extensions>=4.6.3,<5.0",
     "ulid-transform==0.7.2",
@@ -57,6 +58,7 @@ dependencies    = [
 ]
 
 [project.urls]
+"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/"
@@ -77,20 +79,6 @@ include = ["homeassistant*"]
 [tool.black]
 extend-exclude = "/generated/"
 
-[tool.isort]
-# https://github.com/PyCQA/isort/wiki/isort-Settings
-profile = "black"
-# will group `import x` and `from x import` of the same module.
-force_sort_within_sections = true
-known_first_party = [
-    "homeassistant",
-    "tests",
-]
-forced_separate = [
-    "tests",
-]
-combine_as_imports = true
-
 [tool.pylint.MAIN]
 py-version = "3.10"
 ignore = [
@@ -175,19 +163,223 @@ disable = [
     "too-few-public-methods",
     "too-many-ancestors",
     "too-many-arguments",
-    "too-many-branches",
     "too-many-instance-attributes",
     "too-many-lines",
     "too-many-locals",
     "too-many-public-methods",
-    "too-many-return-statements",
-    "too-many-statements",
     "too-many-boolean-expressions",
-    "unused-argument",
     "wrong-import-order",
     "consider-using-f-string",
     "consider-using-namedtuple-or-dataclass",
     "consider-using-assignment-expr",
+
+    # 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
+    "format-needs-mapping", # F502
+    "function-redefined", # F811
+    "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", # PGH001
+    "exec-used", # S102
+    # "expression-not-assigned", # B018, ruff catches new occurrences, needs more work
+    "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, ruff catches new occurrences, needs more work
+    "raise-missing-from", # TRY200
+    # "redefined-builtin", # A001, ruff is way more stricter, needs work
+    "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
+    "superfluous-parens", # UP034
+    "ungrouped-imports", # I001
+    "unidiomatic-typecheck", # E721
+    "unnecessary-direct-lambda-call", # PLC3002
+    "unnecessary-lambda-assignment", # PLC3001
+    "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
+
+    # 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
@@ -242,25 +434,63 @@ filterwarnings = ["error::sqlalchemy.exc.SAWarning"]
 target-version = "py310"
 
 select = [
+    "B002", # Python does not support the unary prefix increment
     "B007", # Loop control variable {name} not used within loop body
     "B014", # Exception handler with duplicate exception
+    "B023", # Function definition does not bind loop variable {name}
+    "B026", # Star-arg unpacking after a keyword argument is strongly discouraged
     "C",  # complexity
+    "COM818", # Trailing comma on bare tuple prohibited
     "D",  # docstrings
     "E",  # pycodestyle
     "F",  # pyflakes/autoflake
+    "G", # flake8-logging-format
+    "I",  # isort
     "ICN001", # import concentions; {name} should be imported as {asname}
+    "ISC001", # Implicitly concatenated string literals on one line
+    "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
+    "PGH001", # No builtin eval() allowed
     "PGH004",  # Use specific rule codes when using noqa
     "PLC0414", # Useless import alias. Import alias does not rename original package.
+    "PLC", # pylint
+    "PLE", # pylint
+    "PLR", # pylint
+    "PLW", # pylint
+    "Q000", # Double quotes found but single quotes preferred
+    "RUF006", # Store a reference to the return value of asyncio.create_task
+    "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
     "SIM105", # Use contextlib.suppress({exception}) instead of try-except-pass
     "SIM117", # Merge with-statements that use the same scope
     "SIM118", # Use {key} in {dict} instead of {key} in {dict}.keys()
     "SIM201", # Use {left} != {right} instead of not {left} == {right}
+    "SIM208", # Use {expr} instead of not (not {expr})
     "SIM212", # Use {a} if {a} else {b} instead of {b} if not {a} else {a}
     "SIM300", # Yoda conditions. Use 'age == 42' instead of '42 == age'.
     "SIM401", # Use get from dict with default instead of an if block
+    "T100", # Trace found: {name} used
     "T20",  # flake8-print
     "TRY004", # Prefer TypeError exception for invalid type
-    "RUF006", # Store a reference to the return value of asyncio.create_task
+    "TRY200", # Use raise from to specify exception cause
+    "TRY302", # Remove exception handler; error is immediately re-raised
     "UP",  # pyupgrade
     "W",  # pycodestyle
 ]
@@ -273,8 +503,20 @@ ignore = [
     "D407",  # Section name underlining
     "E501",  # line too long
     "E731",  # do not assign a lambda expression, use a def
+    "PLC1901", # Lots of false positives
+    # False positives https://github.com/astral-sh/ruff/issues/5386
+    "PLC0208", # Use a sequence type instead of a `set` when iterating over values
+    "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
+    "UP006", # keep type annotation style as is
+    "UP007", # keep type annotation style as is
     # Ignored due to performance: https://github.com/charliermarsh/ruff/issues/2923
     "UP038", # Use `X | Y` in `isinstance` call instead of `(X, Y)`
+
 ]
 
 [tool.ruff.flake8-import-conventions.extend-aliases]
@@ -289,8 +531,12 @@ voluptuous = "vol"
 [tool.ruff.flake8-pytest-style]
 fixture-parentheses = false
 
-[tool.ruff.pyupgrade]
-keep-runtime-typing = true
+[tool.ruff.isort]
+force-sort-within-sections = true
+known-first-party = [
+    "homeassistant",
+]
+combine-as-imports = true
 
 [tool.ruff.per-file-ignores]
 
diff --git a/requirements.txt b/requirements.txt
index 48dfff5d662..f4f2608b597 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
 # Home Assistant Core
 aiohttp==3.8.4
 astral==2.2
-async_timeout==4.0.2
+async-timeout==4.0.2
 attrs==22.2.0
 atomicwrites-homeassistant==1.4.1
 awesomeversion==22.9.0
@@ -13,15 +13,15 @@ ciso8601==2.3.0
 httpx==0.24.1
 home-assistant-bluetooth==1.10.0
 ifaddr==0.2.0
-jinja2==3.1.2
-lru-dict==1.1.8
+Jinja2==3.1.2
+lru-dict==1.2.0
 PyJWT==2.7.0
-cryptography==40.0.2
-pyOpenSSL==23.1.0
-orjson==3.8.12
-pip>=21.0,<23.2
+cryptography==41.0.1
+pyOpenSSL==23.2.0
+orjson==3.9.1
+pip>=21.3.1,<23.2
 python-slugify==4.0.1
-pyyaml==6.0
+PyYAML==6.0
 requests==2.31.0
 typing_extensions>=4.6.3,<5.0
 ulid-transform==0.7.2
diff --git a/requirements_all.txt b/requirements_all.txt
index 2d3fab79538..9ef98d4e402 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -7,24 +7,83 @@ AEMET-OpenData==0.2.2
 # homeassistant.components.aladdin_connect
 AIOAladdinConnect==0.1.56
 
+# homeassistant.components.honeywell
+AIOSomecomfort==0.0.14
+
 # homeassistant.components.adax
 Adax-local==0.1.5
 
+# homeassistant.components.ambiclimate
+Ambiclimate==0.2.1
+
+# homeassistant.components.blinksticklight
+BlinkStick==1.2.0
+
+# homeassistant.components.co2signal
+CO2Signal==0.4.2
+
+# homeassistant.components.doorbird
+DoorBirdPy==2.1.0
+
 # homeassistant.components.homekit
 HAP-python==4.7.0
 
+# homeassistant.components.tasmota
+HATasmota==0.6.5
+
+# homeassistant.components.hydrawise
+Hydrawiser==0.2
+
 # homeassistant.components.mastodon
 Mastodon.py==1.5.1
 
+# homeassistant.components.doods
+# homeassistant.components.generic
+# homeassistant.components.image_upload
+# homeassistant.components.proxy
+# homeassistant.components.qrcode
+# homeassistant.components.seven_segments
+# homeassistant.components.sighthound
+# homeassistant.components.tensorflow
+Pillow==9.5.0
+
+# homeassistant.components.plex
+PlexAPI==4.13.2
+
+# homeassistant.components.progettihwsw
+ProgettiHWSW==0.1.1
+
+# homeassistant.components.bluetooth_tracker
+# PyBluez==0.22
+
+# homeassistant.components.cast
+PyChromecast==13.0.7
+
 # homeassistant.components.flick_electric
 PyFlick==0.0.2
 
+# homeassistant.components.flume
+PyFlume==0.6.5
+
+# homeassistant.components.fronius
+PyFronius==0.7.1
+
 # homeassistant.components.mvglive
 PyMVGLive==1.1.4
 
+# homeassistant.components.met_eireann
+PyMetEireann==2021.8.0
+
+# homeassistant.components.met
+# homeassistant.components.norway_air
+PyMetno==0.10.0
+
 # homeassistant.components.keymitt_ble
 PyMicroBot==0.0.9
 
+# homeassistant.components.nina
+PyNINA==0.3.0
+
 # homeassistant.components.mobile_app
 # homeassistant.components.owntracks
 PyNaCl==1.5.0
@@ -40,7 +99,13 @@ PyRMVtransport==0.3.3
 PySocks==1.7.1
 
 # homeassistant.components.switchbot
-PySwitchbot==0.37.6
+PySwitchbot==0.38.0
+
+# homeassistant.components.switchmate
+PySwitchmate==0.5.1
+
+# homeassistant.components.syncthru
+PySyncThru==0.7.10
 
 # homeassistant.components.transport_nsw
 PyTransportNSW==0.1.1
@@ -55,9 +120,19 @@ PyViCare==2.25.0
 # homeassistant.components.xiaomi_aqara
 PyXiaomiGateway==0.14.3
 
+# homeassistant.components.rachio
+RachioPy==1.0.3
+
+# homeassistant.components.python_script
+RestrictedPython==6.0
+
 # homeassistant.components.remember_the_milk
 RtmAPI==0.7.2
 
+# homeassistant.components.recorder
+# homeassistant.components.sql
+SQLAlchemy==2.0.15
+
 # homeassistant.components.travisci
 TravisPy==0.3.5
 
@@ -86,7 +161,7 @@ adext==0.4.2
 adguardhome==0.6.1
 
 # homeassistant.components.advantage_air
-advantage_air==0.4.4
+advantage-air==0.4.4
 
 # homeassistant.components.frontier_silicon
 afsapi==0.2.7
@@ -95,28 +170,28 @@ afsapi==0.2.7
 agent-py==0.0.23
 
 # homeassistant.components.geo_json_events
-aio_geojson_generic_client==0.3
+aio-geojson-generic-client==0.3
 
 # homeassistant.components.geonetnz_quakes
-aio_geojson_geonetnz_quakes==0.15
+aio-geojson-geonetnz-quakes==0.15
 
 # homeassistant.components.geonetnz_volcano
-aio_geojson_geonetnz_volcano==0.8
+aio-geojson-geonetnz-volcano==0.8
 
 # homeassistant.components.nsw_rural_fire_service_feed
-aio_geojson_nsw_rfs_incidents==0.6
+aio-geojson-nsw-rfs-incidents==0.6
 
 # homeassistant.components.usgs_earthquakes_feed
-aio_geojson_usgs_earthquakes==0.2
+aio-geojson-usgs-earthquakes==0.2
 
 # homeassistant.components.gdacs
-aio_georss_gdacs==0.8
+aio-georss-gdacs==0.8
 
 # homeassistant.components.airq
 aioairq==0.2.4
 
 # homeassistant.components.airzone_cloud
-aioairzone-cloud==0.1.8
+aioairzone-cloud==0.2.0
 
 # homeassistant.components.airzone
 aioairzone==0.6.4
@@ -159,7 +234,7 @@ aioecowitt==2023.5.0
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==13.9.0
+aioesphomeapi==15.1.1
 
 # homeassistant.components.flo
 aioflo==2021.11.0
@@ -181,7 +256,7 @@ aiohomekit==2.6.5
 
 # homeassistant.components.emulated_hue
 # homeassistant.components.http
-aiohttp_cors==0.7.0
+aiohttp-cors==0.7.0
 
 # homeassistant.components.hue
 aiohue==4.6.2
@@ -195,15 +270,15 @@ aiokafka==0.7.2
 # homeassistant.components.kef
 aiokef==0.2.16
 
+# homeassistant.components.lifx
+aiolifx-effects==0.3.2
+
+# homeassistant.components.lifx
+aiolifx-themes==0.4.5
+
 # homeassistant.components.lifx
 aiolifx==0.8.10
 
-# homeassistant.components.lifx
-aiolifx_effects==0.3.2
-
-# homeassistant.components.lifx
-aiolifx_themes==0.4.5
-
 # homeassistant.components.livisi
 aiolivisi==0.0.19
 
@@ -226,7 +301,7 @@ aionanoleaf==0.2.1
 aionotion==2023.05.5
 
 # homeassistant.components.oncue
-aiooncue==0.3.4
+aiooncue==0.3.5
 
 # homeassistant.components.openexchangerates
 aioopenexchangerates==0.4.0
@@ -260,23 +335,17 @@ aioridwell==2023.01.0
 # homeassistant.components.ruuvi_gateway
 aioruuvigateway==0.1.0
 
-# homeassistant.components.senseme
-aiosenseme==0.6.1
-
 # homeassistant.components.senz
 aiosenz==1.0.0
 
 # homeassistant.components.shelly
-aioshelly==5.3.2
+aioshelly==5.4.0
 
 # homeassistant.components.skybell
 aioskybell==22.7.0
 
 # homeassistant.components.slimproto
-aioslimproto==2.1.1
-
-# homeassistant.components.honeywell
-aiosomecomfort==0.0.14
+aioslimproto==2.3.2
 
 # homeassistant.components.steamist
 aiosteamist==0.3.2
@@ -291,7 +360,7 @@ aiosyncthing==0.5.1
 aiotractive==0.5.5
 
 # homeassistant.components.unifi
-aiounifi==48
+aiounifi==49
 
 # homeassistant.components.vlc_telnet
 aiovlc==0.1.0
@@ -312,20 +381,17 @@ airly==1.1.0
 airthings-ble==0.5.3
 
 # homeassistant.components.airthings
-airthings_cloud==0.1.0
+airthings-cloud==0.1.0
 
 # homeassistant.components.airtouch4
 airtouch4pyapi==1.0.5
 
 # homeassistant.components.alpha_vantage
-alpha_vantage==2.3.1
+alpha-vantage==2.3.1
 
 # homeassistant.components.amberelectric
 amberelectric==1.0.4
 
-# homeassistant.components.ambiclimate
-ambiclimate==0.2.1
-
 # homeassistant.components.amcrest
 amcrest==1.9.7
 
@@ -336,7 +402,7 @@ androidtv[async]==0.0.70
 androidtvremote2==0.0.9
 
 # homeassistant.components.anel_pwrctrl
-anel_pwrctrl-homeassistant==0.0.1.dev2
+anel-pwrctrl-homeassistant==0.0.1.dev2
 
 # homeassistant.components.anova
 anova-wifi==0.10.0
@@ -360,7 +426,7 @@ aqualogic==2.6
 aranet4==2.1.3
 
 # homeassistant.components.arcam_fmj
-arcam-fmj==1.3.0
+arcam-fmj==1.4.0
 
 # homeassistant.components.arris_tg2492lg
 arris-tg2492lg==1.2.1
@@ -369,7 +435,7 @@ arris-tg2492lg==1.2.1
 asmog==0.0.6
 
 # homeassistant.components.asterisk_mbox
-asterisk_mbox==0.5.0
+asterisk-mbox==0.5.0
 
 # homeassistant.components.dlna_dmr
 # homeassistant.components.dlna_dms
@@ -428,13 +494,13 @@ batinfo==0.4.2
 beautifulsoup4==4.11.1
 
 # homeassistant.components.beewi_smartclim
-# beewi_smartclim==0.0.10
+# beewi-smartclim==0.0.10
 
 # homeassistant.components.zha
-bellows==0.35.5
+bellows==0.35.8
 
 # homeassistant.components.bmw_connected_drive
-bimmer-connected==0.13.7
+bimmer-connected==0.13.8
 
 # homeassistant.components.bizkaibus
 bizkaibus==0.1.1
@@ -446,14 +512,11 @@ bleak-retry-connector==3.0.2
 bleak==0.20.2
 
 # homeassistant.components.blebox
-blebox_uniapi==2.1.4
+blebox-uniapi==2.1.4
 
 # homeassistant.components.blink
 blinkpy==0.21.0
 
-# homeassistant.components.blinksticklight
-blinkstick==1.2.0
-
 # homeassistant.components.bitcoin
 blockchain==1.4.4
 
@@ -474,13 +537,13 @@ bluetooth-auto-recovery==1.2.0
 # homeassistant.components.esphome
 # homeassistant.components.ld2410_ble
 # homeassistant.components.led_ble
-bluetooth-data-tools==0.4.0
+bluetooth-data-tools==1.3.0
 
 # homeassistant.components.bond
 bond-async==0.1.23
 
 # homeassistant.components.bosch_shc
-boschshcpy==0.2.35
+boschshcpy==0.2.57
 
 # homeassistant.components.amazon_polly
 # homeassistant.components.route53
@@ -499,7 +562,7 @@ brottsplatskartan==0.0.1
 brunt==1.2.0
 
 # homeassistant.components.bluetooth_tracker
-bt_proximity==0.2.1
+bt-proximity==0.2.1
 
 # homeassistant.components.bthome
 bthome-ble==2.12.0
@@ -508,7 +571,7 @@ bthome-ble==2.12.0
 bthomehub5-devicelist==0.1.1
 
 # homeassistant.components.bt_smarthub
-btsmarthub_devicelist==0.2.3
+btsmarthub-devicelist==0.2.3
 
 # homeassistant.components.buienradar
 buienradar==1.0.5
@@ -528,9 +591,6 @@ clearpasspy==1.0.2
 # homeassistant.components.sinch
 clx-sdk-xms==1.0.0
 
-# homeassistant.components.co2signal
-co2signal==0.4.2
-
 # homeassistant.components.coinbase
 coinbase==2.1.0
 
@@ -546,7 +606,6 @@ concord232==0.15
 # homeassistant.components.upc_connect
 connect-box==0.2.8
 
-# homeassistant.components.eddystone_temperature
 # homeassistant.components.eq3btsmart
 # homeassistant.components.xiaomi_miio
 construct==2.10.56
@@ -575,12 +634,12 @@ dbus-fast==1.86.0
 # homeassistant.components.debugpy
 debugpy==1.6.7
 
+# homeassistant.components.decora_wifi
+# decora-wifi==1.4
+
 # homeassistant.components.decora
 # decora==0.6
 
-# homeassistant.components.decora_wifi
-# decora_wifi==1.4
-
 # homeassistant.components.ihc
 # homeassistant.components.namecheapdns
 # homeassistant.components.ohmconnect
@@ -605,19 +664,19 @@ devolo-plc-api==1.3.1
 directv==0.4.0
 
 # homeassistant.components.discogs
-discogs_client==2.3.0
+discogs-client==2.3.0
 
 # homeassistant.components.steamist
 discovery30303==0.2.1
 
-# homeassistant.components.doorbird
-doorbirdpy==2.1.0
-
 # homeassistant.components.dovado
 dovado==0.4.1
 
+# homeassistant.components.dremel_3d_printer
+dremel3dpy==2.1.1
+
 # homeassistant.components.dsmr
-dsmr_parser==0.33
+dsmr-parser==0.33
 
 # homeassistant.components.dwd_weather_warnings
 dwdwfsapi==1.0.6
@@ -626,10 +685,10 @@ dwdwfsapi==1.0.6
 dweepy==0.3.0
 
 # homeassistant.components.dynalite
-dynalite_devices==0.1.47
+dynalite-devices==0.1.47
 
 # homeassistant.components.dynalite
-dynalite_panel==0.0.4
+dynalite-panel==0.0.4
 
 # homeassistant.components.rainforest_eagle
 eagle100==0.1.1
@@ -653,10 +712,10 @@ eliqonline==1.2.2
 elkm1-lib==2.2.5
 
 # homeassistant.components.elmax
-elmax_api==0.0.4
+elmax-api==0.0.4
 
 # homeassistant.components.emulated_roku
-emulated_roku==0.2.1
+emulated-roku==0.2.1
 
 # homeassistant.components.huisbaasje
 energyflip-client==0.2.2
@@ -671,10 +730,10 @@ enocean==0.50
 enturclient==0.2.4
 
 # homeassistant.components.environment_canada
-env_canada==0.5.34
+env-canada==0.5.35
 
 # homeassistant.components.enphase_envoy
-envoy_reader==0.20.1
+envoy-reader==0.20.1
 
 # homeassistant.components.season
 ephem==4.1.2
@@ -692,7 +751,7 @@ esphome-dashboard-api==1.2.3
 eternalegypt==0.0.16
 
 # homeassistant.components.eufylife_ble
-eufylife_ble_client==0.1.7
+eufylife-ble-client==0.1.7
 
 # homeassistant.components.keyboard_remote
 # evdev==1.6.1
@@ -705,7 +764,7 @@ faadelays==0.0.7
 
 # homeassistant.components.dlib_face_detect
 # homeassistant.components.dlib_face_identify
-# face_recognition==1.2.3
+# face-recognition==1.2.3
 
 # homeassistant.components.fastdotcom
 fastdotcom==0.0.3
@@ -735,17 +794,17 @@ fjaraskupan==2.2.0
 flipr-api==1.5.0
 
 # homeassistant.components.flux_led
-flux_led==0.28.37
+flux-led==0.28.37
 
 # homeassistant.components.homekit
 # homeassistant.components.recorder
 fnv-hash-fast==0.3.1
 
 # homeassistant.components.foobot
-foobot_async==1.0.0
+foobot-async==1.0.0
 
 # homeassistant.components.forecast_solar
-forecast_solar==3.0.0
+forecast-solar==3.0.0
 
 # homeassistant.components.fortios
 fortiosapi==1.0.5
@@ -758,7 +817,7 @@ freesms==0.2.0
 
 # homeassistant.components.fritz
 # homeassistant.components.fritzbox_callmonitor
-fritzconnection==1.12.0
+fritzconnection[qr]==1.12.0
 
 # homeassistant.components.google_translate
 gTTS==2.2.4
@@ -779,13 +838,13 @@ geocachingapi==0.2.1
 geopy==2.3.0
 
 # homeassistant.components.geo_rss_events
-georss_generic_client==0.6
+georss-generic-client==0.6
 
 # homeassistant.components.ign_sismologia
-georss_ign_sismologia_client==0.6
+georss-ign-sismologia-client==0.6
 
 # homeassistant.components.qld_bushfire
-georss_qld_bushfire_alert_client==0.5
+georss-qld-bushfire-alert-client==0.5
 
 # homeassistant.components.dlna_dmr
 # homeassistant.components.kef
@@ -802,7 +861,7 @@ gios==3.1.0
 gitterpy==0.1.7
 
 # homeassistant.components.glances
-glances_api==0.4.2
+glances-api==0.4.3
 
 # homeassistant.components.goalzero
 goalzero==0.2.1
@@ -821,10 +880,10 @@ google-cloud-pubsub==2.13.11
 google-cloud-texttospeech==2.12.3
 
 # homeassistant.components.google_generative_ai_conversation
-google-generativeai==0.1.0rc2
+google-generativeai==0.1.0
 
 # homeassistant.components.nest
-google-nest-sdm==2.2.4
+google-nest-sdm==2.2.5
 
 # homeassistant.components.google_travel_time
 googlemaps==2.5.1
@@ -845,7 +904,7 @@ gps3==0.33.3
 greeclimate==1.4.1
 
 # homeassistant.components.greeneye_monitor
-greeneye_monitor==3.0.3
+greeneye-monitor==3.0.3
 
 # homeassistant.components.greenwave
 greenwavereality==0.5.1
@@ -879,23 +938,20 @@ ha-ffmpeg==3.1.0
 ha-iotawattpy==0.1.1
 
 # homeassistant.components.philips_js
-ha-philipsjs==3.0.0
+ha-philipsjs==3.1.0
 
 # homeassistant.components.habitica
 habitipy==0.2.0
 
 # homeassistant.components.cloud
-hass-nabucasa==0.67.1
+hass-nabucasa==0.69.0
 
 # homeassistant.components.splunk
-hass_splunk==0.1.1
+hass-splunk==0.1.1
 
 # homeassistant.components.conversation
 hassil==1.0.6
 
-# homeassistant.components.tasmota
-hatasmota==0.6.5
-
 # homeassistant.components.jewish_calendar
 hdate==0.10.4
 
@@ -903,10 +959,10 @@ hdate==0.10.4
 heatmiserV3==1.1.18
 
 # homeassistant.components.here_travel_time
-here_routing==0.2.0
+here-routing==0.2.0
 
 # homeassistant.components.here_travel_time
-here_transit==1.2.0
+here-transit==1.2.0
 
 # homeassistant.components.hikvisioncam
 hikvision==0.4
@@ -924,10 +980,10 @@ hole==0.8.0
 holidays==0.21.13
 
 # homeassistant.components.frontend
-home-assistant-frontend==20230608.0
+home-assistant-frontend==20230705.0
 
 # homeassistant.components.conversation
-home-assistant-intents==2023.6.5
+home-assistant-intents==2023.6.28
 
 # homeassistant.components.home_connect
 homeconnect==0.7.2
@@ -947,9 +1003,6 @@ httplib2==0.20.4
 # homeassistant.components.huawei_lte
 huawei-lte-api==1.6.11
 
-# homeassistant.components.hydrawise
-hydrawiser==0.2
-
 # homeassistant.components.hyperion
 hyperion-py==0.7.5
 
@@ -960,7 +1013,7 @@ iammeter==0.1.7
 iaqualink==0.5.0
 
 # homeassistant.components.ibeacon
-ibeacon_ble==1.0.1
+ibeacon-ble==1.0.1
 
 # homeassistant.components.watson_iot
 ibmiotf==0.3.4
@@ -1032,7 +1085,7 @@ kegtron-ble==0.4.0
 kiwiki-client==0.1.1
 
 # homeassistant.components.knx
-knx-frontend==2023.6.9.195839
+knx-frontend==2023.6.23.191712
 
 # homeassistant.components.konnected
 konnected==1.2.0
@@ -1047,7 +1100,7 @@ lacrosse-view==1.0.1
 lakeside==0.13
 
 # homeassistant.components.laundrify
-laundrify_aio==1.1.2
+laundrify-aio==1.1.2
 
 # homeassistant.components.ld2410_ble
 ld2410-ble==0.1.1
@@ -1086,11 +1139,14 @@ linode-api==4.1.9b1
 locationsharinglib==5.0.1
 
 # homeassistant.components.logi_circle
-logi_circle==0.2.3
+logi-circle==0.2.3
 
 # homeassistant.components.london_underground
 london-tube-status==0.5
 
+# homeassistant.components.loqed
+loqedAPI==2.1.7
+
 # homeassistant.components.luftdaten
 luftdaten==0.7.4
 
@@ -1155,7 +1211,7 @@ moat-ble==0.1.1
 moehlenhoff-alpha2==1.3.0
 
 # homeassistant.components.mopeka
-mopeka_iot_ble==0.4.1
+mopeka-iot-ble==0.4.1
 
 # homeassistant.components.motion_blinds
 motionblinds==0.6.18
@@ -1173,10 +1229,10 @@ mutagen==1.46.0
 mutesync==0.0.1
 
 # homeassistant.components.nad
-nad_receiver==0.3.0
+nad-receiver==0.3.0
 
 # homeassistant.components.keenetic_ndms2
-ndms2_client==0.1.2
+ndms2-client==0.1.2
 
 # homeassistant.components.ness_alarm
 nessclient==0.10.0
@@ -1292,7 +1348,7 @@ openerz-api==0.2.0
 openevsewifi==1.1.2
 
 # homeassistant.components.openhome
-openhomedevice==2.0.2
+openhomedevice==2.2.0
 
 # homeassistant.components.opensensemap
 opensensemap-api==0.2.0
@@ -1329,7 +1385,7 @@ paho-mqtt==1.6.1
 panacotta==0.2
 
 # homeassistant.components.panasonic_viera
-panasonic_viera==0.3.6
+panasonic-viera==0.3.6
 
 # homeassistant.components.dunehd
 pdunehd==1.3.2
@@ -1350,7 +1406,7 @@ pescea==1.0.12
 pexpect==4.6.0
 
 # homeassistant.components.modem_callerid
-phone_modem==0.1.1
+phone-modem==0.1.1
 
 # homeassistant.components.remote_rpi_gpio
 pigpio==1.78
@@ -1358,22 +1414,9 @@ pigpio==1.78
 # homeassistant.components.pilight
 pilight==0.1.1
 
-# homeassistant.components.doods
-# homeassistant.components.generic
-# homeassistant.components.image_upload
-# homeassistant.components.proxy
-# homeassistant.components.qrcode
-# homeassistant.components.seven_segments
-# homeassistant.components.sighthound
-# homeassistant.components.tensorflow
-pillow==9.5.0
-
 # homeassistant.components.dominos
 pizzapi==0.0.3
 
-# homeassistant.components.plex
-plexapi==4.13.2
-
 # homeassistant.components.plex
 plexauth==0.0.6
 
@@ -1396,16 +1439,13 @@ poolsense==0.0.8
 praw==7.5.0
 
 # homeassistant.components.islamic_prayer_times
-prayer_times_calculator==0.0.6
-
-# homeassistant.components.progettihwsw
-progettihwsw==0.1.1
+prayer-times-calculator==0.0.6
 
 # homeassistant.components.proliphix
 proliphix==0.4.1
 
 # homeassistant.components.prometheus
-prometheus_client==0.7.1
+prometheus-client==0.7.1
 
 # homeassistant.components.proxmoxve
 proxmoxer==2.0.1
@@ -1427,7 +1467,7 @@ pure-python-adb[async]==0.3.0.dev0
 pushbullet.py==0.11.0
 
 # homeassistant.components.pushover
-pushover_complete==1.1.1
+pushover-complete==1.1.1
 
 # homeassistant.components.pvoutput
 pvo==1.0.0
@@ -1444,6 +1484,9 @@ py-dormakaba-dkey==1.0.4
 # homeassistant.components.melissa
 py-melissa-climate==2.1.4
 
+# homeassistant.components.nextbus
+py-nextbusnext==0.1.5
+
 # homeassistant.components.nightscout
 py-nightscout==1.2.2
 
@@ -1462,24 +1505,32 @@ py-zabbix==1.1.7
 # homeassistant.components.seventeentrack
 py17track==2021.12.2
 
+# homeassistant.components.atome
+pyAtome==0.1.1
+
 # homeassistant.components.hdmi_cec
 pyCEC==0.5.2
 
 # homeassistant.components.control4
 pyControl4==1.1.0
 
-# homeassistant.components.met_eireann
-pyMetEireann==2021.8.0
+# homeassistant.components.eight_sleep
+pyEight==0.3.2
 
-# homeassistant.components.met
-# homeassistant.components.norway_air
-pyMetno==0.10.0
+# homeassistant.components.electrasmart
+pyElectra==1.2.0
+
+# homeassistant.components.emby
+pyEmby==1.9
+
+# homeassistant.components.hikvision
+pyHik==0.3.2
 
 # homeassistant.components.rfxtrx
 pyRFXtrx==0.30.1
 
-# homeassistant.components.switchmate
-pySwitchmate==0.5.1
+# homeassistant.components.sony_projector
+pySDCP==1
 
 # homeassistant.components.tibber
 pyTibber==0.27.2
@@ -1490,9 +1541,6 @@ pyW215==0.7.0
 # homeassistant.components.w800rf32
 pyW800rf32==0.1
 
-# homeassistant.components.nextbus
-py_nextbusnext==0.1.5
-
 # homeassistant.components.ads
 pyads==3.2.2
 
@@ -1515,11 +1563,8 @@ pyatag==0.3.5.3
 # homeassistant.components.netatmo
 pyatmo==7.5.0
 
-# homeassistant.components.atome
-pyatome==0.1.1
-
 # homeassistant.components.apple_tv
-pyatv==0.12.0
+pyatv==0.13.2
 
 # homeassistant.components.aussie_broadband
 pyaussiebb==0.0.15
@@ -1533,9 +1578,6 @@ pybbox==0.0.5-alpha
 # homeassistant.components.blackbird
 pyblackbird==0.6
 
-# homeassistant.components.bluetooth_tracker
-# pybluez==0.22
-
 # homeassistant.components.neato
 pybotvac==0.0.23
 
@@ -1551,9 +1593,6 @@ pycfdns==2.0.1
 # homeassistant.components.channels
 pychannels==1.2.3
 
-# homeassistant.components.cast
-pychromecast==13.0.7
-
 # homeassistant.components.pocketcasts
 pycketcasts==1.0.1
 
@@ -1582,14 +1621,17 @@ pydaikin==2.9.0
 pydanfossair==0.1.0
 
 # homeassistant.components.deconz
-pydeconz==112
+pydeconz==113
 
 # homeassistant.components.delijn
-pydelijn==1.0.0
+pydelijn==1.1.0
 
 # homeassistant.components.dexcom
 pydexcom==0.2.3
 
+# homeassistant.components.discovergy
+pydiscovergy==1.2.1
+
 # homeassistant.components.doods
 pydoods==1.0.2
 
@@ -1608,15 +1650,6 @@ pyedimax==0.2.1
 # homeassistant.components.efergy
 pyefergy==22.1.1
 
-# homeassistant.components.eight_sleep
-pyeight==0.3.2
-
-# homeassistant.components.electrasmart
-pyelectra==1.2.0
-
-# homeassistant.components.emby
-pyemby==1.8
-
 # homeassistant.components.envisalink
 pyenvisalink==4.6
 
@@ -1630,7 +1663,7 @@ pyeverlights==0.1.0
 pyevilgenius==2.0.0
 
 # homeassistant.components.ezviz
-pyezviz==0.2.0.12
+pyezviz==0.2.1.2
 
 # homeassistant.components.fibaro
 pyfibaro==0.7.1
@@ -1644,9 +1677,6 @@ pyfireservicerota==0.0.43
 # homeassistant.components.flic
 pyflic==2.0.3
 
-# homeassistant.components.flume
-pyflume==0.6.5
-
 # homeassistant.components.futurenow
 pyfnip==0.2
 
@@ -1659,9 +1689,6 @@ pyfreedompro==1.1.0
 # homeassistant.components.fritzbox
 pyfritzhome==0.6.8
 
-# homeassistant.components.fronius
-pyfronius==0.7.1
-
 # homeassistant.components.ifttt
 pyfttt==0.3
 
@@ -1680,9 +1707,6 @@ pyhaversion==22.8.0
 # homeassistant.components.heos
 pyheos==0.7.2
 
-# homeassistant.components.hikvision
-pyhik==0.3.2
-
 # homeassistant.components.hive
 pyhiveapi==0.5.14
 
@@ -1708,7 +1732,7 @@ pyintesishome==1.8.0
 pyipma==3.0.6
 
 # homeassistant.components.ipp
-pyipp==0.13.0
+pyipp==0.14.0
 
 # homeassistant.components.iqvia
 pyiqvia==2022.04.0
@@ -1786,7 +1810,7 @@ pymailgunner==1.4
 pymata-express==1.19
 
 # homeassistant.components.mazda
-pymazda==0.3.8
+pymazda==0.3.9
 
 # homeassistant.components.mediaroom
 pymediaroom==0.6.5.4
@@ -1804,7 +1828,7 @@ pymitv==1.4.3
 pymochad==0.2.0
 
 # homeassistant.components.modbus
-pymodbus==3.1.3
+pymodbus==3.3.1
 
 # homeassistant.components.monoprice
 pymonoprice==0.4
@@ -1824,9 +1848,6 @@ pynetgear==0.10.9
 # homeassistant.components.netio
 pynetio==0.1.9.1
 
-# homeassistant.components.nina
-pynina==0.3.0
-
 # homeassistant.components.nobo_hub
 pynobo==1.6.0
 
@@ -1846,7 +1867,7 @@ pynx584==0.5
 pynzbgetapi==0.2.0
 
 # homeassistant.components.obihai
-pyobihai==1.3.2
+pyobihai==1.4.2
 
 # homeassistant.components.octoprint
 pyoctoprintapi==0.1.11
@@ -1858,7 +1879,7 @@ pyombi==0.1.10
 pyopenuv==2023.02.0
 
 # homeassistant.components.opnsense
-pyopnsense==0.2.0
+pyopnsense==0.4.0
 
 # homeassistant.components.opple
 pyoppleio-legacy==1.0.8
@@ -1872,7 +1893,7 @@ pyotgw==2.1.3
 pyotp==2.8.0
 
 # homeassistant.components.overkiz
-pyoverkiz==1.8.0
+pyoverkiz==1.9.0
 
 # homeassistant.components.openweathermap
 pyowm==3.2.0
@@ -1946,9 +1967,6 @@ pysabnzbd==1.1.1
 # homeassistant.components.saj
 pysaj==0.0.16
 
-# homeassistant.components.sony_projector
-pysdcp==1
-
 # homeassistant.components.sensibo
 pysensibo==1.0.28
 
@@ -2014,9 +2032,6 @@ pysuez==0.1.19
 # homeassistant.components.switchbee
 pyswitchbee==1.8.0
 
-# homeassistant.components.syncthru
-pysyncthru==0.7.10
-
 # homeassistant.components.tankerkoenig
 pytankerkoenig==0.0.6
 
@@ -2029,6 +2044,9 @@ pytfiac==0.4
 # homeassistant.components.thinkingcleaner
 pythinkingcleaner==0.0.3
 
+# homeassistant.components.awair
+python-awair==0.2.4
+
 # homeassistant.components.blockchain
 python-blockchain-api==0.0.2
 
@@ -2081,13 +2099,13 @@ python-join-api==0.0.9
 python-juicenet==1.1.0
 
 # homeassistant.components.tplink
-python-kasa==0.5.1
+python-kasa[speedups]==0.5.2
 
 # homeassistant.components.lirc
 # python-lirc==1.2.3
 
 # homeassistant.components.matter
-python-matter-server==3.5.1
+python-matter-server==3.6.3
 
 # homeassistant.components.xiaomi_miio
 python-miio==0.5.12
@@ -2101,8 +2119,11 @@ python-mystrom==2.2.0
 # homeassistant.components.nest
 python-nest==4.2.0
 
+# homeassistant.components.swiss_public_transport
+python-opendata-transport==0.3.0
+
 # homeassistant.components.opensky
-python-opensky==0.0.9
+python-opensky==0.0.10
 
 # homeassistant.components.otbr
 # homeassistant.components.thread
@@ -2112,13 +2133,13 @@ python-otbr-api==2.2.0
 python-picnic-api==1.1.0
 
 # homeassistant.components.qbittorrent
-python-qbittorrent==0.4.2
+python-qbittorrent==0.4.3
 
 # homeassistant.components.ripple
 python-ripple-api==0.0.3
 
 # homeassistant.components.roborock
-python-roborock==0.23.4
+python-roborock==0.29.2
 
 # homeassistant.components.smarttub
 python-smarttub==0.0.33
@@ -2135,12 +2156,6 @@ python-telegram-bot==13.1
 # homeassistant.components.vlc
 python-vlc==1.1.2
 
-# homeassistant.components.awair
-python_awair==0.2.4
-
-# homeassistant.components.swiss_public_transport
-python_opendata_transport==0.3.0
-
 # homeassistant.components.egardia
 pythonegardia==1.0.52
 
@@ -2227,9 +2242,6 @@ qnapstats==0.4.0
 # homeassistant.components.quantum_gateway
 quantum-gateway==0.0.8
 
-# homeassistant.components.rachio
-rachiopy==1.0.3
-
 # homeassistant.components.radio_browser
 radios==0.1.1
 
@@ -2251,11 +2263,11 @@ regenmaschine==2023.06.0
 # homeassistant.components.renault
 renault-api==0.1.13
 
-# homeassistant.components.reolink
-reolink-aio==0.5.16
+# homeassistant.components.renson
+renson-endura-delta==1.5.0
 
-# homeassistant.components.python_script
-restrictedpython==6.0
+# homeassistant.components.reolink
+reolink-aio==0.7.1
 
 # homeassistant.components.idteck_prox
 rfk101py==0.0.1
@@ -2264,7 +2276,7 @@ rfk101py==0.0.1
 rflink==0.0.65
 
 # homeassistant.components.ring
-ring_doorbell==0.7.2
+ring-doorbell==0.7.2
 
 # homeassistant.components.fleetgo
 ritassist==0.9.2
@@ -2300,7 +2312,7 @@ russound-rio==1.0.0
 russound==0.1.9
 
 # homeassistant.components.ruuvitag_ble
-ruuvitag-ble==0.1.1
+ruuvitag-ble==0.1.2
 
 # homeassistant.components.yamaha
 rxv==0.7.0
@@ -2312,7 +2324,7 @@ samsungctl[websocket]==0.7.1
 samsungtvws[async,encrypted]==2.6.0
 
 # homeassistant.components.satel_integra
-satel_integra==0.3.7
+satel-integra==0.3.7
 
 # homeassistant.components.dhcp
 scapy==2.5.0
@@ -2329,12 +2341,14 @@ securetar==2023.3.0
 # homeassistant.components.sendgrid
 sendgrid==6.8.2
 
-# homeassistant.components.emulated_kasa
 # homeassistant.components.sense
-sense_energy==0.11.2
+sense-energy==0.12.0
+
+# homeassistant.components.emulated_kasa
+sense_energy==0.12.0
 
 # homeassistant.components.sensirion_ble
-sensirion-ble==0.0.1
+sensirion-ble==0.1.0
 
 # homeassistant.components.sensorpro
 sensorpro-ble==0.5.3
@@ -2343,7 +2357,7 @@ sensorpro-ble==0.5.3
 sensorpush-ble==1.5.5
 
 # homeassistant.components.sentry
-sentry-sdk==1.23.1
+sentry-sdk==1.25.1
 
 # homeassistant.components.sfr_box
 sfrbox-api==0.0.6
@@ -2352,7 +2366,7 @@ sfrbox-api==0.0.6
 sharkiq==1.0.2
 
 # homeassistant.components.aquostv
-sharp_aquos_rc==0.3.2
+sharp-aquos-rc==0.3.2
 
 # homeassistant.components.shodan
 shodan==1.28.0
@@ -2373,7 +2387,7 @@ sisyphus-control==3.1.3
 slackclient==2.5.0
 
 # homeassistant.components.xmpp
-slixmpp==1.8.3
+slixmpp==1.8.4
 
 # homeassistant.components.smart_meter_texas
 smart-meter-texas==0.4.7
@@ -2394,7 +2408,7 @@ solaredge-local==0.2.3
 solaredge==0.0.2
 
 # homeassistant.components.solax
-solax==0.3.0
+solax==0.3.2
 
 # homeassistant.components.somfy_mylink
 somfy-mylink-synergy==1.0.6
@@ -2414,10 +2428,6 @@ spiderpy==1.6.1
 # homeassistant.components.spotify
 spotipy==2.23.0
 
-# homeassistant.components.recorder
-# homeassistant.components.sql
-sqlalchemy==2.0.15
-
 # homeassistant.components.srp_energy
 srpenergy==1.3.6
 
@@ -2467,13 +2477,13 @@ swisshydrodata==0.1.0
 synology-srm==0.2.0
 
 # homeassistant.components.system_bridge
-systembridgeconnector==3.4.8
+systembridgeconnector==3.4.9
 
 # homeassistant.components.tailscale
 tailscale==0.2.0
 
 # homeassistant.components.tank_utility
-tank_utility==1.4.1
+tank-utility==1.4.1
 
 # homeassistant.components.tapsaff
 tapsaff==0.2.1
@@ -2512,7 +2522,7 @@ thermobeacon-ble==0.6.0
 thermopro-ble==0.4.5
 
 # homeassistant.components.thermoworks_smoke
-thermoworks_smoke==0.1.8
+thermoworks-smoke==0.1.8
 
 # homeassistant.components.thingspeak
 thingspeak==1.0.0
@@ -2536,13 +2546,13 @@ tololib==0.1.0b4
 toonapi==0.2.1
 
 # homeassistant.components.totalconnect
-total_connect_client==2023.2
+total-connect-client==2023.2
 
 # homeassistant.components.tplink_lte
 tp-connected==0.0.4
 
 # homeassistant.components.tplink_omada
-tplink-omada-client==1.2.4
+tplink_omada_client==1.2.4
 
 # homeassistant.components.transmission
 transmission-rpc==4.1.5
@@ -2575,7 +2585,7 @@ unifi-discovery==1.1.7
 unifiled==0.11
 
 # homeassistant.components.upb
-upb_lib==0.5.4
+upb-lib==0.5.4
 
 # homeassistant.components.upcloud
 upcloud-api==2.0.0
@@ -2604,7 +2614,7 @@ venstarcolortouch==0.19
 vilfo-api-client==0.4.1
 
 # homeassistant.components.voip
-voip-utils==0.0.7
+voip-utils==0.1.0
 
 # homeassistant.components.volkszaehler
 volkszaehler==0.4.0
@@ -2665,7 +2675,7 @@ withings-api==2.4.0
 wled==0.16.0
 
 # homeassistant.components.wolflink
-wolf_smartset==0.1.11
+wolf-smartset==0.1.11
 
 # homeassistant.components.wyoming
 wyoming==0.0.1
@@ -2677,10 +2687,10 @@ xbox-webapi==2.0.11
 xiaomi-ble==0.17.2
 
 # homeassistant.components.knx
-xknx==2.10.0
+xknx==2.11.1
 
 # homeassistant.components.knx
-xknxproject==3.1.1
+xknxproject==3.2.0
 
 # homeassistant.components.bluesound
 # homeassistant.components.fritz
@@ -2704,7 +2714,7 @@ yalexs-ble==2.1.18
 yalexs==1.5.1
 
 # homeassistant.components.yeelight
-yeelight==0.7.10
+yeelight==0.7.11
 
 # homeassistant.components.yeelightsunflower
 yeelightsunflower==0.0.10
@@ -2716,25 +2726,25 @@ yolink-api==0.2.9
 youless-api==1.0.1
 
 # homeassistant.components.media_extractor
-youtube_dl==2021.12.17
+yt-dlp==2023.3.4
 
 # homeassistant.components.zamg
-zamg==0.2.2
+zamg==0.2.4
 
 # homeassistant.components.zengge
 zengge==0.2
 
 # homeassistant.components.zeroconf
-zeroconf==0.64.0
+zeroconf==0.70.0
 
 # homeassistant.components.zeversolar
 zeversolar==0.3.1
 
 # homeassistant.components.zha
-zha-quirks==0.0.100
+zha-quirks==0.0.101
 
 # homeassistant.components.zhong_hong
-zhong_hong_hvac==1.0.9
+zhong-hong-hvac==1.0.9
 
 # homeassistant.components.ziggo_mediabox_xl
 ziggo-mediabox-xl==1.1.0
@@ -2743,16 +2753,16 @@ ziggo-mediabox-xl==1.1.0
 zigpy-deconz==0.21.0
 
 # homeassistant.components.zha
-zigpy-xbee==0.18.0
+zigpy-xbee==0.18.1
 
 # homeassistant.components.zha
 zigpy-zigate==0.11.0
 
 # homeassistant.components.zha
-zigpy-znp==0.11.1
+zigpy-znp==0.11.2
 
 # homeassistant.components.zha
-zigpy==0.55.0
+zigpy==0.56.1
 
 # homeassistant.components.zoneminder
 zm-py==0.5.2
@@ -2761,4 +2771,4 @@ zm-py==0.5.2
 zwave-js-server-python==0.49.0
 
 # homeassistant.components.zwave_me
-zwave_me_ws==0.4.3
+zwave-me-ws==0.4.3
diff --git a/requirements_test.txt b/requirements_test.txt
index 077a74c1b3a..74369507229 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -11,9 +11,9 @@ astroid==2.15.4
 coverage==7.2.4
 freezegun==1.2.2
 mock-open==1.4.0
-mypy==1.3.0
+mypy==1.4.1
 pre-commit==3.1.0
-pydantic==1.10.8
+pydantic==1.10.9
 pylint==2.17.4
 pylint-per-file-ignores==1.1.0
 pipdeptree==2.7.0
@@ -29,23 +29,23 @@ pytest-unordered==0.5.2
 pytest-picked==0.4.6
 pytest-xdist==3.2.1
 pytest==7.3.1
-requests_mock==1.10.0
+requests_mock==1.11.0
 respx==0.20.1
 syrupy==4.0.2
 tomli==2.0.1;python_version<"3.11"
 tqdm==4.64.0
-types-atomicwrites==1.4.1
+types-atomicwrites==1.4.5.1
 types-croniter==1.0.6
 types-backports==0.1.3
 types-chardet==0.1.5
-types-decorator==5.1.1
+types-decorator==5.1.8.3
 types-enum34==1.1.8
 types-ipaddress==1.0.8
-types-paho-mqtt==1.6.0.1
+types-paho-mqtt==1.6.0.6
 types-pkg-resources==0.1.3
-types-python-dateutil==2.8.19.5
+types-python-dateutil==2.8.19.13
 types-python-slugify==0.1.2
-types-pytz==2022.7.0.0
+types-pytz==2023.3.0.0
 types-PyYAML==6.0.12.2
-types-requests==2.30.0.0
-types-toml==0.10.8.1
+types-requests==2.31.0.1
+types-toml==0.10.8.6
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 712b10c12a6..7c075eb1426 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -9,18 +9,68 @@ AEMET-OpenData==0.2.2
 # homeassistant.components.aladdin_connect
 AIOAladdinConnect==0.1.56
 
+# homeassistant.components.honeywell
+AIOSomecomfort==0.0.14
+
 # homeassistant.components.adax
 Adax-local==0.1.5
 
+# homeassistant.components.ambiclimate
+Ambiclimate==0.2.1
+
+# homeassistant.components.co2signal
+CO2Signal==0.4.2
+
+# homeassistant.components.doorbird
+DoorBirdPy==2.1.0
+
 # homeassistant.components.homekit
 HAP-python==4.7.0
 
+# homeassistant.components.tasmota
+HATasmota==0.6.5
+
+# homeassistant.components.doods
+# homeassistant.components.generic
+# homeassistant.components.image_upload
+# homeassistant.components.proxy
+# homeassistant.components.qrcode
+# homeassistant.components.seven_segments
+# homeassistant.components.sighthound
+# homeassistant.components.tensorflow
+Pillow==9.5.0
+
+# homeassistant.components.plex
+PlexAPI==4.13.2
+
+# homeassistant.components.progettihwsw
+ProgettiHWSW==0.1.1
+
+# homeassistant.components.cast
+PyChromecast==13.0.7
+
 # homeassistant.components.flick_electric
 PyFlick==0.0.2
 
+# homeassistant.components.flume
+PyFlume==0.6.5
+
+# homeassistant.components.fronius
+PyFronius==0.7.1
+
+# homeassistant.components.met_eireann
+PyMetEireann==2021.8.0
+
+# homeassistant.components.met
+# homeassistant.components.norway_air
+PyMetno==0.10.0
+
 # homeassistant.components.keymitt_ble
 PyMicroBot==0.0.9
 
+# homeassistant.components.nina
+PyNINA==0.3.0
+
 # homeassistant.components.mobile_app
 # homeassistant.components.owntracks
 PyNaCl==1.5.0
@@ -36,7 +86,10 @@ PyRMVtransport==0.3.3
 PySocks==1.7.1
 
 # homeassistant.components.switchbot
-PySwitchbot==0.37.6
+PySwitchbot==0.38.0
+
+# homeassistant.components.syncthru
+PySyncThru==0.7.10
 
 # homeassistant.components.transport_nsw
 PyTransportNSW==0.1.1
@@ -51,9 +104,19 @@ PyViCare==2.25.0
 # homeassistant.components.xiaomi_aqara
 PyXiaomiGateway==0.14.3
 
+# homeassistant.components.rachio
+RachioPy==1.0.3
+
+# homeassistant.components.python_script
+RestrictedPython==6.0
+
 # homeassistant.components.remember_the_milk
 RtmAPI==0.7.2
 
+# homeassistant.components.recorder
+# homeassistant.components.sql
+SQLAlchemy==2.0.15
+
 # homeassistant.components.onvif
 WSDiscovery==2.0.0
 
@@ -76,7 +139,7 @@ adext==0.4.2
 adguardhome==0.6.1
 
 # homeassistant.components.advantage_air
-advantage_air==0.4.4
+advantage-air==0.4.4
 
 # homeassistant.components.frontier_silicon
 afsapi==0.2.7
@@ -85,28 +148,28 @@ afsapi==0.2.7
 agent-py==0.0.23
 
 # homeassistant.components.geo_json_events
-aio_geojson_generic_client==0.3
+aio-geojson-generic-client==0.3
 
 # homeassistant.components.geonetnz_quakes
-aio_geojson_geonetnz_quakes==0.15
+aio-geojson-geonetnz-quakes==0.15
 
 # homeassistant.components.geonetnz_volcano
-aio_geojson_geonetnz_volcano==0.8
+aio-geojson-geonetnz-volcano==0.8
 
 # homeassistant.components.nsw_rural_fire_service_feed
-aio_geojson_nsw_rfs_incidents==0.6
+aio-geojson-nsw-rfs-incidents==0.6
 
 # homeassistant.components.usgs_earthquakes_feed
-aio_geojson_usgs_earthquakes==0.2
+aio-geojson-usgs-earthquakes==0.2
 
 # homeassistant.components.gdacs
-aio_georss_gdacs==0.8
+aio-georss-gdacs==0.8
 
 # homeassistant.components.airq
 aioairq==0.2.4
 
 # homeassistant.components.airzone_cloud
-aioairzone-cloud==0.1.8
+aioairzone-cloud==0.2.0
 
 # homeassistant.components.airzone
 aioairzone==0.6.4
@@ -149,7 +212,7 @@ aioecowitt==2023.5.0
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==13.9.0
+aioesphomeapi==15.1.1
 
 # homeassistant.components.flo
 aioflo==2021.11.0
@@ -168,7 +231,7 @@ aiohomekit==2.6.5
 
 # homeassistant.components.emulated_hue
 # homeassistant.components.http
-aiohttp_cors==0.7.0
+aiohttp-cors==0.7.0
 
 # homeassistant.components.hue
 aiohue==4.6.2
@@ -179,15 +242,15 @@ aioimaplib==1.0.1
 # homeassistant.components.apache_kafka
 aiokafka==0.7.2
 
+# homeassistant.components.lifx
+aiolifx-effects==0.3.2
+
+# homeassistant.components.lifx
+aiolifx-themes==0.4.5
+
 # homeassistant.components.lifx
 aiolifx==0.8.10
 
-# homeassistant.components.lifx
-aiolifx_effects==0.3.2
-
-# homeassistant.components.lifx
-aiolifx_themes==0.4.5
-
 # homeassistant.components.livisi
 aiolivisi==0.0.19
 
@@ -210,7 +273,7 @@ aionanoleaf==0.2.1
 aionotion==2023.05.5
 
 # homeassistant.components.oncue
-aiooncue==0.3.4
+aiooncue==0.3.5
 
 # homeassistant.components.openexchangerates
 aioopenexchangerates==0.4.0
@@ -244,23 +307,17 @@ aioridwell==2023.01.0
 # homeassistant.components.ruuvi_gateway
 aioruuvigateway==0.1.0
 
-# homeassistant.components.senseme
-aiosenseme==0.6.1
-
 # homeassistant.components.senz
 aiosenz==1.0.0
 
 # homeassistant.components.shelly
-aioshelly==5.3.2
+aioshelly==5.4.0
 
 # homeassistant.components.skybell
 aioskybell==22.7.0
 
 # homeassistant.components.slimproto
-aioslimproto==2.1.1
-
-# homeassistant.components.honeywell
-aiosomecomfort==0.0.14
+aioslimproto==2.3.2
 
 # homeassistant.components.steamist
 aiosteamist==0.3.2
@@ -275,7 +332,7 @@ aiosyncthing==0.5.1
 aiotractive==0.5.5
 
 # homeassistant.components.unifi
-aiounifi==48
+aiounifi==49
 
 # homeassistant.components.vlc_telnet
 aiovlc==0.1.0
@@ -296,7 +353,7 @@ airly==1.1.0
 airthings-ble==0.5.3
 
 # homeassistant.components.airthings
-airthings_cloud==0.1.0
+airthings-cloud==0.1.0
 
 # homeassistant.components.airtouch4
 airtouch4pyapi==1.0.5
@@ -304,9 +361,6 @@ airtouch4pyapi==1.0.5
 # homeassistant.components.amberelectric
 amberelectric==1.0.4
 
-# homeassistant.components.ambiclimate
-ambiclimate==0.2.1
-
 # homeassistant.components.androidtv
 androidtv[async]==0.0.70
 
@@ -332,7 +386,7 @@ aprslib==0.7.0
 aranet4==2.1.3
 
 # homeassistant.components.arcam_fmj
-arcam-fmj==1.3.0
+arcam-fmj==1.4.0
 
 # homeassistant.components.dlna_dmr
 # homeassistant.components.dlna_dms
@@ -364,10 +418,10 @@ base36==0.1.1
 beautifulsoup4==4.11.1
 
 # homeassistant.components.zha
-bellows==0.35.5
+bellows==0.35.8
 
 # homeassistant.components.bmw_connected_drive
-bimmer-connected==0.13.7
+bimmer-connected==0.13.8
 
 # homeassistant.components.bluetooth
 bleak-retry-connector==3.0.2
@@ -376,7 +430,7 @@ bleak-retry-connector==3.0.2
 bleak==0.20.2
 
 # homeassistant.components.blebox
-blebox_uniapi==2.1.4
+blebox-uniapi==2.1.4
 
 # homeassistant.components.blink
 blinkpy==0.21.0
@@ -394,13 +448,13 @@ bluetooth-auto-recovery==1.2.0
 # homeassistant.components.esphome
 # homeassistant.components.ld2410_ble
 # homeassistant.components.led_ble
-bluetooth-data-tools==0.4.0
+bluetooth-data-tools==1.3.0
 
 # homeassistant.components.bond
 bond-async==0.1.23
 
 # homeassistant.components.bosch_shc
-boschshcpy==0.2.35
+boschshcpy==0.2.57
 
 # homeassistant.components.broadlink
 broadlink==0.18.3
@@ -423,9 +477,6 @@ buienradar==1.0.5
 # homeassistant.components.caldav
 caldav==1.2.0
 
-# homeassistant.components.co2signal
-co2signal==0.4.2
-
 # homeassistant.components.coinbase
 coinbase==2.1.0
 
@@ -435,7 +486,6 @@ colorlog==6.6.0
 # homeassistant.components.color_extractor
 colorthief==0.2.1
 
-# homeassistant.components.eddystone_temperature
 # homeassistant.components.eq3btsmart
 # homeassistant.components.xiaomi_miio
 construct==2.10.56
@@ -490,20 +540,20 @@ directv==0.4.0
 # homeassistant.components.steamist
 discovery30303==0.2.1
 
-# homeassistant.components.doorbird
-doorbirdpy==2.1.0
+# homeassistant.components.dremel_3d_printer
+dremel3dpy==2.1.1
 
 # homeassistant.components.dsmr
-dsmr_parser==0.33
+dsmr-parser==0.33
 
 # homeassistant.components.dwd_weather_warnings
 dwdwfsapi==1.0.6
 
 # homeassistant.components.dynalite
-dynalite_devices==0.1.47
+dynalite-devices==0.1.47
 
 # homeassistant.components.dynalite
-dynalite_panel==0.0.4
+dynalite-panel==0.0.4
 
 # homeassistant.components.rainforest_eagle
 eagle100==0.1.1
@@ -518,10 +568,10 @@ elgato==4.0.1
 elkm1-lib==2.2.5
 
 # homeassistant.components.elmax
-elmax_api==0.0.4
+elmax-api==0.0.4
 
 # homeassistant.components.emulated_roku
-emulated_roku==0.2.1
+emulated-roku==0.2.1
 
 # homeassistant.components.huisbaasje
 energyflip-client==0.2.2
@@ -533,10 +583,10 @@ energyzero==0.4.1
 enocean==0.50
 
 # homeassistant.components.environment_canada
-env_canada==0.5.34
+env-canada==0.5.35
 
 # homeassistant.components.enphase_envoy
-envoy_reader==0.20.1
+envoy-reader==0.20.1
 
 # homeassistant.components.season
 ephem==4.1.2
@@ -548,7 +598,7 @@ epson-projector==0.5.0
 esphome-dashboard-api==1.2.3
 
 # homeassistant.components.eufylife_ble
-eufylife_ble_client==0.1.7
+eufylife-ble-client==0.1.7
 
 # homeassistant.components.faa_delays
 faadelays==0.0.7
@@ -569,24 +619,24 @@ fjaraskupan==2.2.0
 flipr-api==1.5.0
 
 # homeassistant.components.flux_led
-flux_led==0.28.37
+flux-led==0.28.37
 
 # homeassistant.components.homekit
 # homeassistant.components.recorder
 fnv-hash-fast==0.3.1
 
 # homeassistant.components.foobot
-foobot_async==1.0.0
+foobot-async==1.0.0
 
 # homeassistant.components.forecast_solar
-forecast_solar==3.0.0
+forecast-solar==3.0.0
 
 # homeassistant.components.freebox
 freebox-api==1.1.0
 
 # homeassistant.components.fritz
 # homeassistant.components.fritzbox_callmonitor
-fritzconnection==1.12.0
+fritzconnection[qr]==1.12.0
 
 # homeassistant.components.google_translate
 gTTS==2.2.4
@@ -604,13 +654,13 @@ geocachingapi==0.2.1
 geopy==2.3.0
 
 # homeassistant.components.geo_rss_events
-georss_generic_client==0.6
+georss-generic-client==0.6
 
 # homeassistant.components.ign_sismologia
-georss_ign_sismologia_client==0.6
+georss-ign-sismologia-client==0.6
 
 # homeassistant.components.qld_bushfire
-georss_qld_bushfire_alert_client==0.5
+georss-qld-bushfire-alert-client==0.5
 
 # homeassistant.components.dlna_dmr
 # homeassistant.components.kef
@@ -624,7 +674,7 @@ getmac==0.8.2
 gios==3.1.0
 
 # homeassistant.components.glances
-glances_api==0.4.2
+glances-api==0.4.3
 
 # homeassistant.components.goalzero
 goalzero==0.2.1
@@ -640,10 +690,10 @@ google-api-python-client==2.71.0
 google-cloud-pubsub==2.13.11
 
 # homeassistant.components.google_generative_ai_conversation
-google-generativeai==0.1.0rc2
+google-generativeai==0.1.0
 
 # homeassistant.components.nest
-google-nest-sdm==2.2.4
+google-nest-sdm==2.2.5
 
 # homeassistant.components.google_travel_time
 googlemaps==2.5.1
@@ -655,7 +705,7 @@ govee-ble==0.23.0
 greeclimate==1.4.1
 
 # homeassistant.components.greeneye_monitor
-greeneye_monitor==3.0.3
+greeneye-monitor==3.0.3
 
 # homeassistant.components.pure_energie
 gridnet==4.2.0
@@ -683,28 +733,25 @@ ha-ffmpeg==3.1.0
 ha-iotawattpy==0.1.1
 
 # homeassistant.components.philips_js
-ha-philipsjs==3.0.0
+ha-philipsjs==3.1.0
 
 # homeassistant.components.habitica
 habitipy==0.2.0
 
 # homeassistant.components.cloud
-hass-nabucasa==0.67.1
+hass-nabucasa==0.69.0
 
 # homeassistant.components.conversation
 hassil==1.0.6
 
-# homeassistant.components.tasmota
-hatasmota==0.6.5
-
 # homeassistant.components.jewish_calendar
 hdate==0.10.4
 
 # homeassistant.components.here_travel_time
-here_routing==0.2.0
+here-routing==0.2.0
 
 # homeassistant.components.here_travel_time
-here_transit==1.2.0
+here-transit==1.2.0
 
 # homeassistant.components.hlk_sw16
 hlk-sw16==0.0.9
@@ -716,10 +763,10 @@ hole==0.8.0
 holidays==0.21.13
 
 # homeassistant.components.frontend
-home-assistant-frontend==20230608.0
+home-assistant-frontend==20230705.0
 
 # homeassistant.components.conversation
-home-assistant-intents==2023.6.5
+home-assistant-intents==2023.6.28
 
 # homeassistant.components.home_connect
 homeconnect==0.7.2
@@ -743,7 +790,7 @@ hyperion-py==0.7.5
 iaqualink==0.5.0
 
 # homeassistant.components.ibeacon
-ibeacon_ble==1.0.1
+ibeacon-ble==1.0.1
 
 # homeassistant.components.local_calendar
 ical==4.5.4
@@ -791,7 +838,7 @@ justnimbus==0.6.0
 kegtron-ble==0.4.0
 
 # homeassistant.components.knx
-knx-frontend==2023.6.9.195839
+knx-frontend==2023.6.23.191712
 
 # homeassistant.components.konnected
 konnected==1.2.0
@@ -803,7 +850,7 @@ krakenex==2.1.0
 lacrosse-view==1.0.1
 
 # homeassistant.components.laundrify
-laundrify_aio==1.1.2
+laundrify-aio==1.1.2
 
 # homeassistant.components.ld2410_ble
 ld2410-ble==0.1.1
@@ -824,7 +871,10 @@ libsoundtouch==0.8
 life360==5.5.0
 
 # homeassistant.components.logi_circle
-logi_circle==0.2.3
+logi-circle==0.2.3
+
+# homeassistant.components.loqed
+loqedAPI==2.1.7
 
 # homeassistant.components.luftdaten
 luftdaten==0.7.4
@@ -875,7 +925,7 @@ moat-ble==0.1.1
 moehlenhoff-alpha2==1.3.0
 
 # homeassistant.components.mopeka
-mopeka_iot_ble==0.4.1
+mopeka-iot-ble==0.4.1
 
 # homeassistant.components.motion_blinds
 motionblinds==0.6.18
@@ -893,7 +943,7 @@ mutagen==1.46.0
 mutesync==0.0.1
 
 # homeassistant.components.keenetic_ndms2
-ndms2_client==0.1.2
+ndms2-client==0.1.2
 
 # homeassistant.components.ness_alarm
 nessclient==0.10.0
@@ -975,6 +1025,9 @@ openai==0.27.2
 # homeassistant.components.openerz
 openerz-api==0.2.0
 
+# homeassistant.components.openhome
+openhomedevice==2.2.0
+
 # homeassistant.components.oralb
 oralb-ble==0.17.6
 
@@ -989,7 +1042,7 @@ p1monitor==2.1.1
 paho-mqtt==1.6.1
 
 # homeassistant.components.panasonic_viera
-panasonic_viera==0.3.6
+panasonic-viera==0.3.6
 
 # homeassistant.components.dunehd
 pdunehd==1.3.2
@@ -1007,24 +1060,11 @@ pescea==1.0.12
 pexpect==4.6.0
 
 # homeassistant.components.modem_callerid
-phone_modem==0.1.1
+phone-modem==0.1.1
 
 # homeassistant.components.pilight
 pilight==0.1.1
 
-# homeassistant.components.doods
-# homeassistant.components.generic
-# homeassistant.components.image_upload
-# homeassistant.components.proxy
-# homeassistant.components.qrcode
-# homeassistant.components.seven_segments
-# homeassistant.components.sighthound
-# homeassistant.components.tensorflow
-pillow==9.5.0
-
-# homeassistant.components.plex
-plexapi==4.13.2
-
 # homeassistant.components.plex
 plexauth==0.0.6
 
@@ -1044,13 +1084,10 @@ poolsense==0.0.8
 praw==7.5.0
 
 # homeassistant.components.islamic_prayer_times
-prayer_times_calculator==0.0.6
-
-# homeassistant.components.progettihwsw
-progettihwsw==0.1.1
+prayer-times-calculator==0.0.6
 
 # homeassistant.components.prometheus
-prometheus_client==0.7.1
+prometheus-client==0.7.1
 
 # homeassistant.components.hardware
 # homeassistant.components.recorder
@@ -1063,7 +1100,7 @@ pure-python-adb[async]==0.3.0.dev0
 pushbullet.py==0.11.0
 
 # homeassistant.components.pushover
-pushover_complete==1.1.1
+pushover-complete==1.1.1
 
 # homeassistant.components.pvoutput
 pvo==1.0.0
@@ -1080,6 +1117,9 @@ py-dormakaba-dkey==1.0.4
 # homeassistant.components.melissa
 py-melissa-climate==2.1.4
 
+# homeassistant.components.nextbus
+py-nextbusnext==0.1.5
+
 # homeassistant.components.nightscout
 py-nightscout==1.2.2
 
@@ -1095,12 +1135,11 @@ pyCEC==0.5.2
 # homeassistant.components.control4
 pyControl4==1.1.0
 
-# homeassistant.components.met_eireann
-pyMetEireann==2021.8.0
+# homeassistant.components.eight_sleep
+pyEight==0.3.2
 
-# homeassistant.components.met
-# homeassistant.components.norway_air
-pyMetno==0.10.0
+# homeassistant.components.electrasmart
+pyElectra==1.2.0
 
 # homeassistant.components.rfxtrx
 pyRFXtrx==0.30.1
@@ -1111,9 +1150,6 @@ pyTibber==0.27.2
 # homeassistant.components.dlink
 pyW215==0.7.0
 
-# homeassistant.components.nextbus
-py_nextbusnext==0.1.5
-
 # homeassistant.components.hisense_aehw4a1
 pyaehw4a1==0.3.9
 
@@ -1131,7 +1167,7 @@ pyatag==0.3.5.3
 pyatmo==7.5.0
 
 # homeassistant.components.apple_tv
-pyatv==0.12.0
+pyatv==0.13.2
 
 # homeassistant.components.aussie_broadband
 pyaussiebb==0.0.15
@@ -1151,9 +1187,6 @@ pybravia==0.3.3
 # homeassistant.components.cloudflare
 pycfdns==2.0.1
 
-# homeassistant.components.cast
-pychromecast==13.0.7
-
 # homeassistant.components.comfoconnect
 pycomfoconnect==0.5.1
 
@@ -1167,11 +1200,14 @@ pycsspeechtts==1.0.8
 pydaikin==2.9.0
 
 # homeassistant.components.deconz
-pydeconz==112
+pydeconz==113
 
 # homeassistant.components.dexcom
 pydexcom==0.2.3
 
+# homeassistant.components.discovergy
+pydiscovergy==1.2.1
+
 # homeassistant.components.android_ip_webcam
 pydroid-ipcam==2.0.0
 
@@ -1181,12 +1217,6 @@ pyeconet==0.1.20
 # homeassistant.components.efergy
 pyefergy==22.1.1
 
-# homeassistant.components.eight_sleep
-pyeight==0.3.2
-
-# homeassistant.components.electrasmart
-pyelectra==1.2.0
-
 # homeassistant.components.everlights
 pyeverlights==0.1.0
 
@@ -1194,7 +1224,7 @@ pyeverlights==0.1.0
 pyevilgenius==2.0.0
 
 # homeassistant.components.ezviz
-pyezviz==0.2.0.12
+pyezviz==0.2.1.2
 
 # homeassistant.components.fibaro
 pyfibaro==0.7.1
@@ -1208,9 +1238,6 @@ pyfireservicerota==0.0.43
 # homeassistant.components.flic
 pyflic==2.0.3
 
-# homeassistant.components.flume
-pyflume==0.6.5
-
 # homeassistant.components.forked_daapd
 pyforked-daapd==0.1.14
 
@@ -1220,9 +1247,6 @@ pyfreedompro==1.1.0
 # homeassistant.components.fritzbox
 pyfritzhome==0.6.8
 
-# homeassistant.components.fronius
-pyfronius==0.7.1
-
 # homeassistant.components.ifttt
 pyfttt==0.3
 
@@ -1254,7 +1278,7 @@ pyinsteon==1.4.3
 pyipma==3.0.6
 
 # homeassistant.components.ipp
-pyipp==0.13.0
+pyipp==0.14.0
 
 # homeassistant.components.iqvia
 pyiqvia==2022.04.0
@@ -1314,7 +1338,7 @@ pymailgunner==1.4
 pymata-express==1.19
 
 # homeassistant.components.mazda
-pymazda==0.3.8
+pymazda==0.3.9
 
 # homeassistant.components.melcloud
 pymelcloud==2.5.8
@@ -1326,7 +1350,7 @@ pymeteoclimatic==0.0.6
 pymochad==0.2.0
 
 # homeassistant.components.modbus
-pymodbus==3.1.3
+pymodbus==3.3.1
 
 # homeassistant.components.monoprice
 pymonoprice==0.4
@@ -1340,9 +1364,6 @@ pymysensors==0.24.0
 # homeassistant.components.netgear
 pynetgear==0.10.9
 
-# homeassistant.components.nina
-pynina==0.3.0
-
 # homeassistant.components.nobo_hub
 pynobo==1.6.0
 
@@ -1362,7 +1383,7 @@ pynx584==0.5
 pynzbgetapi==0.2.0
 
 # homeassistant.components.obihai
-pyobihai==1.3.2
+pyobihai==1.4.2
 
 # homeassistant.components.octoprint
 pyoctoprintapi==0.1.11
@@ -1371,7 +1392,7 @@ pyoctoprintapi==0.1.11
 pyopenuv==2023.02.0
 
 # homeassistant.components.opnsense
-pyopnsense==0.2.0
+pyopnsense==0.4.0
 
 # homeassistant.components.opentherm_gw
 pyotgw==2.1.3
@@ -1382,7 +1403,7 @@ pyotgw==2.1.3
 pyotp==2.8.0
 
 # homeassistant.components.overkiz
-pyoverkiz==1.8.0
+pyoverkiz==1.9.0
 
 # homeassistant.components.openweathermap
 pyowm==3.2.0
@@ -1491,15 +1512,15 @@ pysqueezebox==0.6.3
 # homeassistant.components.switchbee
 pyswitchbee==1.8.0
 
-# homeassistant.components.syncthru
-pysyncthru==0.7.10
-
 # homeassistant.components.tankerkoenig
 pytankerkoenig==0.0.6
 
 # homeassistant.components.tautulli
 pytautulli==23.1.1
 
+# homeassistant.components.awair
+python-awair==0.2.4
+
 # homeassistant.components.bsblan
 python-bsblan==0.5.11
 
@@ -1519,14 +1540,17 @@ python-izone==1.2.9
 python-juicenet==1.1.0
 
 # homeassistant.components.tplink
-python-kasa==0.5.1
+python-kasa[speedups]==0.5.2
 
 # homeassistant.components.matter
-python-matter-server==3.5.1
+python-matter-server==3.6.3
 
 # homeassistant.components.xiaomi_miio
 python-miio==0.5.12
 
+# homeassistant.components.mystrom
+python-mystrom==2.2.0
+
 # homeassistant.components.nest
 python-nest==4.2.0
 
@@ -1538,10 +1562,10 @@ python-otbr-api==2.2.0
 python-picnic-api==1.1.0
 
 # homeassistant.components.qbittorrent
-python-qbittorrent==0.4.2
+python-qbittorrent==0.4.3
 
 # homeassistant.components.roborock
-python-roborock==0.23.4
+python-roborock==0.29.2
 
 # homeassistant.components.smarttub
 python-smarttub==0.0.33
@@ -1555,9 +1579,6 @@ python-tado==0.15.0
 # homeassistant.components.telegram_bot
 python-telegram-bot==13.1
 
-# homeassistant.components.awair
-python_awair==0.2.4
-
 # homeassistant.components.tile
 pytile==2023.04.0
 
@@ -1617,8 +1638,8 @@ pyzerproc==0.4.8
 # homeassistant.components.qingping
 qingping-ble==0.8.2
 
-# homeassistant.components.rachio
-rachiopy==1.0.3
+# homeassistant.components.qnap
+qnapstats==0.4.0
 
 # homeassistant.components.radio_browser
 radios==0.1.1
@@ -1635,17 +1656,17 @@ regenmaschine==2023.06.0
 # homeassistant.components.renault
 renault-api==0.1.13
 
-# homeassistant.components.reolink
-reolink-aio==0.5.16
+# homeassistant.components.renson
+renson-endura-delta==1.5.0
 
-# homeassistant.components.python_script
-restrictedpython==6.0
+# homeassistant.components.reolink
+reolink-aio==0.7.1
 
 # homeassistant.components.rflink
 rflink==0.0.65
 
 # homeassistant.components.ring
-ring_doorbell==0.7.2
+ring-doorbell==0.7.2
 
 # homeassistant.components.roku
 rokuecp==0.18.0
@@ -1663,7 +1684,7 @@ rpi-bad-power==0.1.0
 rtsp-to-webrtc==0.5.1
 
 # homeassistant.components.ruuvitag_ble
-ruuvitag-ble==0.1.1
+ruuvitag-ble==0.1.2
 
 # homeassistant.components.yamaha
 rxv==0.7.0
@@ -1683,12 +1704,14 @@ screenlogicpy==0.8.2
 # homeassistant.components.backup
 securetar==2023.3.0
 
-# homeassistant.components.emulated_kasa
 # homeassistant.components.sense
-sense_energy==0.11.2
+sense-energy==0.12.0
+
+# homeassistant.components.emulated_kasa
+sense_energy==0.12.0
 
 # homeassistant.components.sensirion_ble
-sensirion-ble==0.0.1
+sensirion-ble==0.1.0
 
 # homeassistant.components.sensorpro
 sensorpro-ble==0.5.3
@@ -1697,7 +1720,7 @@ sensorpro-ble==0.5.3
 sensorpush-ble==1.5.5
 
 # homeassistant.components.sentry
-sentry-sdk==1.23.1
+sentry-sdk==1.25.1
 
 # homeassistant.components.sfr_box
 sfrbox-api==0.0.6
@@ -1733,7 +1756,7 @@ soco==0.29.1
 solaredge==0.0.2
 
 # homeassistant.components.solax
-solax==0.3.0
+solax==0.3.2
 
 # homeassistant.components.somfy_mylink
 somfy-mylink-synergy==1.0.6
@@ -1753,10 +1776,6 @@ spiderpy==1.6.1
 # homeassistant.components.spotify
 spotipy==2.23.0
 
-# homeassistant.components.recorder
-# homeassistant.components.sql
-sqlalchemy==2.0.15
-
 # homeassistant.components.srp_energy
 srpenergy==1.3.6
 
@@ -1794,7 +1813,7 @@ sunwatcher==0.2.1
 surepy==0.8.0
 
 # homeassistant.components.system_bridge
-systembridgeconnector==3.4.8
+systembridgeconnector==3.4.9
 
 # homeassistant.components.tailscale
 tailscale==0.2.0
@@ -1833,10 +1852,10 @@ tololib==0.1.0b4
 toonapi==0.2.1
 
 # homeassistant.components.totalconnect
-total_connect_client==2023.2
+total-connect-client==2023.2
 
 # homeassistant.components.tplink_omada
-tplink-omada-client==1.2.4
+tplink_omada_client==1.2.4
 
 # homeassistant.components.transmission
 transmission-rpc==4.1.5
@@ -1866,7 +1885,7 @@ ultraheat-api==0.5.1
 unifi-discovery==1.1.7
 
 # homeassistant.components.upb
-upb_lib==0.5.4
+upb-lib==0.5.4
 
 # homeassistant.components.upcloud
 upcloud-api==2.0.0
@@ -1895,7 +1914,7 @@ venstarcolortouch==0.19
 vilfo-api-client==0.4.1
 
 # homeassistant.components.voip
-voip-utils==0.0.7
+voip-utils==0.1.0
 
 # homeassistant.components.volvooncall
 volvooncall==0.10.3
@@ -1938,7 +1957,7 @@ withings-api==2.4.0
 wled==0.16.0
 
 # homeassistant.components.wolflink
-wolf_smartset==0.1.11
+wolf-smartset==0.1.11
 
 # homeassistant.components.wyoming
 wyoming==0.0.1
@@ -1950,10 +1969,10 @@ xbox-webapi==2.0.11
 xiaomi-ble==0.17.2
 
 # homeassistant.components.knx
-xknx==2.10.0
+xknx==2.11.1
 
 # homeassistant.components.knx
-xknxproject==3.1.1
+xknxproject==3.2.0
 
 # homeassistant.components.bluesound
 # homeassistant.components.fritz
@@ -1974,7 +1993,7 @@ yalexs-ble==2.1.18
 yalexs==1.5.1
 
 # homeassistant.components.yeelight
-yeelight==0.7.10
+yeelight==0.7.11
 
 # homeassistant.components.yolink
 yolink-api==0.2.9
@@ -1983,34 +2002,34 @@ yolink-api==0.2.9
 youless-api==1.0.1
 
 # homeassistant.components.zamg
-zamg==0.2.2
+zamg==0.2.4
 
 # homeassistant.components.zeroconf
-zeroconf==0.64.0
+zeroconf==0.70.0
 
 # homeassistant.components.zeversolar
 zeversolar==0.3.1
 
 # homeassistant.components.zha
-zha-quirks==0.0.100
+zha-quirks==0.0.101
 
 # homeassistant.components.zha
 zigpy-deconz==0.21.0
 
 # homeassistant.components.zha
-zigpy-xbee==0.18.0
+zigpy-xbee==0.18.1
 
 # homeassistant.components.zha
 zigpy-zigate==0.11.0
 
 # homeassistant.components.zha
-zigpy-znp==0.11.1
+zigpy-znp==0.11.2
 
 # homeassistant.components.zha
-zigpy==0.55.0
+zigpy==0.56.1
 
 # homeassistant.components.zwave_js
 zwave-js-server-python==0.49.0
 
 # homeassistant.components.zwave_me
-zwave_me_ws==0.4.3
+zwave-me-ws==0.4.3
diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt
index 9954e97da97..eff26bcfe82 100644
--- a/requirements_test_pre_commit.txt
+++ b/requirements_test_pre_commit.txt
@@ -1,8 +1,6 @@
 # Automatically generated from .pre-commit-config.yaml by gen_requirements_all.py, do not edit
 
-bandit==1.7.4
 black==23.3.0
 codespell==2.2.2
-isort==5.12.0
-ruff==0.0.262
+ruff==0.0.272
 yamllint==1.28.0
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index 1b5969a6e86..0bbbd97c926 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -20,17 +20,17 @@ else:
     import tomli as tomllib
 
 COMMENT_REQUIREMENTS = (
-    "Adafruit_BBIO",
+    "Adafruit-BBIO",
     "atenpdu",  # depends on pysnmp which is not maintained at this time
     "avea",  # depends on bluepy
     "avion",
     "beacontools",
-    "beewi_smartclim",  # depends on bluepy
+    "beewi-smartclim",  # depends on bluepy
     "bluepy",
     "decora",
-    "decora_wifi",
+    "decora-wifi",
     "evdev",
-    "face_recognition",
+    "face-recognition",
     "opencv-python-headless",
     "pybluez",
     "pycups",
@@ -104,9 +104,9 @@ regex==2021.8.28
 # 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==3.6.2
+anyio==3.7.0
 h11==0.14.0
-httpcore==0.17.0
+httpcore==0.17.2
 
 # Ensure we have a hyperframe version that works in Python 3.10
 # 5.2.0 fixed a collections abc deprecation
@@ -179,10 +179,6 @@ pysnmplib==5.0.21
 # python
 pysnmp==1000000000.0.0
 
-# pyminiaudio 1.58 is missing files in the package
-# https://github.com/irmen/pyminiaudio/issues/67
-miniaudio==1.57
-
 # The get-mac package has been replaced with getmac. Installing get-mac alongside getmac
 # breaks getmac due to them both sharing the same python package name inside 'getmac'.
 get-mac==1000000000.0.0
@@ -437,7 +433,8 @@ def gather_constraints() -> str:
                     *core_requirements(),
                     *gather_recursive_requirements("default_config"),
                     *gather_recursive_requirements("mqtt"),
-                }
+                },
+                key=lambda name: name.lower(),
             )
             + [""]
         )
diff --git a/script/hassfest/__main__.py b/script/hassfest/__main__.py
index 87024619765..1c626ac3c5b 100644
--- a/script/hassfest/__main__.py
+++ b/script/hassfest/__main__.py
@@ -11,6 +11,7 @@ from . import (
     bluetooth,
     codeowners,
     config_flow,
+    config_schema,
     coverage,
     dependencies,
     dhcp,
@@ -32,6 +33,7 @@ INTEGRATION_PLUGINS = [
     application_credentials,
     bluetooth,
     codeowners,
+    config_schema,
     dependencies,
     dhcp,
     json,
@@ -43,7 +45,7 @@ INTEGRATION_PLUGINS = [
     translations,
     usb,
     zeroconf,
-    config_flow,
+    config_flow,  # This needs to run last, after translations are processed
 ]
 HASS_PLUGINS = [
     coverage,
diff --git a/script/hassfest/config_schema.py b/script/hassfest/config_schema.py
new file mode 100644
index 00000000000..b794834161d
--- /dev/null
+++ b/script/hassfest/config_schema.py
@@ -0,0 +1,108 @@
+"""Validate integrations which can be setup from YAML have config schemas."""
+from __future__ import annotations
+
+import ast
+
+from .model import Config, Integration
+
+CONFIG_SCHEMA_IGNORE = {
+    # Configuration under the homeassistant key is a special case, it's handled by
+    # conf_util.async_process_ha_core_config already during bootstrapping, not by
+    # a schema in the homeassistant integration.
+    "homeassistant",
+}
+
+
+def _has_assignment(module: ast.Module, name: str) -> bool:
+    """Test if the module assigns to a name."""
+    for item in module.body:
+        if type(item) not in (ast.Assign, ast.AnnAssign, ast.AugAssign):
+            continue
+        if type(item) == ast.Assign:
+            for target in item.targets:
+                if target.id == name:
+                    return True
+            continue
+        if item.target.id == name:
+            return True
+    return False
+
+
+def _has_function(
+    module: ast.Module, _type: ast.AsyncFunctionDef | ast.FunctionDef, name: str
+) -> bool:
+    """Test if the module defines a function."""
+    for item in module.body:
+        if type(item) == _type and item.name == name:
+            return True
+    return False
+
+
+def _has_import(module: ast.Module, name: str) -> bool:
+    """Test if the module imports to a name."""
+    for item in module.body:
+        if type(item) not in (ast.Import, ast.ImportFrom):
+            continue
+        for alias in item.names:
+            if alias.asname == name or (alias.asname is None and alias.name == name):
+                return True
+    return False
+
+
+def _validate_integration(config: Config, integration: Integration) -> None:
+    """Validate integration has has a configuration schema."""
+    if integration.domain in CONFIG_SCHEMA_IGNORE:
+        return
+
+    init_file = integration.path / "__init__.py"
+
+    if not init_file.is_file():
+        # Virtual integrations don't have any implementation
+        return
+
+    init = ast.parse(init_file.read_text())
+
+    # No YAML Support
+    if not _has_function(
+        init, ast.AsyncFunctionDef, "async_setup"
+    ) and not _has_function(init, ast.FunctionDef, "setup"):
+        return
+
+    # No schema
+    if (
+        _has_assignment(init, "CONFIG_SCHEMA")
+        or _has_assignment(init, "PLATFORM_SCHEMA")
+        or _has_assignment(init, "PLATFORM_SCHEMA_BASE")
+        or _has_import(init, "CONFIG_SCHEMA")
+        or _has_import(init, "PLATFORM_SCHEMA")
+        or _has_import(init, "PLATFORM_SCHEMA_BASE")
+    ):
+        return
+
+    config_file = integration.path / "config.py"
+    if config_file.is_file():
+        config_module = ast.parse(config_file.read_text())
+        if _has_function(config_module, ast.AsyncFunctionDef, "async_validate_config"):
+            return
+
+    if config.specific_integrations:
+        notice_method = integration.add_warning
+    else:
+        notice_method = integration.add_error
+
+    notice_method(
+        "config_schema",
+        "Integrations which implement 'async_setup' or 'setup' must define either "
+        "'CONFIG_SCHEMA', 'PLATFORM_SCHEMA' or 'PLATFORM_SCHEMA_BASE'. If the "
+        "integration has no configuration parameters, can only be set up from platforms"
+        " or can only be set up from config entries, one of the helpers "
+        "cv.empty_config_schema, cv.platform_only_config_schema or "
+        "cv.config_entry_only_config_schema can be used.",
+    )
+
+
+def validate(integrations: dict[str, Integration], config: Config) -> None:
+    """Validate integrations have configuration schemas."""
+    for domain in sorted(integrations):
+        integration = integrations[domain]
+        _validate_integration(config, integration)
diff --git a/script/hassfest/manifest.py b/script/hassfest/manifest.py
index 89a3d70afc7..9a7caec925b 100644
--- a/script/hassfest/manifest.py
+++ b/script/hassfest/manifest.py
@@ -161,8 +161,8 @@ def verify_version(value: str) -> str:
                 AwesomeVersionStrategy.PEP440,
             ],
         )
-    except AwesomeVersionException:
-        raise vol.Invalid(f"'{value}' is not a valid version.")
+    except AwesomeVersionException as err:
+        raise vol.Invalid(f"'{value}' is not a valid version.") from err
     return value
 
 
diff --git a/script/hassfest/serializer.py b/script/hassfest/serializer.py
index 0dd3d35bb15..499ee9d51d9 100644
--- a/script/hassfest/serializer.py
+++ b/script/hassfest/serializer.py
@@ -91,7 +91,7 @@ def format_python_namespace(
         return f": {annotation}" if annotation else ""
 
     code = "\n\n".join(
-        f"{key}{_get_annotation(key)}" f" = {to_string(value)}"
+        f"{key}{_get_annotation(key)} = {to_string(value)}"
         for key, value in sorted(content.items())
     )
     if annotations:
diff --git a/script/languages.py b/script/languages.py
index ad88a31b0b6..f55fc21db93 100644
--- a/script/languages.py
+++ b/script/languages.py
@@ -15,10 +15,61 @@ req = requests.get(
 data = json.loads(req.content)
 languages = set(data.keys())
 
+# Languages which can be used for entity IDs.
+# Languages in the set are those which use a writing system based on the Latin
+# script. Languages not in this set will instead base the entity ID on English.
+
+# Note: Although vietnamese writing is based on the Latin script, it's too ambiguous
+# after accents and diacritics have been removed by slugify
+NATIVE_ENTITY_IDS = {
+    "af",  # Afrikaans
+    "bs",  # Bosanski
+    "ca",  # Català
+    "cs",  # Čeština
+    "cy",  # Cymraeg
+    "da",  # Dansk
+    "de",  # Deutsch
+    "en",  # English
+    "en-GB",  # English (GB)
+    "eo",  # Esperanto
+    "es",  # Español
+    "es-419",  # Español (Latin America)
+    "et",  # Eesti
+    "eu",  # Euskara
+    "fi",  # Suomi
+    "fr",  # Français
+    "fy",  # Frysk
+    "gl",  # Galego
+    "gsw",  # Schwiizerdütsch
+    "hr",  # Hrvatski
+    "hu",  # Magyar
+    "id",  # Indonesia
+    "is",  # Íslenska
+    "it",  # Italiano
+    "ka",  # Kartuli
+    "lb",  # Lëtzebuergesch
+    "lt",  # Lietuvių
+    "lv",  # Latviešu
+    "nb",  # Nederlands
+    "nl",  # Norsk Bokmål
+    "nn",  # Norsk Nynorsk"
+    "pl",  # Polski
+    "pt",  # Português
+    "pt-BR",  # Português (BR)
+    "ro",  # Română
+    "sk",  # Slovenčina
+    "sl",  # Slovenščina
+    "sr-Latn",  # Srpski
+    "sv",  # Svenska
+    "tr",  # Türkçe
+}
+
 Path("homeassistant/generated/languages.py").write_text(
     format_python_namespace(
         {
+            "DEFAULT_LANGUAGE": "en",
             "LANGUAGES": languages,
+            "NATIVE_ENTITY_IDS": NATIVE_ENTITY_IDS,
         },
         generator="script.languages [frontend_tag]",
     )
diff --git a/script/ruff.toml b/script/ruff.toml
new file mode 100644
index 00000000000..9d77bf60af9
--- /dev/null
+++ b/script/ruff.toml
@@ -0,0 +1,7 @@
+# This extend our general Ruff rules specifically for tests
+extend = "../pyproject.toml"
+
+[isort]
+forced-separate = [
+    "tests",
+]
\ No newline at end of file
diff --git a/script/scaffold/gather_info.py b/script/scaffold/gather_info.py
index 85a94459d06..47106e7f956 100644
--- a/script/scaffold/gather_info.py
+++ b/script/scaffold/gather_info.py
@@ -162,8 +162,8 @@ def _gather_info(fields) -> dict:
                 if "default" in info:
                     msg += f" [{info['default']}]"
                 value = input(f"{msg}\n> ")
-            except (KeyboardInterrupt, EOFError):
-                raise ExitApp("Interrupted!", 1)
+            except (KeyboardInterrupt, EOFError) as err:
+                raise ExitApp("Interrupted!", 1) from err
 
             value = value.strip()
 
diff --git a/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py b/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py
index bc087119c6e..d0000b800df 100644
--- a/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py
+++ b/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py
@@ -5,15 +5,15 @@ from unittest.mock import patch
 import pytest
 
 from homeassistant import config_entries
+from homeassistant.components.application_credentials import (
+    ClientCredential,
+    async_import_client_credential,
+)
 from homeassistant.components.NEW_DOMAIN.const import (
     DOMAIN,
     OAUTH2_AUTHORIZE,
     OAUTH2_TOKEN,
 )
-from homeassistant.components.application_credentials import (
-    ClientCredential,
-    async_import_client_credential,
-)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_entry_oauth2_flow
 from homeassistant.setup import async_setup_component
diff --git a/script/scaffold/templates/device_action/tests/test_device_action.py b/script/scaffold/templates/device_action/tests/test_device_action.py
index ce3f907b47b..a6e8f99854a 100644
--- a/script/scaffold/templates/device_action/tests/test_device_action.py
+++ b/script/scaffold/templates/device_action/tests/test_device_action.py
@@ -1,9 +1,10 @@
 """The tests for NEW_NAME device actions."""
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
-from homeassistant.components.NEW_DOMAIN import DOMAIN
 from homeassistant.components.device_automation import DeviceAutomationType
+from homeassistant.components.NEW_DOMAIN import DOMAIN
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
@@ -11,7 +12,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -44,7 +44,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -91,7 +91,7 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_action(hass: HomeAssistant) -> None:
diff --git a/script/scaffold/templates/device_condition/tests/test_device_condition.py b/script/scaffold/templates/device_condition/tests/test_device_condition.py
index 59781e24fe6..1f6e0ffde3c 100644
--- a/script/scaffold/templates/device_condition/tests/test_device_condition.py
+++ b/script/scaffold/templates/device_condition/tests/test_device_condition.py
@@ -2,10 +2,11 @@
 from __future__ import annotations
 
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
-from homeassistant.components.NEW_DOMAIN import DOMAIN
 from homeassistant.components.device_automation import DeviceAutomationType
+from homeassistant.components.NEW_DOMAIN import DOMAIN
 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
@@ -13,7 +14,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -59,7 +59,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
diff --git a/script/scaffold/templates/device_trigger/tests/test_device_trigger.py b/script/scaffold/templates/device_trigger/tests/test_device_trigger.py
index 8cfaa6f64a9..177c095b601 100644
--- a/script/scaffold/templates/device_trigger/tests/test_device_trigger.py
+++ b/script/scaffold/templates/device_trigger/tests/test_device_trigger.py
@@ -1,9 +1,10 @@
 """The tests for NEW_NAME device triggers."""
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
-from homeassistant.components.NEW_DOMAIN import DOMAIN
 from homeassistant.components.device_automation import DeviceAutomationType
+from homeassistant.components.NEW_DOMAIN import DOMAIN
 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
@@ -11,7 +12,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -57,7 +57,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_if_fires_on_state_change(
diff --git a/script/setup b/script/setup
index e68ec72cbba..a5c2d48b2b3 100755
--- a/script/setup
+++ b/script/setup
@@ -24,7 +24,7 @@ fi
 script/bootstrap
 
 pre-commit install
-python3 -m pip install -e . --constraint homeassistant/package_constraints.txt
+python3 -m pip install -e . --config-settings editable_mode=compat --constraint homeassistant/package_constraints.txt
 python3 -m script.translations develop --all
 
 hass --script ensure_config -c config
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 29713b6df46..00000000000
--- a/setup.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Setuptools v62.3 doesn't support editable installs with just 'pyproject.toml' (PEP 660).
-# Keep this file until it does!
-
-[metadata]
-url = https://www.home-assistant.io/
diff --git a/tests/bandit.yaml b/tests/bandit.yaml
deleted file mode 100644
index 568f77d622a..00000000000
--- a/tests/bandit.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# https://bandit.readthedocs.io/en/latest/config.html
-
-tests:
-  - B103
-  - B108
-  - B306
-  - B307
-  - B313
-  - B314
-  - B315
-  - B316
-  - B317
-  - B318
-  - B319
-  - B320
-  - B325
-  - B601
-  - B602
-  - B604
-  - B608
-  - B609
diff --git a/tests/common.py b/tests/common.py
index ca164fcaaf8..4fdccced370 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -48,7 +48,9 @@ from homeassistant.core import (
     Event,
     HomeAssistant,
     ServiceCall,
+    ServiceResponse,
     State,
+    SupportsResponse,
     callback,
 )
 from homeassistant.helpers import (
@@ -248,6 +250,9 @@ async def async_test_home_assistant(event_loop, load_registries=True):
             )
         },
     )
+    hass.bus.async_listen_once(
+        EVENT_HOMEASSISTANT_STOP, hass.config_entries._async_shutdown
+    )
 
     # Load the registries
     entity.async_setup(hass)
@@ -282,7 +287,12 @@ async def async_test_home_assistant(event_loop, load_registries=True):
 
 
 def async_mock_service(
-    hass: HomeAssistant, domain: str, service: str, schema: vol.Schema | None = None
+    hass: HomeAssistant,
+    domain: str,
+    service: str,
+    schema: vol.Schema | None = None,
+    response: ServiceResponse = None,
+    supports_response: SupportsResponse | None = None,
 ) -> list[ServiceCall]:
     """Set up a fake service & return a calls log list to this service."""
     calls = []
@@ -291,8 +301,18 @@ def async_mock_service(
     def mock_service_log(call):  # pylint: disable=unnecessary-lambda
         """Mock service call."""
         calls.append(call)
+        return response
 
-    hass.services.async_register(domain, service, mock_service_log, schema=schema)
+    if supports_response is None and response is not None:
+        supports_response = SupportsResponse.OPTIONAL
+
+    hass.services.async_register(
+        domain,
+        service,
+        mock_service_log,
+        schema=schema,
+        supports_response=supports_response,
+    )
 
     return calls
 
@@ -508,7 +528,9 @@ def mock_registry(
     registry = er.EntityRegistry(hass)
     if mock_entries is None:
         mock_entries = {}
+    registry.deleted_entities = {}
     registry.entities = er.EntityRegistryItems()
+    registry._entities_data = registry.entities.data
     for key, entry in mock_entries.items():
         registry.entities[key] = entry
 
@@ -554,6 +576,7 @@ def mock_device_registry(
     """
     registry = dr.DeviceRegistry(hass)
     registry.devices = dr.DeviceRegistryItems()
+    registry._device_data = registry.devices.data
     if mock_entries is None:
         mock_entries = {}
     for key, entry in mock_entries.items():
@@ -1213,6 +1236,8 @@ def mock_storage(
         if store._data is None:
             # No data to load
             if store.key not in data:
+                # Make sure the next attempt will still load
+                store._load_task = None
                 return None
 
             mock_data = data.get(store.key)
@@ -1348,7 +1373,7 @@ def async_capture_events(hass: HomeAssistant, event_name: str) -> list[Event]:
     def capture_events(event: Event) -> None:
         events.append(event)
 
-    hass.bus.async_listen(event_name, capture_events)
+    hass.bus.async_listen(event_name, capture_events, run_immediately=True)
 
     return events
 
@@ -1368,19 +1393,6 @@ def async_mock_signal(hass: HomeAssistant, signal: str) -> list[tuple[Any]]:
     return calls
 
 
-def assert_lists_same(a: list[Any], b: list[Any]) -> None:
-    """Compare two lists, ignoring order.
-
-    Check both that all items in a are in b and that all items in b are in a,
-    otherwise assert_lists_same(["1", "1"], ["1", "2"]) could be True.
-    """
-    assert len(a) == len(b)
-    for i in a:
-        assert i in b
-    for i in b:
-        assert i in a
-
-
 _SENTINEL = object()
 
 
diff --git a/tests/components/abode/test_light.py b/tests/components/abode/test_light.py
index 5716a18f195..56a924c1226 100644
--- a/tests/components/abode/test_light.py
+++ b/tests/components/abode/test_light.py
@@ -63,7 +63,7 @@ async def test_switch_off(hass: HomeAssistant) -> None:
     await setup_platform(hass, LIGHT_DOMAIN)
 
     with patch("jaraco.abode.devices.light.Light.switch_off") as mock_switch_off:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             LIGHT_DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: DEVICE_ID}, blocking=True
         )
         await hass.async_block_till_done()
diff --git a/tests/components/abode/test_sensor.py b/tests/components/abode/test_sensor.py
index 67892dfafb4..755dfbf584e 100644
--- a/tests/components/abode/test_sensor.py
+++ b/tests/components/abode/test_sensor.py
@@ -37,7 +37,7 @@ async def test_attributes(hass: HomeAssistant) -> None:
     assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Environment Sensor Humidity"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.HUMIDITY
 
-    state = hass.states.get("sensor.environment_sensor_lux")
+    state = hass.states.get("sensor.environment_sensor_illuminance")
     assert state.state == "1.0"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "lx"
 
diff --git a/tests/components/abode/test_switch.py b/tests/components/abode/test_switch.py
index bd9a5f8d72d..a18e554aa39 100644
--- a/tests/components/abode/test_switch.py
+++ b/tests/components/abode/test_switch.py
@@ -49,7 +49,7 @@ async def test_switch_on(hass: HomeAssistant) -> None:
     await setup_platform(hass, SWITCH_DOMAIN)
 
     with patch("jaraco.abode.devices.switch.Switch.switch_on") as mock_switch_on:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             SWITCH_DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: DEVICE_ID}, blocking=True
         )
         await hass.async_block_till_done()
@@ -62,7 +62,7 @@ async def test_switch_off(hass: HomeAssistant) -> None:
     await setup_platform(hass, SWITCH_DOMAIN)
 
     with patch("jaraco.abode.devices.switch.Switch.switch_off") as mock_switch_off:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             SWITCH_DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: DEVICE_ID}, blocking=True
         )
         await hass.async_block_till_done()
diff --git a/tests/components/accuweather/test_weather.py b/tests/components/accuweather/test_weather.py
index de1703128dd..dd5dca8c069 100644
--- a/tests/components/accuweather/test_weather.py
+++ b/tests/components/accuweather/test_weather.py
@@ -5,6 +5,8 @@ from unittest.mock import PropertyMock, patch
 from homeassistant.components.accuweather.const import ATTRIBUTION
 from homeassistant.components.weather import (
     ATTR_FORECAST,
+    ATTR_FORECAST_APPARENT_TEMP,
+    ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
     ATTR_FORECAST_PRECIPITATION,
     ATTR_FORECAST_PRECIPITATION_PROBABILITY,
@@ -12,12 +14,17 @@ from homeassistant.components.weather import (
     ATTR_FORECAST_TEMP_LOW,
     ATTR_FORECAST_TIME,
     ATTR_FORECAST_WIND_BEARING,
+    ATTR_FORECAST_WIND_GUST_SPEED,
     ATTR_FORECAST_WIND_SPEED,
+    ATTR_WEATHER_APPARENT_TEMPERATURE,
+    ATTR_WEATHER_CLOUD_COVERAGE,
+    ATTR_WEATHER_DEW_POINT,
     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,
 )
 from homeassistant.const import ATTR_ATTRIBUTION, ATTR_ENTITY_ID, STATE_UNAVAILABLE
@@ -50,6 +57,10 @@ async def test_weather_without_forecast(hass: HomeAssistant) -> None:
     assert state.attributes.get(ATTR_WEATHER_VISIBILITY) == 16.1
     assert state.attributes.get(ATTR_WEATHER_WIND_BEARING) == 180
     assert state.attributes.get(ATTR_WEATHER_WIND_SPEED) == 14.5  # 4.03 m/s -> km/h
+    assert state.attributes.get(ATTR_WEATHER_APPARENT_TEMPERATURE) == 22.8
+    assert state.attributes.get(ATTR_WEATHER_DEW_POINT) == 16.2
+    assert state.attributes.get(ATTR_WEATHER_CLOUD_COVERAGE) == 10
+    assert state.attributes.get(ATTR_WEATHER_WIND_GUST_SPEED) == 20.3
     assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION
 
     entry = registry.async_get("weather.home")
@@ -71,6 +82,10 @@ async def test_weather_with_forecast(hass: HomeAssistant) -> None:
     assert state.attributes.get(ATTR_WEATHER_VISIBILITY) == 16.1
     assert state.attributes.get(ATTR_WEATHER_WIND_BEARING) == 180
     assert state.attributes.get(ATTR_WEATHER_WIND_SPEED) == 14.5  # 4.03 m/s -> km/h
+    assert state.attributes.get(ATTR_WEATHER_APPARENT_TEMPERATURE) == 22.8
+    assert state.attributes.get(ATTR_WEATHER_DEW_POINT) == 16.2
+    assert state.attributes.get(ATTR_WEATHER_CLOUD_COVERAGE) == 10
+    assert state.attributes.get(ATTR_WEATHER_WIND_GUST_SPEED) == 20.3
     assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION
     forecast = state.attributes.get(ATTR_FORECAST)[0]
     assert forecast.get(ATTR_FORECAST_CONDITION) == "lightning-rainy"
@@ -81,6 +96,9 @@ async def test_weather_with_forecast(hass: HomeAssistant) -> None:
     assert forecast.get(ATTR_FORECAST_TIME) == "2020-07-26T05:00:00+00:00"
     assert forecast.get(ATTR_FORECAST_WIND_BEARING) == 166
     assert forecast.get(ATTR_FORECAST_WIND_SPEED) == 13.0  # 3.61 m/s -> km/h
+    assert forecast.get(ATTR_FORECAST_CLOUD_COVERAGE) == 58
+    assert forecast.get(ATTR_FORECAST_APPARENT_TEMP) == 29.8
+    assert forecast.get(ATTR_FORECAST_WIND_GUST_SPEED) == 29.6
 
     entry = registry.async_get("weather.home")
     assert entry
diff --git a/tests/components/advantage_air/snapshots/test_diagnostics.ambr b/tests/components/advantage_air/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000..a472d4fa1fc
--- /dev/null
+++ b/tests/components/advantage_air/snapshots/test_diagnostics.ambr
@@ -0,0 +1,292 @@
+# serializer version: 1
+# name: test_select_async_setup_entry
+  dict({
+    'aircons': dict({
+      'ac1': dict({
+        'info': dict({
+          'aaAutoFanModeEnabled': False,
+          'climateControlModeEnabled': False,
+          'climateControlModeIsRunning': False,
+          'countDownToOff': 10,
+          'countDownToOn': 0,
+          'fan': 'high',
+          'filterCleanStatus': 0,
+          'freshAirStatus': 'off',
+          'mode': 'vent',
+          'myAutoModeEnabled': False,
+          'myAutoModeIsRunning': False,
+          'myZone': 1,
+          'name': 'myzone',
+          'setTemp': 24,
+          'state': 'on',
+        }),
+        'zones': dict({
+          'z01': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 25,
+            'minDamper': 0,
+            'motion': 20,
+            'motionConfig': 2,
+            'name': 'Zone open with Sensor',
+            'number': 1,
+            'rssi': 40,
+            'setTemp': 24,
+            'state': 'open',
+            'type': 1,
+            'value': 100,
+          }),
+          'z02': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 25,
+            'minDamper': 0,
+            'motion': 21,
+            'motionConfig': 2,
+            'name': 'Zone closed with Sensor',
+            'number': 2,
+            'rssi': 10,
+            'setTemp': 24,
+            'state': 'close',
+            'type': 1,
+            'value': 0,
+          }),
+          'z03': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 25,
+            'minDamper': 0,
+            'motion': 22,
+            'motionConfig': 2,
+            'name': 'Zone 3',
+            'number': 3,
+            'rssi': 25,
+            'setTemp': 24,
+            'state': 'close',
+            'type': 1,
+            'value': 0,
+          }),
+          'z04': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 25,
+            'minDamper': 0,
+            'motion': 1,
+            'motionConfig': 1,
+            'name': 'Zone 4',
+            'number': 4,
+            'rssi': 75,
+            'setTemp': 24,
+            'state': 'close',
+            'type': 1,
+            'value': 0,
+          }),
+          'z05': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 25,
+            'minDamper': 0,
+            'motion': 5,
+            'motionConfig': 1,
+            'name': 'Zone 5',
+            'number': 5,
+            'rssi': 100,
+            'setTemp': 24,
+            'state': 'close',
+            'type': 1,
+            'value': 0,
+          }),
+        }),
+      }),
+      'ac2': dict({
+        'info': dict({
+          'aaAutoFanModeEnabled': True,
+          'climateControlModeEnabled': True,
+          'climateControlModeIsRunning': False,
+          'countDownToOff': 0,
+          'countDownToOn': 20,
+          'fan': 'autoAA',
+          'filterCleanStatus': 1,
+          'freshAirStatus': 'none',
+          'mode': 'cool',
+          'myAutoModeCurrentSetMode': 'cool',
+          'myAutoModeEnabled': False,
+          'myAutoModeIsRunning': False,
+          'myZone': 1,
+          'name': 'mytemp',
+          'setTemp': 24,
+          'state': 'off',
+        }),
+        'zones': dict({
+          'z01': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 25,
+            'minDamper': 0,
+            'motion': 20,
+            'motionConfig': 2,
+            'name': 'Zone A',
+            'number': 1,
+            'rssi': 40,
+            'setTemp': 24,
+            'state': 'open',
+            'type': 1,
+            'value': 100,
+          }),
+          'z02': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 26,
+            'minDamper': 0,
+            'motion': 21,
+            'motionConfig': 2,
+            'name': 'Zone B',
+            'number': 2,
+            'rssi': 10,
+            'setTemp': 23,
+            'state': 'open',
+            'type': 1,
+            'value': 50,
+          }),
+        }),
+      }),
+      'ac3': dict({
+        'info': dict({
+          'aaAutoFanModeEnabled': True,
+          'climateControlModeEnabled': False,
+          'climateControlModeIsRunning': False,
+          'countDownToOff': 0,
+          'countDownToOn': 0,
+          'fan': 'autoAA',
+          'filterCleanStatus': 1,
+          'freshAirStatus': 'none',
+          'mode': 'myauto',
+          'myAutoCoolTargetTemp': 24,
+          'myAutoHeatTargetTemp': 20,
+          'myAutoModeCurrentSetMode': 'cool',
+          'myAutoModeEnabled': True,
+          'myAutoModeIsRunning': True,
+          'myZone': 0,
+          'name': 'myauto',
+          'setTemp': 24,
+          'state': 'on',
+        }),
+        'zones': dict({
+          'z01': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 0,
+            'minDamper': 0,
+            'motion': 0,
+            'motionConfig': 0,
+            'name': 'Zone Y',
+            'number': 1,
+            'rssi': 0,
+            'setTemp': 24,
+            'state': 'open',
+            'type': 0,
+            'value': 100,
+          }),
+          'z02': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 0,
+            'minDamper': 0,
+            'motion': 0,
+            'motionConfig': 0,
+            'name': 'Zone Z',
+            'number': 2,
+            'rssi': 0,
+            'setTemp': 24,
+            'state': 'close',
+            'type': 0,
+            'value': 0,
+          }),
+        }),
+      }),
+    }),
+    'myLights': dict({
+      'lights': dict({
+        '100': dict({
+          'id': '100',
+          'moduleType': 'RM2',
+          'name': 'Light A',
+          'relay': True,
+          'state': 'off',
+        }),
+        '101': dict({
+          'id': '101',
+          'name': 'Light B',
+          'state': 'on',
+          'value': 50,
+        }),
+      }),
+    }),
+    'myThings': dict({
+      'things': dict({
+        '200': dict({
+          'buttonType': 'upDown',
+          'channelDipState': 1,
+          'id': '200',
+          'name': 'Blind 1',
+          'value': 100,
+        }),
+        '201': dict({
+          'buttonType': 'upDown',
+          'channelDipState': 2,
+          'id': '201',
+          'name': 'Blind 2',
+          'value': 0,
+        }),
+        '202': dict({
+          'buttonType': 'openClose',
+          'channelDipState': 3,
+          'id': '202',
+          'name': 'Garage',
+          'value': 100,
+        }),
+        '203': dict({
+          'buttonType': 'onOff',
+          'channelDipState': 4,
+          'id': '203',
+          'name': 'Thing Light',
+          'value': 100,
+        }),
+        '204': dict({
+          'buttonType': 'upDown',
+          'channelDipState': 5,
+          'id': '204',
+          'name': 'Thing Light Dimmable',
+          'value': 100,
+        }),
+        '205': dict({
+          'buttonType': 'onOff',
+          'channelDipState': 8,
+          'id': '205',
+          'name': 'Relay',
+          'value': 100,
+        }),
+        '206': dict({
+          'buttonType': 'onOff',
+          'channelDipState': 9,
+          'id': '206',
+          'name': 'Fan',
+          'value': 100,
+        }),
+      }),
+    }),
+    'system': dict({
+      'hasAircons': True,
+      'hasLights': True,
+      'hasSensors': False,
+      'hasThings': True,
+      'hasThingsBOG': False,
+      'hasThingsLight': False,
+      'myAppRev': '1.234',
+      'name': 'testname',
+      'needsUpdate': False,
+      'rid': '**REDACTED**',
+      'sysType': 'e-zone',
+    }),
+  })
+# ---
diff --git a/tests/components/advantage_air/test_diagnostics.py b/tests/components/advantage_air/test_diagnostics.py
new file mode 100644
index 00000000000..ebd026c6cc7
--- /dev/null
+++ b/tests/components/advantage_air/test_diagnostics.py
@@ -0,0 +1,32 @@
+"""Test the Advantage Air Diagnostics."""
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.core import HomeAssistant
+
+from . import (
+    TEST_SYSTEM_DATA,
+    TEST_SYSTEM_URL,
+    add_mock_config,
+)
+
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.test_util.aiohttp import AiohttpClientMocker
+from tests.typing import ClientSessionGenerator
+
+
+async def test_select_async_setup_entry(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test select platform."""
+
+    aioclient_mock.get(
+        TEST_SYSTEM_URL,
+        text=TEST_SYSTEM_DATA,
+    )
+
+    entry = await add_mock_config(hass)
+    diag = await get_diagnostics_for_config_entry(hass, hass_client, entry)
+    assert diag == snapshot
diff --git a/tests/components/airzone/test_climate.py b/tests/components/airzone/test_climate.py
index 2c66adcb974..f7cc7806bcb 100644
--- a/tests/components/airzone/test_climate.py
+++ b/tests/components/airzone/test_climate.py
@@ -438,7 +438,7 @@ async def test_airzone_climate_set_hvac_slave_error(hass: HomeAssistant) -> None
         )
 
     state = hass.states.get("climate.dorm_2")
-    assert state.state == HVACMode.OFF
+    assert state.state == HVACMode.HEAT
 
 
 async def test_airzone_climate_set_fan_mode(hass: HomeAssistant) -> None:
diff --git a/tests/components/airzone_cloud/test_binary_sensor.py b/tests/components/airzone_cloud/test_binary_sensor.py
new file mode 100644
index 00000000000..b2c9ee173b7
--- /dev/null
+++ b/tests/components/airzone_cloud/test_binary_sensor.py
@@ -0,0 +1,21 @@
+"""The binary sensor tests for the Airzone Cloud platform."""
+
+from homeassistant.const import STATE_OFF
+from homeassistant.core import HomeAssistant
+
+from .util import async_init_integration
+
+
+async def test_airzone_create_binary_sensors(hass: HomeAssistant) -> None:
+    """Test creation of binary sensors."""
+
+    await async_init_integration(hass)
+
+    # Zones
+    state = hass.states.get("binary_sensor.dormitorio_problem")
+    assert state.state == STATE_OFF
+    assert state.attributes.get("warnings") is None
+
+    state = hass.states.get("binary_sensor.salon_problem")
+    assert state.state == STATE_OFF
+    assert state.attributes.get("warnings") is None
diff --git a/tests/components/airzone_cloud/test_sensor.py b/tests/components/airzone_cloud/test_sensor.py
index 41807fac78b..d9b19f93f7d 100644
--- a/tests/components/airzone_cloud/test_sensor.py
+++ b/tests/components/airzone_cloud/test_sensor.py
@@ -17,10 +17,10 @@ async def test_airzone_create_sensors(
     assert state.state == "21.0"
 
     # WebServers
-    state = hass.states.get("sensor.webserver_11_22_33_44_55_66_rssi")
+    state = hass.states.get("sensor.webserver_11_22_33_44_55_66_signal_strength")
     assert state.state == "-56"
 
-    state = hass.states.get("sensor.webserver_11_22_33_44_55_67_rssi")
+    state = hass.states.get("sensor.webserver_11_22_33_44_55_67_signal_strength")
     assert state.state == "-77"
 
     # Zones
diff --git a/tests/components/aladdin_connect/test_sensor.py b/tests/components/aladdin_connect/test_sensor.py
index c01d6c5c781..dca8ecaa513 100644
--- a/tests/components/aladdin_connect/test_sensor.py
+++ b/tests/components/aladdin_connect/test_sensor.py
@@ -47,7 +47,7 @@ async def test_sensors(
         await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
 
-        entry = entity_registry.async_get("sensor.home_battery_level")
+        entry = entity_registry.async_get("sensor.home_battery")
         assert entry
         assert entry.disabled
         assert entry.disabled_by is er.RegistryEntryDisabler.INTEGRATION
@@ -57,7 +57,7 @@ async def test_sensors(
         await hass.async_block_till_done()
         assert update_entry != entry
         assert update_entry.disabled is False
-        state = hass.states.get("sensor.home_battery_level")
+        state = hass.states.get("sensor.home_battery")
         assert state is None
 
         async_fire_time_changed(
@@ -65,7 +65,7 @@ async def test_sensors(
             utcnow() + SCAN_INTERVAL,
         )
         await hass.async_block_till_done()
-        state = hass.states.get("sensor.home_battery_level")
+        state = hass.states.get("sensor.home_battery")
         assert state
 
         entry = entity_registry.async_get("sensor.home_wi_fi_rssi")
@@ -121,11 +121,11 @@ async def test_sensors_model_01(
         await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
 
-        entry = entity_registry.async_get("sensor.home_battery_level")
+        entry = entity_registry.async_get("sensor.home_battery")
         assert entry
         assert entry.disabled is False
         assert entry.disabled_by is None
-        state = hass.states.get("sensor.home_battery_level")
+        state = hass.states.get("sensor.home_battery")
         assert state
 
         entry = entity_registry.async_get("sensor.home_wi_fi_rssi")
diff --git a/tests/components/alarm_control_panel/test_device_action.py b/tests/components/alarm_control_panel/test_device_action.py
index c587d94f3ed..8ba196de545 100644
--- a/tests/components/alarm_control_panel/test_device_action.py
+++ b/tests/components/alarm_control_panel/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Alarm control panel device actions."""
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components.alarm_control_panel import (
     DOMAIN,
@@ -24,7 +25,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
 )
@@ -102,7 +102,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -113,13 +113,12 @@ async def test_get_actions(
         hass.states.async_set(
             f"{DOMAIN}.test_5678", "attributes", {"supported_features": features_state}
         )
-    expected_actions = []
-    expected_actions += [
+    expected_actions = [
         {
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in expected_action_types
@@ -127,7 +126,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -153,7 +152,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -168,7 +167,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["disarm", "arm_away"]
@@ -176,7 +175,7 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_actions_arm_night_only(
@@ -191,7 +190,7 @@ async def test_get_actions_arm_night_only(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     hass.states.async_set(
@@ -202,21 +201,21 @@ async def test_get_actions_arm_night_only(
             "domain": DOMAIN,
             "type": "arm_night",
             "device_id": device_entry.id,
-            "entity_id": "alarm_control_panel.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
         {
             "domain": DOMAIN,
             "type": "disarm",
             "device_id": device_entry.id,
-            "entity_id": "alarm_control_panel.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_action_capabilities(
@@ -266,6 +265,54 @@ async def test_get_action_capabilities(
         assert capabilities == expected_capabilities[action["type"]]
 
 
+async def test_get_action_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test we get the expected capabilities from a sensor trigger."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["no_arm_code"].unique_id,
+        device_id=device_entry.id,
+    )
+
+    expected_capabilities = {
+        "arm_away": {"extra_fields": []},
+        "arm_home": {"extra_fields": []},
+        "arm_night": {"extra_fields": []},
+        "arm_vacation": {"extra_fields": []},
+        "disarm": {
+            "extra_fields": [{"name": "code", "optional": True, "type": "string"}]
+        },
+        "trigger": {"extra_fields": []},
+    }
+    actions = await async_get_device_automations(
+        hass, DeviceAutomationType.ACTION, device_entry.id
+    )
+    assert len(actions) == 6
+    assert {action["type"] for action in actions} == set(expected_capabilities)
+    for action in actions:
+        action["entity_id"] = entity_registry.async_get(action["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.ACTION, action
+        )
+        assert capabilities == expected_capabilities[action["type"]]
+
+
 async def test_get_action_capabilities_arm_code(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
@@ -321,11 +368,77 @@ async def test_get_action_capabilities_arm_code(
         assert capabilities == expected_capabilities[action["type"]]
 
 
-async def test_action(hass: HomeAssistant, enable_custom_integrations: None) -> None:
+async def test_get_action_capabilities_arm_code_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test we get the expected capabilities from a sensor trigger."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["arm_code"].unique_id,
+        device_id=device_entry.id,
+    )
+
+    expected_capabilities = {
+        "arm_away": {
+            "extra_fields": [{"name": "code", "optional": True, "type": "string"}]
+        },
+        "arm_home": {
+            "extra_fields": [{"name": "code", "optional": True, "type": "string"}]
+        },
+        "arm_night": {
+            "extra_fields": [{"name": "code", "optional": True, "type": "string"}]
+        },
+        "arm_vacation": {
+            "extra_fields": [{"name": "code", "optional": True, "type": "string"}]
+        },
+        "disarm": {
+            "extra_fields": [{"name": "code", "optional": True, "type": "string"}]
+        },
+        "trigger": {"extra_fields": []},
+    }
+    actions = await async_get_device_automations(
+        hass, DeviceAutomationType.ACTION, device_entry.id
+    )
+    assert len(actions) == 6
+    assert {action["type"] for action in actions} == set(expected_capabilities)
+    for action in actions:
+        action["entity_id"] = entity_registry.async_get(action["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.ACTION, action
+        )
+        assert capabilities == expected_capabilities[action["type"]]
+
+
+async def test_action(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
     """Test for turn_on and turn_off actions."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
     platform.init()
 
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["no_arm_code"].unique_id,
+    )
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -339,7 +452,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "alarm_control_panel.alarm_no_arm_code",
+                        "entity_id": entity_entry.id,
                         "type": "arm_away",
                     },
                 },
@@ -351,7 +464,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "alarm_control_panel.alarm_no_arm_code",
+                        "entity_id": entity_entry.id,
                         "type": "arm_home",
                     },
                 },
@@ -363,7 +476,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "alarm_control_panel.alarm_no_arm_code",
+                        "entity_id": entity_entry.id,
                         "type": "arm_night",
                     },
                 },
@@ -375,7 +488,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "alarm_control_panel.alarm_no_arm_code",
+                        "entity_id": entity_entry.id,
                         "type": "arm_vacation",
                     },
                 },
@@ -384,7 +497,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "alarm_control_panel.alarm_no_arm_code",
+                        "entity_id": entity_entry.id,
                         "type": "disarm",
                         "code": "1234",
                     },
@@ -397,7 +510,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "alarm_control_panel.alarm_no_arm_code",
+                        "entity_id": entity_entry.id,
                         "type": "trigger",
                     },
                 },
@@ -407,48 +520,73 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state == STATE_UNKNOWN
-    )
+    assert hass.states.get(entity_entry.entity_id).state == STATE_UNKNOWN
 
     hass.bus.async_fire("test_event_arm_away")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state
-        == STATE_ALARM_ARMED_AWAY
-    )
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_ARMED_AWAY
 
     hass.bus.async_fire("test_event_arm_home")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state
-        == STATE_ALARM_ARMED_HOME
-    )
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_ARMED_HOME
 
     hass.bus.async_fire("test_event_arm_vacation")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state
-        == STATE_ALARM_ARMED_VACATION
-    )
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_ARMED_VACATION
 
     hass.bus.async_fire("test_event_arm_night")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state
-        == STATE_ALARM_ARMED_NIGHT
-    )
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_ARMED_NIGHT
 
     hass.bus.async_fire("test_event_disarm")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state
-        == STATE_ALARM_DISARMED
-    )
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_DISARMED
 
     hass.bus.async_fire("test_event_trigger")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state
-        == STATE_ALARM_TRIGGERED
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_TRIGGERED
+
+
+async def test_action_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["no_arm_code"].unique_id,
     )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_arm_away",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entity_entry.entity_id,
+                        "type": "arm_away",
+                    },
+                },
+            ]
+        },
+    )
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    assert hass.states.get(entity_entry.entity_id).state == STATE_UNKNOWN
+
+    hass.bus.async_fire("test_event_arm_away")
+    await hass.async_block_till_done()
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_ARMED_AWAY
diff --git a/tests/components/alarm_control_panel/test_device_condition.py b/tests/components/alarm_control_panel/test_device_condition.py
index b1687a385b3..f1719b83d38 100644
--- a/tests/components/alarm_control_panel/test_device_condition.py
+++ b/tests/components/alarm_control_panel/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Alarm control panel device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components.alarm_control_panel import (
     DOMAIN,
@@ -23,7 +24,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -93,7 +93,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -114,7 +114,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in basic_condition_types
@@ -125,7 +125,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in expected_condition_types
@@ -133,7 +133,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -159,7 +159,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -173,7 +173,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_disarmed", "is_triggered"]
@@ -181,11 +181,15 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls: list[ServiceCall]
+) -> None:
     """Test for all conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -198,7 +202,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_triggered",
                         }
                     ],
@@ -220,7 +224,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_disarmed",
                         }
                     ],
@@ -242,7 +246,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_armed_home",
                         }
                     ],
@@ -264,7 +268,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_armed_away",
                         }
                     ],
@@ -286,7 +290,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_armed_night",
                         }
                     ],
@@ -308,7 +312,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_armed_vacation",
                         }
                     ],
@@ -330,7 +334,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_armed_custom_bypass",
                         }
                     ],
@@ -348,7 +352,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
             ]
         },
     )
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_TRIGGERED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -360,7 +364,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_triggered - event - test_event1"
 
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_DISARMED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_DISARMED)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -372,7 +376,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_disarmed - event - test_event2"
 
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_HOME)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_HOME)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -384,7 +388,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     assert len(calls) == 3
     assert calls[2].data["some"] == "is_armed_home - event - test_event3"
 
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_AWAY)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_AWAY)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -396,7 +400,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     assert len(calls) == 4
     assert calls[3].data["some"] == "is_armed_away - event - test_event4"
 
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_NIGHT)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_NIGHT)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -408,7 +412,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     assert len(calls) == 5
     assert calls[4].data["some"] == "is_armed_night - event - test_event5"
 
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_VACATION)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_VACATION)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -420,7 +424,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     assert len(calls) == 6
     assert calls[5].data["some"] == "is_armed_vacation - event - test_event6"
 
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_CUSTOM_BYPASS)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_CUSTOM_BYPASS)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -431,3 +435,46 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     await hass.async_block_till_done()
     assert len(calls) == 7
     assert calls[6].data["some"] == "is_armed_custom_bypass - event - test_event7"
+
+
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls: list[ServiceCall]
+) -> None:
+    """Test for all conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_triggered",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "is_triggered "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.event.event_type }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_triggered - event - test_event1"
diff --git a/tests/components/alarm_control_panel/test_device_trigger.py b/tests/components/alarm_control_panel/test_device_trigger.py
index d81c83702d8..57b9f8125c2 100644
--- a/tests/components/alarm_control_panel/test_device_trigger.py
+++ b/tests/components/alarm_control_panel/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components.alarm_control_panel import (
     DOMAIN,
@@ -26,7 +27,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
@@ -96,7 +96,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -105,7 +105,7 @@ async def test_get_triggers(
     )
     if set_state:
         hass.states.async_set(
-            "alarm_control_panel.test_5678",
+            entry.entity_id,
             "attributes",
             {"supported_features": features_state},
         )
@@ -117,7 +117,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in expected_trigger_types
@@ -125,7 +125,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -151,7 +151,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -165,7 +165,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["triggered", "disarmed", "arming"]
@@ -173,7 +173,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -210,11 +210,48 @@ async def test_get_trigger_capabilities(
         }
 
 
-async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls: list[ServiceCall]
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
 ) -> None:
+    """Test we get the expected capabilities from an alarm_control_panel."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    hass.states.async_set(
+        "alarm_control_panel.test_5678", "attributes", {"supported_features": 15}
+    )
+
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    assert len(triggers) == 6
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == {
+            "extra_fields": [
+                {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+            ]
+        }
+
+
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls: list[ServiceCall]
+):
     """Test for turn_on and turn_off triggers firing."""
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_PENDING)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ALARM_PENDING)
 
     assert await async_setup_component(
         hass,
@@ -226,7 +263,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "alarm_control_panel.entity",
+                        "entity_id": entry.id,
                         "type": "triggered",
                     },
                     "action": {
@@ -248,7 +285,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "alarm_control_panel.entity",
+                        "entity_id": entry.id,
                         "type": "disarmed",
                     },
                     "action": {
@@ -270,7 +307,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "alarm_control_panel.entity",
+                        "entity_id": entry.id,
                         "type": "armed_home",
                     },
                     "action": {
@@ -292,7 +329,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "alarm_control_panel.entity",
+                        "entity_id": entry.id,
                         "type": "armed_away",
                     },
                     "action": {
@@ -314,7 +351,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "alarm_control_panel.entity",
+                        "entity_id": entry.id,
                         "type": "armed_night",
                     },
                     "action": {
@@ -336,7 +373,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "alarm_control_panel.entity",
+                        "entity_id": entry.id,
                         "type": "armed_vacation",
                     },
                     "action": {
@@ -358,72 +395,67 @@ async def test_if_fires_on_state_change(
     )
 
     # Fake that the entity is triggered.
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_TRIGGERED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
     await hass.async_block_till_done()
     assert len(calls) == 1
     assert (
         calls[0].data["some"]
-        == "triggered - device - alarm_control_panel.entity - pending - triggered -"
-        " None"
+        == f"triggered - device - {entry.entity_id} - pending - triggered - None"
     )
 
     # Fake that the entity is disarmed.
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_DISARMED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_DISARMED)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert (
         calls[1].data["some"]
-        == "disarmed - device - alarm_control_panel.entity - triggered - disarmed -"
-        " None"
+        == f"disarmed - device - {entry.entity_id} - triggered - disarmed - None"
     )
 
     # Fake that the entity is armed home.
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_HOME)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_HOME)
     await hass.async_block_till_done()
     assert len(calls) == 3
     assert (
         calls[2].data["some"]
-        == "armed_home - device - alarm_control_panel.entity - disarmed - armed_home -"
-        " None"
+        == f"armed_home - device - {entry.entity_id} - disarmed - armed_home - None"
     )
 
     # Fake that the entity is armed away.
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_AWAY)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_AWAY)
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert (
         calls[3].data["some"]
-        == "armed_away - device - alarm_control_panel.entity - armed_home - armed_away"
-        " - None"
+        == f"armed_away - device - {entry.entity_id} - armed_home - armed_away - None"
     )
 
     # Fake that the entity is armed night.
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_NIGHT)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_NIGHT)
     await hass.async_block_till_done()
     assert len(calls) == 5
     assert (
         calls[4].data["some"]
-        == "armed_night - device - alarm_control_panel.entity - armed_away -"
-        " armed_night - None"
+        == f"armed_night - device - {entry.entity_id} - armed_away - armed_night - None"
     )
 
     # Fake that the entity is armed vacation.
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_VACATION)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_VACATION)
     await hass.async_block_till_done()
     assert len(calls) == 6
     assert (
         calls[5].data["some"]
-        == "armed_vacation - device - alarm_control_panel.entity - armed_night -"
-        " armed_vacation - None"
+        == f"armed_vacation - device - {entry.entity_id} - armed_night - armed_vacation - None"
     )
 
 
 async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls: list[ServiceCall]
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls: list[ServiceCall]
 ) -> None:
     """Test for triggers firing with delay."""
-    entity_id = f"{DOMAIN}.entity"
-    hass.states.async_set(entity_id, STATE_ALARM_DISARMED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ALARM_DISARMED)
 
     assert await async_setup_component(
         hass,
@@ -435,7 +467,7 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
                         "type": "triggered",
                         "for": {"seconds": 5},
                     },
@@ -459,10 +491,9 @@ async def test_if_fires_on_state_change_with_for(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
     assert len(calls) == 0
 
-    hass.states.async_set(entity_id, STATE_ALARM_TRIGGERED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -471,5 +502,57 @@ async def test_if_fires_on_state_change_with_for(
     await hass.async_block_till_done()
     assert (
         calls[0].data["some"]
-        == f"turn_off device - {entity_id} - disarmed - triggered - 0:00:05"
+        == f"turn_off device - {entry.entity_id} - disarmed - triggered - 0:00:05"
+    )
+
+
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls: list[ServiceCall]
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ALARM_DISARMED)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "triggered",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "turn_off {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                }
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - disarmed - triggered - None"
     )
diff --git a/tests/components/analytics/test_analytics.py b/tests/components/analytics/test_analytics.py
index 412553e81cc..4e51880c754 100644
--- a/tests/components/analytics/test_analytics.py
+++ b/tests/components/analytics/test_analytics.py
@@ -1,5 +1,7 @@
 """The tests for the analytics ."""
-from unittest.mock import AsyncMock, Mock, PropertyMock, patch
+import asyncio
+from typing import Any
+from unittest.mock import ANY, AsyncMock, Mock, PropertyMock, patch
 
 import aiohttp
 import pytest
@@ -14,11 +16,14 @@ from homeassistant.components.analytics.const import (
     ATTR_USAGE,
 )
 from homeassistant.components.recorder import Recorder
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import ATTR_DOMAIN
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import IntegrationNotFound
 from homeassistant.setup import async_setup_component
 
+from tests.common import MockConfigEntry, MockModule, mock_integration
 from tests.test_util.aiohttp import AiohttpClientMocker
 
 MOCK_UUID = "abcdefg"
@@ -27,6 +32,11 @@ MOCK_VERSION_DEV = "1970.1.0.dev0"
 MOCK_VERSION_NIGHTLY = "1970.1.0.dev19700101"
 
 
+def _last_call_payload(aioclient: AiohttpClientMocker) -> dict[str, Any]:
+    """Return the payload of the last call."""
+    return aioclient.mock_calls[-1][2]
+
+
 async def test_no_send(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
@@ -206,18 +216,36 @@ async def test_send_usage(
     assert analytics.preferences[ATTR_USAGE]
     hass.config.components = ["default_config"]
 
-    with patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
+    with patch(
+        "homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION
+    ), patch(
+        "homeassistant.config.load_yaml_config_file",
+        return_value={"default_config": {}},
+    ), patch(
+        "homeassistant.components.analytics.analytics.async_get_system_info",
+        return_value={"installation_type": "Home Assistant Tests"},
+    ):
         await analytics.send_analytics()
 
-    assert "'integrations': ['default_config']" in caplog.text
-    assert "'integration_count':" not in caplog.text
-    assert "'certificate': False" in caplog.text
+    assert (
+        "Submitted analytics to Home Assistant servers. Information submitted includes"
+        in caplog.text
+    )
+    assert _last_call_payload(aioclient_mock) == {
+        "uuid": ANY,
+        "version": MOCK_VERSION,
+        "installation_type": "Home Assistant Tests",
+        "certificate": False,
+        "integrations": ["default_config"],
+        "custom_integrations": [],
+    }
 
 
 async def test_send_usage_with_supervisor(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
     aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send usage with supervisor preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -284,7 +312,12 @@ async def test_send_statistics(
     assert analytics.preferences[ATTR_STATISTICS]
     hass.config.components = ["default_config"]
 
-    with patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
+    with patch(
+        "homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION
+    ), patch(
+        "homeassistant.config.load_yaml_config_file",
+        return_value={"default_config": {}},
+    ):
         await analytics.send_analytics()
     assert (
         "'state_count': 0, 'automation_count': 0, 'integration_count': 1,"
@@ -297,6 +330,7 @@ async def test_send_statistics_one_integration_fails(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
     aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send statistics preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -317,10 +351,85 @@ async def test_send_statistics_one_integration_fails(
     assert post_call[2]["integration_count"] == 0
 
 
+async def test_send_statistics_disabled_integration(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
+) -> None:
+    """Test send statistics with disabled integration."""
+    aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
+    analytics = Analytics(hass)
+    await analytics.save_preferences({ATTR_BASE: True, ATTR_STATISTICS: True})
+    assert analytics.preferences[ATTR_BASE]
+    assert analytics.preferences[ATTR_STATISTICS]
+    hass.config.components = ["default_config"]
+
+    with patch(
+        "homeassistant.components.analytics.analytics.async_get_integrations",
+        return_value={
+            "disabled_integration_manifest": mock_integration(
+                hass,
+                MockModule(
+                    "disabled_integration",
+                    async_setup=AsyncMock(return_value=True),
+                    partial_manifest={"disabled": "system"},
+                ),
+            )
+        },
+    ), patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
+        await analytics.send_analytics()
+
+    payload = _last_call_payload(aioclient_mock)
+    assert "uuid" in payload
+    assert payload["integration_count"] == 0
+
+
+async def test_send_statistics_ignored_integration(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
+) -> None:
+    """Test send statistics with ignored integration."""
+    aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
+    analytics = Analytics(hass)
+    await analytics.save_preferences({ATTR_BASE: True, ATTR_STATISTICS: True})
+    assert analytics.preferences[ATTR_BASE]
+    assert analytics.preferences[ATTR_STATISTICS]
+
+    mock_config_entry = MockConfigEntry(
+        domain="ignored_integration",
+        state=ConfigEntryState.LOADED,
+        source="ignore",
+    )
+    mock_config_entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.analytics.analytics.async_get_integrations",
+        return_value={
+            "ignored_integration": mock_integration(
+                hass,
+                MockModule(
+                    "ignored_integration",
+                    async_setup=AsyncMock(return_value=True),
+                    partial_manifest={"config_flow": True},
+                ),
+            ),
+        },
+    ), patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
+        await analytics.send_analytics()
+
+    payload = _last_call_payload(aioclient_mock)
+    assert "uuid" in payload
+    assert payload["integration_count"] == 0
+
+
 async def test_send_statistics_async_get_integration_unknown_exception(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
     aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send statistics preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -341,6 +450,7 @@ async def test_send_statistics_with_supervisor(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
     aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send statistics preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -421,7 +531,12 @@ async def test_custom_integrations(
     assert await async_setup_component(hass, "test_package", {"test_package": {}})
     await analytics.save_preferences({ATTR_BASE: True, ATTR_USAGE: True})
 
-    with patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
+    with patch(
+        "homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION
+    ), patch(
+        "homeassistant.config.load_yaml_config_file",
+        return_value={"test_package": {}},
+    ):
         await analytics.send_analytics()
 
     payload = aioclient_mock.mock_calls[0][2]
@@ -486,7 +601,9 @@ async def test_nightly_endpoint(
 
 
 async def test_send_with_no_energy(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send base preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -510,7 +627,10 @@ async def test_send_with_no_energy(
 
 
 async def test_send_with_no_energy_config(
-    recorder_mock: Recorder, hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+    recorder_mock: Recorder,
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send base preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -534,7 +654,10 @@ async def test_send_with_no_energy_config(
 
 
 async def test_send_with_energy_config(
-    recorder_mock: Recorder, hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+    recorder_mock: Recorder,
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send base preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -561,6 +684,7 @@ async def test_send_usage_with_certificate(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
     aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send usage preferences with certificate."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -570,7 +694,6 @@ async def test_send_usage_with_certificate(
 
     assert analytics.preferences[ATTR_BASE]
     assert analytics.preferences[ATTR_USAGE]
-    hass.config.components = ["default_config"]
 
     with patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
         await analytics.send_analytics()
@@ -590,8 +713,101 @@ async def test_send_with_recorder(
 
     await analytics.save_preferences({ATTR_BASE: True, ATTR_USAGE: True})
 
-    with patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
+    with patch(
+        "homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION
+    ), patch(
+        "homeassistant.config.load_yaml_config_file",
+        return_value={"recorder": {}},
+    ):
         await analytics.send_analytics()
 
-    postdata = aioclient_mock.mock_calls[-1][2]
+    postdata = _last_call_payload(aioclient_mock)
     assert postdata["recorder"]["engine"] == "sqlite"
+
+
+async def test_send_with_problems_loading_yaml(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    aioclient_mock: AiohttpClientMocker,
+) -> None:
+    """Test error loading YAML configuration."""
+    analytics = Analytics(hass)
+
+    await analytics.save_preferences({ATTR_BASE: True, ATTR_USAGE: True})
+    with patch(
+        "homeassistant.config.load_yaml_config_file",
+        side_effect=HomeAssistantError("Error loading YAML file"),
+    ):
+        await analytics.send_analytics()
+
+    assert "Error loading YAML file" in caplog.text
+    assert len(aioclient_mock.mock_calls) == 0
+
+
+async def test_timeout_while_sending(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
+) -> None:
+    """Test timeout error while sending analytics."""
+    analytics = Analytics(hass)
+    aioclient_mock.post(ANALYTICS_ENDPOINT_URL_DEV, exc=asyncio.TimeoutError())
+
+    await analytics.save_preferences({ATTR_BASE: True})
+    with patch(
+        "homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION_DEV
+    ):
+        await analytics.send_analytics()
+
+    assert "Timeout sending analytics" in caplog.text
+
+
+async def test_not_check_config_entries_if_yaml(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    aioclient_mock: AiohttpClientMocker,
+) -> None:
+    """Test skip config entry check if defined in yaml."""
+    aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
+    analytics = Analytics(hass)
+    hass.http = Mock(ssl_certificate="/some/path/to/cert.pem")
+
+    await analytics.save_preferences(
+        {ATTR_BASE: True, ATTR_STATISTICS: True, ATTR_USAGE: True}
+    )
+    assert analytics.preferences[ATTR_BASE]
+    assert analytics.preferences[ATTR_STATISTICS]
+    hass.config.components = ["default_config"]
+
+    mock_config_entry = MockConfigEntry(
+        domain="ignored_integration",
+        state=ConfigEntryState.LOADED,
+        source="ignore",
+        disabled_by="user",
+    )
+    mock_config_entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.analytics.analytics.async_get_integrations",
+        return_value={
+            "default_config": mock_integration(
+                hass,
+                MockModule(
+                    "default_config",
+                    async_setup=AsyncMock(return_value=True),
+                    partial_manifest={"config_flow": True},
+                ),
+            ),
+        },
+    ), patch(
+        "homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION
+    ), patch(
+        "homeassistant.config.load_yaml_config_file",
+        return_value={"default_config": {}},
+    ):
+        await analytics.send_analytics()
+
+    payload = _last_call_payload(aioclient_mock)
+    assert payload["integration_count"] == 1
+    assert payload["integrations"] == ["default_config"]
diff --git a/tests/components/androidtv_remote/test_media_player.py b/tests/components/androidtv_remote/test_media_player.py
index c716b0f8689..efb3fa97a22 100644
--- a/tests/components/androidtv_remote/test_media_player.py
+++ b/tests/components/androidtv_remote/test_media_player.py
@@ -1,4 +1,5 @@
 """Tests for the Android TV Remote remote platform."""
+import asyncio
 from unittest.mock import MagicMock, call
 
 from androidtvremote2 import ConnectionClosed
@@ -66,7 +67,7 @@ async def test_media_player_toggles(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "turn_off",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -76,7 +77,7 @@ async def test_media_player_toggles(
 
     mock_api.send_key_command.assert_called_with("POWER", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "turn_on",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -95,7 +96,7 @@ async def test_media_player_volume(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "volume_up",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -105,7 +106,7 @@ async def test_media_player_volume(
 
     mock_api.send_key_command.assert_called_with("VOLUME_UP", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "volume_down",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -115,7 +116,7 @@ async def test_media_player_volume(
 
     mock_api.send_key_command.assert_called_with("VOLUME_DOWN", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "volume_mute",
         {"entity_id": MEDIA_PLAYER_ENTITY, "is_volume_muted": True},
@@ -125,7 +126,7 @@ async def test_media_player_volume(
 
     mock_api.send_key_command.assert_called_with("VOLUME_MUTE", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "volume_mute",
         {"entity_id": MEDIA_PLAYER_ENTITY, "is_volume_muted": False},
@@ -144,7 +145,7 @@ async def test_media_player_controls(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "media_play",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -153,7 +154,7 @@ async def test_media_player_controls(
 
     mock_api.send_key_command.assert_called_with("MEDIA_PLAY", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "media_pause",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -162,7 +163,7 @@ async def test_media_player_controls(
 
     mock_api.send_key_command.assert_called_with("MEDIA_PAUSE", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "media_play_pause",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -171,7 +172,7 @@ async def test_media_player_controls(
 
     mock_api.send_key_command.assert_called_with("MEDIA_PLAY_PAUSE", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "media_stop",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -180,7 +181,7 @@ async def test_media_player_controls(
 
     mock_api.send_key_command.assert_called_with("MEDIA_STOP", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "media_previous_track",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -189,7 +190,7 @@ async def test_media_player_controls(
 
     mock_api.send_key_command.assert_called_with("MEDIA_PREVIOUS", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "media_next_track",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -207,7 +208,7 @@ async def test_media_player_play_media(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "play_media",
         {
@@ -234,6 +235,10 @@ async def test_media_player_play_media(
         },
         blocking=False,
     )
+
+    # Give background task time to run
+    await asyncio.sleep(0)
+
     await hass.services.async_call(
         "media_player",
         "play_media",
@@ -246,7 +251,7 @@ async def test_media_player_play_media(
     )
     assert mock_api.send_key_command.call_count == 2
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "play_media",
         {
@@ -259,7 +264,7 @@ async def test_media_player_play_media(
     mock_api.send_launch_app_command.assert_called_with("https://www.youtube.com")
 
     with pytest.raises(ValueError):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             "media_player",
             "play_media",
             {
@@ -271,7 +276,7 @@ async def test_media_player_play_media(
         )
 
     with pytest.raises(ValueError):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             "media_player",
             "play_media",
             {
diff --git a/tests/components/androidtv_remote/test_remote.py b/tests/components/androidtv_remote/test_remote.py
index cc1d8973d49..5157361a158 100644
--- a/tests/components/androidtv_remote/test_remote.py
+++ b/tests/components/androidtv_remote/test_remote.py
@@ -48,7 +48,7 @@ async def test_remote_toggles(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "remote",
         "turn_off",
         {"entity_id": REMOTE_ENTITY},
@@ -58,7 +58,7 @@ async def test_remote_toggles(
 
     mock_api.send_key_command.assert_called_with("POWER", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "remote",
         "turn_on",
         {"entity_id": REMOTE_ENTITY},
@@ -69,7 +69,7 @@ async def test_remote_toggles(
     mock_api.send_key_command.assert_called_with("POWER", "SHORT")
     assert mock_api.send_key_command.call_count == 2
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "remote",
         "turn_on",
         {"entity_id": REMOTE_ENTITY, "activity": "activity1"},
@@ -89,7 +89,7 @@ async def test_remote_send_command(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "remote",
         "send_command",
         {
@@ -112,7 +112,7 @@ async def test_remote_send_command_multiple(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "remote",
         "send_command",
         {
@@ -136,7 +136,7 @@ async def test_remote_send_command_with_hold_secs(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "remote",
         "send_command",
         {
diff --git a/tests/components/aranet/test_sensor.py b/tests/components/aranet/test_sensor.py
index 3de7267f130..7d531bf6111 100644
--- a/tests/components/aranet/test_sensor.py
+++ b/tests/components/aranet/test_sensor.py
@@ -10,7 +10,9 @@ from tests.common import MockConfigEntry
 from tests.components.bluetooth import inject_bluetooth_service_info
 
 
-async def test_sensors(hass: HomeAssistant) -> None:
+async def test_sensors(
+    hass: HomeAssistant, entity_registry_enabled_by_default: None
+) -> None:
     """Test setting up creates the sensors."""
     entry = MockConfigEntry(
         domain=DOMAIN,
@@ -24,7 +26,7 @@ async def test_sensors(hass: HomeAssistant) -> None:
     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")) == 5
+    assert len(hass.states.async_all("sensor")) == 6
 
     batt_sensor = hass.states.get("sensor.aranet4_12345_battery")
     batt_sensor_attrs = batt_sensor.attributes
@@ -61,11 +63,20 @@ async def test_sensors(hass: HomeAssistant) -> None:
     assert press_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "hPa"
     assert press_sensor_attrs[ATTR_STATE_CLASS] == "measurement"
 
+    interval_sensor = hass.states.get("sensor.aranet4_12345_update_interval")
+    interval_sensor_attrs = interval_sensor.attributes
+    assert interval_sensor.state == "300"
+    assert interval_sensor_attrs[ATTR_FRIENDLY_NAME] == "Aranet4 12345 Update Interval"
+    assert interval_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "s"
+    assert interval_sensor_attrs[ATTR_STATE_CLASS] == "measurement"
+
     assert await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
 
 
-async def test_smart_home_integration_disabled(hass: HomeAssistant) -> None:
+async def test_smart_home_integration_disabled(
+    hass: HomeAssistant, entity_registry_enabled_by_default: None
+) -> None:
     """Test disabling smart home integration marks entities as unavailable."""
     entry = MockConfigEntry(
         domain=DOMAIN,
@@ -79,7 +90,7 @@ async def test_smart_home_integration_disabled(hass: HomeAssistant) -> None:
     assert len(hass.states.async_all("sensor")) == 0
     inject_bluetooth_service_info(hass, DISABLED_INTEGRATIONS_SERVICE_INFO)
     await hass.async_block_till_done()
-    assert len(hass.states.async_all("sensor")) == 5
+    assert len(hass.states.async_all("sensor")) == 6
 
     batt_sensor = hass.states.get("sensor.aranet4_12345_battery")
     assert batt_sensor.state == "unavailable"
diff --git a/tests/components/arcam_fmj/conftest.py b/tests/components/arcam_fmj/conftest.py
index 39b44d2ad9e..693cdc685c9 100644
--- a/tests/components/arcam_fmj/conftest.py
+++ b/tests/components/arcam_fmj/conftest.py
@@ -9,7 +9,7 @@ from homeassistant.components.arcam_fmj.const import DEFAULT_NAME
 from homeassistant.components.arcam_fmj.media_player import ArcamFmj
 from homeassistant.const import CONF_HOST, CONF_PORT
 
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, MockEntityPlatform
 
 MOCK_HOST = "127.0.0.1"
 MOCK_PORT = 50000
@@ -75,6 +75,7 @@ def player_fixture(hass, state):
     player = ArcamFmj(MOCK_NAME, state, MOCK_UUID)
     player.entity_id = MOCK_ENTITY_ID
     player.hass = hass
+    player.platform = MockEntityPlatform(hass)
     player.async_write_ha_state = Mock()
     return player
 
diff --git a/tests/components/arcam_fmj/test_device_trigger.py b/tests/components/arcam_fmj/test_device_trigger.py
index 012bc3a20af..7caba687ff2 100644
--- a/tests/components/arcam_fmj/test_device_trigger.py
+++ b/tests/components/arcam_fmj/test_device_trigger.py
@@ -38,7 +38,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         identifiers={(DOMAIN, "host", 1234)},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         "media_player", DOMAIN, "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -47,7 +47,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": "turn_on",
             "device_id": device_entry.id,
-            "entity_id": "media_player.arcam_fmj_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
@@ -66,9 +66,11 @@ async def test_get_triggers(
 
 
 async def test_if_fires_on_turn_on_request(
-    hass: HomeAssistant, calls, player_setup, state
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls, player_setup, state
 ) -> None:
     """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get(player_setup)
+
     state.get_power.return_value = None
 
     assert await async_setup_component(
@@ -81,7 +83,53 @@ async def test_if_fires_on_turn_on_request(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": player_setup,
+                        "entity_id": entry.id,
+                        "type": "turn_on",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "{{ trigger.entity_id }}",
+                            "id": "{{ trigger.id }}",
+                        },
+                    },
+                }
+            ]
+        },
+    )
+
+    await hass.services.async_call(
+        "media_player",
+        "turn_on",
+        {"entity_id": player_setup},
+        blocking=True,
+    )
+
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == player_setup
+    assert calls[0].data["id"] == 0
+
+
+async def test_if_fires_on_turn_on_request_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls, player_setup, state
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get(player_setup)
+
+    state.get_power.return_value = None
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
                         "type": "turn_on",
                     },
                     "action": {
diff --git a/tests/components/assist_pipeline/conftest.py b/tests/components/assist_pipeline/conftest.py
index 7b0b98d65a3..5aa760cc606 100644
--- a/tests/components/assist_pipeline/conftest.py
+++ b/tests/components/assist_pipeline/conftest.py
@@ -9,7 +9,10 @@ import pytest
 
 from homeassistant.components import stt, tts
 from homeassistant.components.assist_pipeline import DOMAIN
-from homeassistant.components.assist_pipeline.pipeline import PipelineStorageCollection
+from homeassistant.components.assist_pipeline.pipeline import (
+    PipelineData,
+    PipelineStorageCollection,
+)
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -260,6 +263,12 @@ async def init_components(hass: HomeAssistant, init_supporting_components):
 
 
 @pytest.fixture
-def pipeline_storage(hass: HomeAssistant, init_components) -> PipelineStorageCollection:
+def pipeline_data(hass: HomeAssistant, init_components) -> PipelineData:
+    """Return pipeline data."""
+    return hass.data[DOMAIN]
+
+
+@pytest.fixture
+def pipeline_storage(pipeline_data) -> PipelineStorageCollection:
     """Return pipeline storage collection."""
-    return hass.data[DOMAIN].pipeline_store
+    return pipeline_data.pipeline_store
diff --git a/tests/components/assist_pipeline/snapshots/test_init.ambr b/tests/components/assist_pipeline/snapshots/test_init.ambr
index 619c59606ed..d8858cec4b6 100644
--- a/tests/components/assist_pipeline/snapshots/test_init.ambr
+++ b/tests/components/assist_pipeline/snapshots/test_init.ambr
@@ -32,6 +32,8 @@
     }),
     dict({
       'data': dict({
+        'conversation_id': None,
+        'device_id': None,
         'engine': 'homeassistant',
         'intent_input': 'test transcript',
         'language': 'en',
@@ -119,6 +121,8 @@
     }),
     dict({
       'data': dict({
+        'conversation_id': None,
+        'device_id': None,
         'engine': 'homeassistant',
         'intent_input': 'test transcript',
         'language': 'en-US',
@@ -206,6 +210,8 @@
     }),
     dict({
       'data': dict({
+        'conversation_id': None,
+        'device_id': None,
         'engine': 'homeassistant',
         'intent_input': 'test transcript',
         'language': 'en-US',
diff --git a/tests/components/assist_pipeline/snapshots/test_websocket.ambr b/tests/components/assist_pipeline/snapshots/test_websocket.ambr
index a2e5ac72b07..12a4d766f06 100644
--- a/tests/components/assist_pipeline/snapshots/test_websocket.ambr
+++ b/tests/components/assist_pipeline/snapshots/test_websocket.ambr
@@ -31,6 +31,8 @@
 # ---
 # name: test_audio_pipeline.3
   dict({
+    'conversation_id': None,
+    'device_id': None,
     'engine': 'homeassistant',
     'intent_input': 'test transcript',
     'language': 'en',
@@ -107,6 +109,8 @@
 # ---
 # name: test_audio_pipeline_debug.3
   dict({
+    'conversation_id': None,
+    'device_id': None,
     'engine': 'homeassistant',
     'intent_input': 'test transcript',
     'language': 'en',
@@ -163,6 +167,8 @@
 # ---
 # name: test_intent_failed.1
   dict({
+    'conversation_id': None,
+    'device_id': None,
     'engine': 'homeassistant',
     'intent_input': 'Are the lights on?',
     'language': 'en',
@@ -180,6 +186,8 @@
 # ---
 # name: test_intent_timeout.1
   dict({
+    'conversation_id': None,
+    'device_id': None,
     'engine': 'homeassistant',
     'intent_input': 'Are the lights on?',
     'language': 'en',
@@ -249,6 +257,8 @@
 # ---
 # name: test_text_only_pipeline.1
   dict({
+    'conversation_id': 'mock-conversation-id',
+    'device_id': 'mock-device-id',
     'engine': 'homeassistant',
     'intent_input': 'Are the lights on?',
     'language': 'en',
diff --git a/tests/components/assist_pipeline/test_select.py b/tests/components/assist_pipeline/test_select.py
index 30874e7b756..bb9c4d45a32 100644
--- a/tests/components/assist_pipeline/test_select.py
+++ b/tests/components/assist_pipeline/test_select.py
@@ -5,10 +5,19 @@ from __future__ import annotations
 import pytest
 
 from homeassistant.components.assist_pipeline import Pipeline
-from homeassistant.components.assist_pipeline.pipeline import PipelineStorageCollection
-from homeassistant.components.assist_pipeline.select import AssistPipelineSelect
+from homeassistant.components.assist_pipeline.pipeline import (
+    PipelineData,
+    PipelineStorageCollection,
+)
+from homeassistant.components.assist_pipeline.select import (
+    AssistPipelineSelect,
+    VadSensitivitySelect,
+)
+from homeassistant.components.assist_pipeline.vad import VadSensitivity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from tests.common import MockConfigEntry, MockPlatform, mock_entity_platform
@@ -25,7 +34,15 @@ class SelectPlatform(MockPlatform):
         async_add_entities: AddEntitiesCallback,
     ) -> None:
         """Set up fake select platform."""
-        async_add_entities([AssistPipelineSelect(hass, "test")])
+        pipeline_entity = AssistPipelineSelect(hass, "test")
+        pipeline_entity._attr_device_info = DeviceInfo(
+            identifiers={("test", "test")},
+        )
+        sensitivity_entity = VadSensitivitySelect(hass, "test")
+        sensitivity_entity._attr_device_info = DeviceInfo(
+            identifiers={("test", "test")},
+        )
+        async_add_entities([pipeline_entity, sensitivity_entity])
 
 
 @pytest.fixture
@@ -33,6 +50,7 @@ async def init_select(hass: HomeAssistant, init_components) -> ConfigEntry:
     """Initialize select entity."""
     mock_entity_platform(hass, "select.assist_pipeline", SelectPlatform())
     config_entry = MockConfigEntry(domain="assist_pipeline")
+    config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_forward_entry_setup(config_entry, "select")
     return config_entry
 
@@ -77,6 +95,26 @@ async def pipeline_2(
     )
 
 
+async def test_select_entity_registering_device(
+    hass: HomeAssistant,
+    init_select: ConfigEntry,
+    pipeline_data: PipelineData,
+) -> None:
+    """Test entity registering as an assist device."""
+    dev_reg = dr.async_get(hass)
+    device = dev_reg.async_get_device({("test", "test")})
+    assert device is not None
+
+    # Test device is registered
+    assert pipeline_data.pipeline_devices == {device.id}
+
+    await hass.config_entries.async_remove(init_select.entry_id)
+    await hass.async_block_till_done()
+
+    # Test device is removed
+    assert pipeline_data.pipeline_devices == set()
+
+
 async def test_select_entity_changing_pipelines(
     hass: HomeAssistant,
     init_select: ConfigEntry,
@@ -109,6 +147,7 @@ async def test_select_entity_changing_pipelines(
     )
 
     state = hass.states.get("select.assist_pipeline_test_pipeline")
+    assert state is not None
     assert state.state == pipeline_2.name
 
     # Reload config entry to test selected option persists
@@ -116,15 +155,52 @@ async def test_select_entity_changing_pipelines(
     assert await hass.config_entries.async_forward_entry_setup(config_entry, "select")
 
     state = hass.states.get("select.assist_pipeline_test_pipeline")
+    assert state is not None
     assert state.state == pipeline_2.name
 
     # Remove selected pipeline
     await pipeline_storage.async_delete_item(pipeline_2.id)
 
     state = hass.states.get("select.assist_pipeline_test_pipeline")
+    assert state is not None
     assert state.state == "preferred"
     assert state.attributes["options"] == [
         "preferred",
         "Home Assistant",
         pipeline_1.name,
     ]
+
+
+async def test_select_entity_changing_vad_sensitivity(
+    hass: HomeAssistant,
+    init_select: ConfigEntry,
+) -> None:
+    """Test entity tracking pipeline changes."""
+    config_entry = init_select  # nicer naming
+
+    state = hass.states.get("select.assist_pipeline_test_vad_sensitivity")
+    assert state is not None
+    assert state.state == VadSensitivity.DEFAULT.value
+
+    # Change select to new pipeline
+    await hass.services.async_call(
+        "select",
+        "select_option",
+        {
+            "entity_id": "select.assist_pipeline_test_vad_sensitivity",
+            "option": VadSensitivity.AGGRESSIVE.value,
+        },
+        blocking=True,
+    )
+
+    state = hass.states.get("select.assist_pipeline_test_vad_sensitivity")
+    assert state is not None
+    assert state.state == VadSensitivity.AGGRESSIVE.value
+
+    # Reload config entry to test selected option persists
+    assert await hass.config_entries.async_forward_entry_unload(config_entry, "select")
+    assert await hass.config_entries.async_forward_entry_setup(config_entry, "select")
+
+    state = hass.states.get("select.assist_pipeline_test_vad_sensitivity")
+    assert state is not None
+    assert state.state == VadSensitivity.AGGRESSIVE.value
diff --git a/tests/components/assist_pipeline/test_websocket.py b/tests/components/assist_pipeline/test_websocket.py
index 23044073368..4ebf0a1fb98 100644
--- a/tests/components/assist_pipeline/test_websocket.py
+++ b/tests/components/assist_pipeline/test_websocket.py
@@ -28,6 +28,8 @@ async def test_text_only_pipeline(
             "start_stage": "intent",
             "end_stage": "intent",
             "input": {"text": "Are the lights on?"},
+            "conversation_id": "mock-conversation-id",
+            "device_id": "mock-device-id",
         }
     )
 
@@ -954,7 +956,6 @@ async def test_list_pipelines(
 ) -> None:
     """Test we can list pipelines."""
     client = await hass_ws_client(hass)
-    hass.data[DOMAIN]
 
     await client.send_json_auto_id({"type": "assist_pipeline/pipeline/list"})
     msg = await client.receive_json()
diff --git a/tests/components/august/test_binary_sensor.py b/tests/components/august/test_binary_sensor.py
index e3c876645aa..f66ba73cebc 100644
--- a/tests/components/august/test_binary_sensor.py
+++ b/tests/components/august/test_binary_sensor.py
@@ -46,9 +46,7 @@ async def test_doorsense(hass: HomeAssistant) -> None:
     assert binary_sensor_online_with_doorsense_name.state == STATE_ON
 
     data = {ATTR_ENTITY_ID: "lock.online_with_doorsense_name"}
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     binary_sensor_online_with_doorsense_name = hass.states.get(
@@ -56,9 +54,7 @@ async def test_doorsense(hass: HomeAssistant) -> None:
     )
     assert binary_sensor_online_with_doorsense_name.state == STATE_ON
 
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_LOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_LOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     binary_sensor_online_with_doorsense_name = hass.states.get(
diff --git a/tests/components/august/test_button.py b/tests/components/august/test_button.py
index 07d2bf1f4ae..eb0bce2faca 100644
--- a/tests/components/august/test_button.py
+++ b/tests/components/august/test_button.py
@@ -16,7 +16,7 @@ async def test_wake_lock(hass: HomeAssistant) -> None:
     binary_sensor_online_with_doorsense_name = hass.states.get(entity_id)
     assert binary_sensor_online_with_doorsense_name is not None
     api_instance.async_status_async.reset_mock()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         BUTTON_DOMAIN, SERVICE_PRESS, {ATTR_ENTITY_ID: entity_id}, blocking=True
     )
     await hass.async_block_till_done()
diff --git a/tests/components/august/test_lock.py b/tests/components/august/test_lock.py
index 8d04e4d0f99..d1e60951c20 100644
--- a/tests/components/august/test_lock.py
+++ b/tests/components/august/test_lock.py
@@ -122,9 +122,7 @@ async def test_one_lock_operation(hass: HomeAssistant) -> None:
     )
 
     data = {ATTR_ENTITY_ID: "lock.online_with_doorsense_name"}
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     lock_online_with_doorsense_name = hass.states.get("lock.online_with_doorsense_name")
@@ -136,9 +134,7 @@ async def test_one_lock_operation(hass: HomeAssistant) -> None:
         == "online_with_doorsense Name"
     )
 
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_LOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_LOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     lock_online_with_doorsense_name = hass.states.get("lock.online_with_doorsense_name")
@@ -176,9 +172,7 @@ async def test_one_lock_operation_pubnub_connected(hass: HomeAssistant) -> None:
     )
 
     data = {ATTR_ENTITY_ID: "lock.online_with_doorsense_name"}
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     pubnub.message(
@@ -203,9 +197,7 @@ async def test_one_lock_operation_pubnub_connected(hass: HomeAssistant) -> None:
         == "online_with_doorsense Name"
     )
 
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_LOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_LOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     pubnub.message(
@@ -262,9 +254,7 @@ async def test_lock_jammed(hass: HomeAssistant) -> None:
     )
 
     data = {ATTR_ENTITY_ID: "lock.online_with_doorsense_name"}
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     lock_online_with_doorsense_name = hass.states.get("lock.online_with_doorsense_name")
@@ -300,9 +290,7 @@ async def test_lock_throws_exception_on_unknown_status_code(
 
     data = {ATTR_ENTITY_ID: "lock.online_with_doorsense_name"}
     with pytest.raises(ClientResponseError):
-        assert await hass.services.async_call(
-            LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True
-        )
+        await hass.services.async_call(LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True)
         await hass.async_block_till_done()
 
 
diff --git a/tests/components/aurora_abb_powerone/test_sensor.py b/tests/components/aurora_abb_powerone/test_sensor.py
index 6449a95db65..8fbe29f9979 100644
--- a/tests/components/aurora_abb_powerone/test_sensor.py
+++ b/tests/components/aurora_abb_powerone/test_sensor.py
@@ -82,15 +82,15 @@ async def test_sensors(hass: HomeAssistant) -> None:
         await hass.config_entries.async_setup(mock_entry.entry_id)
         await hass.async_block_till_done()
 
-        power = hass.states.get("sensor.power_output")
+        power = hass.states.get("sensor.mydevicename_power_output")
         assert power
         assert power.state == "45.7"
 
-        temperature = hass.states.get("sensor.temperature")
+        temperature = hass.states.get("sensor.mydevicename_temperature")
         assert temperature
         assert temperature.state == "9.9"
 
-        energy = hass.states.get("sensor.total_energy")
+        energy = hass.states.get("sensor.mydevicename_total_energy")
         assert energy
         assert energy.state == "12.35"
 
@@ -120,7 +120,7 @@ async def test_sensor_dark(hass: HomeAssistant) -> None:
         await hass.config_entries.async_setup(mock_entry.entry_id)
         await hass.async_block_till_done()
 
-        power = hass.states.get("sensor.power_output")
+        power = hass.states.get("sensor.mydevicename_power_output")
         assert power is not None
         assert power.state == "45.7"
 
@@ -131,7 +131,7 @@ async def test_sensor_dark(hass: HomeAssistant) -> None:
     ):
         async_fire_time_changed(hass, utcnow + timedelta(seconds=60))
         await hass.async_block_till_done()
-        power = hass.states.get("sensor.power_output")
+        power = hass.states.get("sensor.mydevicename_power_output")
         assert power.state == "unknown"
     # sun rose again
     with patch("aurorapy.client.AuroraSerialClient.connect", return_value=None), patch(
@@ -139,7 +139,7 @@ async def test_sensor_dark(hass: HomeAssistant) -> None:
     ):
         async_fire_time_changed(hass, utcnow + timedelta(seconds=60))
         await hass.async_block_till_done()
-        power = hass.states.get("sensor.power_output")
+        power = hass.states.get("sensor.mydevicename_power_output")
         assert power is not None
         assert power.state == "45.7"
     # sunset
@@ -149,7 +149,7 @@ async def test_sensor_dark(hass: HomeAssistant) -> None:
     ):
         async_fire_time_changed(hass, utcnow + timedelta(seconds=60))
         await hass.async_block_till_done()
-        power = hass.states.get("sensor.power_output")
+        power = hass.states.get("sensor.mydevicename_power_output")
         assert power.state == "unknown"  # should this be 'available'?
 
 
@@ -164,5 +164,5 @@ async def test_sensor_unknown_error(hass: HomeAssistant) -> None:
         mock_entry.add_to_hass(hass)
         await hass.config_entries.async_setup(mock_entry.entry_id)
         await hass.async_block_till_done()
-        power = hass.states.get("sensor.power_output")
+        power = hass.states.get("sensor.mydevicename_power_output")
         assert power is None
diff --git a/tests/components/automation/test_init.py b/tests/components/automation/test_init.py
index 3859e0c857c..0d983864e44 100644
--- a/tests/components/automation/test_init.py
+++ b/tests/components/automation/test_init.py
@@ -25,6 +25,7 @@ from homeassistant.const import (
     SERVICE_TURN_ON,
     STATE_OFF,
     STATE_ON,
+    STATE_UNAVAILABLE,
 )
 from homeassistant.core import (
     Context,
@@ -1428,8 +1429,13 @@ async def test_automation_bad_config_validation(
         f" {details}"
     ) in caplog.text
 
-    # Make sure one bad automation does not prevent other automations from setting up
-    assert hass.states.async_entity_ids("automation") == ["automation.good_automation"]
+    # Make sure both automations are setup
+    assert set(hass.states.async_entity_ids("automation")) == {
+        "automation.bad_automation",
+        "automation.good_automation",
+    }
+    # The automation failing validation should be unavailable
+    assert hass.states.get("automation.bad_automation").state == STATE_UNAVAILABLE
 
 
 async def test_automation_with_error_in_script(
@@ -1537,6 +1543,52 @@ async def test_automation_restore_last_triggered_with_initial_state(
     assert state.attributes["last_triggered"] == time
 
 
+async def test_extraction_functions_not_setup(hass: HomeAssistant) -> None:
+    """Test extraction functions when automation is not setup."""
+    assert automation.automations_with_area(hass, "area-in-both") == []
+    assert automation.areas_in_automation(hass, "automation.test") == []
+    assert automation.automations_with_blueprint(hass, "blabla.yaml") == []
+    assert automation.blueprint_in_automation(hass, "automation.test") is None
+    assert automation.automations_with_device(hass, "device-in-both") == []
+    assert automation.devices_in_automation(hass, "automation.test") == []
+    assert automation.automations_with_entity(hass, "light.in_both") == []
+    assert automation.entities_in_automation(hass, "automation.test") == []
+
+
+async def test_extraction_functions_unknown_automation(hass: HomeAssistant) -> None:
+    """Test extraction functions for an unknown automation."""
+    assert await async_setup_component(hass, DOMAIN, {})
+    assert automation.areas_in_automation(hass, "automation.unknown") == []
+    assert automation.blueprint_in_automation(hass, "automation.unknown") is None
+    assert automation.devices_in_automation(hass, "automation.unknown") == []
+    assert automation.entities_in_automation(hass, "automation.unknown") == []
+
+
+async def test_extraction_functions_unavailable_automation(hass: HomeAssistant) -> None:
+    """Test extraction functions for an unknown automation."""
+    entity_id = "automation.test1"
+    assert await async_setup_component(
+        hass,
+        DOMAIN,
+        {
+            DOMAIN: [
+                {
+                    "alias": "test1",
+                }
+            ]
+        },
+    )
+    assert hass.states.get(entity_id).state == STATE_UNAVAILABLE
+    assert automation.automations_with_area(hass, "area-in-both") == []
+    assert automation.areas_in_automation(hass, entity_id) == []
+    assert automation.automations_with_blueprint(hass, "blabla.yaml") == []
+    assert automation.blueprint_in_automation(hass, entity_id) is None
+    assert automation.automations_with_device(hass, "device-in-both") == []
+    assert automation.devices_in_automation(hass, entity_id) == []
+    assert automation.automations_with_entity(hass, "light.in_both") == []
+    assert automation.entities_in_automation(hass, entity_id) == []
+
+
 async def test_extraction_functions(hass: HomeAssistant) -> None:
     """Test extraction functions."""
     await async_setup_component(hass, "homeassistant", {})
@@ -1604,6 +1656,10 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
                             "entity_id": "light.bla",
                             "type": "turn_on",
                         },
+                        {
+                            "service": "test.test",
+                            "target": {"area_id": "area-in-both"},
+                        },
                     ],
                 },
                 {
@@ -1635,7 +1691,7 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
                         {
                             "platform": "event",
                             "event_type": "esphome.button_pressed",
-                            "event_data": {"device_id": ["device-trigger-event"]},
+                            "event_data": {"device_id": ["device-trigger-event2"]},
                         },
                         # device_id is not a string
                         {
@@ -1676,6 +1732,55 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
                         },
                     ],
                 },
+                {
+                    "alias": "test3",
+                    "trigger": [
+                        {
+                            "platform": "event",
+                            "event_type": "esphome.button_pressed",
+                            "event_data": {"area_id": "area-trigger-event"},
+                        },
+                        # area_id is a list of strings (not supported)
+                        {
+                            "platform": "event",
+                            "event_type": "esphome.button_pressed",
+                            "event_data": {"area_id": ["area-trigger-event2"]},
+                        },
+                        # area_id is not a string
+                        {
+                            "platform": "event",
+                            "event_type": "esphome.button_pressed",
+                            "event_data": {"area_id": 123},
+                        },
+                    ],
+                    "condition": {
+                        "condition": "device",
+                        "device_id": "condition-device",
+                        "domain": "light",
+                        "type": "is_on",
+                        "entity_id": "light.bla",
+                    },
+                    "action": [
+                        {
+                            "service": "test.script",
+                            "data": {"entity_id": "light.in_both"},
+                        },
+                        {
+                            "condition": "state",
+                            "entity_id": "sensor.condition",
+                            "state": "100",
+                        },
+                        {"scene": "scene.hello"},
+                        {
+                            "service": "test.test",
+                            "target": {"area_id": "area-in-both"},
+                        },
+                        {
+                            "service": "test.test",
+                            "target": {"area_id": "area-in-last"},
+                        },
+                    ],
+                },
             ]
         },
     )
@@ -1683,6 +1788,7 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
     assert set(automation.automations_with_entity(hass, "light.in_both")) == {
         "automation.test1",
         "automation.test2",
+        "automation.test3",
     }
     assert set(automation.entities_in_automation(hass, "automation.test1")) == {
         "calendar.trigger_calendar",
@@ -1707,6 +1813,15 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
         "device-trigger-tag2",
         "device-trigger-tag3",
     }
+    assert set(automation.automations_with_area(hass, "area-in-both")) == {
+        "automation.test1",
+        "automation.test3",
+    }
+    assert set(automation.areas_in_automation(hass, "automation.test3")) == {
+        "area-in-both",
+        "area-in-last",
+    }
+    assert automation.blueprint_in_automation(hass, "automation.test3") is None
 
 
 async def test_logbook_humanify_automation_triggered_event(hass: HomeAssistant) -> None:
@@ -1980,6 +2095,13 @@ async def test_blueprint_automation(hass: HomeAssistant, calls) -> None:
     assert automation.entities_in_automation(hass, "automation.automation_0") == [
         "light.kitchen"
     ]
+    assert (
+        automation.blueprint_in_automation(hass, "automation.automation_0")
+        == "test_event_service.yaml"
+    )
+    assert automation.automations_with_blueprint(hass, "test_event_service.yaml") == [
+        "automation.automation_0"
+    ]
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/awair/test_sensor.py b/tests/components/awair/test_sensor.py
index 287eb72d21e..24bbb40d9cf 100644
--- a/tests/components/awair/test_sensor.py
+++ b/tests/components/awair/test_sensor.py
@@ -11,6 +11,8 @@ from homeassistant.components.awair.const import (
     API_SPL_A,
     API_TEMP,
     API_VOC,
+)
+from homeassistant.components.awair.sensor import (
     SENSOR_TYPE_SCORE,
     SENSOR_TYPES,
     SENSOR_TYPES_DUST,
@@ -113,7 +115,7 @@ async def test_awair_gen1_sensors(
     assert_expected_properties(
         hass,
         registry,
-        "sensor.living_room_volatile_organic_compounds",
+        "sensor.living_room_vocs",
         f"{AWAIR_UUID}_{SENSOR_TYPES_MAP[API_VOC].unique_id_tag}",
         "366",
         {
diff --git a/tests/components/binary_sensor/test_device_condition.py b/tests/components/binary_sensor/test_device_condition.py
index b1a0296d0d3..b25ab787791 100644
--- a/tests/components/binary_sensor/test_device_condition.py
+++ b/tests/components/binary_sensor/test_device_condition.py
@@ -3,6 +3,7 @@ from datetime import timedelta
 
 from freezegun import freeze_time
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.binary_sensor import DOMAIN, BinarySensorDeviceClass
@@ -16,7 +17,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
@@ -45,6 +45,7 @@ async def test_get_conditions(
     platform.init()
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
+    binary_sensor_entries = {}
 
     config_entry = MockConfigEntry(domain="test", data={})
     config_entry.add_to_hass(hass)
@@ -53,7 +54,7 @@ async def test_get_conditions(
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
     for device_class in BinarySensorDeviceClass:
-        entity_registry.async_get_or_create(
+        binary_sensor_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             platform.ENTITIES[device_class].unique_id,
@@ -66,7 +67,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition["type"],
             "device_id": device_entry.id,
-            "entity_id": platform.ENTITIES[device_class].entity_id,
+            "entity_id": binary_sensor_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in BinarySensorDeviceClass
@@ -75,7 +76,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -101,7 +102,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -115,7 +116,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_on", "is_off"]
@@ -123,7 +124,7 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_get_conditions_no_state(
@@ -138,15 +139,15 @@ async def test_get_conditions_no_state(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_ids = {}
+    binary_sensor_entries = {}
     for device_class in BinarySensorDeviceClass:
-        entity_ids[device_class] = entity_registry.async_get_or_create(
+        binary_sensor_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             f"5678_{device_class}",
             device_id=device_entry.id,
             original_device_class=device_class,
-        ).entity_id
+        )
 
     await hass.async_block_till_done()
 
@@ -156,7 +157,7 @@ async def test_get_conditions_no_state(
             "domain": DOMAIN,
             "type": condition["type"],
             "device_id": device_entry.id,
-            "entity_id": entity_ids[device_class],
+            "entity_id": binary_sensor_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in BinarySensorDeviceClass
@@ -198,8 +199,44 @@ async def test_get_condition_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a binary_sensor condition."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    conditions = await async_get_device_automations(
+        hass, DeviceAutomationType.CONDITION, device_entry.id
+    )
+    for condition in conditions:
+        condition["entity_id"] = entity_registry.async_get(
+            condition["entity_id"]
+        ).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.CONDITION, condition
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_state(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off conditions."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -208,7 +245,7 @@ async def test_if_state(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
-    sensor1 = platform.ENTITIES["battery"]
+    entry = entity_registry.async_get(platform.ENTITIES["battery"].entity_id)
 
     assert await async_setup_component(
         hass,
@@ -222,7 +259,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_bat_low",
                         }
                     ],
@@ -241,7 +278,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_not_bat_low",
                         }
                     ],
@@ -257,7 +294,7 @@ async def test_if_state(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_ON
+    assert hass.states.get(entry.entity_id).state == STATE_ON
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
@@ -265,7 +302,7 @@ async def test_if_state(
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on event - test_event1"
 
-    hass.states.async_set(sensor1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
@@ -273,8 +310,63 @@ async def test_if_state(
     assert calls[1].data["some"] == "is_off event - test_event2"
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+
+    platform.init()
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    entry = entity_registry.async_get(platform.ENTITIES["battery"].entity_id)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_bat_low",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_on {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(("platform", "event.event_type"))
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert hass.states.get(entry.entity_id).state == STATE_ON
+    assert len(calls) == 0
+
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_on event - test_event1"
+
+
 async def test_if_fires_on_for_condition(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for firing if condition is on with delay."""
     point1 = dt_util.utcnow()
@@ -287,7 +379,7 @@ async def test_if_fires_on_for_condition(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
-    sensor1 = platform.ENTITIES["battery"]
+    entry = entity_registry.async_get(platform.ENTITIES["battery"].entity_id)
 
     with freeze_time(point1) as time_freeze:
         assert await async_setup_component(
@@ -301,7 +393,7 @@ async def test_if_fires_on_for_condition(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_not_bat_low",
                             "for": {"seconds": 5},
                         },
@@ -319,7 +411,7 @@ async def test_if_fires_on_for_condition(
             },
         )
         await hass.async_block_till_done()
-        assert hass.states.get(sensor1.entity_id).state == STATE_ON
+        assert hass.states.get(entry.entity_id).state == STATE_ON
         assert len(calls) == 0
 
         hass.bus.async_fire("test_event1")
@@ -332,7 +424,7 @@ async def test_if_fires_on_for_condition(
         await hass.async_block_till_done()
         assert len(calls) == 0
 
-        hass.states.async_set(sensor1.entity_id, STATE_OFF)
+        hass.states.async_set(entry.entity_id, STATE_OFF)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 0
diff --git a/tests/components/binary_sensor/test_device_trigger.py b/tests/components/binary_sensor/test_device_trigger.py
index 49ae9e017ca..4b8318e2d79 100644
--- a/tests/components/binary_sensor/test_device_trigger.py
+++ b/tests/components/binary_sensor/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.binary_sensor import DOMAIN, BinarySensorDeviceClass
@@ -15,7 +16,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
@@ -41,6 +41,7 @@ async def test_get_triggers(
     enable_custom_integrations: None,
 ) -> None:
     """Test we get the expected triggers from a binary_sensor."""
+    registry_entries: dict[BinarySensorDeviceClass, er.RegistryEntry] = {}
     platform = getattr(hass.components, f"test.{DOMAIN}")
     platform.init()
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
@@ -53,7 +54,7 @@ async def test_get_triggers(
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
     for device_class in BinarySensorDeviceClass:
-        entity_registry.async_get_or_create(
+        registry_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             platform.ENTITIES[device_class].unique_id,
@@ -66,7 +67,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger["type"],
             "device_id": device_entry.id,
-            "entity_id": platform.ENTITIES[device_class].entity_id,
+            "entity_id": registry_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in BinarySensorDeviceClass
@@ -75,7 +76,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -101,7 +102,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -115,7 +116,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["turned_on", "turned_off"]
@@ -123,7 +124,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_no_state(
@@ -132,9 +133,9 @@ async def test_get_triggers_no_state(
     entity_registry: er.EntityRegistry,
 ) -> None:
     """Test we get the expected triggers from a binary_sensor."""
+    registry_entries: dict[BinarySensorDeviceClass, er.RegistryEntry] = {}
     platform = getattr(hass.components, f"test.{DOMAIN}")
     platform.init()
-    entity_ids = {}
 
     config_entry = MockConfigEntry(domain="test", data={})
     config_entry.add_to_hass(hass)
@@ -143,13 +144,13 @@ async def test_get_triggers_no_state(
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
     for device_class in BinarySensorDeviceClass:
-        entity_ids[device_class] = entity_registry.async_get_or_create(
+        registry_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             f"5678_{device_class}",
             device_id=device_entry.id,
             original_device_class=device_class,
-        ).entity_id
+        )
 
     await hass.async_block_till_done()
 
@@ -159,7 +160,7 @@ async def test_get_triggers_no_state(
             "domain": DOMAIN,
             "type": trigger["type"],
             "device_id": device_entry.id,
-            "entity_id": entity_ids[device_class],
+            "entity_id": registry_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in BinarySensorDeviceClass
@@ -168,7 +169,7 @@ async def test_get_triggers_no_state(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -201,8 +202,42 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a binary_sensor trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for on and off triggers firing."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -210,7 +245,11 @@ async def test_if_fires_on_state_change(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
-    sensor1 = platform.ENTITIES["battery"]
+    entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["battery"].unique_id,
+    )
 
     assert await async_setup_component(
         hass,
@@ -222,7 +261,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "bat_low",
                     },
                     "action": {
@@ -246,7 +285,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "not_bat_low",
                     },
                     "action": {
@@ -269,26 +308,30 @@ async def test_if_fires_on_state_change(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_ON
+    assert hass.states.get(entry.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data["some"] == "not_bat_low device - {} - on - off - None".format(
-        sensor1.entity_id
+    assert (
+        calls[0].data["some"]
+        == f"not_bat_low device - {entry.entity_id} - on - off - None"
     )
 
-    hass.states.async_set(sensor1.entity_id, STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data["some"] == "bat_low device - {} - off - on - None".format(
-        sensor1.entity_id
+    assert (
+        calls[1].data["some"] == f"bat_low device - {entry.entity_id} - off - on - None"
     )
 
 
 async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for triggers firing with delay."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -297,7 +340,11 @@ async def test_if_fires_on_state_change_with_for(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
-    sensor1 = platform.ENTITIES["battery"]
+    entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["battery"].unique_id,
+    )
 
     assert await async_setup_component(
         hass,
@@ -309,7 +356,7 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_off",
                         "for": {"seconds": 5},
                     },
@@ -333,16 +380,80 @@ async def test_if_fires_on_state_change_with_for(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_ON
+    assert hass.states.get(entry.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
     await hass.async_block_till_done()
     assert len(calls) == 1
     await hass.async_block_till_done()
-    assert calls[0].data["some"] == "turn_off device - {} - on - off - 0:00:05".format(
-        sensor1.entity_id
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - 0:00:05"
+    )
+
+
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for triggers firing."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+
+    platform.init()
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["battery"].unique_id,
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "turned_off",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "turn_off {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                }
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert hass.states.get(entry.entity_id).state == STATE_ON
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "turn_off device - {} - on - off - None".format(
+        entry.entity_id
     )
diff --git a/tests/components/binary_sensor/test_init.py b/tests/components/binary_sensor/test_init.py
index 79596d95d98..a35a6c906df 100644
--- a/tests/components/binary_sensor/test_init.py
+++ b/tests/components/binary_sensor/test_init.py
@@ -1,8 +1,25 @@
 """The tests for the Binary sensor component."""
+from collections.abc import Generator
 from unittest import mock
 
+import pytest
+
 from homeassistant.components import binary_sensor
+from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import STATE_OFF, STATE_ON
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from tests.common import (
+    MockConfigEntry,
+    MockModule,
+    MockPlatform,
+    mock_config_flow,
+    mock_integration,
+    mock_platform,
+)
+
+TEST_DOMAIN = "test"
 
 
 def test_state() -> None:
@@ -19,3 +36,93 @@ def test_state() -> None:
         new=True,
     ):
         assert binary_sensor.BinarySensorEntity().state == STATE_ON
+
+
+class MockFlow(ConfigFlow):
+    """Test flow."""
+
+
+@pytest.fixture(autouse=True)
+def config_flow_fixture(hass: HomeAssistant) -> Generator[None, None, None]:
+    """Mock config flow."""
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+
+    with mock_config_flow(TEST_DOMAIN, MockFlow):
+        yield
+
+
+async def test_name(hass: HomeAssistant) -> None:
+    """Test binary sensor name."""
+
+    async def async_setup_entry_init(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> bool:
+        """Set up test config entry."""
+        await hass.config_entries.async_forward_entry_setup(
+            config_entry, binary_sensor.DOMAIN
+        )
+        return True
+
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+    mock_integration(
+        hass,
+        MockModule(
+            TEST_DOMAIN,
+            async_setup_entry=async_setup_entry_init,
+        ),
+    )
+
+    # Unnamed binary sensor without device class -> no name
+    entity1 = binary_sensor.BinarySensorEntity()
+    entity1.entity_id = "binary_sensor.test1"
+
+    # Unnamed binary sensor with device class but has_entity_name False -> no name
+    entity2 = binary_sensor.BinarySensorEntity()
+    entity2.entity_id = "binary_sensor.test2"
+    entity2._attr_device_class = binary_sensor.BinarySensorDeviceClass.BATTERY
+
+    # Unnamed binary sensor with device class and has_entity_name True -> named
+    entity3 = binary_sensor.BinarySensorEntity()
+    entity3.entity_id = "binary_sensor.test3"
+    entity3._attr_device_class = binary_sensor.BinarySensorDeviceClass.BATTERY
+    entity3._attr_has_entity_name = True
+
+    # Unnamed binary sensor with device class and has_entity_name True -> named
+    entity4 = binary_sensor.BinarySensorEntity()
+    entity4.entity_id = "binary_sensor.test4"
+    entity4.entity_description = binary_sensor.BinarySensorEntityDescription(
+        "test",
+        binary_sensor.BinarySensorDeviceClass.BATTERY,
+        has_entity_name=True,
+    )
+
+    async def async_setup_entry_platform(
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        async_add_entities: AddEntitiesCallback,
+    ) -> None:
+        """Set up test stt platform via config entry."""
+        async_add_entities([entity1, entity2, entity3, entity4])
+
+    mock_platform(
+        hass,
+        f"{TEST_DOMAIN}.{binary_sensor.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()
+
+    state = hass.states.get(entity1.entity_id)
+    assert state.attributes == {}
+
+    state = hass.states.get(entity2.entity_id)
+    assert state.attributes == {"device_class": "battery"}
+
+    state = hass.states.get(entity3.entity_id)
+    assert state.attributes == {"device_class": "battery", "friendly_name": "Battery"}
+
+    state = hass.states.get(entity4.entity_id)
+    assert state.attributes == {"device_class": "battery", "friendly_name": "Battery"}
diff --git a/tests/components/blueprint/test_importer.py b/tests/components/blueprint/test_importer.py
index cdec562b99f..d41c8417b57 100644
--- a/tests/components/blueprint/test_importer.py
+++ b/tests/components/blueprint/test_importer.py
@@ -162,3 +162,30 @@ async def test_fetch_blueprint_from_github_gist_url(
     assert imported_blueprint.blueprint.inputs == snapshot
     assert imported_blueprint.suggested_filename == "balloob/motion_light"
     assert imported_blueprint.blueprint.metadata["source_url"] == url
+
+
+async def test_fetch_blueprint_from_website_url(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test fetching blueprint from url."""
+    aioclient_mock.get(
+        "https://www.home-assistant.io/blueprints/awesome.yaml",
+        text=Path(
+            hass.config.path("blueprints/automation/test_event_service.yaml")
+        ).read_text(),
+    )
+
+    url = "https://www.home-assistant.io/blueprints/awesome.yaml"
+    imported_blueprint = await importer.fetch_blueprint_from_url(hass, url)
+    assert isinstance(imported_blueprint, importer.ImportedBlueprint)
+    assert imported_blueprint.blueprint.domain == "automation"
+    assert imported_blueprint.suggested_filename == "homeassistant/awesome"
+    assert imported_blueprint.blueprint.metadata["source_url"] == url
+
+
+async def test_fetch_blueprint_from_unsupported_url(hass: HomeAssistant) -> None:
+    """Test fetching blueprint from an unsupported URL."""
+    url = "https://example.com/unsupported.yaml"
+
+    with pytest.raises(HomeAssistantError, match=r"^Unsupported URL$"):
+        await importer.fetch_blueprint_from_url(hass, url)
diff --git a/tests/components/bluetooth/test_api.py b/tests/components/bluetooth/test_api.py
index 77d802264e1..63b60c8f487 100644
--- a/tests/components/bluetooth/test_api.py
+++ b/tests/components/bluetooth/test_api.py
@@ -1,8 +1,12 @@
 """Tests for the Bluetooth integration API."""
+import time
+
 from bleak.backends.scanner import AdvertisementData, BLEDevice
+import pytest
 
 from homeassistant.components import bluetooth
 from homeassistant.components.bluetooth import (
+    MONOTONIC_TIME,
     BaseHaRemoteScanner,
     BaseHaScanner,
     HaBluetoothConnector,
@@ -31,6 +35,11 @@ async def test_scanner_by_source(hass: HomeAssistant, enable_bluetooth: None) ->
     assert async_scanner_by_source(hass, "hci2") is None
 
 
+async def test_monotonic_time() -> None:
+    """Test monotonic time."""
+    assert MONOTONIC_TIME() == pytest.approx(time.monotonic(), abs=0.1)
+
+
 async def test_async_scanner_devices_by_address_connectable(
     hass: HomeAssistant, enable_bluetooth: None
 ) -> None:
@@ -51,6 +60,7 @@ async def test_async_scanner_devices_by_address_connectable(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = manager.scanner_adv_received
diff --git a/tests/components/bluetooth/test_base_scanner.py b/tests/components/bluetooth/test_base_scanner.py
index 8817acad468..5662bc6324b 100644
--- a/tests/components/bluetooth/test_base_scanner.py
+++ b/tests/components/bluetooth/test_base_scanner.py
@@ -12,6 +12,7 @@ import pytest
 
 from homeassistant.components import bluetooth
 from homeassistant.components.bluetooth import (
+    MONOTONIC_TIME,
     BaseHaRemoteScanner,
     HaBluetoothConnector,
     storage,
@@ -84,6 +85,7 @@ async def test_remote_scanner(hass: HomeAssistant, enable_bluetooth: None) -> No
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = manager.scanner_adv_received
@@ -158,6 +160,7 @@ async def test_remote_scanner_expires_connectable(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = manager.scanner_adv_received
@@ -232,6 +235,7 @@ async def test_remote_scanner_expires_non_connectable(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = manager.scanner_adv_received
@@ -329,6 +333,7 @@ async def test_base_scanner_connecting_behavior(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = manager.scanner_adv_received
@@ -452,6 +457,7 @@ async def test_device_with_ten_minute_advertising_interval(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = manager.scanner_adv_received
diff --git a/tests/components/bluetooth/test_diagnostics.py b/tests/components/bluetooth/test_diagnostics.py
index 7ffd3f00131..765e2a9a612 100644
--- a/tests/components/bluetooth/test_diagnostics.py
+++ b/tests/components/bluetooth/test_diagnostics.py
@@ -5,7 +5,11 @@ from bleak.backends.scanner import AdvertisementData, BLEDevice
 from bluetooth_adapters import DEFAULT_ADDRESS
 
 from homeassistant.components import bluetooth
-from homeassistant.components.bluetooth import BaseHaRemoteScanner, HaBluetoothConnector
+from homeassistant.components.bluetooth import (
+    MONOTONIC_TIME,
+    BaseHaRemoteScanner,
+    HaBluetoothConnector,
+)
 from homeassistant.core import HomeAssistant
 
 from . import (
@@ -450,6 +454,7 @@ async def test_diagnostics_remote_adapter(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     with patch(
diff --git a/tests/components/bluetooth/test_manager.py b/tests/components/bluetooth/test_manager.py
index 85da27b027e..f637ee3a27a 100644
--- a/tests/components/bluetooth/test_manager.py
+++ b/tests/components/bluetooth/test_manager.py
@@ -11,6 +11,7 @@ import pytest
 
 from homeassistant.components import bluetooth
 from homeassistant.components.bluetooth import (
+    MONOTONIC_TIME,
     BaseHaRemoteScanner,
     BluetoothChange,
     BluetoothScanningMode,
@@ -711,6 +712,7 @@ async def test_goes_unavailable_connectable_only_and_recovers(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = async_get_advertisement_callback(hass)
@@ -883,6 +885,7 @@ async def test_goes_unavailable_dismisses_discovery_and_makes_discoverable(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
         def clear_all_devices(self) -> None:
@@ -1008,6 +1011,7 @@ async def test_debug_logging(
         {"homeassistant.components.bluetooth": "DEBUG"},
         blocking=True,
     )
+    await hass.async_block_till_done()
 
     address = "44:44:33:11:23:41"
     start_time_monotonic = 50.0
diff --git a/tests/components/bluetooth/test_wrappers.py b/tests/components/bluetooth/test_wrappers.py
index e1656b39c18..de646f8ef9c 100644
--- a/tests/components/bluetooth/test_wrappers.py
+++ b/tests/components/bluetooth/test_wrappers.py
@@ -10,6 +10,7 @@ from bleak.backends.scanner import AdvertisementData
 import pytest
 
 from homeassistant.components.bluetooth import (
+    MONOTONIC_TIME,
     BaseHaRemoteScanner,
     BluetoothServiceInfoBleak,
     HaBluetoothConnector,
@@ -59,6 +60,7 @@ class FakeScanner(BaseHaRemoteScanner):
             advertisement_data.manufacturer_data,
             advertisement_data.tx_power,
             device.details | {"scanner_specific_data": "test"},
+            MONOTONIC_TIME(),
         )
 
 
diff --git a/tests/components/bmw_connected_drive/__init__.py b/tests/components/bmw_connected_drive/__init__.py
index b1f1db305b8..89a34682c1b 100644
--- a/tests/components/bmw_connected_drive/__init__.py
+++ b/tests/components/bmw_connected_drive/__init__.py
@@ -1,9 +1,11 @@
 """Tests for the for the BMW Connected Drive integration."""
 
 from pathlib import Path
+from urllib.parse import urlparse
 
 from bimmer_connected.api.authentication import MyBMWAuthentication
 from bimmer_connected.const import (
+    REMOTE_SERVICE_POSITION_URL,
     VEHICLE_CHARGING_DETAILS_URL,
     VEHICLE_STATE_URL,
     VEHICLES_URL,
@@ -115,6 +117,18 @@ def mock_vehicles() -> respx.Router:
     router.get(VEHICLE_CHARGING_DETAILS_URL).mock(
         side_effect=vehicle_charging_sideeffect
     )
+
+    # Get vehicle position after remote service
+    router.post(urlparse(REMOTE_SERVICE_POSITION_URL).netloc).mock(
+        httpx.Response(
+            200,
+            json=load_json_object_fixture(
+                FIXTURE_PATH / "remote_service" / "eventposition.json",
+                integration=BMW_DOMAIN,
+            ),
+        )
+    )
+
     return router
 
 
diff --git a/tests/components/bmw_connected_drive/fixtures/remote_service/eventposition.json b/tests/components/bmw_connected_drive/fixtures/remote_service/eventposition.json
new file mode 100644
index 00000000000..92d1a6a9db0
--- /dev/null
+++ b/tests/components/bmw_connected_drive/fixtures/remote_service/eventposition.json
@@ -0,0 +1,12 @@
+{
+  "positionData": {
+    "status": "OK",
+    "position": {
+      "latitude": 123.456,
+      "longitude": 34.5678,
+      "formattedAddress": "some_formatted_address",
+      "heading": 121
+    }
+  },
+  "errorDetails": null
+}
diff --git a/tests/components/bmw_connected_drive/snapshots/test_button.ambr b/tests/components/bmw_connected_drive/snapshots/test_button.ambr
new file mode 100644
index 00000000000..a7520a6bce0
--- /dev/null
+++ b/tests/components/bmw_connected_drive/snapshots/test_button.ambr
@@ -0,0 +1,137 @@
+# serializer version: 1
+# name: test_entity_state_attrs
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i4 eDrive40 Flash lights',
+        'icon': 'mdi:car-light-alert',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i4_edrive40_flash_lights',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i4 eDrive40 Sound horn',
+        'icon': 'mdi:bullhorn',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i4_edrive40_sound_horn',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i4 eDrive40 Activate air conditioning',
+        'icon': 'mdi:hvac',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i4_edrive40_activate_air_conditioning',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i4 eDrive40 Deactivate air conditioning',
+        'icon': 'mdi:hvac-off',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i4_edrive40_deactivate_air_conditioning',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i4 eDrive40 Find vehicle',
+        'icon': 'mdi:crosshairs-question',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i4_edrive40_find_vehicle',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i4 eDrive40 Refresh from cloud',
+        'icon': 'mdi:refresh',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i4_edrive40_refresh_from_cloud',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i3 (+ REX) Flash lights',
+        'icon': 'mdi:car-light-alert',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i3_rex_flash_lights',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i3 (+ REX) Sound horn',
+        'icon': 'mdi:bullhorn',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i3_rex_sound_horn',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i3 (+ REX) Activate air conditioning',
+        'icon': 'mdi:hvac',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i3_rex_activate_air_conditioning',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i3 (+ REX) Find vehicle',
+        'icon': 'mdi:crosshairs-question',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i3_rex_find_vehicle',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i3 (+ REX) Refresh from cloud',
+        'icon': 'mdi:refresh',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i3_rex_refresh_from_cloud',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
diff --git a/tests/components/bmw_connected_drive/test_button.py b/tests/components/bmw_connected_drive/test_button.py
new file mode 100644
index 00000000000..236dd76ce9f
--- /dev/null
+++ b/tests/components/bmw_connected_drive/test_button.py
@@ -0,0 +1,79 @@
+"""Test BMW buttons."""
+from bimmer_connected.vehicle.remote_services import RemoteServices
+import pytest
+import respx
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.bmw_connected_drive.coordinator import (
+    BMWDataUpdateCoordinator,
+)
+from homeassistant.core import HomeAssistant
+
+from . import setup_mocked_integration
+
+
+async def test_entity_state_attrs(
+    hass: HomeAssistant,
+    bmw_fixture: respx.Router,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test button options and values."""
+
+    # Setup component
+    assert await setup_mocked_integration(hass)
+
+    # Get all button entities
+    assert hass.states.async_all("button") == snapshot
+
+
+@pytest.mark.parametrize(
+    ("entity_id"),
+    [
+        ("button.i4_edrive40_flash_lights"),
+        ("button.i4_edrive40_sound_horn"),
+        ("button.i4_edrive40_activate_air_conditioning"),
+        ("button.i4_edrive40_deactivate_air_conditioning"),
+        ("button.i4_edrive40_find_vehicle"),
+    ],
+)
+async def test_update_triggers_success(
+    hass: HomeAssistant,
+    entity_id: str,
+    bmw_fixture: respx.Router,
+) -> None:
+    """Test button press."""
+
+    # Setup component
+    assert await setup_mocked_integration(hass)
+    BMWDataUpdateCoordinator.async_update_listeners.reset_mock()
+
+    # Test
+    await hass.services.async_call(
+        "button",
+        "press",
+        blocking=True,
+        target={"entity_id": entity_id},
+    )
+    assert RemoteServices.trigger_remote_service.call_count == 1
+    assert BMWDataUpdateCoordinator.async_update_listeners.call_count == 1
+
+
+async def test_refresh_from_cloud(
+    hass: HomeAssistant,
+    bmw_fixture: respx.Router,
+) -> None:
+    """Test button press for deprecated service."""
+
+    # Setup component
+    assert await setup_mocked_integration(hass)
+    BMWDataUpdateCoordinator.async_update_listeners.reset_mock()
+
+    # Test
+    await hass.services.async_call(
+        "button",
+        "press",
+        blocking=True,
+        target={"entity_id": "button.i4_edrive40_refresh_from_cloud"},
+    )
+    assert RemoteServices.trigger_remote_service.call_count == 0
+    assert BMWDataUpdateCoordinator.async_update_listeners.call_count == 2
diff --git a/tests/components/bmw_connected_drive/test_select.py b/tests/components/bmw_connected_drive/test_select.py
index b5a13a13b63..97da6f81d6e 100644
--- a/tests/components/bmw_connected_drive/test_select.py
+++ b/tests/components/bmw_connected_drive/test_select.py
@@ -1,4 +1,7 @@
 """Test BMW selects."""
+from unittest.mock import AsyncMock
+
+from bimmer_connected.models import MyBMWAPIError, MyBMWRemoteServiceError
 from bimmer_connected.vehicle.remote_services import RemoteServices
 import pytest
 import respx
@@ -8,6 +11,7 @@ from homeassistant.components.bmw_connected_drive.coordinator import (
     BMWDataUpdateCoordinator,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 
 from . import setup_mocked_integration
 
@@ -87,3 +91,42 @@ async def test_update_triggers_fail(
         )
     assert RemoteServices.trigger_remote_service.call_count == 0
     assert BMWDataUpdateCoordinator.async_update_listeners.call_count == 0
+
+
+@pytest.mark.parametrize(
+    ("raised", "expected"),
+    [
+        (MyBMWRemoteServiceError, HomeAssistantError),
+        (MyBMWAPIError, HomeAssistantError),
+        (ValueError, ValueError),
+    ],
+)
+async def test_remote_service_exceptions(
+    hass: HomeAssistant,
+    raised: Exception,
+    expected: Exception,
+    bmw_fixture: respx.Router,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Test exception handling for remote services."""
+
+    # Setup component
+    assert await setup_mocked_integration(hass)
+
+    # Setup exception
+    monkeypatch.setattr(
+        RemoteServices,
+        "trigger_remote_service",
+        AsyncMock(side_effect=raised),
+    )
+
+    # Test
+    with pytest.raises(expected):
+        await hass.services.async_call(
+            "select",
+            "select_option",
+            service_data={"option": "16"},
+            blocking=True,
+            target={"entity_id": "select.i4_edrive40_ac_charging_limit"},
+        )
+    assert RemoteServices.trigger_remote_service.call_count == 1
diff --git a/tests/components/button/test_device_action.py b/tests/components/button/test_device_action.py
index 4c84faf18af..43e2d3f855f 100644
--- a/tests/components/button/test_device_action.py
+++ b/tests/components/button/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Button device actions."""
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
 from homeassistant.components.button import DOMAIN
@@ -11,7 +12,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -29,7 +29,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = [
@@ -37,14 +37,14 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": "press",
             "device_id": device_entry.id,
-            "entity_id": "button.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -70,7 +70,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -84,7 +84,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["press"]
@@ -92,11 +92,13 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for press action."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -110,7 +112,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "button.entity",
+                        "entity_id": entry.id,
                         "type": "press",
                     },
                 },
@@ -125,4 +127,41 @@ async def test_action(hass: HomeAssistant) -> None:
     assert len(press_calls) == 1
     assert press_calls[0].domain == DOMAIN
     assert press_calls[0].service == "press"
-    assert press_calls[0].data == {"entity_id": "button.entity"}
+    assert press_calls[0].data == {"entity_id": entry.entity_id}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for press action."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "press",
+                    },
+                },
+            ]
+        },
+    )
+
+    press_calls = async_mock_service(hass, DOMAIN, "press")
+
+    hass.bus.async_fire("test_event")
+    await hass.async_block_till_done()
+    assert len(press_calls) == 1
+    assert press_calls[0].domain == DOMAIN
+    assert press_calls[0].service == "press"
+    assert press_calls[0].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/button/test_device_trigger.py b/tests/components/button/test_device_trigger.py
index 0987a7753be..32f10044206 100644
--- a/tests/components/button/test_device_trigger.py
+++ b/tests/components/button/test_device_trigger.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
 from homeassistant.components.button import DOMAIN
@@ -13,7 +14,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -37,7 +37,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -46,14 +46,14 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": "pressed",
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
     ]
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -79,7 +79,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -93,7 +93,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["pressed"]
@@ -101,12 +101,16 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
-    hass.states.async_set("button.entity", "unknown")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, "unknown")
 
     assert await async_setup_component(
         hass,
@@ -118,7 +122,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "button.entity",
+                        "entity_id": entry.id,
                         "type": "pressed",
                     },
                     "action": {
@@ -140,11 +144,59 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Test triggering device trigger with a to state
-    hass.states.async_set("button.entity", "2021-01-01T23:59:59+00:00")
+    hass.states.async_set(entry.entity_id, "2021-01-01T23:59:59+00:00")
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data[
-        "some"
-    ] == "to - device - {} - unknown - 2021-01-01T23:59:59+00:00 - None - 0".format(
-        "button.entity"
+    assert (
+        calls[0].data["some"]
+        == f"to - device - {entry.entity_id} - unknown - 2021-01-01T23:59:59+00:00 - None - 0"
+    )
+
+
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, "unknown")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "pressed",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data": {
+                            "some": (
+                                "to - {{ trigger.platform }} "
+                                "- {{ trigger.entity_id }} "
+                                "- {{ trigger.from_state.state }} "
+                                "- {{ trigger.to_state.state }} "
+                                "- {{ trigger.for }} "
+                                "- {{ trigger.id }}"
+                            )
+                        },
+                    },
+                }
+            ]
+        },
+    )
+
+    # Test triggering device trigger with a to state
+    hass.states.async_set(entry.entity_id, "2021-01-01T23:59:59+00:00")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"to - device - {entry.entity_id} - unknown - 2021-01-01T23:59:59+00:00 - None - 0"
     )
diff --git a/tests/components/button/test_init.py b/tests/components/button/test_init.py
index 94b2bae88e0..24f893578ce 100644
--- a/tests/components/button/test_init.py
+++ b/tests/components/button/test_init.py
@@ -1,15 +1,34 @@
 """The tests for the Button component."""
+from collections.abc import Generator
 from unittest.mock import MagicMock, patch
 
 import pytest
 
-from homeassistant.components.button import DOMAIN, SERVICE_PRESS, ButtonEntity
+from homeassistant.components.button import (
+    DOMAIN,
+    SERVICE_PRESS,
+    ButtonDeviceClass,
+    ButtonEntity,
+    ButtonEntityDescription,
+)
+from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import ATTR_ENTITY_ID, CONF_PLATFORM, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, State
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 
-from tests.common import mock_restore_cache
+from tests.common import (
+    MockConfigEntry,
+    MockModule,
+    MockPlatform,
+    mock_config_flow,
+    mock_integration,
+    mock_platform,
+    mock_restore_cache,
+)
+
+TEST_DOMAIN = "test"
 
 
 async def test_button(hass: HomeAssistant) -> None:
@@ -68,3 +87,95 @@ async def test_restore_state(
     await hass.async_block_till_done()
 
     assert hass.states.get("button.button_1").state == "2021-01-01T23:59:59+00:00"
+
+
+class MockFlow(ConfigFlow):
+    """Test flow."""
+
+
+@pytest.fixture(autouse=True)
+def config_flow_fixture(hass: HomeAssistant) -> Generator[None, None, None]:
+    """Mock config flow."""
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+
+    with mock_config_flow(TEST_DOMAIN, MockFlow):
+        yield
+
+
+async def test_name(hass: HomeAssistant) -> None:
+    """Test button name."""
+
+    async def async_setup_entry_init(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> bool:
+        """Set up test config entry."""
+        await hass.config_entries.async_forward_entry_setup(config_entry, DOMAIN)
+        return True
+
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+    mock_integration(
+        hass,
+        MockModule(
+            TEST_DOMAIN,
+            async_setup_entry=async_setup_entry_init,
+        ),
+    )
+
+    # Unnamed button without device class -> no name
+    entity1 = ButtonEntity()
+    entity1.entity_id = "button.test1"
+
+    # Unnamed button with device class but has_entity_name False -> no name
+    entity2 = ButtonEntity()
+    entity2.entity_id = "button.test2"
+    entity2._attr_device_class = ButtonDeviceClass.RESTART
+
+    # Unnamed button with device class and has_entity_name True -> named
+    entity3 = ButtonEntity()
+    entity3.entity_id = "button.test3"
+    entity3._attr_device_class = ButtonDeviceClass.RESTART
+    entity3._attr_has_entity_name = True
+
+    # Unnamed button with device class and has_entity_name True -> named
+    entity4 = ButtonEntity()
+    entity4.entity_id = "sensor.test4"
+    entity4.entity_description = ButtonEntityDescription(
+        "test",
+        ButtonDeviceClass.RESTART,
+        has_entity_name=True,
+    )
+
+    async def async_setup_entry_platform(
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        async_add_entities: AddEntitiesCallback,
+    ) -> None:
+        """Set up test button platform via config entry."""
+        async_add_entities([entity1, entity2, entity3, entity4])
+
+    mock_platform(
+        hass,
+        f"{TEST_DOMAIN}.{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()
+
+    state = hass.states.get(entity1.entity_id)
+    assert state
+    assert state.attributes == {}
+
+    state = hass.states.get(entity2.entity_id)
+    assert state
+    assert state.attributes == {"device_class": "restart"}
+
+    state = hass.states.get(entity3.entity_id)
+    assert state
+    assert state.attributes == {"device_class": "restart", "friendly_name": "Restart"}
+
+    state = hass.states.get(entity4.entity_id)
+    assert state
+    assert state.attributes == {"device_class": "restart", "friendly_name": "Restart"}
diff --git a/tests/components/calendar/conftest.py b/tests/components/calendar/conftest.py
index 4d6b5adfde7..5d506d67c6f 100644
--- a/tests/components/calendar/conftest.py
+++ b/tests/components/calendar/conftest.py
@@ -9,3 +9,11 @@ from homeassistant.setup import async_setup_component
 async def setup_homeassistant(hass: HomeAssistant):
     """Set up the homeassistant integration."""
     await async_setup_component(hass, "homeassistant", {})
+
+
+@pytest.fixture
+def set_time_zone(hass: HomeAssistant) -> None:
+    """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
+    hass.config.set_time_zone("America/Regina")
diff --git a/tests/components/calendar/test_init.py b/tests/components/calendar/test_init.py
index d58932ce898..e0fbbf0cdeb 100644
--- a/tests/components/calendar/test_init.py
+++ b/tests/components/calendar/test_init.py
@@ -6,11 +6,12 @@ from http import HTTPStatus
 from typing import Any
 from unittest.mock import patch
 
+from freezegun import freeze_time
 import pytest
 import voluptuous as vol
 
 from homeassistant.bootstrap import async_setup_component
-from homeassistant.components.calendar import DOMAIN
+from homeassistant.components.calendar import DOMAIN, SERVICE_LIST_EVENTS
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.util.dt as dt_util
@@ -384,3 +385,141 @@ async def test_create_event_service_invalid_params(
             target={"entity_id": "calendar.calendar_1"},
             blocking=True,
         )
+
+
+@freeze_time("2023-06-22 10:30:00+00:00")
+@pytest.mark.parametrize(
+    ("start_time", "end_time"),
+    [
+        ("2023-06-22T04:30:00-06:00", "2023-06-22T06:30:00-06:00"),
+        ("2023-06-22T04:30:00", "2023-06-22T06:30:00"),
+        ("2023-06-22T10:30:00Z", "2023-06-22T12:30:00Z"),
+    ],
+)
+async def test_list_events_service(
+    hass: HomeAssistant, set_time_zone: None, start_time: str, end_time: str
+) -> None:
+    """Test listing events from the service call using exlplicit start and end time.
+
+    This test uses a fixed date/time so that it can deterministically test the
+    string output values.
+    """
+
+    await async_setup_component(hass, "calendar", {"calendar": {"platform": "demo"}})
+    await hass.async_block_till_done()
+
+    response = await hass.services.async_call(
+        DOMAIN,
+        SERVICE_LIST_EVENTS,
+        {
+            "entity_id": "calendar.calendar_1",
+            "start_date_time": start_time,
+            "end_date_time": end_time,
+        },
+        blocking=True,
+        return_response=True,
+    )
+    assert response == {
+        "events": [
+            {
+                "start": "2023-06-22T05:00:00-06:00",
+                "end": "2023-06-22T06:00:00-06:00",
+                "summary": "Future Event",
+                "description": "Future Description",
+                "location": "Future Location",
+            }
+        ]
+    }
+
+
+@pytest.mark.parametrize(
+    ("entity", "duration", "expected_events"),
+    [
+        # Calendar 1 has an hour long event starting in 30 minutes. No events in the
+        # next 15 minutes, but it shows up an hour from now.
+        ("calendar.calendar_1", "00:15:00", []),
+        ("calendar.calendar_1", "01:00:00", ["Future Event"]),
+        # Calendar 2 has a active event right now
+        ("calendar.calendar_2", "00:15:00", ["Current Event"]),
+    ],
+)
+async def test_list_events_service_duration(
+    hass: HomeAssistant,
+    entity: str,
+    duration: str,
+    expected_events: list[str],
+) -> None:
+    """Test listing events using a time duration."""
+    await async_setup_component(hass, "calendar", {"calendar": {"platform": "demo"}})
+    await hass.async_block_till_done()
+
+    response = await hass.services.async_call(
+        DOMAIN,
+        SERVICE_LIST_EVENTS,
+        {
+            "entity_id": entity,
+            "duration": duration,
+        },
+        blocking=True,
+        return_response=True,
+    )
+    assert response
+    assert "events" in response
+    events = response["events"]
+    assert [event["summary"] for event in events] == expected_events
+
+
+async def test_list_events_positive_duration(hass: HomeAssistant) -> None:
+    """Test listing events requires a positive duration."""
+    await async_setup_component(hass, "calendar", {"calendar": {"platform": "demo"}})
+    await hass.async_block_till_done()
+
+    with pytest.raises(vol.Invalid, match="should be positive"):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_LIST_EVENTS,
+            {
+                "entity_id": "calendar.calendar_1",
+                "duration": "-01:00:00",
+            },
+            blocking=True,
+            return_response=True,
+        )
+
+
+async def test_list_events_exclusive_fields(hass: HomeAssistant) -> None:
+    """Test listing events specifying fields that are exclusive."""
+    await async_setup_component(hass, "calendar", {"calendar": {"platform": "demo"}})
+    await hass.async_block_till_done()
+
+    end = dt_util.now() + timedelta(days=1)
+
+    with pytest.raises(vol.Invalid, match="at most one of"):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_LIST_EVENTS,
+            {
+                "entity_id": "calendar.calendar_1",
+                "end_date_time": end,
+                "duration": "01:00:00",
+            },
+            blocking=True,
+            return_response=True,
+        )
+
+
+async def test_list_events_missing_fields(hass: HomeAssistant) -> None:
+    """Test listing events missing some required fields."""
+    await async_setup_component(hass, "calendar", {"calendar": {"platform": "demo"}})
+    await hass.async_block_till_done()
+
+    with pytest.raises(vol.Invalid, match="at least one of"):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_LIST_EVENTS,
+            {
+                "entity_id": "calendar.calendar_1",
+            },
+            blocking=True,
+            return_response=True,
+        )
diff --git a/tests/components/calendar/test_recorder.py b/tests/components/calendar/test_recorder.py
index d99a50bd286..c529789b596 100644
--- a/tests/components/calendar/test_recorder.py
+++ b/tests/components/calendar/test_recorder.py
@@ -1,11 +1,12 @@
 """The tests for calendar recorder."""
 from datetime import timedelta
+from unittest.mock import patch
 
 import pytest
 
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -19,6 +20,16 @@ async def setup_homeassistant():
     """Override the fixture in calendar.conftest."""
 
 
+@pytest.fixture(autouse=True)
+async def calendar_only() -> None:
+    """Enable only the calendar platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.CALENDAR],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test sensor attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/calendar/test_trigger.py b/tests/components/calendar/test_trigger.py
index 05c7d95d8ad..45dd9d6afe1 100644
--- a/tests/components/calendar/test_trigger.py
+++ b/tests/components/calendar/test_trigger.py
@@ -121,14 +121,6 @@ class FakeSchedule:
             await self.fire_time(dt_util.utcnow())
 
 
-@pytest.fixture
-def set_time_zone(hass: HomeAssistant) -> None:
-    """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
-    hass.config.set_time_zone("America/Regina")
-
-
 @pytest.fixture
 def fake_schedule(
     hass: HomeAssistant, freezer: FrozenDateTimeFactory
diff --git a/tests/components/camera/conftest.py b/tests/components/camera/conftest.py
index 8953158e423..21737323671 100644
--- a/tests/components/camera/conftest.py
+++ b/tests/components/camera/conftest.py
@@ -5,6 +5,7 @@ import pytest
 
 from homeassistant.components import camera
 from homeassistant.components.camera.const import StreamType
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -17,6 +18,16 @@ async def setup_homeassistant(hass: HomeAssistant):
     await async_setup_component(hass, "homeassistant", {})
 
 
+@pytest.fixture(autouse=True)
+async def camera_only() -> None:
+    """Enable only the camera platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.CAMERA],
+    ):
+        yield
+
+
 @pytest.fixture(name="mock_camera")
 async def mock_camera_fixture(hass):
     """Initialize a demo camera platform."""
diff --git a/tests/components/cast/test_media_player.py b/tests/components/cast/test_media_player.py
index f290754d6fa..6f7a13b47af 100644
--- a/tests/components/cast/test_media_player.py
+++ b/tests/components/cast/test_media_player.py
@@ -1894,7 +1894,7 @@ async def test_failed_cast_other_url(
         assert await async_setup_component(
             hass,
             tts.DOMAIN,
-            {tts.DOMAIN: {"platform": "demo", "base_url": "http://example.local:8123"}},
+            {tts.DOMAIN: {"platform": "demo"}},
         )
 
     info = get_fake_chromecast_info()
@@ -1951,7 +1951,7 @@ async def test_failed_cast_external_url(
         assert await async_setup_component(
             hass,
             tts.DOMAIN,
-            {tts.DOMAIN: {"platform": "demo", "base_url": "http://example.com:8123"}},
+            {tts.DOMAIN: {"platform": "demo"}},
         )
 
     info = get_fake_chromecast_info()
@@ -1969,33 +1969,6 @@ async def test_failed_cast_external_url(
     )
 
 
-async def test_failed_cast_tts_base_url(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
-) -> None:
-    """Test warning when casting from tts.base_url fails."""
-    await async_setup_component(hass, "homeassistant", {})
-    with assert_setup_component(1, tts.DOMAIN):
-        assert await async_setup_component(
-            hass,
-            tts.DOMAIN,
-            {tts.DOMAIN: {"platform": "demo", "base_url": "http://example.local:8123"}},
-        )
-
-    info = get_fake_chromecast_info()
-    chromecast, _ = await async_setup_media_player_cast(hass, info)
-    _, _, media_status_cb = get_status_callbacks(chromecast)
-
-    media_status = MagicMock(images=None)
-    media_status.player_is_idle = True
-    media_status.idle_reason = "ERROR"
-    media_status.content_id = "http://example.local:8123/tts.mp3"
-    media_status_cb(media_status)
-    assert (
-        "Failed to cast media http://example.local:8123/tts.mp3 from tts.base_url"
-        in caplog.text
-    )
-
-
 async def test_disconnect_on_stop(hass: HomeAssistant) -> None:
     """Test cast device disconnects socket on stop."""
     info = get_fake_chromecast_info()
diff --git a/tests/components/climate/test_device_action.py b/tests/components/climate/test_device_action.py
index 30fe9c92dc6..05c5c4cdebb 100644
--- a/tests/components/climate/test_device_action.py
+++ b/tests/components/climate/test_device_action.py
@@ -1,10 +1,13 @@
 """The tests for Climate device actions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
 from homeassistant.components.climate import DOMAIN, HVACMode, const, device_action
-from homeassistant.components.device_automation import DeviceAutomationType
+from homeassistant.components.device_automation import (
+    DeviceAutomationType,
+)
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import (
@@ -17,7 +20,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -63,7 +65,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -82,7 +84,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in expected_action_types
@@ -91,7 +93,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -117,7 +119,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -132,7 +134,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["set_hvac_mode"]
@@ -140,13 +142,15 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.COOL,
         {
             const.ATTR_HVAC_MODES: [HVACMode.COOL, HVACMode.OFF],
@@ -167,7 +171,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "climate.entity",
+                        "entity_id": entry.id,
                         "type": "set_hvac_mode",
                         "hvac_mode": HVACMode.OFF,
                     },
@@ -180,7 +184,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "climate.entity",
+                        "entity_id": entry.id,
                         "type": "set_preset_mode",
                         "preset_mode": const.PRESET_AWAY,
                     },
@@ -202,6 +206,70 @@ async def test_action(hass: HomeAssistant) -> None:
     assert len(set_hvac_mode_calls) == 1
     assert len(set_preset_mode_calls) == 1
 
+    assert set_hvac_mode_calls[0].domain == DOMAIN
+    assert set_hvac_mode_calls[0].service == "set_hvac_mode"
+    assert set_hvac_mode_calls[0].data == {
+        "entity_id": entry.entity_id,
+        "hvac_mode": const.HVAC_MODE_OFF,
+    }
+    assert set_preset_mode_calls[0].domain == DOMAIN
+    assert set_preset_mode_calls[0].service == "set_preset_mode"
+    assert set_preset_mode_calls[0].data == {
+        "entity_id": entry.entity_id,
+        "preset_mode": const.PRESET_AWAY,
+    }
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(
+        entry.entity_id,
+        HVACMode.COOL,
+        {
+            const.ATTR_HVAC_MODES: [HVACMode.COOL, HVACMode.OFF],
+            const.ATTR_PRESET_MODES: [const.PRESET_HOME, const.PRESET_AWAY],
+        },
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_set_hvac_mode",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "set_hvac_mode",
+                        "hvac_mode": HVACMode.OFF,
+                    },
+                },
+            ]
+        },
+    )
+
+    set_hvac_mode_calls = async_mock_service(hass, "climate", "set_hvac_mode")
+
+    hass.bus.async_fire("test_event_set_hvac_mode")
+    await hass.async_block_till_done()
+    assert len(set_hvac_mode_calls) == 1
+
+    assert set_hvac_mode_calls[0].domain == DOMAIN
+    assert set_hvac_mode_calls[0].service == "set_hvac_mode"
+    assert set_hvac_mode_calls[0].data == {
+        "entity_id": entry.entity_id,
+        "hvac_mode": const.HVAC_MODE_OFF,
+    }
+
 
 @pytest.mark.parametrize(
     (
@@ -287,7 +355,7 @@ async def test_capabilities(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -306,7 +374,125 @@ async def test_capabilities(
         {
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
+            "type": action,
+        },
+    )
+
+    assert capabilities and "extra_fields" in capabilities
+
+    assert (
+        voluptuous_serialize.convert(
+            capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+        )
+        == expected_capabilities
+    )
+
+
+@pytest.mark.parametrize(
+    (
+        "set_state",
+        "capabilities_reg",
+        "capabilities_state",
+        "action",
+        "expected_capabilities",
+    ),
+    [
+        (
+            False,
+            {const.ATTR_HVAC_MODES: [HVACMode.COOL, HVACMode.OFF]},
+            {},
+            "set_hvac_mode",
+            [
+                {
+                    "name": "hvac_mode",
+                    "options": [("cool", "cool"), ("off", "off")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            False,
+            {const.ATTR_PRESET_MODES: [const.PRESET_HOME, const.PRESET_AWAY]},
+            {},
+            "set_preset_mode",
+            [
+                {
+                    "name": "preset_mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {const.ATTR_HVAC_MODES: [HVACMode.COOL, HVACMode.OFF]},
+            "set_hvac_mode",
+            [
+                {
+                    "name": "hvac_mode",
+                    "options": [("cool", "cool"), ("off", "off")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {const.ATTR_PRESET_MODES: [const.PRESET_HOME, const.PRESET_AWAY]},
+            "set_preset_mode",
+            [
+                {
+                    "name": "preset_mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+    ],
+)
+async def test_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    capabilities_reg,
+    capabilities_state,
+    action,
+    expected_capabilities,
+) -> None:
+    """Test getting capabilities."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        "5678",
+        device_id=device_entry.id,
+        capabilities=capabilities_reg,
+    )
+    if set_state:
+        hass.states.async_set(
+            f"{DOMAIN}.test_5678",
+            HVACMode.COOL,
+            capabilities_state,
+        )
+
+    capabilities = await device_action.async_get_action_capabilities(
+        hass,
+        {
+            "domain": DOMAIN,
+            "device_id": "abcdefgh",
+            "entity_id": entity_entry.entity_id,
             "type": action,
         },
     )
diff --git a/tests/components/climate/test_device_condition.py b/tests/components/climate/test_device_condition.py
index 2feb8073f07..33df78bf347 100644
--- a/tests/components/climate/test_device_condition.py
+++ b/tests/components/climate/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Climate device conditions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -17,7 +18,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -69,7 +69,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -87,7 +87,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in expected_condition_types
@@ -95,7 +95,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -121,7 +121,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -135,7 +135,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_hvac_mode"]
@@ -143,11 +143,15 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -160,7 +164,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "climate.entity",
+                            "entity_id": entry.id,
                             "type": "is_hvac_mode",
                             "hvac_mode": "cool",
                         }
@@ -182,7 +186,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "climate.entity",
+                            "entity_id": entry.id,
                             "type": "is_preset_mode",
                             "preset_mode": "away",
                         }
@@ -207,7 +211,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 0
 
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.COOL,
         {
             const.ATTR_PRESET_MODE: const.PRESET_AWAY,
@@ -220,7 +224,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert calls[0].data["some"] == "is_hvac_mode - event - test_event1"
 
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.AUTO,
         {
             const.ATTR_PRESET_MODE: const.PRESET_AWAY,
@@ -239,7 +243,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert calls[1].data["some"] == "is_preset_mode - event - test_event2"
 
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.AUTO,
         {
             const.ATTR_PRESET_MODE: const.PRESET_HOME,
@@ -252,6 +256,54 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 2
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_hvac_mode",
+                            "hvac_mode": "cool",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "is_hvac_mode - {{ trigger.platform }} "
+                                "- {{ trigger.event.event_type }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    hass.states.async_set(
+        entry.entity_id,
+        HVACMode.COOL,
+    )
+
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_hvac_mode - event - test_event1"
+
+
 @pytest.mark.parametrize(
     (
         "set_state",
@@ -336,7 +388,7 @@ async def test_capabilities(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -345,7 +397,7 @@ async def test_capabilities(
     )
     if set_state:
         hass.states.async_set(
-            f"{DOMAIN}.test_5678",
+            entity_entry.entity_id,
             HVACMode.COOL,
             capabilities_state,
         )
@@ -356,7 +408,126 @@ async def test_capabilities(
             "condition": "device",
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
+            "type": condition,
+        },
+    )
+
+    assert capabilities and "extra_fields" in capabilities
+
+    assert (
+        voluptuous_serialize.convert(
+            capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+        )
+        == expected_capabilities
+    )
+
+
+@pytest.mark.parametrize(
+    (
+        "set_state",
+        "capabilities_reg",
+        "capabilities_state",
+        "condition",
+        "expected_capabilities",
+    ),
+    [
+        (
+            False,
+            {const.ATTR_HVAC_MODES: [HVACMode.COOL, HVACMode.OFF]},
+            {},
+            "is_hvac_mode",
+            [
+                {
+                    "name": "hvac_mode",
+                    "options": [("cool", "cool"), ("off", "off")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            False,
+            {const.ATTR_PRESET_MODES: [const.PRESET_HOME, const.PRESET_AWAY]},
+            {},
+            "is_preset_mode",
+            [
+                {
+                    "name": "preset_mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {const.ATTR_HVAC_MODES: [HVACMode.COOL, HVACMode.OFF]},
+            "is_hvac_mode",
+            [
+                {
+                    "name": "hvac_mode",
+                    "options": [("cool", "cool"), ("off", "off")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {const.ATTR_PRESET_MODES: [const.PRESET_HOME, const.PRESET_AWAY]},
+            "is_preset_mode",
+            [
+                {
+                    "name": "preset_mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+    ],
+)
+async def test_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    capabilities_reg,
+    capabilities_state,
+    condition,
+    expected_capabilities,
+) -> None:
+    """Test getting capabilities."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        "5678",
+        device_id=device_entry.id,
+        capabilities=capabilities_reg,
+    )
+    if set_state:
+        hass.states.async_set(
+            entity_entry.entity_id,
+            HVACMode.COOL,
+            capabilities_state,
+        )
+
+    capabilities = await device_condition.async_get_condition_capabilities(
+        hass,
+        {
+            "condition": "device",
+            "domain": DOMAIN,
+            "device_id": "abcdefgh",
+            "entity_id": entity_entry.entity_id,
             "type": condition,
         },
     )
@@ -388,7 +559,7 @@ async def test_capabilities_missing_entity(
             "condition": "device",
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": "01234567890123456789012345678901",
             "type": condition,
         },
     )
diff --git a/tests/components/climate/test_device_trigger.py b/tests/components/climate/test_device_trigger.py
index 0cfb0a896b3..c600e4004e8 100644
--- a/tests/components/climate/test_device_trigger.py
+++ b/tests/components/climate/test_device_trigger.py
@@ -1,5 +1,6 @@
 """The tests for Climate device triggers."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -23,7 +24,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -52,13 +52,12 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
-    entity_id = f"{DOMAIN}.test_5678"
     hass.states.async_set(
-        entity_id,
-        HVACMode.COOL,
+        entity_entry.entity_id,
+        const.HVAC_MODE_COOL,
         {
             const.ATTR_HVAC_ACTION: HVACAction.IDLE,
             const.ATTR_CURRENT_HUMIDITY: 23,
@@ -71,7 +70,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": entity_id,
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in [
@@ -83,7 +82,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -109,7 +108,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -117,9 +116,8 @@ async def test_get_triggers_hidden_auxiliary(
         entity_category=entity_category,
         hidden_by=hidden_by,
     )
-    entity_id = f"{DOMAIN}.test_5678"
     hass.states.async_set(
-        entity_id,
+        entity_entry.entity_id,
         HVACMode.COOL,
         {
             const.ATTR_HVAC_ACTION: HVACAction.IDLE,
@@ -133,7 +131,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in [
@@ -145,13 +143,17 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.COOL,
         {
             const.ATTR_HVAC_ACTION: HVACAction.IDLE,
@@ -170,7 +172,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "climate.entity",
+                        "entity_id": entry.id,
                         "type": "hvac_mode_changed",
                         "to": HVACMode.AUTO,
                     },
@@ -184,7 +186,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "climate.entity",
+                        "entity_id": entry.id,
                         "type": "current_temperature_changed",
                         "above": 20,
                     },
@@ -198,7 +200,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "climate.entity",
+                        "entity_id": entry.id,
                         "type": "current_humidity_changed",
                         "below": 10,
                     },
@@ -213,7 +215,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
 
     # Fake that the HVAC mode is changing
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.AUTO,
         {
             const.ATTR_HVAC_ACTION: HVACAction.COOLING,
@@ -227,7 +229,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
 
     # Fake that the temperature is changing
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.AUTO,
         {
             const.ATTR_HVAC_ACTION: HVACAction.COOLING,
@@ -241,7 +243,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
 
     # Fake that the humidity is changing
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.AUTO,
         {
             const.ATTR_HVAC_ACTION: HVACAction.COOLING,
@@ -254,6 +256,60 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     assert calls[2].data["some"] == "current_humidity_changed"
 
 
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(
+        entry.entity_id,
+        HVACMode.COOL,
+        {
+            const.ATTR_HVAC_ACTION: HVACAction.IDLE,
+            const.ATTR_CURRENT_HUMIDITY: 23,
+            const.ATTR_CURRENT_TEMPERATURE: 18,
+        },
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "hvac_mode_changed",
+                        "to": HVACMode.AUTO,
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": "hvac_mode_changed"},
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the HVAC mode is changing
+    hass.states.async_set(
+        entry.entity_id,
+        HVACMode.AUTO,
+        {
+            const.ATTR_HVAC_ACTION: HVACAction.COOLING,
+            const.ATTR_CURRENT_HUMIDITY: 23,
+            const.ATTR_CURRENT_TEMPERATURE: 18,
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "hvac_mode_changed"
+
+
 async def test_get_trigger_capabilities_hvac_mode(hass: HomeAssistant) -> None:
     """Test we get the expected capabilities from a climate trigger."""
     capabilities = await device_trigger.async_get_trigger_capabilities(
@@ -262,7 +318,7 @@ async def test_get_trigger_capabilities_hvac_mode(hass: HomeAssistant) -> None:
             "platform": "device",
             "domain": "climate",
             "type": "hvac_mode_changed",
-            "entity_id": "climate.upstairs",
+            "entity_id": "01234567890123456789012345678901",
             "to": "heat",
         },
     )
@@ -290,17 +346,23 @@ async def test_get_trigger_capabilities_hvac_mode(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.parametrize(
-    "type", ["current_temperature_changed", "current_humidity_changed"]
+    ("type", "suffix"),
+    [
+        ("current_temperature_changed", UnitOfTemperature.CELSIUS),
+        ("current_humidity_changed", "%"),
+    ],
 )
-async def test_get_trigger_capabilities_temp_humid(hass: HomeAssistant, type) -> None:
+async def test_get_trigger_capabilities_temp_humid(
+    hass: HomeAssistant, type, suffix
+) -> None:
     """Test we get the expected capabilities from a climate trigger."""
     capabilities = await device_trigger.async_get_trigger_capabilities(
         hass,
         {
             "platform": "device",
             "domain": "climate",
-            "type": "current_temperature_changed",
-            "entity_id": "climate.upstairs",
+            "type": type,
+            "entity_id": "01234567890123456789012345678901",
             "above": "23",
         },
     )
@@ -311,13 +373,13 @@ async def test_get_trigger_capabilities_temp_humid(hass: HomeAssistant, type) ->
         capabilities["extra_fields"], custom_serializer=cv.custom_serializer
     ) == [
         {
-            "description": {"suffix": UnitOfTemperature.CELSIUS},
+            "description": {"suffix": suffix},
             "name": "above",
             "optional": True,
             "type": "float",
         },
         {
-            "description": {"suffix": UnitOfTemperature.CELSIUS},
+            "description": {"suffix": suffix},
             "name": "below",
             "optional": True,
             "type": "float",
diff --git a/tests/components/climate/test_recorder.py b/tests/components/climate/test_recorder.py
index b6acf375f2e..150d70d1dba 100644
--- a/tests/components/climate/test_recorder.py
+++ b/tests/components/climate/test_recorder.py
@@ -2,6 +2,9 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import climate
 from homeassistant.components.climate import (
@@ -17,7 +20,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -26,6 +29,16 @@ from tests.common import async_fire_time_changed
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def climate_only() -> None:
+    """Enable only the climate platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.CLIMATE],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test climate registered attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/cloud/test_client.py b/tests/components/cloud/test_client.py
index 534456896b4..50cfce3f9a9 100644
--- a/tests/components/cloud/test_client.py
+++ b/tests/components/cloud/test_client.py
@@ -18,7 +18,7 @@ from homeassistant.components.homeassistant.exposed_entities import (
     ExposedEntities,
     async_expose_entity,
 )
-from homeassistant.const import CONTENT_TYPE_JSON
+from homeassistant.const import CONTENT_TYPE_JSON, __version__ as HA_VERSION
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
@@ -306,7 +306,7 @@ async def test_set_username(hass: HomeAssistant) -> None:
     )
     client = CloudClient(hass, prefs, None, {}, {})
     client.cloud = MagicMock(is_logged_in=True, username="mock-username")
-    await client.on_cloud_connected()
+    await client.cloud_connected()
 
     assert len(prefs.async_set_username.mock_calls) == 1
     assert prefs.async_set_username.mock_calls[0][1][0] == "mock-username"
@@ -326,7 +326,7 @@ async def test_login_recovers_bad_internet(
     client._alexa_config = Mock(
         async_enable_proactive_mode=Mock(side_effect=aiohttp.ClientError)
     )
-    await client.on_cloud_connected()
+    await client.cloud_connected()
     assert len(client._alexa_config.async_enable_proactive_mode.mock_calls) == 1
     assert "Unable to activate Alexa Report State" in caplog.text
 
@@ -353,3 +353,18 @@ async def test_system_msg(hass: HomeAssistant) -> None:
 
     assert response is None
     assert cloud.client.relayer_region == "xx-earth-616"
+
+
+async def test_cloud_connection_info(hass: HomeAssistant) -> None:
+    """Test connection info msg."""
+    with patch("hass_nabucasa.Cloud.initialize"):
+        setup = await async_setup_component(hass, "cloud", {"cloud": {}})
+        assert setup
+    cloud = hass.data["cloud"]
+
+    response = await cloud.client.async_cloud_connection_info({})
+
+    assert response == {
+        "remote": {"connected": False, "enabled": False, "instance_domain": None},
+        "version": HA_VERSION,
+    }
diff --git a/tests/components/cloud/test_init.py b/tests/components/cloud/test_init.py
index f56789729d8..28b531b608c 100644
--- a/tests/components/cloud/test_init.py
+++ b/tests/components/cloud/test_init.py
@@ -137,7 +137,7 @@ async def test_on_connect(hass: HomeAssistant, mock_cloud_fixture) -> None:
     """Test cloud on connect triggers."""
     cl: Cloud[cloud.client.CloudClient] = hass.data["cloud"]
 
-    assert len(cl.iot._on_connect) == 4
+    assert len(cl.iot._on_connect) == 3
 
     assert len(hass.states.async_entity_ids("binary_sensor")) == 0
 
diff --git a/tests/components/color_extractor/test_service.py b/tests/components/color_extractor/test_service.py
index b1236af89fb..31218387858 100644
--- a/tests/components/color_extractor/test_service.py
+++ b/tests/components/color_extractor/test_service.py
@@ -139,9 +139,7 @@ async def _async_load_color_extractor_url(hass, service_data):
     assert state.state == STATE_OFF
 
     # Call the shared service, our above mock should return the base64 decoded fixture 1x1 pixel
-    assert await hass.services.async_call(
-        DOMAIN, SERVICE_TURN_ON, service_data, blocking=True
-    )
+    await hass.services.async_call(DOMAIN, SERVICE_TURN_ON, service_data, blocking=True)
 
     await hass.async_block_till_done()
 
diff --git a/tests/components/command_line/test_cover.py b/tests/components/command_line/test_cover.py
index cbbe2e78eac..ac0a33fc7a9 100644
--- a/tests/components/command_line/test_cover.py
+++ b/tests/components/command_line/test_cover.py
@@ -148,7 +148,7 @@ async def test_poll_when_cover_has_command_state(
         await hass.async_block_till_done()
         check_output.assert_called_once_with(
             "echo state",
-            shell=True,  # nosec # shell by design
+            shell=True,  # noqa: S604 # shell by design
             timeout=15,
             close_fds=False,
         )
diff --git a/tests/components/command_line/test_notify.py b/tests/components/command_line/test_notify.py
index aeda981ce26..a17b1ec33e1 100644
--- a/tests/components/command_line/test_notify.py
+++ b/tests/components/command_line/test_notify.py
@@ -94,7 +94,7 @@ async def test_command_line_output(hass: HomeAssistant) -> None:
 
         assert hass.services.has_service(NOTIFY_DOMAIN, "test3")
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             NOTIFY_DOMAIN, "test3", {"message": message}, blocking=True
         )
         with open(filename, encoding="UTF-8") as handle:
@@ -122,7 +122,7 @@ async def test_error_for_none_zero_exit_code(
 ) -> None:
     """Test if an error is logged for non zero exit codes."""
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         NOTIFY_DOMAIN, "test4", {"message": "error"}, blocking=True
     )
     assert "Command failed" in caplog.text
@@ -149,7 +149,7 @@ async def test_timeout(
     caplog: pytest.LogCaptureFixture, hass: HomeAssistant, load_yaml_integration: None
 ) -> None:
     """Test blocking is not forever."""
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         NOTIFY_DOMAIN, "test5", {"message": "error"}, blocking=True
     )
     assert "Timeout" in caplog.text
@@ -185,13 +185,13 @@ async def test_subprocess_exceptions(
             subprocess.SubprocessError(),
         ]
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             NOTIFY_DOMAIN, "test6", {"message": "error"}, blocking=True
         )
         assert check_output.call_count == 2
         assert "Timeout for command" in caplog.text
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             NOTIFY_DOMAIN, "test6", {"message": "error"}, blocking=True
         )
         assert check_output.call_count == 4
diff --git a/tests/components/command_line/test_sensor.py b/tests/components/command_line/test_sensor.py
index fd3ff8613ec..b837f580862 100644
--- a/tests/components/command_line/test_sensor.py
+++ b/tests/components/command_line/test_sensor.py
@@ -172,7 +172,7 @@ async def test_template_render_with_quote(hass: HomeAssistant) -> None:
         assert len(check_output.mock_calls) == 1
         check_output.assert_called_with(
             'echo "sensor_value" "3 4"',
-            shell=True,  # nosec # shell by design
+            shell=True,  # noqa: S604 # shell by design
             timeout=15,
             close_fds=False,
         )
diff --git a/tests/components/compensation/test_sensor.py b/tests/components/compensation/test_sensor.py
index 59804c6b854..5bc5a5e1c39 100644
--- a/tests/components/compensation/test_sensor.py
+++ b/tests/components/compensation/test_sensor.py
@@ -223,3 +223,50 @@ async def test_new_state_is_none(hass: HomeAssistant) -> None:
     )
 
     assert last_changed == hass.states.get(expected_entity_id).last_changed
+
+
+@pytest.mark.parametrize(
+    ("lower", "upper"),
+    [
+        (True, False),
+        (False, True),
+        (True, True),
+    ],
+)
+async def test_limits(hass: HomeAssistant, lower: bool, upper: bool) -> None:
+    """Test compensation sensor state."""
+    source = "sensor.test"
+    config = {
+        "compensation": {
+            "test": {
+                "source": source,
+                "data_points": [
+                    [1.0, 0.0],
+                    [3.0, 2.0],
+                    [2.0, 1.0],
+                ],
+                "precision": 2,
+                "lower_limit": lower,
+                "upper_limit": upper,
+                "unit_of_measurement": "a",
+            }
+        }
+    }
+    await async_setup_component(hass, DOMAIN, config)
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    entity_id = "sensor.compensation_sensor_test"
+
+    hass.states.async_set(source, 0, {})
+    await hass.async_block_till_done()
+    state = hass.states.get(entity_id)
+    value = 0.0 if lower else -1.0
+    assert float(state.state) == value
+
+    hass.states.async_set(source, 5, {})
+    await hass.async_block_till_done()
+    state = hass.states.get(entity_id)
+    value = 2.0 if upper else 4.0
+    assert float(state.state) == value
diff --git a/tests/components/config/test_automation.py b/tests/components/config/test_automation.py
index ac6780c0972..11f17199e5a 100644
--- a/tests/components/config/test_automation.py
+++ b/tests/components/config/test_automation.py
@@ -1,14 +1,17 @@
 """Test Automation config panel."""
 from http import HTTPStatus
 import json
+from typing import Any
 from unittest.mock import patch
 
 import pytest
 
 from homeassistant.bootstrap import async_setup_component
 from homeassistant.components import config
+from homeassistant.const import STATE_ON, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
+from homeassistant.util import yaml
 
 from tests.typing import ClientSessionGenerator
 
@@ -75,8 +78,11 @@ async def test_update_automation_config(
     )
     await hass.async_block_till_done()
     assert sorted(hass.states.async_entity_ids("automation")) == [
-        "automation.automation_0"
+        "automation.automation_0",
+        "automation.automation_1",
     ]
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
+    assert hass.states.get("automation.automation_1").state == STATE_ON
 
     assert resp.status == HTTPStatus.OK
     result = await resp.json()
@@ -88,12 +94,61 @@ async def test_update_automation_config(
 
 
 @pytest.mark.parametrize("automation_config", ({},))
+@pytest.mark.parametrize(
+    ("updated_config", "validation_error"),
+    [
+        (
+            {"action": []},
+            "required key not provided @ data['trigger']",
+        ),
+        (
+            {
+                "trigger": {"platform": "automation"},
+                "action": [],
+            },
+            "Integration 'automation' does not provide trigger support",
+        ),
+        (
+            {
+                "trigger": {"platform": "event", "event_type": "test_event"},
+                "condition": {
+                    "condition": "state",
+                    # The UUID will fail being resolved to en entity_id
+                    "entity_id": "abcdabcdabcdabcdabcdabcdabcdabcd",
+                    "state": "blah",
+                },
+                "action": [],
+            },
+            "Unknown entity registry entry abcdabcdabcdabcdabcdabcdabcdabcd",
+        ),
+        (
+            {
+                "trigger": {"platform": "event", "event_type": "test_event"},
+                "action": {
+                    "condition": "state",
+                    # The UUID will fail being resolved to en entity_id
+                    "entity_id": "abcdabcdabcdabcdabcdabcdabcdabcd",
+                    "state": "blah",
+                },
+            },
+            "Unknown entity registry entry abcdabcdabcdabcdabcdabcdabcdabcd",
+        ),
+        (
+            {
+                "use_blueprint": {"path": "test_event_service.yaml", "input": {}},
+            },
+            "Missing input a_number, service_to_call, trigger_event",
+        ),
+    ],
+)
 async def test_update_automation_config_with_error(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     hass_config_store,
     setup_automation,
     caplog: pytest.LogCaptureFixture,
+    updated_config: Any,
+    validation_error: str,
 ) -> None:
     """Test updating automation config with errors."""
     with patch.object(config, "SECTIONS", ["automation"]):
@@ -108,14 +163,70 @@ async def test_update_automation_config_with_error(
 
     resp = await client.post(
         "/api/config/automation/config/moon",
-        data=json.dumps({"action": []}),
+        data=json.dumps(updated_config),
     )
     await hass.async_block_till_done()
     assert sorted(hass.states.async_entity_ids("automation")) == []
 
     assert resp.status != HTTPStatus.OK
     result = await resp.json()
-    validation_error = "required key not provided @ data['trigger']"
+    assert result == {"message": f"Message malformed: {validation_error}"}
+    # Assert the validation error is not logged
+    assert validation_error not in caplog.text
+
+
+@pytest.mark.parametrize("automation_config", ({},))
+@pytest.mark.parametrize(
+    ("updated_config", "validation_error"),
+    [
+        (
+            {
+                "use_blueprint": {
+                    "path": "test_event_service.yaml",
+                    "input": {
+                        "trigger_event": "test_event",
+                        "service_to_call": "test.automation",
+                        "a_number": 5,
+                    },
+                },
+            },
+            "No substitution found for input blah",
+        ),
+    ],
+)
+async def test_update_automation_config_with_blueprint_substitution_error(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    hass_config_store,
+    setup_automation,
+    caplog: pytest.LogCaptureFixture,
+    updated_config: Any,
+    validation_error: str,
+) -> None:
+    """Test updating automation config with errors."""
+    with patch.object(config, "SECTIONS", ["automation"]):
+        await async_setup_component(hass, "config", {})
+
+    assert sorted(hass.states.async_entity_ids("automation")) == []
+
+    client = await hass_client()
+
+    orig_data = [{"id": "sun"}, {"id": "moon"}]
+    hass_config_store["automations.yaml"] = orig_data
+
+    with patch(
+        "homeassistant.components.blueprint.models.BlueprintInputs.async_substitute",
+        side_effect=yaml.UndefinedSubstitution("blah"),
+    ):
+        resp = await client.post(
+            "/api/config/automation/config/moon",
+            data=json.dumps(updated_config),
+        )
+        await hass.async_block_till_done()
+    assert sorted(hass.states.async_entity_ids("automation")) == []
+
+    assert resp.status != HTTPStatus.OK
+    result = await resp.json()
     assert result == {"message": f"Message malformed: {validation_error}"}
     # Assert the validation error is not logged
     assert validation_error not in caplog.text
@@ -145,8 +256,11 @@ async def test_update_remove_key_automation_config(
     )
     await hass.async_block_till_done()
     assert sorted(hass.states.async_entity_ids("automation")) == [
-        "automation.automation_0"
+        "automation.automation_0",
+        "automation.automation_1",
     ]
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
+    assert hass.states.get("automation.automation_1").state == STATE_ON
 
     assert resp.status == HTTPStatus.OK
     result = await resp.json()
@@ -187,8 +301,11 @@ async def test_bad_formatted_automations(
     )
     await hass.async_block_till_done()
     assert sorted(hass.states.async_entity_ids("automation")) == [
-        "automation.automation_0"
+        "automation.automation_0",
+        "automation.automation_1",
     ]
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
+    assert hass.states.get("automation.automation_1").state == STATE_ON
 
     assert resp.status == HTTPStatus.OK
     result = await resp.json()
diff --git a/tests/components/config/test_config_entries.py b/tests/components/config/test_config_entries.py
index efd9617c491..bf94e36a9b4 100644
--- a/tests/components/config/test_config_entries.py
+++ b/tests/components/config/test_config_entries.py
@@ -976,7 +976,7 @@ async def test_get_single(
     assert await async_setup_component(hass, "config", {})
     ws_client = await hass_ws_client(hass)
 
-    entry = MockConfigEntry(domain="demo", state=core_ce.ConfigEntryState.LOADED)
+    entry = MockConfigEntry(domain="test", state=core_ce.ConfigEntryState.LOADED)
     entry.add_to_hass(hass)
 
     assert entry.pref_disable_new_entities is False
@@ -993,7 +993,7 @@ async def test_get_single(
     assert response["success"]
     assert response["result"]["config_entry"] == {
         "disabled_by": None,
-        "domain": "demo",
+        "domain": "test",
         "entry_id": entry.entry_id,
         "pref_disable_new_entities": False,
         "pref_disable_polling": False,
diff --git a/tests/components/config/test_script.py b/tests/components/config/test_script.py
index fd1aed1b750..34f807e3cc5 100644
--- a/tests/components/config/test_script.py
+++ b/tests/components/config/test_script.py
@@ -1,14 +1,17 @@
 """Tests for config/script."""
 from http import HTTPStatus
 import json
+from typing import Any
 from unittest.mock import patch
 
 import pytest
 
 from homeassistant.bootstrap import async_setup_component
 from homeassistant.components import config
+from homeassistant.const import STATE_OFF, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
+from homeassistant.util import yaml
 
 from tests.typing import ClientSessionGenerator
 
@@ -67,7 +70,12 @@ async def test_update_script_config(
         data=json.dumps({"alias": "Moon updated", "sequence": []}),
     )
     await hass.async_block_till_done()
-    assert sorted(hass.states.async_entity_ids("script")) == ["script.moon"]
+    assert sorted(hass.states.async_entity_ids("script")) == [
+        "script.moon",
+        "script.sun",
+    ]
+    assert hass.states.get("script.moon").state == STATE_OFF
+    assert hass.states.get("script.sun").state == STATE_UNAVAILABLE
 
     assert resp.status == HTTPStatus.OK
     result = await resp.json()
@@ -79,11 +87,39 @@ async def test_update_script_config(
 
 
 @pytest.mark.parametrize("script_config", ({},))
+@pytest.mark.parametrize(
+    ("updated_config", "validation_error"),
+    [
+        ({}, "required key not provided @ data['sequence']"),
+        (
+            {
+                "sequence": {
+                    "condition": "state",
+                    # The UUID will fail being resolved to en entity_id
+                    "entity_id": "abcdabcdabcdabcdabcdabcdabcdabcd",
+                    "state": "blah",
+                }
+            },
+            "Unknown entity registry entry abcdabcdabcdabcdabcdabcdabcdabcd",
+        ),
+        (
+            {
+                "use_blueprint": {
+                    "path": "test_service.yaml",
+                    "input": {},
+                },
+            },
+            "Missing input service_to_call",
+        ),
+    ],
+)
 async def test_update_script_config_with_error(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     hass_config_store,
     caplog: pytest.LogCaptureFixture,
+    updated_config: Any,
+    validation_error: str,
 ) -> None:
     """Test updating script config with errors."""
     with patch.object(config, "SECTIONS", ["script"]):
@@ -98,14 +134,68 @@ async def test_update_script_config_with_error(
 
     resp = await client.post(
         "/api/config/script/config/moon",
-        data=json.dumps({}),
+        data=json.dumps(updated_config),
     )
     await hass.async_block_till_done()
     assert sorted(hass.states.async_entity_ids("script")) == []
 
     assert resp.status != HTTPStatus.OK
     result = await resp.json()
-    validation_error = "required key not provided @ data['sequence']"
+    assert result == {"message": f"Message malformed: {validation_error}"}
+    # Assert the validation error is not logged
+    assert validation_error not in caplog.text
+
+
+@pytest.mark.parametrize("script_config", ({},))
+@pytest.mark.parametrize(
+    ("updated_config", "validation_error"),
+    [
+        (
+            {
+                "use_blueprint": {
+                    "path": "test_service.yaml",
+                    "input": {
+                        "service_to_call": "test.automation",
+                    },
+                },
+            },
+            "No substitution found for input blah",
+        ),
+    ],
+)
+async def test_update_script_config_with_blueprint_substitution_error(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    hass_config_store,
+    # setup_automation,
+    caplog: pytest.LogCaptureFixture,
+    updated_config: Any,
+    validation_error: str,
+) -> None:
+    """Test updating script config with errors."""
+    with patch.object(config, "SECTIONS", ["script"]):
+        await async_setup_component(hass, "config", {})
+
+    assert sorted(hass.states.async_entity_ids("script")) == []
+
+    client = await hass_client()
+
+    orig_data = {"sun": {}, "moon": {}}
+    hass_config_store["scripts.yaml"] = orig_data
+
+    with patch(
+        "homeassistant.components.blueprint.models.BlueprintInputs.async_substitute",
+        side_effect=yaml.UndefinedSubstitution("blah"),
+    ):
+        resp = await client.post(
+            "/api/config/script/config/moon",
+            data=json.dumps(updated_config),
+        )
+        await hass.async_block_till_done()
+    assert sorted(hass.states.async_entity_ids("script")) == []
+
+    assert resp.status != HTTPStatus.OK
+    result = await resp.json()
     assert result == {"message": f"Message malformed: {validation_error}"}
     # Assert the validation error is not logged
     assert validation_error not in caplog.text
@@ -131,7 +221,12 @@ async def test_update_remove_key_script_config(
         data=json.dumps({"sequence": []}),
     )
     await hass.async_block_till_done()
-    assert sorted(hass.states.async_entity_ids("script")) == ["script.moon"]
+    assert sorted(hass.states.async_entity_ids("script")) == [
+        "script.moon",
+        "script.sun",
+    ]
+    assert hass.states.get("script.moon").state == STATE_OFF
+    assert hass.states.get("script.sun").state == STATE_UNAVAILABLE
 
     assert resp.status == HTTPStatus.OK
     result = await resp.json()
diff --git a/tests/components/conversation/snapshots/test_init.ambr b/tests/components/conversation/snapshots/test_init.ambr
index 61e499b15da..8ef0cef52f9 100644
--- a/tests/components/conversation/snapshots/test_init.ambr
+++ b/tests/components/conversation/snapshots/test_init.ambr
@@ -1,22 +1,22 @@
 # serializer version: 1
 # name: test_get_agent_info
-  dict({
-    'id': 'mock-entry',
-    'name': 'Mock Title',
-  })
-# ---
-# name: test_get_agent_info.1
   dict({
     'id': 'homeassistant',
     'name': 'Home Assistant',
   })
 # ---
-# name: test_get_agent_info.2
+# name: test_get_agent_info.1
   dict({
     'id': 'mock-entry',
     'name': 'Mock Title',
   })
 # ---
+# name: test_get_agent_info.2
+  dict({
+    'id': 'homeassistant',
+    'name': 'Home Assistant',
+  })
+# ---
 # name: test_get_agent_info.3
   dict({
     'id': 'mock-entry',
@@ -41,6 +41,8 @@
           'el',
           'en',
           'es',
+          'et',
+          'eu',
           'fa',
           'fi',
           'fr',
@@ -222,12 +224,129 @@
     ]),
   })
 # ---
+# name: test_turn_on_intent[turn kitchen on-None]
+  dict({
+    'conversation_id': None,
+    'response': dict({
+      'card': dict({
+      }),
+      'data': dict({
+        'failed': list([
+        ]),
+        'success': list([
+          dict({
+            'id': 'light.kitchen',
+            'name': 'kitchen',
+            'type': <IntentResponseTargetType.ENTITY: 'entity'>,
+          }),
+        ]),
+        'targets': list([
+        ]),
+      }),
+      'language': 'en',
+      'response_type': 'action_done',
+      'speech': dict({
+        'plain': dict({
+          'extra_data': None,
+          'speech': 'Turned on light',
+        }),
+      }),
+    }),
+  })
+# ---
+# name: test_turn_on_intent[turn kitchen on-homeassistant]
+  dict({
+    'conversation_id': None,
+    'response': dict({
+      'card': dict({
+      }),
+      'data': dict({
+        'failed': list([
+        ]),
+        'success': list([
+          dict({
+            'id': 'light.kitchen',
+            'name': 'kitchen',
+            'type': <IntentResponseTargetType.ENTITY: 'entity'>,
+          }),
+        ]),
+        'targets': list([
+        ]),
+      }),
+      'language': 'en',
+      'response_type': 'action_done',
+      'speech': dict({
+        'plain': dict({
+          'extra_data': None,
+          'speech': 'Turned on light',
+        }),
+      }),
+    }),
+  })
+# ---
+# name: test_turn_on_intent[turn on kitchen-None]
+  dict({
+    'conversation_id': None,
+    'response': dict({
+      'card': dict({
+      }),
+      'data': dict({
+        'failed': list([
+        ]),
+        'success': list([
+          dict({
+            'id': 'light.kitchen',
+            'name': 'kitchen',
+            'type': <IntentResponseTargetType.ENTITY: 'entity'>,
+          }),
+        ]),
+        'targets': list([
+        ]),
+      }),
+      'language': 'en',
+      'response_type': 'action_done',
+      'speech': dict({
+        'plain': dict({
+          'extra_data': None,
+          'speech': 'Turned on light',
+        }),
+      }),
+    }),
+  })
+# ---
+# name: test_turn_on_intent[turn on kitchen-homeassistant]
+  dict({
+    'conversation_id': None,
+    'response': dict({
+      'card': dict({
+      }),
+      'data': dict({
+        'failed': list([
+        ]),
+        'success': list([
+          dict({
+            'id': 'light.kitchen',
+            'name': 'kitchen',
+            'type': <IntentResponseTargetType.ENTITY: 'entity'>,
+          }),
+        ]),
+        'targets': list([
+        ]),
+      }),
+      'language': 'en',
+      'response_type': 'action_done',
+      'speech': dict({
+        'plain': dict({
+          'extra_data': None,
+          'speech': 'Turned on light',
+        }),
+      }),
+    }),
+  })
+# ---
 # name: test_ws_get_agent_info
   dict({
-    'attribution': dict({
-      'name': 'Mock assistant',
-      'url': 'https://assist.me',
-    }),
+    'attribution': None,
   })
 # ---
 # name: test_ws_get_agent_info.1
@@ -249,3 +368,102 @@
     'message': "invalid agent ID for dictionary value @ data['agent_id']. Got 'not_exist'",
   })
 # ---
+# name: test_ws_hass_agent_debug
+  dict({
+    'results': list([
+      dict({
+        'entities': dict({
+          'name': dict({
+            'name': 'name',
+            'text': 'my cool light',
+            'value': 'my cool light',
+          }),
+        }),
+        'intent': dict({
+          'name': 'HassTurnOn',
+        }),
+        'targets': dict({
+          'light.kitchen': dict({
+            'matched': True,
+          }),
+        }),
+      }),
+      dict({
+        'entities': dict({
+          'name': dict({
+            'name': 'name',
+            'text': 'my cool light',
+            'value': 'my cool light',
+          }),
+        }),
+        'intent': dict({
+          'name': 'HassTurnOff',
+        }),
+        'targets': dict({
+          'light.kitchen': dict({
+            'matched': True,
+          }),
+        }),
+      }),
+      dict({
+        'entities': dict({
+          'area': dict({
+            'name': 'area',
+            'text': 'kitchen',
+            'value': 'kitchen',
+          }),
+          'domain': dict({
+            'name': 'domain',
+            'text': '',
+            'value': 'light',
+          }),
+        }),
+        'intent': dict({
+          'name': 'HassTurnOn',
+        }),
+        'targets': dict({
+          'light.kitchen': dict({
+            'matched': True,
+          }),
+        }),
+      }),
+      dict({
+        'entities': dict({
+          'area': dict({
+            'name': 'area',
+            'text': 'kitchen',
+            'value': 'kitchen',
+          }),
+          'domain': dict({
+            'name': 'domain',
+            'text': 'lights',
+            'value': 'light',
+          }),
+          'state': dict({
+            'name': 'state',
+            'text': 'on',
+            'value': 'on',
+          }),
+        }),
+        'intent': dict({
+          'name': 'HassGetState',
+        }),
+        'targets': dict({
+          'light.kitchen': dict({
+            'matched': False,
+          }),
+        }),
+      }),
+      None,
+    ]),
+  })
+# ---
+# name: test_ws_hass_agent_debug.1
+  dict({
+    'name': dict({
+      'name': 'name',
+      'text': 'my cool light',
+      'value': 'my cool light',
+    }),
+  })
+# ---
diff --git a/tests/components/conversation/test_default_agent.py b/tests/components/conversation/test_default_agent.py
index 58fe9371e11..899fd761d5e 100644
--- a/tests/components/conversation/test_default_agent.py
+++ b/tests/components/conversation/test_default_agent.py
@@ -1,5 +1,5 @@
 """Test for the default agent."""
-from unittest.mock import patch
+from unittest.mock import AsyncMock, patch
 
 import pytest
 
@@ -223,3 +223,45 @@ async def test_unexposed_entities_skipped(
     assert result.response.response_type == intent.IntentResponseType.QUERY_ANSWER
     assert len(result.response.matched_states) == 1
     assert result.response.matched_states[0].entity_id == exposed_light.entity_id
+
+
+async def test_trigger_sentences(hass: HomeAssistant, init_components) -> None:
+    """Test registering/unregistering/matching a few trigger sentences."""
+    trigger_sentences = ["It's party time", "It is time to party"]
+    trigger_response = "Cowabunga!"
+
+    agent = await conversation._get_agent_manager(hass).async_get_agent(
+        conversation.HOME_ASSISTANT_AGENT
+    )
+    assert isinstance(agent, conversation.DefaultAgent)
+
+    callback = AsyncMock(return_value=trigger_response)
+    unregister = agent.register_trigger(trigger_sentences, callback)
+
+    result = await conversation.async_converse(hass, "Not the trigger", None, Context())
+    assert result.response.response_type == intent.IntentResponseType.ERROR
+
+    # Using different case and including punctuation
+    test_sentences = ["it's party time!", "IT IS TIME TO PARTY."]
+    for sentence in test_sentences:
+        callback.reset_mock()
+        result = await conversation.async_converse(hass, sentence, None, Context())
+        callback.assert_called_once_with(sentence)
+        assert (
+            result.response.response_type == intent.IntentResponseType.ACTION_DONE
+        ), sentence
+        assert result.response.speech == {
+            "plain": {"speech": trigger_response, "extra_data": None}
+        }
+
+    unregister()
+
+    # Should produce errors now
+    callback.reset_mock()
+    for sentence in test_sentences:
+        result = await conversation.async_converse(hass, sentence, None, Context())
+        assert (
+            result.response.response_type == intent.IntentResponseType.ERROR
+        ), sentence
+
+    assert len(callback.mock_calls) == 0
diff --git a/tests/components/conversation/test_init.py b/tests/components/conversation/test_init.py
index 54e7020fdda..6ad9beb3362 100644
--- a/tests/components/conversation/test_init.py
+++ b/tests/components/conversation/test_init.py
@@ -12,6 +12,7 @@ from homeassistant.components.cover import SERVICE_OPEN_COVER
 from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
 from homeassistant.const import ATTR_FRIENDLY_NAME
 from homeassistant.core import Context, HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import (
     area_registry as ar,
     device_registry as dr,
@@ -873,7 +874,7 @@ async def test_http_processing_intent_conversion_not_expose_new(
 @pytest.mark.parametrize("agent_id", AGENT_ID_OPTIONS)
 @pytest.mark.parametrize("sentence", ("turn on kitchen", "turn kitchen on"))
 async def test_turn_on_intent(
-    hass: HomeAssistant, init_components, sentence, agent_id
+    hass: HomeAssistant, init_components, sentence, agent_id, snapshot
 ) -> None:
     """Test calling the turn on intent."""
     hass.states.async_set("light.kitchen", "off")
@@ -882,8 +883,13 @@ async def test_turn_on_intent(
     data = {conversation.ATTR_TEXT: sentence}
     if agent_id is not None:
         data[conversation.ATTR_AGENT_ID] = agent_id
-    await hass.services.async_call("conversation", "process", data)
-    await hass.async_block_till_done()
+    result = await hass.services.async_call(
+        "conversation",
+        "process",
+        data,
+        blocking=True,
+        return_response=True,
+    )
 
     assert len(calls) == 1
     call = calls[0]
@@ -891,6 +897,22 @@ async def test_turn_on_intent(
     assert call.service == "turn_on"
     assert call.data == {"entity_id": ["light.kitchen"]}
 
+    assert result == snapshot
+
+
+async def test_service_fails(hass: HomeAssistant, init_components) -> None:
+    """Test calling the turn on intent."""
+    with pytest.raises(HomeAssistantError), patch(
+        "homeassistant.components.conversation.async_converse",
+        side_effect=intent.IntentHandleError,
+    ):
+        await hass.services.async_call(
+            "conversation",
+            "process",
+            {"text": "bla"},
+            blocking=True,
+        )
+
 
 @pytest.mark.parametrize("sentence", ("turn off kitchen", "turn kitchen off"))
 async def test_turn_off_intent(hass: HomeAssistant, init_components, sentence) -> None:
@@ -1032,16 +1054,16 @@ async def test_http_api_wrong_data(
     assert resp.status == HTTPStatus.BAD_REQUEST
 
 
-@pytest.mark.parametrize("agent_id", (None, "mock-entry"))
 async def test_custom_agent(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     hass_admin_user: MockUser,
     mock_agent,
-    agent_id,
 ) -> None:
     """Test a custom conversation agent."""
+    assert await async_setup_component(hass, "homeassistant", {})
     assert await async_setup_component(hass, "conversation", {})
+    assert await async_setup_component(hass, "intent", {})
 
     client = await hass_client()
 
@@ -1049,9 +1071,8 @@ async def test_custom_agent(
         "text": "Test Text",
         "conversation_id": "test-conv-id",
         "language": "test-language",
+        "agent_id": mock_agent.agent_id,
     }
-    if agent_id is not None:
-        data["agent_id"] = agent_id
 
     resp = await client.post("/api/conversation/process", json=data)
     assert resp.status == HTTPStatus.OK
@@ -1371,6 +1392,7 @@ async def test_non_default_response(hass: HomeAssistant, init_components) -> Non
             text="open the front door",
             context=Context(),
             conversation_id=None,
+            device_id=None,
             language=hass.config.language,
         )
     )
@@ -1576,8 +1598,7 @@ async def test_get_agent_info(
     """Test get agent info."""
     agent_info = conversation.async_get_agent_info(hass)
     # Test it's the default
-    assert agent_info.id == mock_agent.agent_id
-    assert agent_info == snapshot
+    assert conversation.async_get_agent_info(hass, "homeassistant") == agent_info
     assert conversation.async_get_agent_info(hass, "homeassistant") == snapshot
     assert conversation.async_get_agent_info(hass, mock_agent.agent_id) == snapshot
     assert conversation.async_get_agent_info(hass, "not exist") is None
@@ -1625,3 +1646,51 @@ async def test_ws_get_agent_info(
     msg = await client.receive_json()
     assert not msg["success"]
     assert msg["error"] == snapshot
+
+
+async def test_ws_hass_agent_debug(
+    hass: HomeAssistant,
+    init_components,
+    hass_ws_client: WebSocketGenerator,
+    area_registry: ar.AreaRegistry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test homeassistant agent debug websocket command."""
+    client = await hass_ws_client(hass)
+
+    kitchen_area = area_registry.async_create("kitchen")
+    entity_registry.async_get_or_create(
+        "light", "demo", "1234", suggested_object_id="kitchen"
+    )
+    entity_registry.async_update_entity(
+        "light.kitchen",
+        aliases={"my cool light"},
+        area_id=kitchen_area.id,
+    )
+    hass.states.async_set("light.kitchen", "off")
+
+    on_calls = async_mock_service(hass, LIGHT_DOMAIN, "turn_on")
+    off_calls = async_mock_service(hass, LIGHT_DOMAIN, "turn_off")
+
+    await client.send_json_auto_id(
+        {
+            "type": "conversation/agent/homeassistant/debug",
+            "sentences": [
+                "turn on my cool light",
+                "turn my cool light off",
+                "turn on all lights in the kitchen",
+                "how many lights are on in the kitchen?",
+                "this will not match anything",  # null in results
+            ],
+        }
+    )
+
+    msg = await client.receive_json()
+
+    assert msg["success"]
+    assert msg["result"] == snapshot
+
+    # Light state should not have been changed
+    assert len(on_calls) == 0
+    assert len(off_calls) == 0
diff --git a/tests/components/conversation/test_trigger.py b/tests/components/conversation/test_trigger.py
new file mode 100644
index 00000000000..522162fa457
--- /dev/null
+++ b/tests/components/conversation/test_trigger.py
@@ -0,0 +1,190 @@
+"""Test conversation triggers."""
+import pytest
+import voluptuous as vol
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import trigger
+from homeassistant.setup import async_setup_component
+
+from tests.common import async_mock_service
+
+
+@pytest.fixture
+def calls(hass):
+    """Track calls to a mock service."""
+    return async_mock_service(hass, "test", "automation")
+
+
+@pytest.fixture(autouse=True)
+async def setup_comp(hass):
+    """Initialize components."""
+    assert await async_setup_component(hass, "homeassistant", {})
+    assert await async_setup_component(hass, "conversation", {})
+
+
+async def test_if_fires_on_event(hass: HomeAssistant, calls, setup_comp) -> None:
+    """Test the firing of events."""
+    assert await async_setup_component(
+        hass,
+        "automation",
+        {
+            "automation": {
+                "trigger": {
+                    "platform": "conversation",
+                    "command": [
+                        "Hey yo",
+                        "Ha ha ha",
+                    ],
+                },
+                "action": {
+                    "service": "test.automation",
+                    "data_template": {"data": "{{ trigger }}"},
+                },
+            }
+        },
+    )
+
+    await hass.services.async_call(
+        "conversation",
+        "process",
+        {
+            "text": "Ha ha ha",
+        },
+        blocking=True,
+    )
+
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["data"] == {
+        "alias": None,
+        "id": "0",
+        "idx": "0",
+        "platform": "conversation",
+        "sentence": "Ha ha ha",
+    }
+
+
+async def test_same_trigger_multiple_sentences(
+    hass: HomeAssistant, calls, setup_comp
+) -> None:
+    """Test matching of multiple sentences from the same trigger."""
+    assert await async_setup_component(
+        hass,
+        "automation",
+        {
+            "automation": {
+                "trigger": {
+                    "platform": "conversation",
+                    "command": ["hello", "hello[ world]"],
+                },
+                "action": {
+                    "service": "test.automation",
+                    "data_template": {"data": "{{ trigger }}"},
+                },
+            }
+        },
+    )
+
+    await hass.services.async_call(
+        "conversation",
+        "process",
+        {
+            "text": "hello",
+        },
+        blocking=True,
+    )
+
+    # Only triggers once
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["data"] == {
+        "alias": None,
+        "id": "0",
+        "idx": "0",
+        "platform": "conversation",
+        "sentence": "hello",
+    }
+
+
+async def test_same_sentence_multiple_triggers(
+    hass: HomeAssistant, calls, setup_comp
+) -> None:
+    """Test use of the same sentence in multiple triggers."""
+    assert await async_setup_component(
+        hass,
+        "automation",
+        {
+            "automation": [
+                {
+                    "trigger": {
+                        "id": "trigger1",
+                        "platform": "conversation",
+                        "command": [
+                            "hello",
+                        ],
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"data": "{{ trigger }}"},
+                    },
+                },
+                {
+                    "trigger": {
+                        "id": "trigger2",
+                        "platform": "conversation",
+                        "command": [
+                            "hello[ world]",
+                        ],
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"data": "{{ trigger }}"},
+                    },
+                },
+            ],
+        },
+    )
+
+    await hass.services.async_call(
+        "conversation",
+        "process",
+        {
+            "text": "hello",
+        },
+        blocking=True,
+    )
+
+    await hass.async_block_till_done()
+    assert len(calls) == 2
+
+    # The calls may come in any order
+    call_datas: set[tuple[str, str, str]] = set()
+    for call in calls:
+        call_data = call.data["data"]
+        call_datas.add((call_data["id"], call_data["platform"], call_data["sentence"]))
+
+    assert call_datas == {
+        ("trigger1", "conversation", "hello"),
+        ("trigger2", "conversation", "hello"),
+    }
+
+
+@pytest.mark.parametrize(
+    "command",
+    ["hello?", "hello!", "4 a.m."],
+)
+async def test_fails_on_punctuation(hass: HomeAssistant, command: str) -> None:
+    """Test that validation fails when sentences contain punctuation."""
+    with pytest.raises(vol.Invalid):
+        await trigger.async_validate_trigger_config(
+            hass,
+            [
+                {
+                    "id": "trigger1",
+                    "platform": "conversation",
+                    "command": [
+                        command,
+                    ],
+                },
+            ],
+        )
diff --git a/tests/components/cover/test_device_action.py b/tests/components/cover/test_device_action.py
index 17f6e2185e9..0cc6716bd3c 100644
--- a/tests/components/cover/test_device_action.py
+++ b/tests/components/cover/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Cover device actions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.cover import DOMAIN, CoverEntityFeature
@@ -12,7 +13,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
@@ -61,7 +61,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -70,7 +70,7 @@ async def test_get_actions(
     )
     if set_state:
         hass.states.async_set(
-            f"{DOMAIN}.test_5678", "attributes", {"supported_features": features_state}
+            entity_entry.entity_id, "attributes", {"supported_features": features_state}
         )
     await hass.async_block_till_done()
 
@@ -80,7 +80,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in expected_action_types
@@ -88,7 +88,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -114,7 +114,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -129,7 +129,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["close"]
@@ -137,7 +137,7 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_action_capabilities(
@@ -190,6 +190,57 @@ async def test_get_action_capabilities(
         assert capabilities == {"extra_fields": []}
 
 
+async def test_get_action_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test we get the expected capabilities from a cover action."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init(empty=True)
+    platform.ENTITIES.append(
+        platform.MockCover(
+            name="Set position cover",
+            is_on=True,
+            unique_id="unique_set_pos_cover",
+            current_cover_position=50,
+            supported_features=CoverEntityFeature.OPEN
+            | CoverEntityFeature.CLOSE
+            | CoverEntityFeature.STOP
+            | CoverEntityFeature.OPEN_TILT
+            | CoverEntityFeature.CLOSE_TILT
+            | CoverEntityFeature.STOP_TILT,
+        ),
+    )
+    ent = platform.ENTITIES[0]
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", ent.unique_id, device_id=device_entry.id
+    )
+
+    actions = await async_get_device_automations(
+        hass, DeviceAutomationType.ACTION, device_entry.id
+    )
+    assert len(actions) == 5  # open, close, open_tilt, close_tilt
+    action_types = {action["type"] for action in actions}
+    assert action_types == {"open", "close", "stop", "open_tilt", "close_tilt"}
+    for action in actions:
+        action["entity_id"] = entity_registry.async_get(action["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.ACTION, action
+        )
+        assert capabilities == {"extra_fields": []}
+
+
 async def test_get_action_capabilities_set_pos(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
@@ -298,11 +349,13 @@ async def test_get_action_capabilities_set_tilt_pos(
             assert capabilities == {"extra_fields": []}
 
 
-async def test_action(hass: HomeAssistant, enable_custom_integrations: None) -> None:
+async def test_action(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
     """Test for cover actions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -314,7 +367,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "open",
                     },
                 },
@@ -323,7 +376,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "close",
                     },
                 },
@@ -332,7 +385,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "stop",
                     },
                 },
@@ -363,14 +416,24 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
     assert len(close_calls) == 1
     assert len(stop_calls) == 1
 
+    assert open_calls[0].domain == DOMAIN
+    assert open_calls[0].service == "open_cover"
+    assert open_calls[0].data == {"entity_id": entry.entity_id}
+    assert close_calls[0].domain == DOMAIN
+    assert close_calls[0].service == "close_cover"
+    assert close_calls[0].data == {"entity_id": entry.entity_id}
+    assert stop_calls[0].domain == DOMAIN
+    assert stop_calls[0].service == "stop_cover"
+    assert stop_calls[0].data == {"entity_id": entry.entity_id}
 
-async def test_action_tilt(
-    hass: HomeAssistant, enable_custom_integrations: None
+
+async def test_action_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
 ) -> None:
-    """Test for cover tilt actions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    """Test for cover actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -382,7 +445,45 @@ async def test_action_tilt(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
+                        "type": "open",
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+
+    open_calls = async_mock_service(hass, "cover", "open_cover")
+
+    hass.bus.async_fire("test_event_open")
+    await hass.async_block_till_done()
+    assert len(open_calls) == 1
+
+    assert open_calls[0].domain == DOMAIN
+    assert open_calls[0].service == "open_cover"
+    assert open_calls[0].data == {"entity_id": entry.entity_id}
+
+
+async def test_action_tilt(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for cover tilt actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event_open"},
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.id,
                         "type": "open_tilt",
                     },
                 },
@@ -391,7 +492,7 @@ async def test_action_tilt(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "close_tilt",
                     },
                 },
@@ -418,14 +519,21 @@ async def test_action_tilt(
     assert len(open_calls) == 1
     assert len(close_calls) == 1
 
+    assert open_calls[0].domain == DOMAIN
+    assert open_calls[0].service == "open_cover_tilt"
+    assert open_calls[0].data == {"entity_id": entry.entity_id}
+    assert close_calls[0].domain == DOMAIN
+    assert close_calls[0].service == "close_cover_tilt"
+    assert close_calls[0].data == {"entity_id": entry.entity_id}
+
 
 async def test_action_set_position(
-    hass: HomeAssistant, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for cover set position actions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -440,7 +548,7 @@ async def test_action_set_position(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "set_position",
                         "position": 25,
                     },
@@ -453,7 +561,7 @@ async def test_action_set_position(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "set_tilt_position",
                         "position": 75,
                     },
@@ -469,11 +577,16 @@ async def test_action_set_position(
     hass.bus.async_fire("test_event_set_pos")
     await hass.async_block_till_done()
     assert len(cover_pos_calls) == 1
-    assert cover_pos_calls[0].data["position"] == 25
     assert len(tilt_pos_calls) == 0
 
     hass.bus.async_fire("test_event_set_tilt_pos")
     await hass.async_block_till_done()
     assert len(cover_pos_calls) == 1
     assert len(tilt_pos_calls) == 1
-    assert tilt_pos_calls[0].data["tilt_position"] == 75
+
+    assert cover_pos_calls[0].domain == DOMAIN
+    assert cover_pos_calls[0].service == "set_cover_position"
+    assert cover_pos_calls[0].data == {"entity_id": entry.entity_id, "position": 25}
+    assert tilt_pos_calls[0].domain == DOMAIN
+    assert tilt_pos_calls[0].service == "set_cover_tilt_position"
+    assert tilt_pos_calls[0].data == {"entity_id": entry.entity_id, "tilt_position": 75}
diff --git a/tests/components/cover/test_device_condition.py b/tests/components/cover/test_device_condition.py
index f1afe6c6d6b..bfde3a0b514 100644
--- a/tests/components/cover/test_device_condition.py
+++ b/tests/components/cover/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Cover device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.cover import DOMAIN, CoverEntityFeature
@@ -20,7 +21,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
@@ -89,7 +89,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -109,7 +109,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in expected_condition_types
@@ -117,7 +117,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -143,7 +143,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -158,7 +158,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_open", "is_closed", "is_opening", "is_closing"]
@@ -166,7 +166,7 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_get_condition_capabilities(
@@ -203,6 +203,43 @@ async def test_get_condition_capabilities(
         assert capabilities == {"extra_fields": []}
 
 
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test we get the expected capabilities from a cover condition."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+    ent = platform.ENTITIES[0]
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", ent.unique_id, device_id=device_entry.id
+    )
+
+    conditions = await async_get_device_automations(
+        hass, DeviceAutomationType.CONDITION, device_entry.id
+    )
+    assert len(conditions) == 4
+    for condition in conditions:
+        condition["entity_id"] = entity_registry.async_get(
+            condition["entity_id"]
+        ).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.CONDITION, condition
+        )
+        assert capabilities == {"extra_fields": []}
+
+
 async def test_get_condition_capabilities_set_pos(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
@@ -317,9 +354,13 @@ async def test_get_condition_capabilities_set_tilt_pos(
             assert capabilities == {"extra_fields": []}
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("cover.entity", STATE_OPEN)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OPEN)
 
     assert await async_setup_component(
         hass,
@@ -333,7 +374,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "cover.entity",
+                            "entity_id": entry.id,
                             "type": "is_open",
                         }
                     ],
@@ -355,7 +396,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "cover.entity",
+                            "entity_id": entry.id,
                             "type": "is_closed",
                         }
                     ],
@@ -377,7 +418,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "cover.entity",
+                            "entity_id": entry.id,
                             "type": "is_opening",
                         }
                     ],
@@ -399,7 +440,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "cover.entity",
+                            "entity_id": entry.id,
                             "type": "is_closing",
                         }
                     ],
@@ -423,21 +464,21 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_open - event - test_event1"
 
-    hass.states.async_set("cover.entity", STATE_CLOSED)
+    hass.states.async_set(entry.entity_id, STATE_CLOSED)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_closed - event - test_event2"
 
-    hass.states.async_set("cover.entity", STATE_OPENING)
+    hass.states.async_set(entry.entity_id, STATE_OPENING)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event3")
     await hass.async_block_till_done()
     assert len(calls) == 3
     assert calls[2].data["some"] == "is_opening - event - test_event3"
 
-    hass.states.async_set("cover.entity", STATE_CLOSING)
+    hass.states.async_set(entry.entity_id, STATE_CLOSING)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event4")
     await hass.async_block_till_done()
@@ -445,8 +486,54 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert calls[3].data["some"] == "is_closing - event - test_event4"
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OPEN)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_open",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "is_open "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.event.event_type }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_event2")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_open - event - test_event1"
+
+
 async def test_if_position(
     hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
     calls,
     caplog: pytest.LogCaptureFixture,
     enable_custom_integrations: None,
@@ -458,6 +545,8 @@ async def test_if_position(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
+    entry = entity_registry.async_get(ent.entity_id)
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -471,7 +560,7 @@ async def test_if_position(
                                 "condition": "device",
                                 "domain": DOMAIN,
                                 "device_id": "",
-                                "entity_id": ent.entity_id,
+                                "entity_id": entry.id,
                                 "type": "is_position",
                                 "above": 45,
                             },
@@ -505,7 +594,7 @@ async def test_if_position(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_position",
                             "below": 90,
                         }
@@ -528,7 +617,7 @@ async def test_if_position(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_position",
                             "above": 45,
                             "below": 90,
@@ -597,6 +686,7 @@ async def test_if_position(
 
 async def test_if_tilt_position(
     hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
     calls,
     caplog: pytest.LogCaptureFixture,
     enable_custom_integrations: None,
@@ -608,6 +698,8 @@ async def test_if_tilt_position(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
+    entry = entity_registry.async_get(ent.entity_id)
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -621,7 +713,7 @@ async def test_if_tilt_position(
                                 "condition": "device",
                                 "domain": DOMAIN,
                                 "device_id": "",
-                                "entity_id": ent.entity_id,
+                                "entity_id": entry.id,
                                 "type": "is_tilt_position",
                                 "above": 45,
                             },
@@ -655,7 +747,7 @@ async def test_if_tilt_position(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_tilt_position",
                             "below": 90,
                         }
@@ -678,7 +770,7 @@ async def test_if_tilt_position(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_tilt_position",
                             "above": 45,
                             "below": 90,
diff --git a/tests/components/cover/test_device_trigger.py b/tests/components/cover/test_device_trigger.py
index 6d70acd7f01..fc82bbd1499 100644
--- a/tests/components/cover/test_device_trigger.py
+++ b/tests/components/cover/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.cover import DOMAIN, CoverEntityFeature
@@ -22,7 +23,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
@@ -88,7 +88,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -97,7 +97,7 @@ async def test_get_triggers(
     )
     if set_state:
         hass.states.async_set(
-            f"{DOMAIN}.test_5678",
+            entity_entry.entity_id,
             "attributes",
             {"supported_features": features_state},
         )
@@ -110,7 +110,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in expected_trigger_types
@@ -118,7 +118,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -144,7 +144,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -159,7 +159,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["opened", "closed", "opening", "closing"]
@@ -167,7 +167,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -208,6 +208,45 @@ async def test_get_trigger_capabilities(
         }
 
 
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test we get the expected capabilities from a cover trigger."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+    ent = platform.ENTITIES[0]
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", ent.unique_id, device_id=device_entry.id
+    )
+
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    assert len(triggers) == 4
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == {
+            "extra_fields": [
+                {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+            ]
+        }
+
+
 async def test_get_trigger_capabilities_set_pos(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
@@ -338,9 +377,13 @@ async def test_get_trigger_capabilities_set_tilt_pos(
             }
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for state triggers firing."""
-    hass.states.async_set("cover.entity", STATE_CLOSED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_CLOSED)
 
     assert await async_setup_component(
         hass,
@@ -352,7 +395,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "opened",
                     },
                     "action": {
@@ -374,7 +417,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "closed",
                     },
                     "action": {
@@ -396,7 +439,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "opening",
                     },
                     "action": {
@@ -418,7 +461,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "closing",
                     },
                     "action": {
@@ -440,42 +483,49 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Fake that the entity is opened.
-    hass.states.async_set("cover.entity", STATE_OPEN)
+    hass.states.async_set(entry.entity_id, STATE_OPEN)
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data[
-        "some"
-    ] == "opened - device - {} - closed - open - None".format("cover.entity")
+    assert (
+        calls[0].data["some"]
+        == f"opened - device - {entry.entity_id} - closed - open - None"
+    )
 
     # Fake that the entity is closed.
-    hass.states.async_set("cover.entity", STATE_CLOSED)
+    hass.states.async_set(entry.entity_id, STATE_CLOSED)
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data[
-        "some"
-    ] == "closed - device - {} - open - closed - None".format("cover.entity")
+    assert (
+        calls[1].data["some"]
+        == f"closed - device - {entry.entity_id} - open - closed - None"
+    )
 
     # Fake that the entity is opening.
-    hass.states.async_set("cover.entity", STATE_OPENING)
+    hass.states.async_set(entry.entity_id, STATE_OPENING)
     await hass.async_block_till_done()
     assert len(calls) == 3
-    assert calls[2].data[
-        "some"
-    ] == "opening - device - {} - closed - opening - None".format("cover.entity")
+    assert (
+        calls[2].data["some"]
+        == f"opening - device - {entry.entity_id} - closed - opening - None"
+    )
 
     # Fake that the entity is closing.
-    hass.states.async_set("cover.entity", STATE_CLOSING)
+    hass.states.async_set(entry.entity_id, STATE_CLOSING)
     await hass.async_block_till_done()
     assert len(calls) == 4
-    assert calls[3].data[
-        "some"
-    ] == "closing - device - {} - opening - closing - None".format("cover.entity")
+    assert (
+        calls[3].data["some"]
+        == f"closing - device - {entry.entity_id} - opening - closing - None"
+    )
 
 
-async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) -> None:
-    """Test for triggers firing with delay."""
-    entity_id = "cover.entity"
-    hass.states.async_set(entity_id, STATE_CLOSED)
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for state triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_CLOSED)
 
     assert await async_setup_component(
         hass,
@@ -487,7 +537,56 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.entity_id,
+                        "type": "opened",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "opened "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.entity_id }} "
+                                "- {{ trigger.from_state.state }} "
+                                "- {{ trigger.to_state.state }} "
+                                "- {{ trigger.for }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the entity is opened.
+    hass.states.async_set(entry.entity_id, STATE_OPEN)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"opened - device - {entry.entity_id} - closed - open - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_CLOSED)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
                         "type": "opened",
                         "for": {"seconds": 5},
                     },
@@ -511,10 +610,9 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == STATE_CLOSED
     assert len(calls) == 0
 
-    hass.states.async_set(entity_id, STATE_OPEN)
+    hass.states.async_set(entry.entity_id, STATE_OPEN)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -523,12 +621,15 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     await hass.async_block_till_done()
     assert (
         calls[0].data["some"]
-        == f"turn_off device - {entity_id} - closed - open - 0:00:05"
+        == f"turn_off device - {entry.entity_id} - closed - open - 0:00:05"
     )
 
 
 async def test_if_fires_on_position(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for position triggers."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -537,6 +638,8 @@ async def test_if_fires_on_position(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
+    entry = entity_registry.async_get(ent.entity_id)
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -548,7 +651,7 @@ async def test_if_fires_on_position(
                             "platform": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "position",
                             "above": 45,
                         }
@@ -573,7 +676,7 @@ async def test_if_fires_on_position(
                             "platform": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "position",
                             "below": 90,
                         }
@@ -598,7 +701,7 @@ async def test_if_fires_on_position(
                             "platform": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "position",
                             "above": 45,
                             "below": 90,
@@ -669,7 +772,10 @@ async def test_if_fires_on_position(
 
 
 async def test_if_fires_on_tilt_position(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for tilt position triggers."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -678,6 +784,8 @@ async def test_if_fires_on_tilt_position(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
+    entry = entity_registry.async_get(ent.entity_id)
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -689,7 +797,7 @@ async def test_if_fires_on_tilt_position(
                             "platform": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "tilt_position",
                             "above": 45,
                         }
@@ -714,7 +822,7 @@ async def test_if_fires_on_tilt_position(
                             "platform": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "tilt_position",
                             "below": 90,
                         }
@@ -739,7 +847,7 @@ async def test_if_fires_on_tilt_position(
                             "platform": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "tilt_position",
                             "above": 45,
                             "below": 90,
diff --git a/tests/components/deconz/test_device_trigger.py b/tests/components/deconz/test_device_trigger.py
index e26a22b02e4..fe2ba8d4177 100644
--- a/tests/components/deconz/test_device_trigger.py
+++ b/tests/components/deconz/test_device_trigger.py
@@ -2,6 +2,7 @@
 from unittest.mock import Mock, patch
 
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components.automation import DOMAIN as AUTOMATION_DOMAIN
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
@@ -23,16 +24,16 @@ from homeassistant.const import (
     CONF_DOMAIN,
     CONF_PLATFORM,
     CONF_TYPE,
+    STATE_UNAVAILABLE,
 )
 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.helpers.trigger import async_initialize_triggers
 from homeassistant.setup import async_setup_component
 
 from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -84,6 +85,10 @@ async def test_get_triggers(
     device = device_registry.async_get_device(
         identifiers={(DECONZ_DOMAIN, "d0:cf:5e:ff:fe:71:a4:3a")}
     )
+    entity_registry = er.async_get(hass)
+    battery_sensor_entry = entity_registry.async_get(
+        "sensor.tradfri_on_off_switch_battery"
+    )
 
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device.id
@@ -141,14 +146,14 @@ async def test_get_triggers(
         {
             CONF_DEVICE_ID: device.id,
             CONF_DOMAIN: SENSOR_DOMAIN,
-            ATTR_ENTITY_ID: "sensor.tradfri_on_off_switch_battery",
+            ATTR_ENTITY_ID: battery_sensor_entry.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: ATTR_BATTERY_LEVEL,
             "metadata": {"secondary": True},
         },
     ]
 
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_for_alarm_event(
@@ -192,6 +197,10 @@ async def test_get_triggers_for_alarm_event(
     device = device_registry.async_get_device(
         identifiers={(DECONZ_DOMAIN, "00:00:00:00:00:00:00:00")}
     )
+    entity_registry = er.async_get(hass)
+    bat_entity = entity_registry.async_get("sensor.keypad_battery")
+    low_bat_entity = entity_registry.async_get("binary_sensor.keypad_low_battery")
+    tamper_entity = entity_registry.async_get("binary_sensor.keypad_tampered")
 
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device.id
@@ -201,7 +210,7 @@ async def test_get_triggers_for_alarm_event(
         {
             CONF_DEVICE_ID: device.id,
             CONF_DOMAIN: BINARY_SENSOR_DOMAIN,
-            ATTR_ENTITY_ID: "binary_sensor.keypad_low_battery",
+            ATTR_ENTITY_ID: low_bat_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: CONF_BAT_LOW,
             "metadata": {"secondary": True},
@@ -209,7 +218,7 @@ async def test_get_triggers_for_alarm_event(
         {
             CONF_DEVICE_ID: device.id,
             CONF_DOMAIN: BINARY_SENSOR_DOMAIN,
-            ATTR_ENTITY_ID: "binary_sensor.keypad_low_battery",
+            ATTR_ENTITY_ID: low_bat_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: CONF_NOT_BAT_LOW,
             "metadata": {"secondary": True},
@@ -217,7 +226,7 @@ async def test_get_triggers_for_alarm_event(
         {
             CONF_DEVICE_ID: device.id,
             CONF_DOMAIN: BINARY_SENSOR_DOMAIN,
-            ATTR_ENTITY_ID: "binary_sensor.keypad_tampered",
+            ATTR_ENTITY_ID: tamper_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: CONF_TAMPERED,
             "metadata": {"secondary": True},
@@ -225,7 +234,7 @@ async def test_get_triggers_for_alarm_event(
         {
             CONF_DEVICE_ID: device.id,
             CONF_DOMAIN: BINARY_SENSOR_DOMAIN,
-            ATTR_ENTITY_ID: "binary_sensor.keypad_tampered",
+            ATTR_ENTITY_ID: tamper_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: CONF_NOT_TAMPERED,
             "metadata": {"secondary": True},
@@ -233,14 +242,14 @@ async def test_get_triggers_for_alarm_event(
         {
             CONF_DEVICE_ID: device.id,
             CONF_DOMAIN: SENSOR_DOMAIN,
-            ATTR_ENTITY_ID: "sensor.keypad_battery",
+            ATTR_ENTITY_ID: bat_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: ATTR_BATTERY_LEVEL,
             "metadata": {"secondary": True},
         },
     ]
 
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_manage_unsupported_remotes(
@@ -283,7 +292,7 @@ async def test_get_triggers_manage_unsupported_remotes(
 
     expected_triggers = []
 
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_functional_device_trigger(
@@ -432,7 +441,9 @@ async def test_validate_trigger_unsupported_device(
     )
     await hass.async_block_till_done()
 
-    assert len(hass.states.async_entity_ids(AUTOMATION_DOMAIN)) == 0
+    automations = hass.states.async_entity_ids(AUTOMATION_DOMAIN)
+    assert len(automations) == 1
+    assert hass.states.get(automations[0]).state == STATE_UNAVAILABLE
 
 
 async def test_validate_trigger_unsupported_trigger(
@@ -473,7 +484,9 @@ async def test_validate_trigger_unsupported_trigger(
     )
     await hass.async_block_till_done()
 
-    assert len(hass.states.async_entity_ids(AUTOMATION_DOMAIN)) == 0
+    automations = hass.states.async_entity_ids(AUTOMATION_DOMAIN)
+    assert len(automations) == 1
+    assert hass.states.get(automations[0]).state == STATE_UNAVAILABLE
 
 
 async def test_attach_trigger_no_matching_event(
diff --git a/tests/components/deconz/test_sensor.py b/tests/components/deconz/test_sensor.py
index 0d2f792b6dc..4d93df17ba3 100644
--- a/tests/components/deconz/test_sensor.py
+++ b/tests/components/deconz/test_sensor.py
@@ -441,6 +441,43 @@ TEST_DATA = [
             "next_state": "10.0",
         },
     ),
+    (  # Moisture Sensor
+        {
+            "config": {"battery": 100, "offset": 0, "on": True, "reachable": True},
+            "etag": "1ba99c68975111c04367b67cf95ead44",
+            "lastannounced": None,
+            "lastseen": "2023-05-19T09:55Z",
+            "manufacturername": "_TZE200_myd45weu",
+            "modelid": "TS0601",
+            "name": "Soil Sensor",
+            "state": {
+                "lastupdated": "2023-05-19T09:42:00.472",
+                "lowbattery": False,
+                "moisture": 7213,
+            },
+            "swversion": "1.0.8",
+            "type": "ZHAMoisture",
+            "uniqueid": "a4:c1:38:fe:86:8f:07:a3-01-0408",
+        },
+        {
+            "entity_count": 3,
+            "device_count": 3,
+            "entity_id": "sensor.soil_sensor",
+            "unique_id": "a4:c1:38:fe:86:8f:07:a3-01-0408-moisture",
+            "state": "72.13",
+            "entity_category": None,
+            "device_class": SensorDeviceClass.MOISTURE,
+            "state_class": SensorStateClass.MEASUREMENT,
+            "attributes": {
+                "state_class": "measurement",
+                "unit_of_measurement": "%",
+                "device_class": "moisture",
+                "friendly_name": "Soil Sensor",
+            },
+            "websocket_event": {"state": {"moisture": 6923}},
+            "next_state": "69.23",
+        },
+    ),
     (  # Light level sensor
         {
             "config": {
diff --git a/tests/components/demo/conftest.py b/tests/components/demo/conftest.py
index 6cfd1a33f9c..0e54587ba4e 100644
--- a/tests/components/demo/conftest.py
+++ b/tests/components/demo/conftest.py
@@ -1,4 +1,6 @@
 """demo conftest."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.core import HomeAssistant
@@ -16,3 +18,13 @@ def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
 async def setup_homeassistant(hass: HomeAssistant):
     """Set up the homeassistant integration."""
     await async_setup_component(hass, "homeassistant", {})
+
+
+@pytest.fixture
+async def disable_platforms(hass: HomeAssistant) -> None:
+    """Disable platforms to speed up tests."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [],
+    ):
+        yield
diff --git a/tests/components/demo/test_button.py b/tests/components/demo/test_button.py
index 98728c0ffab..bcaddab433b 100644
--- a/tests/components/demo/test_button.py
+++ b/tests/components/demo/test_button.py
@@ -5,7 +5,7 @@ from unittest.mock import patch
 import pytest
 
 from homeassistant.components.button import DOMAIN, SERVICE_PRESS
-from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
+from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -13,8 +13,18 @@ from homeassistant.util import dt as dt_util
 ENTITY_PUSH = "button.push"
 
 
+@pytest.fixture
+async def button_only() -> None:
+    """Enable only the button platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.BUTTON],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_button(hass: HomeAssistant) -> None:
+async def setup_demo_button(hass: HomeAssistant, button_only) -> None:
     """Initialize setup demo button entity."""
     assert await async_setup_component(hass, DOMAIN, {"button": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_camera.py b/tests/components/demo/test_camera.py
index 25c7814961b..132e7bdb096 100644
--- a/tests/components/demo/test_camera.py
+++ b/tests/components/demo/test_camera.py
@@ -14,7 +14,7 @@ from homeassistant.components.camera import (
     async_get_image,
 )
 from homeassistant.components.demo import DOMAIN
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
@@ -22,8 +22,18 @@ from homeassistant.setup import async_setup_component
 ENTITY_CAMERA = "camera.demo_camera"
 
 
+@pytest.fixture
+async def camera_only() -> None:
+    """Enable only the button platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.CAMERA],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def demo_camera(hass):
+async def demo_camera(hass, camera_only):
     """Initialize a demo camera platform."""
     assert await async_setup_component(
         hass, CAMERA_DOMAIN, {CAMERA_DOMAIN: {"platform": DOMAIN}}
diff --git a/tests/components/demo/test_climate.py b/tests/components/demo/test_climate.py
index 7ce19e2143e..fa87c439a4d 100644
--- a/tests/components/demo/test_climate.py
+++ b/tests/components/demo/test_climate.py
@@ -1,4 +1,5 @@
 """The tests for the demo climate component."""
+from unittest.mock import patch
 
 import pytest
 import voluptuous as vol
@@ -40,6 +41,7 @@ from homeassistant.const import (
     SERVICE_TURN_ON,
     STATE_OFF,
     STATE_ON,
+    Platform,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
@@ -50,8 +52,18 @@ ENTITY_ECOBEE = "climate.ecobee"
 ENTITY_HEATPUMP = "climate.heatpump"
 
 
+@pytest.fixture
+async def climate_only() -> None:
+    """Enable only the climate platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.CLIMATE],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_climate(hass):
+async def setup_demo_climate(hass, climate_only):
     """Initialize setup demo climate."""
     hass.config.units = METRIC_SYSTEM
     assert await async_setup_component(hass, DOMAIN, {"climate": {"platform": "demo"}})
diff --git a/tests/components/demo/test_cover.py b/tests/components/demo/test_cover.py
index d6b44b06b9a..3a8fbb02f80 100644
--- a/tests/components/demo/test_cover.py
+++ b/tests/components/demo/test_cover.py
@@ -1,5 +1,6 @@
 """The tests for the Demo cover platform."""
 from datetime import timedelta
+from unittest.mock import patch
 
 import pytest
 
@@ -27,6 +28,7 @@ from homeassistant.const import (
     STATE_CLOSING,
     STATE_OPEN,
     STATE_OPENING,
+    Platform,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
@@ -39,7 +41,17 @@ ENTITY_COVER = "cover.living_room_window"
 
 
 @pytest.fixture
-async def setup_comp(hass):
+async def cover_only() -> None:
+    """Enable only the climate platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.COVER],
+    ):
+        yield
+
+
+@pytest.fixture
+async def setup_comp(hass, cover_only):
     """Set up demo cover component."""
     with assert_setup_component(1, DOMAIN):
         await async_setup_component(hass, DOMAIN, CONFIG)
diff --git a/tests/components/demo/test_date.py b/tests/components/demo/test_date.py
index c42ba06667e..d0208c8e6dd 100644
--- a/tests/components/demo/test_date.py
+++ b/tests/components/demo/test_date.py
@@ -1,16 +1,28 @@
 """The tests for the demo date component."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.components.date import ATTR_DATE, DOMAIN, SERVICE_SET_VALUE
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 ENTITY_DATE = "date.date"
 
 
+@pytest.fixture
+async def date_only() -> None:
+    """Enable only the date platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.DATE],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_date(hass: HomeAssistant) -> None:
+async def setup_demo_date(hass: HomeAssistant, date_only) -> None:
     """Initialize setup demo date."""
     assert await async_setup_component(hass, DOMAIN, {"date": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_datetime.py b/tests/components/demo/test_datetime.py
index 90019f46af5..41ed6969df3 100644
--- a/tests/components/demo/test_datetime.py
+++ b/tests/components/demo/test_datetime.py
@@ -1,16 +1,28 @@
 """The tests for the demo datetime component."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.components.datetime import ATTR_DATETIME, DOMAIN, SERVICE_SET_VALUE
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 ENTITY_DATETIME = "datetime.date_and_time"
 
 
+@pytest.fixture
+async def datetime_only() -> None:
+    """Enable only the datetime platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.DATETIME],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_datetime(hass: HomeAssistant) -> None:
+async def setup_demo_datetime(hass: HomeAssistant, datetime_only) -> None:
     """Initialize setup demo datetime."""
     assert await async_setup_component(hass, DOMAIN, {"datetime": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_fan.py b/tests/components/demo/test_fan.py
index 773b94b3482..9c1b84313f6 100644
--- a/tests/components/demo/test_fan.py
+++ b/tests/components/demo/test_fan.py
@@ -32,7 +32,7 @@ PERCENTAGE_MODEL_FANS = ["fan.percentage_full_fan", "fan.percentage_limited_fan"
 
 
 @pytest.fixture(autouse=True)
-async def setup_comp(hass):
+async def setup_comp(hass, disable_platforms):
     """Initialize components."""
     assert await async_setup_component(hass, fan.DOMAIN, {"fan": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_geo_location.py b/tests/components/demo/test_geo_location.py
index 431db116f36..8cd176934bc 100644
--- a/tests/components/demo/test_geo_location.py
+++ b/tests/components/demo/test_geo_location.py
@@ -21,7 +21,7 @@ from tests.common import assert_setup_component, async_fire_time_changed
 CONFIG = {geo_location.DOMAIN: [{"platform": "demo"}]}
 
 
-async def test_setup_platform(hass: HomeAssistant) -> None:
+async def test_setup_platform(hass: HomeAssistant, disable_platforms) -> None:
     """Test setup of demo platform via configuration."""
     utcnow = dt_util.utcnow()
     # Patching 'utcnow' to gain more control over the timed update.
diff --git a/tests/components/demo/test_humidifier.py b/tests/components/demo/test_humidifier.py
index 565c0ebcad1..13aeb5724b9 100644
--- a/tests/components/demo/test_humidifier.py
+++ b/tests/components/demo/test_humidifier.py
@@ -4,6 +4,8 @@ import pytest
 import voluptuous as vol
 
 from homeassistant.components.humidifier import (
+    ATTR_ACTION,
+    ATTR_CURRENT_HUMIDITY,
     ATTR_HUMIDITY,
     ATTR_MAX_HUMIDITY,
     ATTR_MIN_HUMIDITY,
@@ -30,7 +32,7 @@ ENTITY_HUMIDIFIER = "humidifier.humidifier"
 
 
 @pytest.fixture(autouse=True)
-async def setup_demo_humidifier(hass):
+async def setup_demo_humidifier(hass, disable_platforms):
     """Initialize setup demo humidifier."""
     assert await async_setup_component(
         hass, DOMAIN, {"humidifier": {"platform": "demo"}}
@@ -43,6 +45,8 @@ def test_setup_params(hass: HomeAssistant) -> None:
     state = hass.states.get(ENTITY_DEHUMIDIFIER)
     assert state.state == STATE_ON
     assert state.attributes.get(ATTR_HUMIDITY) == 54
+    assert state.attributes.get(ATTR_CURRENT_HUMIDITY) == 59
+    assert state.attributes.get(ATTR_ACTION) == "drying"
 
 
 def test_default_setup_params(hass: HomeAssistant) -> None:
@@ -122,12 +126,14 @@ async def test_turn_on(hass: HomeAssistant) -> None:
     )
     state = hass.states.get(ENTITY_DEHUMIDIFIER)
     assert state.state == STATE_OFF
+    assert state.attributes.get(ATTR_ACTION) == "off"
 
     await hass.services.async_call(
         DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: ENTITY_DEHUMIDIFIER}, blocking=True
     )
     state = hass.states.get(ENTITY_DEHUMIDIFIER)
     assert state.state == STATE_ON
+    assert state.attributes.get(ATTR_ACTION) == "drying"
 
 
 async def test_turn_off(hass: HomeAssistant) -> None:
@@ -137,12 +143,14 @@ async def test_turn_off(hass: HomeAssistant) -> None:
     )
     state = hass.states.get(ENTITY_DEHUMIDIFIER)
     assert state.state == STATE_ON
+    assert state.attributes.get(ATTR_ACTION) == "drying"
 
     await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_DEHUMIDIFIER}, blocking=True
     )
     state = hass.states.get(ENTITY_DEHUMIDIFIER)
     assert state.state == STATE_OFF
+    assert state.attributes.get(ATTR_ACTION) == "off"
 
 
 async def test_toggle(hass: HomeAssistant) -> None:
diff --git a/tests/components/demo/test_light.py b/tests/components/demo/test_light.py
index d5a3b7434b2..90fa26885dc 100644
--- a/tests/components/demo/test_light.py
+++ b/tests/components/demo/test_light.py
@@ -1,4 +1,6 @@
 """The tests for the demo light component."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.components.demo import DOMAIN
@@ -16,15 +18,25 @@ from homeassistant.components.light import (
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
 )
-from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 ENTITY_LIGHT = "light.bed_light"
 
 
+@pytest.fixture
+async def light_only() -> None:
+    """Enable only the light platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.LIGHT],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_comp(hass):
+async def setup_comp(hass, light_only):
     """Set up demo component."""
     assert await async_setup_component(
         hass, LIGHT_DOMAIN, {LIGHT_DOMAIN: {"platform": DOMAIN}}
diff --git a/tests/components/demo/test_lock.py b/tests/components/demo/test_lock.py
index d859eaeef94..377f9f2d765 100644
--- a/tests/components/demo/test_lock.py
+++ b/tests/components/demo/test_lock.py
@@ -28,7 +28,7 @@ OPENABLE_LOCK = "lock.openable_lock"
 
 
 @pytest.fixture(autouse=True)
-async def setup_comp(hass):
+async def setup_comp(hass, disable_platforms):
     """Set up demo component."""
     assert await async_setup_component(
         hass, LOCK_DOMAIN, {LOCK_DOMAIN: {"platform": DOMAIN}}
diff --git a/tests/components/demo/test_media_player.py b/tests/components/demo/test_media_player.py
index c9ea785678a..1681cdb9101 100644
--- a/tests/components/demo/test_media_player.py
+++ b/tests/components/demo/test_media_player.py
@@ -23,6 +23,11 @@ from tests.typing import ClientSessionGenerator
 TEST_ENTITY_ID = "media_player.walkman"
 
 
+@pytest.fixture(autouse=True)
+def autouse_disable_platforms(disable_platforms):
+    """Auto use the disable_platforms fixture."""
+
+
 @pytest.fixture(name="mock_media_seek")
 def media_player_media_seek_fixture():
     """Mock demo YouTube player media seek."""
diff --git a/tests/components/demo/test_notify.py b/tests/components/demo/test_notify.py
index 40bc7db2cc3..96ffcdec96b 100644
--- a/tests/components/demo/test_notify.py
+++ b/tests/components/demo/test_notify.py
@@ -16,6 +16,11 @@ from tests.common import assert_setup_component, async_capture_events
 CONFIG = {notify.DOMAIN: {"platform": "demo"}}
 
 
+@pytest.fixture(autouse=True)
+def autouse_disable_platforms(disable_platforms):
+    """Auto use the disable_platforms fixture."""
+
+
 @pytest.fixture
 def events(hass):
     """Fixture that catches notify events."""
diff --git a/tests/components/demo/test_number.py b/tests/components/demo/test_number.py
index b87c6690cf5..f444b2f4831 100644
--- a/tests/components/demo/test_number.py
+++ b/tests/components/demo/test_number.py
@@ -1,4 +1,5 @@
 """The tests for the demo number component."""
+from unittest.mock import patch
 
 import pytest
 import voluptuous as vol
@@ -12,7 +13,7 @@ from homeassistant.components.number import (
     SERVICE_SET_VALUE,
     NumberMode,
 )
-from homeassistant.const import ATTR_ENTITY_ID, ATTR_MODE
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_MODE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -22,8 +23,18 @@ ENTITY_LARGE_RANGE = "number.large_range"
 ENTITY_SMALL_RANGE = "number.small_range"
 
 
+@pytest.fixture
+async def number_only() -> None:
+    """Enable only the number platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.NUMBER],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_number(hass):
+async def setup_demo_number(hass, number_only):
     """Initialize setup demo Number entity."""
     assert await async_setup_component(hass, DOMAIN, {"number": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_remote.py b/tests/components/demo/test_remote.py
index 943d1fb3886..d1e5b4007ca 100644
--- a/tests/components/demo/test_remote.py
+++ b/tests/components/demo/test_remote.py
@@ -18,7 +18,7 @@ SERVICE_SEND_COMMAND = "send_command"
 
 
 @pytest.fixture(autouse=True)
-async def setup_component(hass):
+async def setup_component(hass, disable_platforms):
     """Initialize components."""
     assert await async_setup_component(
         hass, remote.DOMAIN, {"remote": {"platform": "demo"}}
diff --git a/tests/components/demo/test_select.py b/tests/components/demo/test_select.py
index 06b8beac5fe..a4fff2a231e 100644
--- a/tests/components/demo/test_select.py
+++ b/tests/components/demo/test_select.py
@@ -1,4 +1,5 @@
 """The tests for the demo select component."""
+from unittest.mock import patch
 
 import pytest
 
@@ -8,15 +9,25 @@ from homeassistant.components.select import (
     DOMAIN,
     SERVICE_SELECT_OPTION,
 )
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 ENTITY_SPEED = "select.speed"
 
 
+@pytest.fixture
+async def select_only() -> None:
+    """Enable only the select platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.SELECT],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_select(hass: HomeAssistant) -> None:
+async def setup_demo_select(hass: HomeAssistant, select_only) -> None:
     """Initialize setup demo select entity."""
     assert await async_setup_component(hass, DOMAIN, {"select": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_sensor.py b/tests/components/demo/test_sensor.py
index 71c212694c4..0fbe8f3fa7f 100644
--- a/tests/components/demo/test_sensor.py
+++ b/tests/components/demo/test_sensor.py
@@ -1,5 +1,6 @@
 """The tests for the demo sensor component."""
 from datetime import timedelta
+from unittest.mock import patch
 
 from freezegun.api import FrozenDateTimeFactory
 import pytest
@@ -7,12 +8,23 @@ import pytest
 from homeassistant import core as ha
 from homeassistant.components.demo import DOMAIN
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 from tests.common import mock_restore_cache_with_extra_data
 
 
+@pytest.fixture(autouse=True)
+async def sensor_only() -> None:
+    """Enable only the sensor platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.SENSOR],
+    ):
+        yield
+
+
 @pytest.mark.parametrize(("entity_id", "delta"), (("sensor.total_energy_kwh", 0.5),))
 async def test_energy_sensor(
     hass: HomeAssistant, entity_id, delta, freezer: FrozenDateTimeFactory
diff --git a/tests/components/demo/test_siren.py b/tests/components/demo/test_siren.py
index 21c464c7325..8051aaf5b20 100644
--- a/tests/components/demo/test_siren.py
+++ b/tests/components/demo/test_siren.py
@@ -25,7 +25,7 @@ ENTITY_SIREN_WITH_ALL_FEATURES = "siren.siren_with_all_features"
 
 
 @pytest.fixture(autouse=True)
-async def setup_demo_siren(hass):
+async def setup_demo_siren(hass, disable_platforms):
     """Initialize setup demo siren."""
     assert await async_setup_component(hass, DOMAIN, {"siren": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_stt.py b/tests/components/demo/test_stt.py
index 5d4242844ee..6ce25135ae0 100644
--- a/tests/components/demo/test_stt.py
+++ b/tests/components/demo/test_stt.py
@@ -4,42 +4,38 @@ from unittest.mock import patch
 
 import pytest
 
-from homeassistant.components import stt
 from homeassistant.components.demo import DOMAIN as DEMO_DOMAIN
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
 from tests.typing import ClientSessionGenerator
 
 
 @pytest.fixture
-async def setup_legacy_platform(hass: HomeAssistant) -> None:
-    """Set up legacy demo platform."""
-    assert await async_setup_component(hass, stt.DOMAIN, {"stt": {"platform": "demo"}})
-    await hass.async_block_till_done()
-
-
-@pytest.fixture
-async def setup_config_entry(hass: HomeAssistant) -> None:
-    """Set up demo component from config entry."""
-    config_entry = MockConfigEntry(domain=DEMO_DOMAIN)
-    config_entry.add_to_hass(hass)
+async def stt_only(hass: HomeAssistant) -> None:
+    """Enable only the stt platform."""
     with patch(
         "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
         [Platform.STT],
     ):
-        assert await hass.config_entries.async_setup(config_entry.entry_id)
+        yield
+
+
+@pytest.fixture(autouse=True)
+async def setup_config_entry(hass: HomeAssistant, stt_only) -> None:
+    """Set up demo component from config entry."""
+    config_entry = MockConfigEntry(domain=DEMO_DOMAIN)
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
 
-@pytest.mark.usefixtures("setup_legacy_platform")
 async def test_demo_settings(hass_client: ClientSessionGenerator) -> None:
     """Test retrieve settings from demo provider."""
     client = await hass_client()
 
-    response = await client.get("/api/stt/demo")
+    response = await client.get("/api/stt/stt.demo_stt")
     response_data = await response.json()
 
     assert response.status == HTTPStatus.OK
@@ -53,22 +49,20 @@ async def test_demo_settings(hass_client: ClientSessionGenerator) -> None:
     }
 
 
-@pytest.mark.usefixtures("setup_legacy_platform")
 async def test_demo_speech_no_metadata(hass_client: ClientSessionGenerator) -> None:
     """Test retrieve settings from demo provider."""
     client = await hass_client()
 
-    response = await client.post("/api/stt/demo", data=b"Test")
+    response = await client.post("/api/stt/stt.demo_stt", data=b"Test")
     assert response.status == HTTPStatus.BAD_REQUEST
 
 
-@pytest.mark.usefixtures("setup_legacy_platform")
 async def test_demo_speech_wrong_metadata(hass_client: ClientSessionGenerator) -> None:
     """Test retrieve settings from demo provider."""
     client = await hass_client()
 
     response = await client.post(
-        "/api/stt/demo",
+        "/api/stt/stt.demo_stt",
         headers={
             "X-Speech-Content": (
                 "format=wav; codec=pcm; sample_rate=8000; bit_rate=16; channel=1;"
@@ -80,13 +74,12 @@ async def test_demo_speech_wrong_metadata(hass_client: ClientSessionGenerator) -
     assert response.status == HTTPStatus.UNSUPPORTED_MEDIA_TYPE
 
 
-@pytest.mark.usefixtures("setup_legacy_platform")
 async def test_demo_speech(hass_client: ClientSessionGenerator) -> None:
     """Test retrieve settings from demo provider."""
     client = await hass_client()
 
     response = await client.post(
-        "/api/stt/demo",
+        "/api/stt/stt.demo_stt",
         headers={
             "X-Speech-Content": (
                 "format=wav; codec=pcm; sample_rate=16000; bit_rate=16; channel=2;"
diff --git a/tests/components/demo/test_switch.py b/tests/components/demo/test_switch.py
index 30c07b49573..95963ba0cbd 100644
--- a/tests/components/demo/test_switch.py
+++ b/tests/components/demo/test_switch.py
@@ -1,4 +1,6 @@
 """The tests for the demo switch component."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.components.demo import DOMAIN
@@ -7,15 +9,25 @@ from homeassistant.components.switch import (
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
 )
-from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 SWITCH_ENTITY_IDS = ["switch.decorative_lights", "switch.ac"]
 
 
+@pytest.fixture
+async def switch_only() -> None:
+    """Enable only the switch platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.SWITCH],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_comp(hass):
+async def setup_comp(hass, switch_only):
     """Set up demo component."""
     assert await async_setup_component(
         hass, SWITCH_DOMAIN, {SWITCH_DOMAIN: {"platform": DOMAIN}}
diff --git a/tests/components/demo/test_text.py b/tests/components/demo/test_text.py
index bfeca29f1dd..2b8d8d122a3 100644
--- a/tests/components/demo/test_text.py
+++ b/tests/components/demo/test_text.py
@@ -1,4 +1,6 @@
 """The tests for the demo text component."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.components.text import (
@@ -9,15 +11,30 @@ from homeassistant.components.text import (
     DOMAIN,
     SERVICE_SET_VALUE,
 )
-from homeassistant.const import ATTR_ENTITY_ID, ATTR_MODE, MAX_LENGTH_STATE_STATE
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ATTR_MODE,
+    MAX_LENGTH_STATE_STATE,
+    Platform,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 ENTITY_TEXT = "text.text"
 
 
+@pytest.fixture
+async def text_only() -> None:
+    """Enable only the text platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.TEXT],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_text(hass):
+async def setup_demo_text(hass, text_only):
     """Initialize setup demo text."""
     assert await async_setup_component(hass, DOMAIN, {"text": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_time.py b/tests/components/demo/test_time.py
index 555cfe3ffc9..efa62c1436b 100644
--- a/tests/components/demo/test_time.py
+++ b/tests/components/demo/test_time.py
@@ -1,16 +1,28 @@
 """The tests for the demo time component."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.components.time import ATTR_TIME, DOMAIN, SERVICE_SET_VALUE
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 ENTITY_TIME = "time.time"
 
 
+@pytest.fixture
+async def time_only() -> None:
+    """Enable only the time platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.TIME],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_datetime(hass: HomeAssistant) -> None:
+async def setup_demo_datetime(hass: HomeAssistant, time_only) -> None:
     """Initialize setup demo time."""
     assert await async_setup_component(hass, DOMAIN, {"time": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_update.py b/tests/components/demo/test_update.py
index c06483b7bdc..a645c45019c 100644
--- a/tests/components/demo/test_update.py
+++ b/tests/components/demo/test_update.py
@@ -20,14 +20,25 @@ from homeassistant.const import (
     ATTR_ENTITY_PICTURE,
     STATE_OFF,
     STATE_ON,
+    Platform,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.setup import async_setup_component
 
 
+@pytest.fixture
+async def update_only() -> None:
+    """Enable only the update platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.UPDATE],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_update(hass: HomeAssistant) -> None:
+async def setup_demo_update(hass: HomeAssistant, update_only) -> None:
     """Initialize setup demo update entity."""
     assert await async_setup_component(hass, DOMAIN, {"update": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_vacuum.py b/tests/components/demo/test_vacuum.py
index 38bb9418091..bc003c6e27b 100644
--- a/tests/components/demo/test_vacuum.py
+++ b/tests/components/demo/test_vacuum.py
@@ -52,7 +52,7 @@ ENTITY_VACUUM_STATE = f"{DOMAIN}.{DEMO_VACUUM_STATE}".lower()
 
 
 @pytest.fixture(autouse=True)
-async def setup_demo_vacuum(hass):
+async def setup_demo_vacuum(hass, disable_platforms):
     """Initialize setup demo vacuum."""
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_water_heater.py b/tests/components/demo/test_water_heater.py
index bbe28b8a5e5..9e45b4e39bf 100644
--- a/tests/components/demo/test_water_heater.py
+++ b/tests/components/demo/test_water_heater.py
@@ -14,7 +14,7 @@ ENTITY_WATER_HEATER_CELSIUS = "water_heater.demo_water_heater_celsius"
 
 
 @pytest.fixture(autouse=True)
-async def setup_comp(hass):
+async def setup_comp(hass, disable_platforms):
     """Set up demo component."""
     hass.config.units = US_CUSTOMARY_SYSTEM
     assert await async_setup_component(
diff --git a/tests/components/demo/test_weather.py b/tests/components/demo/test_weather.py
index 92005491cef..b2b789a084f 100644
--- a/tests/components/demo/test_weather.py
+++ b/tests/components/demo/test_weather.py
@@ -20,7 +20,7 @@ from homeassistant.setup import async_setup_component
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
 
-async def test_attributes(hass: HomeAssistant) -> None:
+async def test_attributes(hass: HomeAssistant, disable_platforms) -> None:
     """Test weather attributes."""
     assert await async_setup_component(
         hass, weather.DOMAIN, {"weather": {"platform": "demo"}}
diff --git a/tests/components/derivative/test_sensor.py b/tests/components/derivative/test_sensor.py
index 8260e5a0ada..2d1d7a93afc 100644
--- a/tests/components/derivative/test_sensor.py
+++ b/tests/components/derivative/test_sensor.py
@@ -5,11 +5,15 @@ import random
 
 from freezegun import freeze_time
 
+from homeassistant.components.derivative.const import DOMAIN
 from homeassistant.const import UnitOfPower, UnitOfTime
 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 tests.common import MockConfigEntry
+
 
 async def test_state(hass: HomeAssistant) -> None:
     """Test derivative sensor state."""
@@ -342,3 +346,48 @@ async def test_suffix(hass: HomeAssistant) -> None:
 
     # Testing a network speed sensor at 1000 bytes/s over 10s  = 10kbytes/s2
     assert round(float(state.state), config["sensor"]["round"]) == 0.0
+
+
+async def test_device_id(hass: HomeAssistant) -> None:
+    """Test for source entity device for Derivative."""
+    device_registry = dr.async_get(hass)
+    entity_registry = er.async_get(hass)
+
+    source_config_entry = MockConfigEntry()
+    source_device_entry = device_registry.async_get_or_create(
+        config_entry_id=source_config_entry.entry_id,
+        identifiers={("sensor", "identifier_test")},
+        connections={("mac", "30:31:32:33:34:35")},
+    )
+    source_entity = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source",
+        config_entry=source_config_entry,
+        device_id=source_device_entry.id,
+    )
+    await hass.async_block_till_done()
+    assert entity_registry.async_get("sensor.test_source") is not None
+
+    derivative_config_entry = MockConfigEntry(
+        data={},
+        domain=DOMAIN,
+        options={
+            "name": "Derivative",
+            "round": 1.0,
+            "source": "sensor.test_source",
+            "time_window": {"seconds": 0.0},
+            "unit_prefix": "k",
+            "unit_time": "min",
+        },
+        title="Derivative",
+    )
+
+    derivative_config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(derivative_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    derivative_entity = entity_registry.async_get("sensor.derivative")
+    assert derivative_entity is not None
+    assert derivative_entity.device_id == source_entity.device_id
diff --git a/tests/components/device_automation/test_init.py b/tests/components/device_automation/test_init.py
index d48fb520eba..d0f013299b1 100644
--- a/tests/components/device_automation/test_init.py
+++ b/tests/components/device_automation/test_init.py
@@ -114,7 +114,7 @@ async def test_websocket_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         "fake_integration", "test", "5678", device_id=device_entry.id
     )
     expected_actions = [
@@ -122,21 +122,21 @@ async def test_websocket_get_actions(
             "domain": "fake_integration",
             "type": "turn_off",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
         {
             "domain": "fake_integration",
             "type": "turn_on",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
         {
             "domain": "fake_integration",
             "type": "toggle",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
@@ -169,7 +169,7 @@ async def test_websocket_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         "fake_integration", "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -178,7 +178,7 @@ async def test_websocket_get_conditions(
             "domain": "fake_integration",
             "type": "is_off",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
         {
@@ -186,7 +186,7 @@ async def test_websocket_get_conditions(
             "domain": "fake_integration",
             "type": "is_on",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
@@ -223,7 +223,7 @@ async def test_websocket_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         "fake_integration", "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -232,7 +232,7 @@ async def test_websocket_get_triggers(
             "domain": "fake_integration",
             "type": "changed_states",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
         {
@@ -240,7 +240,7 @@ async def test_websocket_get_triggers(
             "domain": "fake_integration",
             "type": "turned_off",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
         {
@@ -248,7 +248,7 @@ async def test_websocket_get_triggers(
             "domain": "fake_integration",
             "type": "turned_on",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
diff --git a/tests/components/device_tracker/test_device_condition.py b/tests/components/device_tracker/test_device_condition.py
index 4ef22f77ca3..008a7eb75c4 100644
--- a/tests/components/device_tracker/test_device_condition.py
+++ b/tests/components/device_tracker/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Device tracker device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -12,7 +13,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -41,7 +41,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -50,7 +50,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in ["is_not_home", "is_home"]
@@ -58,7 +58,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -84,7 +84,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -98,7 +98,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_not_home", "is_home"]
@@ -106,12 +106,16 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("device_tracker.entity", STATE_HOME)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_HOME)
 
     assert await async_setup_component(
         hass,
@@ -125,7 +129,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "device_tracker.entity",
+                            "entity_id": entry.id,
                             "type": "is_home",
                         }
                     ],
@@ -147,7 +151,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "device_tracker.entity",
+                            "entity_id": entry.id,
                             "type": "is_not_home",
                         }
                     ],
@@ -171,9 +175,54 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_home - event - test_event1"
 
-    hass.states.async_set("device_tracker.entity", "school")
+    hass.states.async_set(entry.entity_id, "school")
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_not_home - event - test_event2"
+
+
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_HOME)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_home",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "is_home "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.event.event_type }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_event2")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_home - event - test_event1"
diff --git a/tests/components/device_tracker/test_device_trigger.py b/tests/components/device_tracker/test_device_trigger.py
index 677e5e1d547..75209ec607b 100644
--- a/tests/components/device_tracker/test_device_trigger.py
+++ b/tests/components/device_tracker/test_device_trigger.py
@@ -1,5 +1,6 @@
 """The tests for Device Tracker device triggers."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -18,7 +19,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -73,7 +73,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -82,7 +82,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["leaves", "enters"]
@@ -90,7 +90,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -116,7 +116,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -130,7 +130,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["leaves", "enters"]
@@ -138,13 +138,17 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
-async def test_if_fires_on_zone_change(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_zone_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for enter and leave triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "device_tracker.entity",
+        entry.entity_id,
         "state",
         {"latitude": AWAY_LATITUDE, "longitude": AWAY_LONGITUDE},
     )
@@ -159,7 +163,7 @@ async def test_if_fires_on_zone_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "device_tracker.entity",
+                        "entity_id": entry.id,
                         "type": "enters",
                         "zone": "zone.test",
                     },
@@ -183,7 +187,7 @@ async def test_if_fires_on_zone_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "device_tracker.entity",
+                        "entity_id": entry.id,
                         "type": "leaves",
                         "zone": "zone.test",
                     },
@@ -208,26 +212,87 @@ async def test_if_fires_on_zone_change(hass: HomeAssistant, calls) -> None:
 
     # Fake that the entity is entering.
     hass.states.async_set(
-        "device_tracker.entity",
+        entry.entity_id,
         "state",
         {"latitude": HOME_LATITUDE, "longitude": HOME_LONGITUDE},
     )
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data["some"] == "enter - device - {} - -117.235 - -117.238".format(
-        "device_tracker.entity"
+    assert (
+        calls[0].data["some"]
+        == f"enter - device - {entry.entity_id} - -117.235 - -117.238"
     )
 
     # Fake that the entity is leaving.
     hass.states.async_set(
-        "device_tracker.entity",
+        entry.entity_id,
         "state",
         {"latitude": AWAY_LATITUDE, "longitude": AWAY_LONGITUDE},
     )
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data["some"] == "leave - device - {} - -117.238 - -117.235".format(
-        "device_tracker.entity"
+    assert (
+        calls[1].data["some"]
+        == f"leave - device - {entry.entity_id} - -117.238 - -117.235"
+    )
+
+
+async def test_if_fires_on_zone_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for enter and leave triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(
+        entry.entity_id,
+        "state",
+        {"latitude": AWAY_LATITUDE, "longitude": AWAY_LONGITUDE},
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "enters",
+                        "zone": "zone.test",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "enter "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.entity_id }} "
+                                "- {{ "
+                                "    trigger.from_state.attributes.longitude|round(3) "
+                                "  }} "
+                                "- {{ trigger.to_state.attributes.longitude|round(3) }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the entity is entering.
+    hass.states.async_set(
+        entry.entity_id,
+        "state",
+        {"latitude": HOME_LATITUDE, "longitude": HOME_LONGITUDE},
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"enter - device - {entry.entity_id} - -117.235 - -117.238"
     )
 
 
@@ -243,7 +308,7 @@ async def test_get_trigger_capabilities(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     capabilities = await device_trigger.async_get_trigger_capabilities(
@@ -253,7 +318,46 @@ async def test_get_trigger_capabilities(
             "domain": DOMAIN,
             "type": "enters",
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
+        },
+    )
+    assert capabilities and "extra_fields" in capabilities
+
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "zone",
+            "required": True,
+            "type": "select",
+            "options": [("zone.test", "test"), ("zone.home", "test home")],
+        }
+    ]
+
+
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a device_tracker trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    capabilities = await device_trigger.async_get_trigger_capabilities(
+        hass,
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "type": "enters",
+            "device_id": device_entry.id,
+            "entity_id": entity_entry.entity_id,
         },
     )
     assert capabilities and "extra_fields" in capabilities
diff --git a/tests/components/devolo_home_network/__init__.py b/tests/components/devolo_home_network/__init__.py
index 9340f7d2283..ac6a960fd8f 100644
--- a/tests/components/devolo_home_network/__init__.py
+++ b/tests/components/devolo_home_network/__init__.py
@@ -14,7 +14,7 @@ def configure_integration(hass: HomeAssistant) -> MockConfigEntry:
         CONF_IP_ADDRESS: IP,
         CONF_PASSWORD: "test",
     }
-    entry = MockConfigEntry(domain=DOMAIN, data=config)
+    entry = MockConfigEntry(domain=DOMAIN, data=config, entry_id="123456")
     entry.add_to_hass(hass)
 
     return entry
diff --git a/tests/components/devolo_home_network/snapshots/test_binary_sensor.ambr b/tests/components/devolo_home_network/snapshots/test_binary_sensor.ambr
new file mode 100644
index 00000000000..f247f2dc1f0
--- /dev/null
+++ b/tests/components/devolo_home_network/snapshots/test_binary_sensor.ambr
@@ -0,0 +1,45 @@
+# serializer version: 1
+# name: test_update_attached_to_router
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'plug',
+      'friendly_name': 'Mock Title Connected to router',
+      'icon': 'mdi:router-network',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.mock_title_connected_to_router',
+    'last_changed': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_update_attached_to_router.1
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.mock_title_connected_to_router',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PLUG: 'plug'>,
+    'original_icon': 'mdi:router-network',
+    'original_name': 'Connected to router',
+    'platform': 'devolo_home_network',
+    'supported_features': 0,
+    'translation_key': 'connected_to_router',
+    'unique_id': '1234567890_connected_to_router',
+    'unit_of_measurement': None,
+  })
+# ---
diff --git a/tests/components/devolo_home_network/snapshots/test_device_tracker.ambr b/tests/components/devolo_home_network/snapshots/test_device_tracker.ambr
new file mode 100644
index 00000000000..d438aca6a4a
--- /dev/null
+++ b/tests/components/devolo_home_network/snapshots/test_device_tracker.ambr
@@ -0,0 +1,17 @@
+# serializer version: 1
+# name: test_device_tracker
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'band': '5 GHz',
+      'icon': 'mdi:lan-connect',
+      'mac': 'AA:BB:CC:DD:EE:FF',
+      'source_type': <SourceType.ROUTER: 'router'>,
+      'wifi': 'Main',
+    }),
+    'context': <ANY>,
+    'entity_id': 'device_tracker.devolo_home_network_1234567890_aa_bb_cc_dd_ee_ff',
+    'last_changed': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'home',
+  })
+# ---
diff --git a/tests/components/devolo_home_network/snapshots/test_diagnostics.ambr b/tests/components/devolo_home_network/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000..236588b87ad
--- /dev/null
+++ b/tests/components/devolo_home_network/snapshots/test_diagnostics.ambr
@@ -0,0 +1,37 @@
+# serializer version: 1
+# name: test_entry_diagnostics
+  dict({
+    'device_info': dict({
+      'device_api': True,
+      'features': list([
+        'intmtg1',
+        'led',
+        'reset',
+        'restart',
+        'update',
+        'wifi1',
+      ]),
+      'firmware': '5.6.1',
+      'mt_number': '2730',
+      'plcnet_api': True,
+      'product': 'dLAN pro 1200+ WiFi ac',
+    }),
+    'entry': dict({
+      'data': dict({
+        'ip_address': '192.0.2.1',
+        'password': '**REDACTED**',
+      }),
+      'disabled_by': None,
+      'domain': 'devolo_home_network',
+      'entry_id': '123456',
+      'options': dict({
+      }),
+      'pref_disable_new_entities': False,
+      'pref_disable_polling': False,
+      'source': 'user',
+      'title': 'Mock Title',
+      'unique_id': None,
+      'version': 1,
+    }),
+  })
+# ---
diff --git a/tests/components/devolo_home_network/snapshots/test_switch.ambr b/tests/components/devolo_home_network/snapshots/test_switch.ambr
new file mode 100644
index 00000000000..600c9478035
--- /dev/null
+++ b/tests/components/devolo_home_network/snapshots/test_switch.ambr
@@ -0,0 +1,173 @@
+# serializer version: 1
+# name: test_switches[enable_guest_wifi-async_get_wifi_guest_access-async_set_wifi_guest_access-interval0]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Mock Title Enable guest Wifi',
+      'icon': 'mdi:wifi',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.mock_title_enable_guest_wifi',
+    'last_changed': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_switches[enable_guest_wifi-async_get_wifi_guest_access-async_set_wifi_guest_access-interval0].1
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.mock_title_enable_guest_wifi',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:wifi',
+    'original_name': 'Enable guest Wifi',
+    'platform': 'devolo_home_network',
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234567890_switch_guest_wifi',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_switches[enable_leds-async_get_led_setting-async_set_led_setting-interval1]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Mock Title Enable LEDs',
+      'icon': 'mdi:led-off',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.mock_title_enable_leds',
+    'last_changed': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_switches[enable_leds-async_get_led_setting-async_set_led_setting-interval1].1
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'switch.mock_title_enable_leds',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:led-off',
+    'original_name': 'Enable LEDs',
+    'platform': 'devolo_home_network',
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234567890_switch_leds',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_update_enable_guest_wifi
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Mock Title Enable guest Wifi',
+      'icon': 'mdi:wifi',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.mock_title_enable_guest_wifi',
+    'last_changed': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_update_enable_guest_wifi.1
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.mock_title_enable_guest_wifi',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:wifi',
+    'original_name': 'Enable guest Wifi',
+    'platform': 'devolo_home_network',
+    'supported_features': 0,
+    'translation_key': 'switch_guest_wifi',
+    'unique_id': '1234567890_switch_guest_wifi',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_update_enable_leds
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Mock Title Enable LEDs',
+      'icon': 'mdi:led-off',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.mock_title_enable_leds',
+    'last_changed': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_update_enable_leds.1
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'switch.mock_title_enable_leds',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:led-off',
+    'original_name': 'Enable LEDs',
+    'platform': 'devolo_home_network',
+    'supported_features': 0,
+    'translation_key': 'switch_leds',
+    'unique_id': '1234567890_switch_leds',
+    'unit_of_measurement': None,
+  })
+# ---
diff --git a/tests/components/devolo_home_network/test_binary_sensor.py b/tests/components/devolo_home_network/test_binary_sensor.py
index fc9cb232989..7a6395c20f1 100644
--- a/tests/components/devolo_home_network/test_binary_sensor.py
+++ b/tests/components/devolo_home_network/test_binary_sensor.py
@@ -3,19 +3,14 @@ from unittest.mock import AsyncMock
 
 from devolo_plc_api.exceptions.device import DeviceUnavailable
 import pytest
+from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.binary_sensor import DOMAIN
 from homeassistant.components.devolo_home_network.const import (
     CONNECTED_TO_ROUTER,
     LONG_UPDATE_INTERVAL,
 )
-from homeassistant.const import (
-    ATTR_FRIENDLY_NAME,
-    STATE_OFF,
-    STATE_ON,
-    STATE_UNAVAILABLE,
-    EntityCategory,
-)
+from homeassistant.const import STATE_ON, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.util import dt as dt_util
@@ -42,7 +37,10 @@ async def test_binary_sensor_setup(hass: HomeAssistant) -> None:
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
 async def test_update_attached_to_router(
-    hass: HomeAssistant, mock_device: MockDevice, entity_registry: er.EntityRegistry
+    hass: HomeAssistant,
+    mock_device: MockDevice,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test state change of a attached_to_router binary sensor device."""
     entry = configure_integration(hass)
@@ -52,15 +50,8 @@ async def test_update_attached_to_router(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    state = hass.states.get(state_key)
-    assert state is not None
-    assert state.state == STATE_OFF
-    assert state.attributes[ATTR_FRIENDLY_NAME] == f"{entry.title} Connected to router"
-
-    assert (
-        entity_registry.async_get(state_key).entity_category
-        == EntityCategory.DIAGNOSTIC
-    )
+    assert hass.states.get(state_key) == snapshot
+    assert entity_registry.async_get(state_key) == snapshot
 
     # Emulate device failure
     mock_device.plcnet.async_get_network_overview = AsyncMock(
diff --git a/tests/components/devolo_home_network/test_config_flow.py b/tests/components/devolo_home_network/test_config_flow.py
index 82aa983522e..91d7d6f39cf 100644
--- a/tests/components/devolo_home_network/test_config_flow.py
+++ b/tests/components/devolo_home_network/test_config_flow.py
@@ -31,7 +31,7 @@ from .mock import MockDevice
 from tests.common import MockConfigEntry
 
 
-async def test_form(hass: HomeAssistant, info: dict[str, Any]):
+async def test_form(hass: HomeAssistant, info: dict[str, Any]) -> None:
     """Test we get the form."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
diff --git a/tests/components/devolo_home_network/test_device_tracker.py b/tests/components/devolo_home_network/test_device_tracker.py
index 4ccb16644ce..324f8b44041 100644
--- a/tests/components/devolo_home_network/test_device_tracker.py
+++ b/tests/components/devolo_home_network/test_device_tracker.py
@@ -2,20 +2,14 @@
 from unittest.mock import AsyncMock
 
 from devolo_plc_api.exceptions.device import DeviceUnavailable
+from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.device_tracker import DOMAIN as PLATFORM
 from homeassistant.components.devolo_home_network.const import (
     DOMAIN,
     LONG_UPDATE_INTERVAL,
-    WIFI_APTYPE,
-    WIFI_BANDS,
-)
-from homeassistant.const import (
-    STATE_HOME,
-    STATE_NOT_HOME,
-    STATE_UNAVAILABLE,
-    UnitOfFrequency,
 )
+from homeassistant.const import STATE_NOT_HOME, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.util import dt as dt_util
@@ -31,7 +25,10 @@ SERIAL = DISCOVERY_INFO.properties["SN"]
 
 
 async def test_device_tracker(
-    hass: HomeAssistant, mock_device: MockDevice, entity_registry: er.EntityRegistry
+    hass: HomeAssistant,
+    mock_device: MockDevice,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test device tracker states."""
     state_key = (
@@ -49,14 +46,7 @@ async def test_device_tracker(
     async_fire_time_changed(hass, dt_util.utcnow() + LONG_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
-    state = hass.states.get(state_key)
-    assert state is not None
-    assert state.state == STATE_HOME
-    assert state.attributes["wifi"] == WIFI_APTYPE[STATION.vap_type]
-    assert (
-        state.attributes["band"]
-        == f"{WIFI_BANDS[STATION.band]} {UnitOfFrequency.GIGAHERTZ}"
-    )
+    assert hass.states.get(state_key) == snapshot
 
     # Emulate state change
     mock_device.device.async_get_wifi_connected_station = AsyncMock(
@@ -84,7 +74,9 @@ async def test_device_tracker(
 
 
 async def test_restoring_clients(
-    hass: HomeAssistant, mock_device: MockDevice, entity_registry: er.EntityRegistry
+    hass: HomeAssistant,
+    mock_device: MockDevice,
+    entity_registry: er.EntityRegistry,
 ) -> None:
     """Test restoring existing device_tracker entities."""
     state_key = (
diff --git a/tests/components/devolo_home_network/test_diagnostics.py b/tests/components/devolo_home_network/test_diagnostics.py
index f56f73aac0a..0248d755e22 100644
--- a/tests/components/devolo_home_network/test_diagnostics.py
+++ b/tests/components/devolo_home_network/test_diagnostics.py
@@ -2,14 +2,12 @@
 from __future__ import annotations
 
 import pytest
+from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.components.devolo_home_network.diagnostics import TO_REDACT
-from homeassistant.components.diagnostics import REDACTED
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 
 from . import configure_integration
-from .const import DISCOVERY_INFO
 
 from tests.components.diagnostics import get_diagnostics_for_config_entry
 from tests.typing import ClientSessionGenerator
@@ -19,6 +17,7 @@ from tests.typing import ClientSessionGenerator
 async def test_entry_diagnostics(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test config entry diagnostics."""
     entry = configure_integration(hass)
@@ -27,19 +26,5 @@ async def test_entry_diagnostics(
 
     assert entry.state == ConfigEntryState.LOADED
 
-    entry_dict = entry.as_dict()
-    for key in TO_REDACT:
-        entry_dict["data"][key] = REDACTED
-
     result = await get_diagnostics_for_config_entry(hass, hass_client, entry)
-    assert result == {
-        "entry": entry_dict,
-        "device_info": {
-            "mt_number": DISCOVERY_INFO.properties["MT"],
-            "product": DISCOVERY_INFO.properties["Product"],
-            "firmware": DISCOVERY_INFO.properties["FirmwareVersion"],
-            "device_api": True,
-            "plcnet_api": True,
-            "features": DISCOVERY_INFO.properties["Features"].split(","),
-        },
-    }
+    assert result == snapshot
diff --git a/tests/components/devolo_home_network/test_switch.py b/tests/components/devolo_home_network/test_switch.py
index b2f0e54f971..8b84a0a9344 100644
--- a/tests/components/devolo_home_network/test_switch.py
+++ b/tests/components/devolo_home_network/test_switch.py
@@ -5,6 +5,7 @@ from unittest.mock import AsyncMock, patch
 from devolo_plc_api.device_api import WifiGuestAccessGet
 from devolo_plc_api.exceptions.device import DevicePasswordProtected, DeviceUnavailable
 import pytest
+from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.devolo_home_network.const import (
     DOMAIN,
@@ -18,7 +19,6 @@ from homeassistant.const import (
     STATE_OFF,
     STATE_ON,
     STATE_UNAVAILABLE,
-    EntityCategory,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
@@ -72,7 +72,10 @@ async def test_update_guest_wifi_status_auth_failed(
 
 
 async def test_update_enable_guest_wifi(
-    hass: HomeAssistant, mock_device: MockDevice
+    hass: HomeAssistant,
+    mock_device: MockDevice,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test state change of a enable_guest_wifi switch device."""
     entry = configure_integration(hass)
@@ -82,9 +85,8 @@ async def test_update_enable_guest_wifi(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    state = hass.states.get(state_key)
-    assert state is not None
-    assert state.state == STATE_OFF
+    assert hass.states.get(state_key) == snapshot
+    assert entity_registry.async_get(state_key) == snapshot
 
     # Emulate state change
     mock_device.device.async_get_wifi_guest_access.return_value = WifiGuestAccessGet(
@@ -159,7 +161,10 @@ async def test_update_enable_guest_wifi(
 
 
 async def test_update_enable_leds(
-    hass: HomeAssistant, mock_device: MockDevice, entity_registry: er.EntityRegistry
+    hass: HomeAssistant,
+    mock_device: MockDevice,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test state change of a enable_leds switch device."""
     entry = configure_integration(hass)
@@ -169,11 +174,8 @@ async def test_update_enable_leds(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    state = hass.states.get(state_key)
-    assert state is not None
-    assert state.state == STATE_OFF
-
-    assert entity_registry.async_get(state_key).entity_category == EntityCategory.CONFIG
+    assert hass.states.get(state_key) == snapshot
+    assert entity_registry.async_get(state_key) == snapshot
 
     # Emulate state change
     mock_device.device.async_get_led_setting.return_value = True
diff --git a/tests/components/discovergy/__init__.py b/tests/components/discovergy/__init__.py
new file mode 100644
index 00000000000..321e66ef74e
--- /dev/null
+++ b/tests/components/discovergy/__init__.py
@@ -0,0 +1 @@
+"""Test the Discovergy integration."""
diff --git a/tests/components/discovergy/conftest.py b/tests/components/discovergy/conftest.py
new file mode 100644
index 00000000000..313985bd7d2
--- /dev/null
+++ b/tests/components/discovergy/conftest.py
@@ -0,0 +1,33 @@
+"""Fixtures for Discovergy integration tests."""
+from unittest.mock import AsyncMock, Mock, patch
+
+import pytest
+
+from homeassistant.components.discovergy import DOMAIN
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+from tests.components.discovergy.const import GET_METERS
+
+
+@pytest.fixture
+def mock_meters() -> Mock:
+    """Patch libraries."""
+    with patch("pydiscovergy.Discovergy.get_meters") as discovergy:
+        discovergy.side_effect = AsyncMock(return_value=GET_METERS)
+        yield discovergy
+
+
+@pytest.fixture
+async def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Return a MockConfigEntry for testing."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="user@example.org",
+        unique_id="user@example.org",
+        data={CONF_EMAIL: "user@example.org", CONF_PASSWORD: "supersecretpassword"},
+    )
+    entry.add_to_hass(hass)
+
+    return entry
diff --git a/tests/components/discovergy/const.py b/tests/components/discovergy/const.py
new file mode 100644
index 00000000000..2205a70830e
--- /dev/null
+++ b/tests/components/discovergy/const.py
@@ -0,0 +1,49 @@
+"""Constants for Discovergy integration tests."""
+import datetime
+
+from pydiscovergy.models import Meter, Reading
+
+GET_METERS = [
+    Meter(
+        meterId="f8d610b7a8cc4e73939fa33b990ded54",
+        serialNumber="abc123",
+        fullSerialNumber="abc123",
+        type="TST",
+        measurementType="ELECTRICITY",
+        loadProfileType="SLP",
+        location={
+            "city": "Testhause",
+            "street": "Teststraße",
+            "streetNumber": "1",
+            "country": "Germany",
+        },
+        manufacturerId="TST",
+        printedFullSerialNumber="abc123",
+        administrationNumber="12345",
+        scalingFactor=1,
+        currentScalingFactor=1,
+        voltageScalingFactor=1,
+        internalMeters=1,
+        firstMeasurementTime=1517569090926,
+        lastMeasurementTime=1678430543742,
+    ),
+]
+
+LAST_READING = Reading(
+    time=datetime.datetime(2023, 3, 10, 7, 32, 6, 702000),
+    values={
+        "energy": 119348699715000.0,
+        "energy1": 2254180000.0,
+        "energy2": 119346445534000.0,
+        "energyOut": 55048723044000.0,
+        "energyOut1": 0.0,
+        "energyOut2": 0.0,
+        "power": 531750.0,
+        "power1": 142680.0,
+        "power2": 138010.0,
+        "power3": 251060.0,
+        "voltage1": 239800.0,
+        "voltage2": 239700.0,
+        "voltage3": 239000.0,
+    },
+)
diff --git a/tests/components/discovergy/test_config_flow.py b/tests/components/discovergy/test_config_flow.py
new file mode 100644
index 00000000000..f42a4a983fb
--- /dev/null
+++ b/tests/components/discovergy/test_config_flow.py
@@ -0,0 +1,133 @@
+"""Test the Discovergy config flow."""
+from unittest.mock import Mock, patch
+
+from pydiscovergy.error import HTTPError, InvalidLogin
+
+from homeassistant import data_entry_flow
+from homeassistant.components.discovergy.const import DOMAIN
+from homeassistant.config_entries import SOURCE_REAUTH, SOURCE_USER
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def test_form(hass: HomeAssistant, mock_meters: Mock) -> None:
+    """Test we get the form."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["errors"] is None
+
+    with patch(
+        "homeassistant.components.discovergy.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_EMAIL: "test@example.com",
+                CONF_PASSWORD: "test-password",
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "test@example.com"
+    assert result2["data"] == {
+        CONF_EMAIL: "test@example.com",
+        CONF_PASSWORD: "test-password",
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_reauth(
+    hass: HomeAssistant, mock_meters: Mock, mock_config_entry: MockConfigEntry
+) -> None:
+    """Test reauth flow."""
+    init_result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_REAUTH, "unique_id": mock_config_entry.unique_id},
+        data=None,
+    )
+
+    assert init_result["type"] == data_entry_flow.FlowResultType.FORM
+    assert init_result["step_id"] == "reauth"
+
+    with patch(
+        "homeassistant.components.discovergy.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        configure_result = await hass.config_entries.flow.async_configure(
+            init_result["flow_id"],
+            {
+                CONF_EMAIL: "test@example.com",
+                CONF_PASSWORD: "test-password",
+            },
+        )
+        await hass.async_block_till_done()
+
+        assert configure_result["type"] == data_entry_flow.FlowResultType.ABORT
+        assert configure_result["reason"] == "reauth_successful"
+        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": SOURCE_USER}
+    )
+
+    with patch(
+        "pydiscovergy.Discovergy.get_meters",
+        side_effect=InvalidLogin,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_EMAIL: "test@example.com",
+                CONF_PASSWORD: "test-password",
+            },
+        )
+
+    assert result2["type"] == data_entry_flow.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": SOURCE_USER}
+    )
+
+    with patch("pydiscovergy.Discovergy.get_meters", side_effect=HTTPError):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_EMAIL: "test@example.com",
+                CONF_PASSWORD: "test-password",
+            },
+        )
+
+    assert result2["type"] == data_entry_flow.FlowResultType.FORM
+    assert result2["errors"] == {"base": "cannot_connect"}
+
+
+async def test_form_unknown_exception(hass: HomeAssistant) -> None:
+    """Test we handle cannot connect error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    with patch("pydiscovergy.Discovergy.get_meters", side_effect=Exception):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_EMAIL: "test@example.com",
+                CONF_PASSWORD: "test-password",
+            },
+        )
+
+    assert result2["type"] == data_entry_flow.FlowResultType.FORM
+    assert result2["errors"] == {"base": "unknown"}
diff --git a/tests/components/discovergy/test_diagnostics.py b/tests/components/discovergy/test_diagnostics.py
new file mode 100644
index 00000000000..1d465dda0e0
--- /dev/null
+++ b/tests/components/discovergy/test_diagnostics.py
@@ -0,0 +1,88 @@
+"""Test Discovergy diagnostics."""
+from unittest.mock import patch
+
+from homeassistant.components.diagnostics import REDACTED
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.components.discovergy.const import GET_METERS, LAST_READING
+from tests.typing import ClientSessionGenerator
+
+
+async def test_entry_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test config entry diagnostics."""
+    with patch("pydiscovergy.Discovergy.get_meters", return_value=GET_METERS), patch(
+        "pydiscovergy.Discovergy.get_last_reading", return_value=LAST_READING
+    ):
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    result = await get_diagnostics_for_config_entry(
+        hass, hass_client, mock_config_entry
+    )
+
+    assert result["entry"] == {
+        "entry_id": mock_config_entry.entry_id,
+        "version": 1,
+        "domain": "discovergy",
+        "title": REDACTED,
+        "data": {"email": REDACTED, "password": REDACTED},
+        "options": {},
+        "pref_disable_new_entities": False,
+        "pref_disable_polling": False,
+        "source": "user",
+        "unique_id": REDACTED,
+        "disabled_by": None,
+    }
+
+    assert result["meters"] == [
+        {
+            "additional": {
+                "administrationNumber": REDACTED,
+                "currentScalingFactor": 1,
+                "firstMeasurementTime": 1517569090926,
+                "fullSerialNumber": REDACTED,
+                "internalMeters": 1,
+                "lastMeasurementTime": 1678430543742,
+                "loadProfileType": "SLP",
+                "manufacturerId": "TST",
+                "printedFullSerialNumber": REDACTED,
+                "scalingFactor": 1,
+                "type": "TST",
+                "voltageScalingFactor": 1,
+            },
+            "full_serial_number": REDACTED,
+            "load_profile_type": "SLP",
+            "location": REDACTED,
+            "measurement_type": "ELECTRICITY",
+            "meter_id": "f8d610b7a8cc4e73939fa33b990ded54",
+            "serial_number": REDACTED,
+            "type": "TST",
+        }
+    ]
+
+    assert result["readings"] == {
+        "f8d610b7a8cc4e73939fa33b990ded54": {
+            "time": "2023-03-10T07:32:06.702000",
+            "values": {
+                "energy": 119348699715000.0,
+                "energy1": 2254180000.0,
+                "energy2": 119346445534000.0,
+                "energyOut": 55048723044000.0,
+                "energyOut1": 0.0,
+                "energyOut2": 0.0,
+                "power": 531750.0,
+                "power1": 142680.0,
+                "power2": 138010.0,
+                "power3": 251060.0,
+                "voltage1": 239800.0,
+                "voltage2": 239700.0,
+                "voltage3": 239000.0,
+            },
+        }
+    }
diff --git a/tests/components/discovergy/test_system_health.py b/tests/components/discovergy/test_system_health.py
new file mode 100644
index 00000000000..91025b06dd7
--- /dev/null
+++ b/tests/components/discovergy/test_system_health.py
@@ -0,0 +1,48 @@
+"""Test Discovergy system health."""
+import asyncio
+
+from aiohttp import ClientError
+from pydiscovergy.const import API_BASE
+
+from homeassistant.components.discovergy.const import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import get_system_health_info
+from tests.test_util.aiohttp import AiohttpClientMocker
+
+
+async def test_discovergy_system_health(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test Discovergy system health."""
+    aioclient_mock.get(API_BASE, text="")
+    hass.config.components.add(DOMAIN)
+    assert await async_setup_component(hass, "system_health", {})
+
+    info = await get_system_health_info(hass, DOMAIN)
+
+    for key, val in info.items():
+        if asyncio.iscoroutine(val):
+            info[key] = await val
+
+    assert info == {"api_endpoint_reachable": "ok"}
+
+
+async def test_discovergy_system_health_fail(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test Discovergy system health."""
+    aioclient_mock.get(API_BASE, exc=ClientError)
+    hass.config.components.add(DOMAIN)
+    assert await async_setup_component(hass, "system_health", {})
+
+    info = await get_system_health_info(hass, DOMAIN)
+
+    for key, val in info.items():
+        if asyncio.iscoroutine(val):
+            info[key] = await val
+
+    assert info == {
+        "api_endpoint_reachable": {"type": "failed", "error": "unreachable"}
+    }
diff --git a/tests/components/dremel_3d_printer/__init__.py b/tests/components/dremel_3d_printer/__init__.py
new file mode 100644
index 00000000000..90da6ee929b
--- /dev/null
+++ b/tests/components/dremel_3d_printer/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Dremel 3D Printer integration."""
diff --git a/tests/components/dremel_3d_printer/conftest.py b/tests/components/dremel_3d_printer/conftest.py
new file mode 100644
index 00000000000..8df59a2e64a
--- /dev/null
+++ b/tests/components/dremel_3d_printer/conftest.py
@@ -0,0 +1,58 @@
+"""Configure tests for the Dremel 3D Printer integration."""
+from http import HTTPStatus
+from unittest.mock import patch
+
+import pytest
+import requests_mock
+
+from homeassistant.components.dremel_3d_printer.const import DOMAIN
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry, load_fixture
+
+HOST = "1.2.3.4"
+CONF_DATA = {CONF_HOST: HOST}
+
+
+def create_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Create fixture for adding config entry in Home Assistant."""
+    entry = MockConfigEntry(domain=DOMAIN, data=CONF_DATA, unique_id="123456789")
+    entry.add_to_hass(hass)
+    return entry
+
+
+@pytest.fixture
+def config_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Add config entry in Home Assistant."""
+    return create_entry(hass)
+
+
+@pytest.fixture
+def connection() -> None:
+    """Mock Dremel 3D Printer connection."""
+    mock = requests_mock.Mocker()
+    mock.post(
+        f"http://{HOST}:80/command",
+        response_list=[
+            {"text": load_fixture("dremel_3d_printer/command_1.json")},
+            {"text": load_fixture("dremel_3d_printer/command_2.json")},
+            {"text": load_fixture("dremel_3d_printer/command_1.json")},
+            {"text": load_fixture("dremel_3d_printer/command_2.json")},
+        ],
+    )
+
+    mock.post(
+        f"https://{HOST}:11134/getHomeMessage",
+        text=load_fixture("dremel_3d_printer/get_home_message.json"),
+        status_code=HTTPStatus.OK,
+    )
+    mock.start()
+
+
+def patch_async_setup_entry():
+    """Patch the async entry setup of Dremel 3D Printer."""
+    return patch(
+        "homeassistant.components.dremel_3d_printer.async_setup_entry",
+        return_value=True,
+    )
diff --git a/tests/components/dremel_3d_printer/fixtures/command_1.json b/tests/components/dremel_3d_printer/fixtures/command_1.json
new file mode 100644
index 00000000000..4e61b40ea46
--- /dev/null
+++ b/tests/components/dremel_3d_printer/fixtures/command_1.json
@@ -0,0 +1,12 @@
+{
+  "SN": "123456789",
+  "api_version": "1.0.2-alpha",
+  "error_code": 200,
+  "ethernet_connected": 1,
+  "ethernet_ip": "1.2.3.4",
+  "firmware_version": "v3.0_R02.12.10",
+  "machine_type": "DREMEL 3D45 IDEA BUILDER",
+  "message": "success",
+  "wifi_connected": 1,
+  "wifi_ip": "1.2.3.5"
+}
diff --git a/tests/components/dremel_3d_printer/fixtures/command_2.json b/tests/components/dremel_3d_printer/fixtures/command_2.json
new file mode 100644
index 00000000000..fc73b10cb57
--- /dev/null
+++ b/tests/components/dremel_3d_printer/fixtures/command_2.json
@@ -0,0 +1,22 @@
+{
+  "buildPlate_target_temperature": 60,
+  "chamber_temperature": 27,
+  "door_open": 0,
+  "elaspedtime": 0,
+  "error_code": 200,
+  "extruder_target_temperature": 230,
+  "fanSpeed": 0,
+  "filament_type ": "ECO-ABS",
+  "firmware_version": "v3.0_R02.12.10",
+  "jobname": "D32_Imperial_Credit.gcode",
+  "jobstatus": "building",
+  "layer": 0,
+  "message": "success",
+  "networkBuild": 1,
+  "platform_temperature": 60,
+  "progress": 13.9,
+  "remaining": 3736,
+  "status": "busy",
+  "temperature": 230,
+  "totalTime": 4340
+}
diff --git a/tests/components/dremel_3d_printer/fixtures/get_home_message.json b/tests/components/dremel_3d_printer/fixtures/get_home_message.json
new file mode 100644
index 00000000000..1a79210c35d
--- /dev/null
+++ b/tests/components/dremel_3d_printer/fixtures/get_home_message.json
@@ -0,0 +1,26 @@
+{
+  "BedTemp": 60,
+  "BedTempTarget": 60,
+  "ErrorCode": 200,
+  "FilamentType": 2,
+  "FirwareVersion": "v3.0_R02.12.10",
+  "Message": "success",
+  "NozzleTemp": 230,
+  "NozzleTempTarget": 230,
+  "PreheatBed": 0,
+  "PreheatNozzle": 0,
+  "PrinterBedMessage": "Bed 0-100 ℃",
+  "PrinterCamera": "http://1.2.3.4:10123/?action=stream",
+  "PrinterFiles": 10,
+  "PrinterMicrons": "50-300 microns",
+  "PrinterName": "DREMEL DIGILAB 3D45",
+  "PrinterNozzleMessage": "Nozzle 0-280 ℃",
+  "PrinterStatus": "printing",
+  "PrintererAvailabelStorage": 87,
+  "PrintingFileName": "D32_Imperial_Credit.gcode",
+  "PrintingFilePic": "/tmp/mnt/dev/mmcblk0p3/modelFromDevice/pic/D32_Imperial_Credit_gcode.bmp",
+  "PrintingProgress": 13.9,
+  "RemainTime": 3736,
+  "SerialNumber": "123456789",
+  "UsageCounter": "7"
+}
diff --git a/tests/components/dremel_3d_printer/test_binary_sensor.py b/tests/components/dremel_3d_printer/test_binary_sensor.py
new file mode 100644
index 00000000000..081cc7a02fb
--- /dev/null
+++ b/tests/components/dremel_3d_printer/test_binary_sensor.py
@@ -0,0 +1,27 @@
+"""Binary sensor tests for the Dremel 3D Printer integration."""
+from unittest.mock import AsyncMock
+
+from homeassistant.components.binary_sensor import BinarySensorDeviceClass
+from homeassistant.components.dremel_3d_printer.const import DOMAIN
+from homeassistant.const import ATTR_DEVICE_CLASS, STATE_OFF, STATE_ON
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
+
+
+async def test_binary_sensors(
+    hass: HomeAssistant,
+    connection,
+    config_entry: MockConfigEntry,
+    entity_registry_enabled_by_default: AsyncMock,
+) -> None:
+    """Test we get binary sensor data."""
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert await async_setup_component(hass, DOMAIN, {})
+    state = hass.states.get("binary_sensor.dremel_3d45_door")
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == BinarySensorDeviceClass.DOOR
+    assert state.state == STATE_OFF
+    state = hass.states.get("binary_sensor.dremel_3d45_running")
+    assert state.state == STATE_ON
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == BinarySensorDeviceClass.RUNNING
diff --git a/tests/components/dremel_3d_printer/test_button.py b/tests/components/dremel_3d_printer/test_button.py
new file mode 100644
index 00000000000..00102b3306b
--- /dev/null
+++ b/tests/components/dremel_3d_printer/test_button.py
@@ -0,0 +1,56 @@
+"""Button tests for the Dremel 3D Printer integration."""
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
+from homeassistant.components.dremel_3d_printer.const import DOMAIN
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.parametrize(
+    ("button", "function"),
+    (
+        ("cancel", "stop"),
+        ("pause", "pause"),
+        ("resume", "resume"),
+    ),
+)
+async def test_buttons(
+    hass: HomeAssistant,
+    connection: None,
+    config_entry: MockConfigEntry,
+    entity_registry_enabled_by_default: AsyncMock,
+    button: str,
+    function: str,
+) -> None:
+    """Test button entities function."""
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert await async_setup_component(hass, DOMAIN, {})
+    with patch(
+        f"homeassistant.components.dremel_3d_printer.Dremel3DPrinter.{function}_print"
+    ) as mock:
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: [f"button.dremel_3d45_{button}_job"]},
+            blocking=True,
+        )
+    assert mock.call_count == 1
+
+    with patch(
+        f"homeassistant.components.dremel_3d_printer.Dremel3DPrinter.{function}_print",
+        side_effect=RuntimeError,
+    ) as mock, pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: [f"button.dremel_3d45_{button}_job"]},
+            blocking=True,
+        )
+    assert mock.call_count == 1
diff --git a/tests/components/dremel_3d_printer/test_config_flow.py b/tests/components/dremel_3d_printer/test_config_flow.py
new file mode 100644
index 00000000000..8161662a14a
--- /dev/null
+++ b/tests/components/dremel_3d_printer/test_config_flow.py
@@ -0,0 +1,87 @@
+"""Test Dremel 3D Printer config flow."""
+from unittest.mock import patch
+
+from requests.exceptions import ConnectTimeout
+
+from homeassistant import data_entry_flow
+from homeassistant.components.dremel_3d_printer.const import DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.const import CONF_SOURCE
+from homeassistant.core import HomeAssistant
+
+from .conftest import CONF_DATA, patch_async_setup_entry
+
+from tests.common import MockConfigEntry
+
+MOCK = "homeassistant.components.dremel_3d_printer.config_flow.Dremel3DPrinter"
+
+
+async def test_full_user_flow_implementation(hass: HomeAssistant, connection) -> None:
+    """Test the full manual user flow from start to finish."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={CONF_SOURCE: SOURCE_USER}
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "user"
+
+    with patch_async_setup_entry():
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input=CONF_DATA
+        )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["title"] == "DREMEL 3D45"
+    assert result["data"] == CONF_DATA
+
+
+async def test_already_configured(
+    hass: HomeAssistant, connection, config_entry: MockConfigEntry
+) -> None:
+    """Test we abort if the device is already configured."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={CONF_SOURCE: SOURCE_USER}, data=CONF_DATA
+    )
+    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["reason"] == "already_configured"
+
+
+async def test_cannot_connect(hass: HomeAssistant, connection) -> None:
+    """Test we show user form on connection error."""
+    with patch(MOCK, side_effect=ConnectTimeout):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={CONF_SOURCE: SOURCE_USER}, data=CONF_DATA
+        )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "cannot_connect"}
+
+    with patch_async_setup_entry():
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input=CONF_DATA
+        )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["data"] == CONF_DATA
+
+
+async def test_unknown_error(hass: HomeAssistant, connection) -> None:
+    """Test we show user form on unknown error."""
+    with patch(MOCK, side_effect=Exception):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={CONF_SOURCE: SOURCE_USER}, data=CONF_DATA
+        )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "unknown"}
+
+    with patch_async_setup_entry():
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input=CONF_DATA
+        )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["title"] == "DREMEL 3D45"
+    assert result["data"] == CONF_DATA
diff --git a/tests/components/dremel_3d_printer/test_init.py b/tests/components/dremel_3d_printer/test_init.py
new file mode 100644
index 00000000000..a77c6159927
--- /dev/null
+++ b/tests/components/dremel_3d_printer/test_init.py
@@ -0,0 +1,88 @@
+"""Test Dremel 3D Printer integration."""
+from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
+from requests.exceptions import ConnectTimeout
+
+from homeassistant.components.dremel_3d_printer.const 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
+from homeassistant.setup import async_setup_component
+import homeassistant.util.dt as dt_util
+
+from tests.common import MockConfigEntry, async_fire_time_changed
+
+MOCKED_MODEL = "homeassistant.components.dremel_3d_printer.Dremel3DPrinter.get_model"
+
+
+@pytest.mark.parametrize("model", ["3D45", "3D20"])
+async def test_setup(
+    hass: HomeAssistant, connection, config_entry: MockConfigEntry, model: str
+) -> None:
+    """Test load and unload."""
+    with patch(MOCKED_MODEL, return_value=model) as mock:
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        assert await async_setup_component(hass, DOMAIN, {})
+    assert config_entry.state == ConfigEntryState.LOADED
+    assert mock.called
+
+    with patch(MOCKED_MODEL, return_value=model) as mock:
+        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
+    assert not hass.data.get(DOMAIN)
+    assert mock.called
+
+
+async def test_async_setup_entry_not_ready(
+    hass: HomeAssistant, connection, config_entry: MockConfigEntry
+) -> None:
+    """Test that it throws ConfigEntryNotReady when exception occurs during setup."""
+    with patch(
+        "homeassistant.components.dremel_3d_printer.Dremel3DPrinter",
+        side_effect=ConnectTimeout,
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+    assert await async_setup_component(hass, DOMAIN, {})
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert config_entry.state == ConfigEntryState.SETUP_RETRY
+    assert not hass.data.get(DOMAIN)
+
+
+async def test_update_failed(
+    hass: HomeAssistant, connection, config_entry: MockConfigEntry
+) -> None:
+    """Test coordinator throws UpdateFailed after failed update."""
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert await async_setup_component(hass, DOMAIN, {})
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    with patch(
+        "homeassistant.components.dremel_3d_printer.Dremel3DPrinter.refresh",
+        side_effect=RuntimeError,
+    ) as updater:
+        next_update = dt_util.utcnow() + timedelta(seconds=10)
+        async_fire_time_changed(hass, next_update)
+        await hass.async_block_till_done()
+        updater.assert_called_once()
+    state = hass.states.get("sensor.dremel_3d45_job_phase")
+    assert state.state == STATE_UNAVAILABLE
+
+
+async def test_device_info(
+    hass: HomeAssistant, connection, config_entry: MockConfigEntry
+) -> None:
+    """Test device info."""
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert await async_setup_component(hass, DOMAIN, {})
+    device_registry = dr.async_get(hass)
+    device = device_registry.async_get_device({(DOMAIN, config_entry.unique_id)})
+
+    assert device.manufacturer == "Dremel"
+    assert device.model == "3D45"
+    assert device.name == "DREMEL 3D45"
+    assert device.sw_version == "v3.0_R02.12.10"
diff --git a/tests/components/dremel_3d_printer/test_sensor.py b/tests/components/dremel_3d_printer/test_sensor.py
new file mode 100644
index 00000000000..49d66fe1e61
--- /dev/null
+++ b/tests/components/dremel_3d_printer/test_sensor.py
@@ -0,0 +1,111 @@
+"""Sensor tests for the Dremel 3D Printer integration."""
+from datetime import datetime
+from unittest.mock import AsyncMock
+
+from freezegun.api import FrozenDateTimeFactory
+
+from homeassistant.components.dremel_3d_printer.const import DOMAIN
+from homeassistant.components.sensor import (
+    ATTR_STATE_CLASS,
+    SensorDeviceClass,
+    SensorStateClass,
+)
+from homeassistant.const import (
+    ATTR_DEVICE_CLASS,
+    ATTR_UNIT_OF_MEASUREMENT,
+    PERCENTAGE,
+    UnitOfInformation,
+    UnitOfTemperature,
+    UnitOfTime,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+from homeassistant.util.dt import UTC
+
+from tests.common import MockConfigEntry
+
+
+async def test_sensors(
+    hass: HomeAssistant,
+    connection,
+    config_entry: MockConfigEntry,
+    entity_registry_enabled_by_default: AsyncMock,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test we get sensor data."""
+    freezer.move_to(datetime(2023, 5, 31, 13, 30, tzinfo=UTC))
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert await async_setup_component(hass, DOMAIN, {})
+    state = hass.states.get("sensor.dremel_3d45_job_phase")
+    assert state.state == "building"
+    state = hass.states.get("sensor.dremel_3d45_completion_time")
+    assert state.state == "2023-05-31T14:32:16+00:00"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TIMESTAMP
+    state = hass.states.get("sensor.dremel_3d45_progress")
+    assert state.state == "13.9"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is PERCENTAGE
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_chamber")
+    assert state.state == "27"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_platform_temperature")
+    assert state.state == "60"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_target_platform_temperature")
+    assert state.state == "60"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_max_platform_temperature")
+    assert state.state == "100"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_extruder")
+    assert state.state == "230"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_target_extruder_temperature")
+    assert state.state == "230"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_max_extruder_temperature")
+    assert state.state == "280"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_network_build")
+    assert state.state == "1"
+    state = hass.states.get("sensor.dremel_3d45_filament")
+    assert state.state == "ECO-ABS"
+    state = hass.states.get("sensor.dremel_3d45_elapsed_time")
+    assert state.state == "0"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.DURATION
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTime.SECONDS
+    state = hass.states.get("sensor.dremel_3d45_estimated_total_time")
+    assert state.state == "4340"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.DURATION
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTime.SECONDS
+    state = hass.states.get("sensor.dremel_3d45_job_status")
+    assert state.state == "building"
+    state = hass.states.get("sensor.dremel_3d45_job_name")
+    assert state.state == "D32_Imperial_Credit"
+    state = hass.states.get("sensor.dremel_3d45_api_version")
+    assert state.state == "1.0.2-alpha"
+    state = hass.states.get("sensor.dremel_3d45_host")
+    assert state.state == "1.2.3.4"
+    state = hass.states.get("sensor.dremel_3d45_connection_type")
+    assert state.state == "eth0"
+    state = hass.states.get("sensor.dremel_3d45_available_storage")
+    assert state.state == "8700"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfInformation.MEGABYTES
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.DATA_SIZE
+    state = hass.states.get("sensor.dremel_3d45_hours_used")
+    assert state.state == "7"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTime.HOURS
diff --git a/tests/components/ecobee/test_climate.py b/tests/components/ecobee/test_climate.py
index 09b127432db..8572764ce4d 100644
--- a/tests/components/ecobee/test_climate.py
+++ b/tests/components/ecobee/test_climate.py
@@ -25,6 +25,7 @@ def ecobee_fixture():
     vals = {
         "name": "Ecobee",
         "modelNumber": "athenaSmart",
+        "identifier": "abc",
         "program": {
             "climates": [
                 {"name": "Climate1", "climateRef": "c1"},
@@ -83,7 +84,7 @@ def thermostat_fixture(data):
 
 async def test_name(thermostat) -> None:
     """Test name property."""
-    assert thermostat.name == "Ecobee"
+    assert thermostat.device_info["name"] == "Ecobee"
 
 
 async def test_aux_heat_not_supported_by_default(hass: HomeAssistant) -> None:
diff --git a/tests/components/econet/test_config_flow.py b/tests/components/econet/test_config_flow.py
index d01d6163285..3444cc83834 100644
--- a/tests/components/econet/test_config_flow.py
+++ b/tests/components/econet/test_config_flow.py
@@ -25,9 +25,7 @@ async def test_bad_credentials(hass: HomeAssistant) -> None:
     with patch(
         "pyeconet.EcoNetApiInterface.login",
         side_effect=InvalidCredentialsError(),
-    ), patch("homeassistant.components.econet.async_setup", return_value=True), patch(
-        "homeassistant.components.econet.async_setup_entry", return_value=True
-    ):
+    ), patch("homeassistant.components.econet.async_setup_entry", return_value=True):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input={
@@ -55,9 +53,7 @@ async def test_generic_error_from_library(hass: HomeAssistant) -> None:
     with patch(
         "pyeconet.EcoNetApiInterface.login",
         side_effect=PyeconetError(),
-    ), patch("homeassistant.components.econet.async_setup", return_value=True), patch(
-        "homeassistant.components.econet.async_setup_entry", return_value=True
-    ):
+    ), patch("homeassistant.components.econet.async_setup_entry", return_value=True):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input={
@@ -85,9 +81,7 @@ async def test_auth_worked(hass: HomeAssistant) -> None:
     with patch(
         "pyeconet.EcoNetApiInterface.login",
         return_value=EcoNetApiInterface,
-    ), patch("homeassistant.components.econet.async_setup", return_value=True), patch(
-        "homeassistant.components.econet.async_setup_entry", return_value=True
-    ):
+    ), patch("homeassistant.components.econet.async_setup_entry", return_value=True):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input={
@@ -122,9 +116,7 @@ async def test_already_configured(hass: HomeAssistant) -> None:
     with patch(
         "pyeconet.EcoNetApiInterface.login",
         return_value=EcoNetApiInterface,
-    ), patch("homeassistant.components.econet.async_setup", return_value=True), patch(
-        "homeassistant.components.econet.async_setup_entry", return_value=True
-    ):
+    ), patch("homeassistant.components.econet.async_setup_entry", return_value=True):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input={
diff --git a/tests/components/efergy/test_sensor.py b/tests/components/efergy/test_sensor.py
index f38832e1876..f8eb889d3c3 100644
--- a/tests/components/efergy/test_sensor.py
+++ b/tests/components/efergy/test_sensor.py
@@ -35,62 +35,62 @@ async def test_sensor_readings(
     entry = await setup_platform(hass, aioclient_mock, SENSOR_DOMAIN)
     ent_reg: EntityRegistry = er.async_get(hass)
 
-    state = hass.states.get("sensor.power_usage")
+    state = hass.states.get("sensor.efergy_power_usage")
     assert state.state == "1580"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-    state = hass.states.get("sensor.energy_budget")
+    state = hass.states.get("sensor.efergy_energy_budget")
     assert state.state == "ok"
     assert state.attributes.get(ATTR_DEVICE_CLASS) is None
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is None
     assert state.attributes.get(ATTR_STATE_CLASS) is None
-    state = hass.states.get("sensor.daily_consumption")
+    state = hass.states.get("sensor.efergy_daily_consumption")
     assert state.state == "38.21"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.weekly_consumption")
+    state = hass.states.get("sensor.efergy_weekly_consumption")
     assert state.state == "267.47"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.monthly_consumption")
+    state = hass.states.get("sensor.efergy_monthly_consumption")
     assert state.state == "1069.88"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.yearly_consumption")
+    state = hass.states.get("sensor.efergy_yearly_consumption")
     assert state.state == "13373.50"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.daily_energy_cost")
+    state = hass.states.get("sensor.efergy_daily_energy_cost")
     assert state.state == "5.27"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.MONETARY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "EUR"
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.weekly_energy_cost")
+    state = hass.states.get("sensor.efergy_weekly_energy_cost")
     assert state.state == "36.89"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.MONETARY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "EUR"
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.monthly_energy_cost")
+    state = hass.states.get("sensor.efergy_monthly_energy_cost")
     assert state.state == "147.56"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.MONETARY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "EUR"
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.yearly_energy_cost")
+    state = hass.states.get("sensor.efergy_yearly_energy_cost")
     assert state.state == "1844.50"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.MONETARY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "EUR"
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    entity = ent_reg.async_get("sensor.power_usage_728386")
+    entity = ent_reg.async_get("sensor.efergy_power_usage_728386")
     assert entity.disabled_by is er.RegistryEntryDisabler.INTEGRATION
     ent_reg.async_update_entity(entity.entity_id, **{"disabled_by": None})
     await hass.config_entries.async_reload(entry.entry_id)
     await hass.async_block_till_done()
-    state = hass.states.get("sensor.power_usage_728386")
+    state = hass.states.get("sensor.efergy_power_usage_728386")
     assert state.state == "1628"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
@@ -104,17 +104,17 @@ async def test_multi_sensor_readings(
     for description in SENSOR_TYPES:
         description.entity_registry_enabled_default = True
     await setup_platform(hass, aioclient_mock, SENSOR_DOMAIN, MULTI_SENSOR_TOKEN)
-    state = hass.states.get("sensor.power_usage_728386")
+    state = hass.states.get("sensor.efergy_power_usage_728386")
     assert state.state == "218"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-    state = hass.states.get("sensor.power_usage_0")
+    state = hass.states.get("sensor.efergy_power_usage_0")
     assert state.state == "1808"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-    state = hass.states.get("sensor.power_usage_728387")
+    state = hass.states.get("sensor.efergy_power_usage_728387")
     assert state.state == "312"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
@@ -126,16 +126,16 @@ async def test_failed_update_and_reconnection(
 ) -> None:
     """Test failed update and reconnection."""
     await setup_platform(hass, aioclient_mock, SENSOR_DOMAIN)
-    assert hass.states.get("sensor.power_usage").state == "1580"
+    assert hass.states.get("sensor.efergy_power_usage").state == "1580"
     aioclient_mock.clear_requests()
     await mock_responses(hass, aioclient_mock, error=True)
     next_update = dt_util.utcnow() + timedelta(seconds=30)
     async_fire_time_changed(hass, next_update)
     await hass.async_block_till_done()
-    assert hass.states.get("sensor.power_usage").state == STATE_UNAVAILABLE
+    assert hass.states.get("sensor.efergy_power_usage").state == STATE_UNAVAILABLE
     aioclient_mock.clear_requests()
     await mock_responses(hass, aioclient_mock)
     next_update = dt_util.utcnow() + timedelta(seconds=30)
     async_fire_time_changed(hass, next_update)
     await hass.async_block_till_done()
-    assert hass.states.get("sensor.power_usage").state == "1580"
+    assert hass.states.get("sensor.efergy_power_usage").state == "1580"
diff --git a/tests/components/elgato/snapshots/test_button.ambr b/tests/components/elgato/snapshots/test_button.ambr
index cb420c486b4..920aa40bfe7 100644
--- a/tests/components/elgato/snapshots/test_button.ambr
+++ b/tests/components/elgato/snapshots/test_button.ambr
@@ -2,8 +2,8 @@
 # name: test_buttons[button.frenck_identify-identify-key-light-mini]
   StateSnapshot({
     'attributes': ReadOnlyDict({
+      'device_class': 'identify',
       'friendly_name': 'Frenck Identify',
-      'icon': 'mdi:help',
     }),
     'context': <ANY>,
     'entity_id': 'button.frenck_identify',
@@ -32,12 +32,12 @@
     'name': None,
     'options': dict({
     }),
-    'original_device_class': None,
-    'original_icon': 'mdi:help',
+    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
+    'original_icon': None,
     'original_name': 'Identify',
     'platform': 'elgato',
     'supported_features': 0,
-    'translation_key': 'identify',
+    'translation_key': None,
     'unique_id': 'GW24L1A02987_identify',
     'unit_of_measurement': None,
   })
@@ -111,7 +111,7 @@
     'original_name': 'Restart',
     'platform': 'elgato',
     'supported_features': 0,
-    'translation_key': 'restart',
+    'translation_key': None,
     'unique_id': 'GW24L1A02987_restart',
     'unit_of_measurement': None,
   })
diff --git a/tests/components/elgato/snapshots/test_sensor.ambr b/tests/components/elgato/snapshots/test_sensor.ambr
index 35429b8a320..5fa7a6e827a 100644
--- a/tests/components/elgato/snapshots/test_sensor.ambr
+++ b/tests/components/elgato/snapshots/test_sensor.ambr
@@ -44,7 +44,7 @@
     'original_name': 'Battery',
     'platform': 'elgato',
     'supported_features': 0,
-    'translation_key': 'battery',
+    'translation_key': None,
     'unique_id': 'GW24L1A02987_battery',
     'unit_of_measurement': '%',
   })
diff --git a/tests/components/emulated_hue/test_hue_api.py b/tests/components/emulated_hue/test_hue_api.py
index 247a507bb69..acfb11ced0a 100644
--- a/tests/components/emulated_hue/test_hue_api.py
+++ b/tests/components/emulated_hue/test_hue_api.py
@@ -120,7 +120,7 @@ async def _async_setup_emulated_hue(hass: HomeAssistant, conf: ConfigType) -> No
             hass,
             emulated_hue.DOMAIN,
             {emulated_hue.DOMAIN: conf},
-        ),
+        )
         await hass.async_block_till_done()
 
 
@@ -135,8 +135,25 @@ async def base_setup(hass):
     )
 
 
+@pytest.fixture(autouse=True)
+async def wanted_platforms_only() -> None:
+    """Enable only the wanted demo platforms."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [
+            const.Platform.CLIMATE,
+            const.Platform.COVER,
+            const.Platform.FAN,
+            const.Platform.HUMIDIFIER,
+            const.Platform.LIGHT,
+            const.Platform.MEDIA_PLAYER,
+        ],
+    ):
+        yield
+
+
 @pytest.fixture
-async def demo_setup(hass):
+async def demo_setup(hass, wanted_platforms_only):
     """Fixture to setup demo platforms."""
     # We need to do this to get access to homeassistant/turn_(on,off)
     setups = [
@@ -144,12 +161,7 @@ async def demo_setup(hass):
         setup.async_setup_component(
             hass, http.DOMAIN, {http.DOMAIN: {http.CONF_SERVER_PORT: HTTP_SERVER_PORT}}
         ),
-        *[
-            setup.async_setup_component(
-                hass, comp.DOMAIN, {comp.DOMAIN: [{"platform": "demo"}]}
-            )
-            for comp in (light, climate, humidifier, media_player, fan, cover)
-        ],
+        setup.async_setup_component(hass, "demo", {}),
         setup.async_setup_component(
             hass,
             script.DOMAIN,
diff --git a/tests/components/energyzero/snapshots/test_sensor.ambr b/tests/components/energyzero/snapshots/test_sensor.ambr
index f758e8f53ca..619813c52c1 100644
--- a/tests/components/energyzero/snapshots/test_sensor.ambr
+++ b/tests/components/energyzero/snapshots/test_sensor.ambr
@@ -41,7 +41,7 @@
     'original_name': 'Current hour',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'current_hour_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -105,7 +105,7 @@
     'original_name': 'Average - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'average_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -169,7 +169,7 @@
     'original_name': 'Average - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'current_hour_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -236,7 +236,7 @@
     'original_name': 'Current hour',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'current_hour_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -303,7 +303,7 @@
     'original_name': 'Current hour',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'average_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -367,7 +367,7 @@
     'original_name': 'Time of highest price - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'highest_price_time',
     'unit_of_measurement': None,
   })
 # ---
@@ -431,7 +431,7 @@
     'original_name': 'Highest price - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'max_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -495,7 +495,7 @@
     'original_name': 'Average - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'average_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -562,7 +562,7 @@
     'original_name': 'Current hour',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'current_hour_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -626,7 +626,7 @@
     'original_name': 'Time of highest price - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'highest_price_time',
     'unit_of_measurement': None,
   })
 # ---
@@ -690,7 +690,7 @@
     'original_name': 'Highest price - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'max_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -757,7 +757,7 @@
     'original_name': 'Current hour',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'current_hour_price',
     'unit_of_measurement': '€/m³',
   })
 # ---
diff --git a/tests/components/esphome/conftest.py b/tests/components/esphome/conftest.py
index 23f140587c7..ffd87691b38 100644
--- a/tests/components/esphome/conftest.py
+++ b/tests/components/esphome/conftest.py
@@ -1,9 +1,20 @@
 """esphome session fixtures."""
 from __future__ import annotations
 
+from asyncio import Event
+from collections.abc import Awaitable, Callable
+from typing import Any
 from unittest.mock import AsyncMock, Mock, patch
 
-from aioesphomeapi import APIClient, APIVersion, DeviceInfo
+from aioesphomeapi import (
+    APIClient,
+    APIVersion,
+    DeviceInfo,
+    EntityInfo,
+    EntityState,
+    ReconnectLogic,
+    UserService,
+)
 import pytest
 from zeroconf import Zeroconf
 
@@ -13,6 +24,10 @@ from homeassistant.components.esphome import (
     DOMAIN,
     dashboard,
 )
+from homeassistant.components.esphome.const import (
+    CONF_ALLOW_SERVICE_CALLS,
+    DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
+)
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
@@ -63,7 +78,7 @@ def mock_device_info() -> DeviceInfo:
     return DeviceInfo(
         uses_password=False,
         name="test",
-        bluetooth_proxy_version=0,
+        legacy_bluetooth_proxy_version=0,
         mac_address="11:22:33:44:55:aa",
         esphome_version="1.0.0",
     )
@@ -81,7 +96,7 @@ async def init_integration(
 
 
 @pytest.fixture
-def mock_client(mock_device_info):
+def mock_client(mock_device_info) -> APIClient:
     """Mock APIClient."""
     mock_client = Mock(spec=APIClient)
 
@@ -131,14 +146,41 @@ async def mock_dashboard(hass):
         yield data
 
 
-@pytest.fixture
-async def mock_voice_assistant_entry(
-    hass: HomeAssistant,
-    mock_client,
-) -> MockConfigEntry:
-    """Set up an ESPHome entry with voice assistant."""
+class MockESPHomeDevice:
+    """Mock an esphome device."""
 
-    async def _mock_voice_assistant_entry(version: int):
+    def __init__(self, entry: MockConfigEntry) -> None:
+        """Init the mock."""
+        self.entry = entry
+        self.state_callback: Callable[[EntityState], None]
+        self.on_disconnect: Callable[[bool], None]
+
+    def set_state_callback(self, state_callback: Callable[[EntityState], None]) -> None:
+        """Set the state callback."""
+        self.state_callback = state_callback
+
+    def set_state(self, state: EntityState) -> None:
+        """Mock setting state."""
+        self.state_callback(state)
+
+    def set_on_disconnect(self, on_disconnect: Callable[[bool], None]) -> None:
+        """Set the disconnect callback."""
+        self.on_disconnect = on_disconnect
+
+    async def mock_disconnect(self, expected_disconnect: bool) -> None:
+        """Mock disconnecting."""
+        await self.on_disconnect(expected_disconnect)
+
+
+async def _mock_generic_device_entry(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_device_info: dict[str, Any],
+    mock_list_entities_services: tuple[list[EntityInfo], list[UserService]],
+    states: list[EntityState],
+    entry: MockConfigEntry | None = None,
+) -> MockESPHomeDevice:
+    if not entry:
         entry = MockConfigEntry(
             domain=DOMAIN,
             data={
@@ -146,26 +188,74 @@ async def mock_voice_assistant_entry(
                 CONF_PORT: 6053,
                 CONF_PASSWORD: "",
             },
+            options={
+                CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS
+            },
         )
         entry.add_to_hass(hass)
 
-        device_info = DeviceInfo(
-            name="test",
-            friendly_name="Test",
-            voice_assistant_version=version,
-            mac_address="11:22:33:44:55:aa",
-            esphome_version="1.0.0",
-        )
+    mock_device = MockESPHomeDevice(entry)
 
-        mock_client.device_info = AsyncMock(return_value=device_info)
-        mock_client.subscribe_voice_assistant = AsyncMock(return_value=Mock())
+    device_info = DeviceInfo(
+        name="test",
+        friendly_name="Test",
+        mac_address="11:22:33:44:55:aa",
+        esphome_version="1.0.0",
+        **mock_device_info,
+    )
 
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-        await hass.async_block_till_done()
-        await hass.async_block_till_done()
+    async def _subscribe_states(callback: Callable[[EntityState], None]) -> None:
+        """Subscribe to state."""
+        mock_device.set_state_callback(callback)
+        for state in states:
+            callback(state)
 
-        return entry
+    mock_client.device_info = AsyncMock(return_value=device_info)
+    mock_client.subscribe_voice_assistant = AsyncMock(return_value=Mock())
+    mock_client.list_entities_services = AsyncMock(
+        return_value=mock_list_entities_services
+    )
+    mock_client.subscribe_states = _subscribe_states
+
+    try_connect_done = Event()
+
+    class MockReconnectLogic(ReconnectLogic):
+        """Mock ReconnectLogic."""
+
+        def __init__(self, *args, **kwargs):
+            """Init the mock."""
+            super().__init__(*args, **kwargs)
+            mock_device.set_on_disconnect(kwargs["on_disconnect"])
+            self._try_connect = self.mock_try_connect
+
+        async def mock_try_connect(self):
+            """Set an event when ReconnectLogic._try_connect has been awaited."""
+            result = await super()._try_connect()
+            try_connect_done.set()
+            return result
+
+    with patch("homeassistant.components.esphome.ReconnectLogic", MockReconnectLogic):
+        assert await hass.config_entries.async_setup(entry.entry_id)
+        await try_connect_done.wait()
+
+    await hass.async_block_till_done()
+
+    return mock_device
+
+
+@pytest.fixture
+async def mock_voice_assistant_entry(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+):
+    """Set up an ESPHome entry with voice assistant."""
+
+    async def _mock_voice_assistant_entry(version: int) -> MockConfigEntry:
+        return (
+            await _mock_generic_device_entry(
+                hass, mock_client, {"voice_assistant_version": version}, ([], []), []
+            )
+        ).entry
 
     return _mock_voice_assistant_entry
 
@@ -180,3 +270,50 @@ async def mock_voice_assistant_v1_entry(mock_voice_assistant_entry) -> MockConfi
 async def mock_voice_assistant_v2_entry(mock_voice_assistant_entry) -> MockConfigEntry:
     """Set up an ESPHome entry with voice assistant."""
     return await mock_voice_assistant_entry(version=2)
+
+
+@pytest.fixture
+async def mock_generic_device_entry(
+    hass: HomeAssistant,
+) -> Callable[
+    [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+    Awaitable[MockConfigEntry],
+]:
+    """Set up an ESPHome entry and return the MockConfigEntry."""
+
+    async def _mock_device_entry(
+        mock_client: APIClient,
+        entity_info: list[EntityInfo],
+        user_service: list[UserService],
+        states: list[EntityState],
+    ) -> MockConfigEntry:
+        return (
+            await _mock_generic_device_entry(
+                hass, mock_client, {}, (entity_info, user_service), states
+            )
+        ).entry
+
+    return _mock_device_entry
+
+
+@pytest.fixture
+async def mock_esphome_device(
+    hass: HomeAssistant,
+) -> Callable[
+    [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+    Awaitable[MockESPHomeDevice],
+]:
+    """Set up an ESPHome entry and return the MockESPHomeDevice."""
+
+    async def _mock_device(
+        mock_client: APIClient,
+        entity_info: list[EntityInfo],
+        user_service: list[UserService],
+        states: list[EntityState],
+        entry: MockConfigEntry | None = None,
+    ) -> MockESPHomeDevice:
+        return await _mock_generic_device_entry(
+            hass, mock_client, {}, (entity_info, user_service), states, entry
+        )
+
+    return _mock_device
diff --git a/tests/components/esphome/test_alarm_control_panel.py b/tests/components/esphome/test_alarm_control_panel.py
new file mode 100644
index 00000000000..90d7bde5215
--- /dev/null
+++ b/tests/components/esphome/test_alarm_control_panel.py
@@ -0,0 +1,247 @@
+"""Test ESPHome alarm_control_panels."""
+from unittest.mock import call
+
+from aioesphomeapi import (
+    AlarmControlPanelCommand,
+    AlarmControlPanelEntityState,
+    AlarmControlPanelInfo,
+    AlarmControlPanelState,
+    APIClient,
+)
+
+from homeassistant.components.alarm_control_panel import (
+    ATTR_CODE,
+    DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
+    SERVICE_ALARM_ARM_AWAY,
+    SERVICE_ALARM_ARM_CUSTOM_BYPASS,
+    SERVICE_ALARM_ARM_HOME,
+    SERVICE_ALARM_ARM_NIGHT,
+    SERVICE_ALARM_ARM_VACATION,
+    SERVICE_ALARM_DISARM,
+    SERVICE_ALARM_TRIGGER,
+)
+from homeassistant.components.esphome.alarm_control_panel import EspHomeACPFeatures
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_UNKNOWN,
+)
+from homeassistant.core import HomeAssistant
+
+
+async def test_generic_alarm_control_panel_requires_code(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic alarm_control_panel entity that requires a code."""
+    entity_info = [
+        AlarmControlPanelInfo(
+            object_id="myalarm_control_panel",
+            key=1,
+            name="my alarm_control_panel",
+            unique_id="my_alarm_control_panel",
+            supported_features=EspHomeACPFeatures.ARM_AWAY
+            | EspHomeACPFeatures.ARM_CUSTOM_BYPASS
+            | EspHomeACPFeatures.ARM_HOME
+            | EspHomeACPFeatures.ARM_NIGHT
+            | EspHomeACPFeatures.ARM_VACATION
+            | EspHomeACPFeatures.TRIGGER,
+            requires_code=True,
+            requires_code_to_arm=True,
+        )
+    ]
+    states = [
+        AlarmControlPanelEntityState(key=1, state=AlarmControlPanelState.ARMED_AWAY)
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("alarm_control_panel.test_my_alarm_control_panel")
+    assert state is not None
+    assert state.state == STATE_ALARM_ARMED_AWAY
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_ARM_AWAY,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.ARM_AWAY, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_ARM_CUSTOM_BYPASS,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.ARM_CUSTOM_BYPASS, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_ARM_HOME,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.ARM_HOME, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_ARM_NIGHT,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.ARM_NIGHT, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_ARM_VACATION,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.ARM_VACATION, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_TRIGGER,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.TRIGGER, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_DISARM,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.DISARM, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+
+async def test_generic_alarm_control_panel_no_code(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic alarm_control_panel entity that does not require a code."""
+    entity_info = [
+        AlarmControlPanelInfo(
+            object_id="myalarm_control_panel",
+            key=1,
+            name="my alarm_control_panel",
+            unique_id="my_alarm_control_panel",
+            supported_features=EspHomeACPFeatures.ARM_AWAY
+            | EspHomeACPFeatures.ARM_CUSTOM_BYPASS
+            | EspHomeACPFeatures.ARM_HOME
+            | EspHomeACPFeatures.ARM_NIGHT
+            | EspHomeACPFeatures.ARM_VACATION
+            | EspHomeACPFeatures.TRIGGER,
+            requires_code=False,
+            requires_code_to_arm=False,
+        )
+    ]
+    states = [
+        AlarmControlPanelEntityState(key=1, state=AlarmControlPanelState.ARMED_AWAY)
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("alarm_control_panel.test_my_alarm_control_panel")
+    assert state is not None
+    assert state.state == STATE_ALARM_ARMED_AWAY
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_DISARM,
+        {ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel"},
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.DISARM, None)]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+
+async def test_generic_alarm_control_panel_missing_state(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic alarm_control_panel entity that is missing state."""
+    entity_info = [
+        AlarmControlPanelInfo(
+            object_id="myalarm_control_panel",
+            key=1,
+            name="my alarm_control_panel",
+            unique_id="my_alarm_control_panel",
+            supported_features=EspHomeACPFeatures.ARM_AWAY
+            | EspHomeACPFeatures.ARM_CUSTOM_BYPASS
+            | EspHomeACPFeatures.ARM_HOME
+            | EspHomeACPFeatures.ARM_NIGHT
+            | EspHomeACPFeatures.ARM_VACATION
+            | EspHomeACPFeatures.TRIGGER,
+            requires_code=False,
+            requires_code_to_arm=False,
+        )
+    ]
+    states = []
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("alarm_control_panel.test_my_alarm_control_panel")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
diff --git a/tests/components/esphome/test_binary_sensor.py b/tests/components/esphome/test_binary_sensor.py
index 3f780f3003d..231bd51c0a3 100644
--- a/tests/components/esphome/test_binary_sensor.py
+++ b/tests/components/esphome/test_binary_sensor.py
@@ -1,9 +1,24 @@
 """Test ESPHome binary sensors."""
+from collections.abc import Awaitable, Callable
 
+from aioesphomeapi import (
+    APIClient,
+    BinarySensorInfo,
+    BinarySensorState,
+    EntityInfo,
+    EntityState,
+    UserService,
+)
+import pytest
 
 from homeassistant.components.esphome import DomainData
+from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 
+from .conftest import MockESPHomeDevice
+
+from tests.common import MockConfigEntry
+
 
 async def test_assist_in_progress(
     hass: HomeAssistant,
@@ -26,3 +41,135 @@ async def test_assist_in_progress(
 
     state = hass.states.get("binary_sensor.test_assist_in_progress")
     assert state.state == "off"
+
+
+@pytest.mark.parametrize(
+    "binary_state", ((True, STATE_ON), (False, STATE_OFF), (None, STATE_UNKNOWN))
+)
+async def test_binary_sensor_generic_entity(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    binary_state: tuple[bool, str],
+    mock_generic_device_entry: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockConfigEntry],
+    ],
+) -> None:
+    """Test a generic binary_sensor entity."""
+    entity_info = [
+        BinarySensorInfo(
+            object_id="mybinary_sensor",
+            key=1,
+            name="my binary_sensor",
+            unique_id="my_binary_sensor",
+        )
+    ]
+    esphome_state, hass_state = binary_state
+    states = [BinarySensorState(key=1, state=esphome_state)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == hass_state
+
+
+async def test_status_binary_sensor(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockConfigEntry],
+    ],
+) -> None:
+    """Test a generic binary_sensor entity."""
+    entity_info = [
+        BinarySensorInfo(
+            object_id="mybinary_sensor",
+            key=1,
+            name="my binary_sensor",
+            unique_id="my_binary_sensor",
+            is_status_binary_sensor=True,
+        )
+    ]
+    states = [BinarySensorState(key=1, state=None)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == STATE_ON
+
+
+async def test_binary_sensor_missing_state(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockConfigEntry],
+    ],
+) -> None:
+    """Test a generic binary_sensor that is missing state."""
+    entity_info = [
+        BinarySensorInfo(
+            object_id="mybinary_sensor",
+            key=1,
+            name="my binary_sensor",
+            unique_id="my_binary_sensor",
+        )
+    ]
+    states = [BinarySensorState(key=1, state=True, missing_state=True)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+
+async def test_binary_sensor_has_state_false(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test a generic binary_sensor where has_state is false."""
+    entity_info = [
+        BinarySensorInfo(
+            object_id="mybinary_sensor",
+            key=1,
+            name="my binary_sensor",
+            unique_id="my_binary_sensor",
+        )
+    ]
+    states = []
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+    mock_device.set_state(BinarySensorState(key=1, state=True, missing_state=False))
+    await hass.async_block_till_done()
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == STATE_ON
diff --git a/tests/components/esphome/test_button.py b/tests/components/esphome/test_button.py
new file mode 100644
index 00000000000..c0e7db14998
--- /dev/null
+++ b/tests/components/esphome/test_button.py
@@ -0,0 +1,54 @@
+"""Test ESPHome buttones."""
+
+
+from unittest.mock import call
+
+from aioesphomeapi import APIClient, ButtonInfo
+
+from homeassistant.components.button import (
+    DOMAIN as BUTTON_DOMAIN,
+    SERVICE_PRESS,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_UNAVAILABLE, STATE_UNKNOWN
+from homeassistant.core import HomeAssistant
+
+
+async def test_button_generic_entity(
+    hass: HomeAssistant, mock_client: APIClient, mock_esphome_device
+) -> None:
+    """Test a generic button entity."""
+    entity_info = [
+        ButtonInfo(
+            object_id="mybutton",
+            key=1,
+            name="my button",
+            unique_id="my_button",
+        )
+    ]
+    states = []
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("button.test_my_button")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+    await hass.services.async_call(
+        BUTTON_DOMAIN,
+        SERVICE_PRESS,
+        {ATTR_ENTITY_ID: "button.test_my_button"},
+        blocking=True,
+    )
+    mock_client.button_command.assert_has_calls([call(1)])
+    state = hass.states.get("button.test_my_button")
+    assert state is not None
+    assert state.state != STATE_UNKNOWN
+
+    await mock_device.mock_disconnect(False)
+    state = hass.states.get("button.test_my_button")
+    assert state is not None
+    assert state.state == STATE_UNAVAILABLE
diff --git a/tests/components/esphome/test_climate.py b/tests/components/esphome/test_climate.py
new file mode 100644
index 00000000000..59072dc2e59
--- /dev/null
+++ b/tests/components/esphome/test_climate.py
@@ -0,0 +1,314 @@
+"""Test ESPHome climates."""
+
+
+from unittest.mock import call
+
+from aioesphomeapi import (
+    APIClient,
+    ClimateAction,
+    ClimateFanMode,
+    ClimateInfo,
+    ClimateMode,
+    ClimatePreset,
+    ClimateState,
+    ClimateSwingMode,
+)
+
+from homeassistant.components.climate import (
+    ATTR_FAN_MODE,
+    ATTR_HVAC_MODE,
+    ATTR_PRESET_MODE,
+    ATTR_SWING_MODE,
+    ATTR_TARGET_TEMP_HIGH,
+    ATTR_TARGET_TEMP_LOW,
+    ATTR_TEMPERATURE,
+    DOMAIN as CLIMATE_DOMAIN,
+    FAN_HIGH,
+    SERVICE_SET_FAN_MODE,
+    SERVICE_SET_HVAC_MODE,
+    SERVICE_SET_PRESET_MODE,
+    SERVICE_SET_SWING_MODE,
+    SERVICE_SET_TEMPERATURE,
+    SWING_BOTH,
+    HVACMode,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+
+async def test_climate_entity(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic climate entity."""
+    entity_info = [
+        ClimateInfo(
+            object_id="myclimate",
+            key=1,
+            name="my climate",
+            unique_id="my_climate",
+            supports_current_temperature=True,
+            supports_two_point_target_temperature=True,
+            supports_action=True,
+            visual_min_temperature=10.0,
+            visual_max_temperature=30.0,
+        )
+    ]
+    states = [
+        ClimateState(
+            key=1,
+            mode=ClimateMode.COOL,
+            action=ClimateAction.COOLING,
+            current_temperature=30,
+            target_temperature=20,
+            fan_mode=ClimateFanMode.AUTO,
+            swing_mode=ClimateSwingMode.BOTH,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("climate.test_my_climate")
+    assert state is not None
+    assert state.state == HVACMode.COOL
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_TEMPERATURE: 25},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls([call(key=1, target_temperature=25.0)])
+    mock_client.climate_command.reset_mock()
+
+
+async def test_climate_entity_with_step_and_two_point(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic climate entity."""
+    entity_info = [
+        ClimateInfo(
+            object_id="myclimate",
+            key=1,
+            name="my climate",
+            unique_id="my_climate",
+            supports_current_temperature=True,
+            supports_two_point_target_temperature=True,
+            visual_target_temperature_step=2,
+            visual_current_temperature_step=2,
+            supports_action=False,
+            visual_min_temperature=10.0,
+            visual_max_temperature=30.0,
+            supported_modes=[ClimateMode.COOL, ClimateMode.HEAT, ClimateMode.AUTO],
+            supported_presets=[ClimatePreset.AWAY, ClimatePreset.ACTIVITY],
+        )
+    ]
+    states = [
+        ClimateState(
+            key=1,
+            mode=ClimateMode.COOL,
+            current_temperature=30,
+            target_temperature=20,
+            fan_mode=ClimateFanMode.AUTO,
+            swing_mode=ClimateSwingMode.BOTH,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("climate.test_my_climate")
+    assert state is not None
+    assert state.state == HVACMode.COOL
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_TEMPERATURE: 25},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls([call(key=1, target_temperature=25.0)])
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {
+            ATTR_ENTITY_ID: "climate.test_my_climate",
+            ATTR_HVAC_MODE: HVACMode.AUTO,
+            ATTR_TARGET_TEMP_LOW: 20,
+            ATTR_TARGET_TEMP_HIGH: 30,
+        },
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                mode=ClimateMode.AUTO,
+                target_temperature_low=20.0,
+                target_temperature_high=30.0,
+            )
+        ]
+    )
+    mock_client.climate_command.reset_mock()
+
+
+async def test_climate_entity_with_step_and_target_temp(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic climate entity."""
+    entity_info = [
+        ClimateInfo(
+            object_id="myclimate",
+            key=1,
+            name="my climate",
+            unique_id="my_climate",
+            supports_current_temperature=True,
+            visual_target_temperature_step=2,
+            visual_current_temperature_step=2,
+            supports_action=True,
+            visual_min_temperature=10.0,
+            visual_max_temperature=30.0,
+            supported_fan_modes=[ClimateFanMode.LOW, ClimateFanMode.HIGH],
+            supported_modes=[ClimateMode.COOL, ClimateMode.HEAT, ClimateMode.AUTO],
+            supported_presets=[ClimatePreset.AWAY, ClimatePreset.ACTIVITY],
+            supported_custom_presets=["preset1", "preset2"],
+            supported_custom_fan_modes=["fan1", "fan2"],
+            supported_swing_modes=[ClimateSwingMode.BOTH, ClimateSwingMode.OFF],
+        )
+    ]
+    states = [
+        ClimateState(
+            key=1,
+            mode=ClimateMode.COOL,
+            action=ClimateAction.COOLING,
+            current_temperature=30,
+            target_temperature=20,
+            fan_mode=ClimateFanMode.AUTO,
+            swing_mode=ClimateSwingMode.BOTH,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("climate.test_my_climate")
+    assert state is not None
+    assert state.state == HVACMode.COOL
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_TEMPERATURE: 25},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls([call(key=1, target_temperature=25.0)])
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {
+            ATTR_ENTITY_ID: "climate.test_my_climate",
+            ATTR_HVAC_MODE: HVACMode.AUTO,
+            ATTR_TARGET_TEMP_LOW: 20,
+            ATTR_TARGET_TEMP_HIGH: 30,
+        },
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                mode=ClimateMode.AUTO,
+                target_temperature_low=20.0,
+                target_temperature_high=30.0,
+            )
+        ]
+    )
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {
+            ATTR_ENTITY_ID: "climate.test_my_climate",
+            ATTR_HVAC_MODE: HVACMode.HEAT,
+        },
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                mode=ClimateMode.HEAT,
+            )
+        ]
+    )
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_PRESET_MODE: "away"},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                preset=ClimatePreset.AWAY,
+            )
+        ]
+    )
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_PRESET_MODE: "preset1"},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls([call(key=1, custom_preset="preset1")])
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_FAN_MODE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_FAN_MODE: FAN_HIGH},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls(
+        [call(key=1, fan_mode=ClimateFanMode.HIGH)]
+    )
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_FAN_MODE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_FAN_MODE: "fan2"},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls([call(key=1, custom_fan_mode="fan2")])
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_SWING_MODE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_SWING_MODE: SWING_BOTH},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls(
+        [call(key=1, swing_mode=ClimateSwingMode.BOTH)]
+    )
+    mock_client.climate_command.reset_mock()
diff --git a/tests/components/esphome/test_config_flow.py b/tests/components/esphome/test_config_flow.py
index 7d901733d81..662816a53d8 100644
--- a/tests/components/esphome/test_config_flow.py
+++ b/tests/components/esphome/test_config_flow.py
@@ -1,7 +1,10 @@
 """Test config flow."""
+import asyncio
+import json
 from unittest.mock import AsyncMock, MagicMock, patch
 
 from aioesphomeapi import (
+    APIClient,
     APIConnectionError,
     DeviceInfo,
     InvalidAuthAPIError,
@@ -9,6 +12,7 @@ from aioesphomeapi import (
     RequiresEncryptionAPIError,
     ResolveAPIError,
 )
+import aiohttp
 import pytest
 
 from homeassistant import config_entries, data_entry_flow
@@ -20,6 +24,10 @@ from homeassistant.components.esphome import (
     DomainData,
     dashboard,
 )
+from homeassistant.components.esphome.const import (
+    CONF_ALLOW_SERVICE_CALLS,
+    DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
+)
 from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import HomeAssistant
@@ -30,9 +38,10 @@ from . import VALID_NOISE_PSK
 from tests.common import MockConfigEntry
 
 INVALID_NOISE_PSK = "lSYBYEjQI1bVL8s2Vask4YytGMj1f1epNtmoim2yuTM="
+WRONG_NOISE_PSK = "GP+ciK+nVfTQ/gcz6uOdS+oKEdJgesU+jeu8Ssj2how="
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture(autouse=False)
 def mock_setup_entry():
     """Mock setting up a config entry."""
     with patch("homeassistant.components.esphome.async_setup_entry", return_value=True):
@@ -40,7 +49,7 @@ def mock_setup_entry():
 
 
 async def test_user_connection_works(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test we can finish a config flow."""
     result = await hass.config_entries.flow.async_init(
@@ -66,6 +75,9 @@ async def test_user_connection_works(
         CONF_NOISE_PSK: "",
         CONF_DEVICE_NAME: "test",
     }
+    assert result["options"] == {
+        CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS
+    }
     assert result["title"] == "test"
     assert result["result"].unique_id == "11:22:33:44:55:aa"
 
@@ -79,7 +91,7 @@ async def test_user_connection_works(
 
 
 async def test_user_connection_updates_host(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test setup up the same name updates the host."""
     entry = MockConfigEntry(
@@ -107,8 +119,60 @@ async def test_user_connection_updates_host(
     assert entry.data[CONF_HOST] == "127.0.0.1"
 
 
+async def test_user_sets_unique_id(
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
+) -> None:
+    """Test that the user flow sets the unique id."""
+    service_info = zeroconf.ZeroconfServiceInfo(
+        host="192.168.43.183",
+        addresses=["192.168.43.183"],
+        hostname="test8266.local.",
+        name="mock_name",
+        port=6053,
+        properties={
+            "mac": "1122334455aa",
+        },
+        type="mock_type",
+    )
+    discovery_result = await hass.config_entries.flow.async_init(
+        "esphome", context={"source": config_entries.SOURCE_ZEROCONF}, data=service_info
+    )
+
+    assert discovery_result["type"] == FlowResultType.FORM
+    assert discovery_result["step_id"] == "discovery_confirm"
+
+    discovery_result = await hass.config_entries.flow.async_configure(
+        discovery_result["flow_id"],
+        {},
+    )
+    assert discovery_result["type"] == FlowResultType.CREATE_ENTRY
+    assert discovery_result["data"] == {
+        CONF_HOST: "192.168.43.183",
+        CONF_PORT: 6053,
+        CONF_PASSWORD: "",
+        CONF_NOISE_PSK: "",
+        CONF_DEVICE_NAME: "test",
+    }
+
+    result = await hass.config_entries.flow.async_init(
+        "esphome",
+        context={"source": config_entries.SOURCE_USER},
+        data=None,
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_HOST: "127.0.0.1", CONF_PORT: 6053},
+    )
+    assert result["type"] == FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+
 async def test_user_resolve_error(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test user step with IP resolve error."""
 
@@ -132,8 +196,55 @@ async def test_user_resolve_error(
     assert len(mock_client.disconnect.mock_calls) == 1
 
 
+async def test_user_causes_zeroconf_to_abort(
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
+) -> None:
+    """Test that the user flow sets the unique id and aborts the zeroconf flow."""
+    service_info = zeroconf.ZeroconfServiceInfo(
+        host="192.168.43.183",
+        addresses=["192.168.43.183"],
+        hostname="test8266.local.",
+        name="mock_name",
+        port=6053,
+        properties={
+            "mac": "1122334455aa",
+        },
+        type="mock_type",
+    )
+    discovery_result = await hass.config_entries.flow.async_init(
+        "esphome", context={"source": config_entries.SOURCE_ZEROCONF}, data=service_info
+    )
+
+    assert discovery_result["type"] == FlowResultType.FORM
+    assert discovery_result["step_id"] == "discovery_confirm"
+
+    result = await hass.config_entries.flow.async_init(
+        "esphome",
+        context={"source": config_entries.SOURCE_USER},
+        data=None,
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_HOST: "127.0.0.1", CONF_PORT: 6053},
+    )
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_HOST: "127.0.0.1",
+        CONF_PORT: 6053,
+        CONF_PASSWORD: "",
+        CONF_NOISE_PSK: "",
+        CONF_DEVICE_NAME: "test",
+    }
+
+    assert not hass.config_entries.flow.async_progress_by_handler(DOMAIN)
+
+
 async def test_user_connection_error(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test user step with connection error."""
     mock_client.device_info.side_effect = APIConnectionError
@@ -154,7 +265,7 @@ async def test_user_connection_error(
 
 
 async def test_user_with_password(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test user step with password."""
     mock_client.device_info.return_value = DeviceInfo(uses_password=True, name="test")
@@ -209,8 +320,218 @@ async def test_user_invalid_password(
     assert result["errors"] == {"base": "invalid_auth"}
 
 
+async def test_user_dashboard_has_wrong_key(
+    hass: HomeAssistant,
+    mock_client,
+    mock_dashboard,
+    mock_zeroconf: None,
+    mock_setup_entry: None,
+) -> None:
+    """Test user step with key from dashboard that is incorrect."""
+    mock_client.device_info.side_effect = [
+        RequiresEncryptionAPIError,
+        InvalidEncryptionKeyAPIError,
+        DeviceInfo(
+            uses_password=False,
+            name="test",
+            mac_address="11:22:33:44:55:AA",
+        ),
+    ]
+
+    with patch(
+        "homeassistant.components.esphome.dashboard.ESPHomeDashboardAPI.get_encryption_key",
+        return_value=WRONG_NOISE_PSK,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            "esphome",
+            context={"source": config_entries.SOURCE_USER},
+            data={CONF_HOST: "127.0.0.1", CONF_PORT: 6053},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "encryption_key"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={CONF_NOISE_PSK: VALID_NOISE_PSK}
+    )
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_HOST: "127.0.0.1",
+        CONF_PORT: 6053,
+        CONF_PASSWORD: "",
+        CONF_NOISE_PSK: VALID_NOISE_PSK,
+        CONF_DEVICE_NAME: "test",
+    }
+    assert mock_client.noise_psk == VALID_NOISE_PSK
+
+
+async def test_user_discovers_name_and_gets_key_from_dashboard(
+    hass: HomeAssistant,
+    mock_client,
+    mock_dashboard,
+    mock_zeroconf: None,
+    mock_setup_entry: None,
+) -> None:
+    """Test user step can discover the name and get the key from the dashboard."""
+    mock_client.device_info.side_effect = [
+        RequiresEncryptionAPIError,
+        InvalidEncryptionKeyAPIError("Wrong key", "test"),
+        DeviceInfo(
+            uses_password=False,
+            name="test",
+            mac_address="11:22:33:44:55:AA",
+        ),
+    ]
+
+    mock_dashboard["configured"].append(
+        {
+            "name": "test",
+            "configuration": "test.yaml",
+        }
+    )
+    await dashboard.async_get_dashboard(hass).async_refresh()
+
+    with patch(
+        "homeassistant.components.esphome.dashboard.ESPHomeDashboardAPI.get_encryption_key",
+        return_value=VALID_NOISE_PSK,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            "esphome",
+            context={"source": config_entries.SOURCE_USER},
+            data={CONF_HOST: "127.0.0.1", CONF_PORT: 6053},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_HOST: "127.0.0.1",
+        CONF_PORT: 6053,
+        CONF_PASSWORD: "",
+        CONF_NOISE_PSK: VALID_NOISE_PSK,
+        CONF_DEVICE_NAME: "test",
+    }
+    assert mock_client.noise_psk == VALID_NOISE_PSK
+
+
+@pytest.mark.parametrize(
+    "dashboard_exception",
+    [aiohttp.ClientError(), json.JSONDecodeError("test", "test", 0)],
+)
+async def test_user_discovers_name_and_gets_key_from_dashboard_fails(
+    hass: HomeAssistant,
+    dashboard_exception: Exception,
+    mock_client,
+    mock_dashboard,
+    mock_zeroconf: None,
+    mock_setup_entry: None,
+) -> None:
+    """Test user step can discover the name and get the key from the dashboard."""
+    mock_client.device_info.side_effect = [
+        RequiresEncryptionAPIError,
+        InvalidEncryptionKeyAPIError("Wrong key", "test"),
+        DeviceInfo(
+            uses_password=False,
+            name="test",
+            mac_address="11:22:33:44:55:aa",
+        ),
+    ]
+
+    mock_dashboard["configured"].append(
+        {
+            "name": "test",
+            "configuration": "test.yaml",
+        }
+    )
+    await dashboard.async_get_dashboard(hass).async_refresh()
+
+    with patch(
+        "homeassistant.components.esphome.dashboard.ESPHomeDashboardAPI.get_encryption_key",
+        side_effect=dashboard_exception,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            "esphome",
+            context={"source": config_entries.SOURCE_USER},
+            data={CONF_HOST: "127.0.0.1", CONF_PORT: 6053},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "encryption_key"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={CONF_NOISE_PSK: VALID_NOISE_PSK}
+    )
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_HOST: "127.0.0.1",
+        CONF_PORT: 6053,
+        CONF_PASSWORD: "",
+        CONF_NOISE_PSK: VALID_NOISE_PSK,
+        CONF_DEVICE_NAME: "test",
+    }
+    assert mock_client.noise_psk == VALID_NOISE_PSK
+
+
+async def test_user_discovers_name_and_dashboard_is_unavailable(
+    hass: HomeAssistant,
+    mock_client,
+    mock_dashboard,
+    mock_zeroconf: None,
+    mock_setup_entry: None,
+) -> None:
+    """Test user step can discover the name but the dashboard is unavailable."""
+    mock_client.device_info.side_effect = [
+        RequiresEncryptionAPIError,
+        InvalidEncryptionKeyAPIError("Wrong key", "test"),
+        DeviceInfo(
+            uses_password=False,
+            name="test",
+            mac_address="11:22:33:44:55:AA",
+        ),
+    ]
+
+    mock_dashboard["configured"].append(
+        {
+            "name": "test",
+            "configuration": "test.yaml",
+        }
+    )
+
+    with patch(
+        "esphome_dashboard_api.ESPHomeDashboardAPI.get_devices",
+        side_effect=asyncio.TimeoutError,
+    ):
+        await dashboard.async_get_dashboard(hass).async_refresh()
+        result = await hass.config_entries.flow.async_init(
+            "esphome",
+            context={"source": config_entries.SOURCE_USER},
+            data={CONF_HOST: "127.0.0.1", CONF_PORT: 6053},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "encryption_key"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={CONF_NOISE_PSK: VALID_NOISE_PSK}
+    )
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_HOST: "127.0.0.1",
+        CONF_PORT: 6053,
+        CONF_PASSWORD: "",
+        CONF_NOISE_PSK: VALID_NOISE_PSK,
+        CONF_DEVICE_NAME: "test",
+    }
+    assert mock_client.noise_psk == VALID_NOISE_PSK
+
+
 async def test_login_connection_error(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test user step with connection error on login attempt."""
     mock_client.device_info.return_value = DeviceInfo(uses_password=True, name="test")
@@ -236,7 +557,7 @@ async def test_login_connection_error(
 
 
 async def test_discovery_initiation(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test discovery importing works."""
     service_info = zeroconf.ZeroconfServiceInfo(
@@ -268,7 +589,7 @@ async def test_discovery_initiation(
 
 
 async def test_discovery_no_mac(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test discovery aborted if old ESPHome without mac in zeroconf."""
     service_info = zeroconf.ZeroconfServiceInfo(
@@ -287,7 +608,9 @@ async def test_discovery_no_mac(
     assert flow["reason"] == "mdns_missing_mac"
 
 
-async def test_discovery_already_configured(hass: HomeAssistant, mock_client) -> None:
+async def test_discovery_already_configured(
+    hass: HomeAssistant, mock_client: APIClient, mock_setup_entry: None
+) -> None:
     """Test discovery aborts if already configured via hostname."""
     entry = MockConfigEntry(
         domain=DOMAIN,
@@ -314,7 +637,9 @@ async def test_discovery_already_configured(hass: HomeAssistant, mock_client) ->
     assert result["reason"] == "already_configured"
 
 
-async def test_discovery_duplicate_data(hass: HomeAssistant, mock_client) -> None:
+async def test_discovery_duplicate_data(
+    hass: HomeAssistant, mock_client: APIClient, mock_setup_entry: None
+) -> None:
     """Test discovery aborts if same mDNS packet arrives."""
     service_info = zeroconf.ZeroconfServiceInfo(
         host="192.168.43.183",
@@ -339,7 +664,9 @@ async def test_discovery_duplicate_data(hass: HomeAssistant, mock_client) -> Non
     assert result["reason"] == "already_in_progress"
 
 
-async def test_discovery_updates_unique_id(hass: HomeAssistant, mock_client) -> None:
+async def test_discovery_updates_unique_id(
+    hass: HomeAssistant, mock_client: APIClient, mock_setup_entry: None
+) -> None:
     """Test a duplicate discovery host aborts and updates existing entry."""
     entry = MockConfigEntry(
         domain=DOMAIN,
@@ -369,7 +696,7 @@ async def test_discovery_updates_unique_id(hass: HomeAssistant, mock_client) ->
 
 
 async def test_user_requires_psk(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test user step with requiring encryption key."""
     mock_client.device_info.side_effect = RequiresEncryptionAPIError
@@ -384,13 +711,13 @@ async def test_user_requires_psk(
     assert result["step_id"] == "encryption_key"
     assert result["errors"] == {}
 
-    assert len(mock_client.connect.mock_calls) == 1
-    assert len(mock_client.device_info.mock_calls) == 1
-    assert len(mock_client.disconnect.mock_calls) == 1
+    assert len(mock_client.connect.mock_calls) == 2
+    assert len(mock_client.device_info.mock_calls) == 2
+    assert len(mock_client.disconnect.mock_calls) == 2
 
 
 async def test_encryption_key_valid_psk(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test encryption key step with valid key."""
 
@@ -424,7 +751,7 @@ async def test_encryption_key_valid_psk(
 
 
 async def test_encryption_key_invalid_psk(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test encryption key step with invalid key."""
 
@@ -473,7 +800,7 @@ async def test_reauth_initiation(
 
 
 async def test_reauth_confirm_valid(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test reauth initiation with valid PSK."""
     entry = MockConfigEntry(
@@ -502,7 +829,11 @@ async def test_reauth_confirm_valid(
 
 
 async def test_reauth_fixed_via_dashboard(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_dashboard
+    hass: HomeAssistant,
+    mock_client,
+    mock_zeroconf: None,
+    mock_dashboard,
+    mock_setup_entry: None,
 ) -> None:
     """Test reauth fixed automatically via dashboard."""
 
@@ -554,6 +885,7 @@ async def test_reauth_fixed_via_dashboard_add_encryption_remove_password(
     mock_zeroconf: None,
     mock_dashboard,
     mock_config_entry,
+    mock_setup_entry: None,
 ) -> None:
     """Test reauth fixed automatically via dashboard with password removed."""
     mock_client.device_info.side_effect = (
@@ -596,6 +928,7 @@ async def test_reauth_fixed_via_remove_password(
     mock_client,
     mock_config_entry,
     mock_dashboard,
+    mock_setup_entry: None,
 ) -> None:
     """Test reauth fixed automatically by seeing password removed."""
     mock_client.device_info.return_value = DeviceInfo(uses_password=False, name="test")
@@ -615,7 +948,11 @@ async def test_reauth_fixed_via_remove_password(
 
 
 async def test_reauth_fixed_via_dashboard_at_confirm(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_dashboard
+    hass: HomeAssistant,
+    mock_client,
+    mock_zeroconf: None,
+    mock_dashboard,
+    mock_setup_entry: None,
 ) -> None:
     """Test reauth fixed automatically via dashboard at confirm step."""
 
@@ -668,7 +1005,7 @@ async def test_reauth_fixed_via_dashboard_at_confirm(
 
 
 async def test_reauth_confirm_invalid(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test reauth initiation with invalid PSK."""
     entry = MockConfigEntry(
@@ -709,7 +1046,7 @@ async def test_reauth_confirm_invalid(
 
 
 async def test_reauth_confirm_invalid_with_unique_id(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test reauth initiation with invalid PSK."""
     entry = MockConfigEntry(
@@ -750,7 +1087,9 @@ async def test_reauth_confirm_invalid_with_unique_id(
     assert entry.data[CONF_NOISE_PSK] == VALID_NOISE_PSK
 
 
-async def test_discovery_dhcp_updates_host(hass: HomeAssistant, mock_client) -> None:
+async def test_discovery_dhcp_updates_host(
+    hass: HomeAssistant, mock_client: APIClient, mock_setup_entry: None
+) -> None:
     """Test dhcp discovery updates host and aborts."""
     entry = MockConfigEntry(
         domain=DOMAIN,
@@ -774,7 +1113,9 @@ async def test_discovery_dhcp_updates_host(hass: HomeAssistant, mock_client) ->
     assert entry.data[CONF_HOST] == "192.168.43.184"
 
 
-async def test_discovery_dhcp_no_changes(hass: HomeAssistant, mock_client) -> None:
+async def test_discovery_dhcp_no_changes(
+    hass: HomeAssistant, mock_client: APIClient, mock_setup_entry: None
+) -> None:
     """Test dhcp discovery updates host and aborts."""
     entry = MockConfigEntry(
         domain=DOMAIN,
@@ -827,7 +1168,11 @@ async def test_discovery_hassio(hass: HomeAssistant, mock_dashboard) -> None:
 
 
 async def test_zeroconf_encryption_key_via_dashboard(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_dashboard
+    hass: HomeAssistant,
+    mock_client,
+    mock_zeroconf: None,
+    mock_dashboard,
+    mock_setup_entry: None,
 ) -> None:
     """Test encryption key retrieved from dashboard."""
     service_info = zeroconf.ZeroconfServiceInfo(
@@ -862,7 +1207,7 @@ async def test_zeroconf_encryption_key_via_dashboard(
         DeviceInfo(
             uses_password=False,
             name="test8266",
-            mac_address="11:22:33:44:55:aa",
+            mac_address="11:22:33:44:55:AA",
         ),
     ]
 
@@ -889,7 +1234,11 @@ async def test_zeroconf_encryption_key_via_dashboard(
 
 
 async def test_zeroconf_no_encryption_key_via_dashboard(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_dashboard
+    hass: HomeAssistant,
+    mock_client,
+    mock_zeroconf: None,
+    mock_dashboard,
+    mock_setup_entry: None,
 ) -> None:
     """Test encryption key not retrieved from dashboard."""
     service_info = zeroconf.ZeroconfServiceInfo(
@@ -920,3 +1269,42 @@ async def test_zeroconf_no_encryption_key_via_dashboard(
 
     assert result["type"] == FlowResultType.FORM
     assert result["step_id"] == "encryption_key"
+
+
+@pytest.mark.parametrize("option_value", [True, False])
+async def test_option_flow(
+    hass: HomeAssistant,
+    option_value: bool,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test config flow options."""
+    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"] == data_entry_flow.FlowResultType.FORM
+    assert result["step_id"] == "init"
+    assert result["data_schema"]({}) == {
+        CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS
+    }
+
+    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: option_value,
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["data"] == {CONF_ALLOW_SERVICE_CALLS: option_value}
+    assert len(mock_reload.mock_calls) == int(option_value)
diff --git a/tests/components/esphome/test_cover.py b/tests/components/esphome/test_cover.py
new file mode 100644
index 00000000000..59eadb3cfd9
--- /dev/null
+++ b/tests/components/esphome/test_cover.py
@@ -0,0 +1,208 @@
+"""Test ESPHome covers."""
+
+from collections.abc import Awaitable, Callable
+from unittest.mock import call
+
+from aioesphomeapi import (
+    APIClient,
+    CoverInfo,
+    CoverOperation,
+    CoverState,
+    EntityInfo,
+    EntityState,
+    UserService,
+)
+
+from homeassistant.components.cover import (
+    ATTR_CURRENT_POSITION,
+    ATTR_CURRENT_TILT_POSITION,
+    ATTR_POSITION,
+    ATTR_TILT_POSITION,
+    DOMAIN as COVER_DOMAIN,
+    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,
+    STATE_CLOSED,
+    STATE_CLOSING,
+    STATE_OPEN,
+    STATE_OPENING,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+from .conftest import MockESPHomeDevice
+
+
+async def test_cover_entity(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test a generic cover entity."""
+    entity_info = [
+        CoverInfo(
+            object_id="mycover",
+            key=1,
+            name="my cover",
+            unique_id="my_cover",
+            supports_position=True,
+            supports_tilt=True,
+            supports_stop=True,
+        )
+    ]
+    states = [
+        CoverState(
+            key=1,
+            position=0.5,
+            tilt=0.5,
+            current_operation=CoverOperation.IS_OPENING,
+        )
+    ]
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("cover.test_my_cover")
+    assert state is not None
+    assert state.state == STATE_OPENING
+    assert state.attributes[ATTR_CURRENT_POSITION] == 50
+    assert state.attributes[ATTR_CURRENT_TILT_POSITION] == 50
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_CLOSE_COVER,
+        {ATTR_ENTITY_ID: "cover.test_my_cover"},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, position=0.0)])
+    mock_client.cover_command.reset_mock()
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_OPEN_COVER,
+        {ATTR_ENTITY_ID: "cover.test_my_cover"},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, position=1.0)])
+    mock_client.cover_command.reset_mock()
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_SET_COVER_POSITION,
+        {ATTR_ENTITY_ID: "cover.test_my_cover", ATTR_POSITION: 50},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, position=0.5)])
+    mock_client.cover_command.reset_mock()
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_STOP_COVER,
+        {ATTR_ENTITY_ID: "cover.test_my_cover"},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, stop=True)])
+    mock_client.cover_command.reset_mock()
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_OPEN_COVER_TILT,
+        {ATTR_ENTITY_ID: "cover.test_my_cover"},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, tilt=1.0)])
+    mock_client.cover_command.reset_mock()
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_CLOSE_COVER_TILT,
+        {ATTR_ENTITY_ID: "cover.test_my_cover"},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, tilt=0.0)])
+    mock_client.cover_command.reset_mock()
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_SET_COVER_TILT_POSITION,
+        {ATTR_ENTITY_ID: "cover.test_my_cover", ATTR_TILT_POSITION: 50},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, tilt=0.5)])
+    mock_client.cover_command.reset_mock()
+
+    mock_device.set_state(
+        CoverState(key=1, position=0.0, current_operation=CoverOperation.IDLE)
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("cover.test_my_cover")
+    assert state is not None
+    assert state.state == STATE_CLOSED
+
+    mock_device.set_state(
+        CoverState(key=1, position=0.5, current_operation=CoverOperation.IS_CLOSING)
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("cover.test_my_cover")
+    assert state is not None
+    assert state.state == STATE_CLOSING
+
+    mock_device.set_state(
+        CoverState(key=1, position=1.0, current_operation=CoverOperation.IDLE)
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("cover.test_my_cover")
+    assert state is not None
+    assert state.state == STATE_OPEN
+
+
+async def test_cover_entity_without_position(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test a generic cover entity without position, tilt, or stop."""
+    entity_info = [
+        CoverInfo(
+            object_id="mycover",
+            key=1,
+            name="my cover",
+            unique_id="my_cover",
+            supports_position=False,
+            supports_tilt=False,
+            supports_stop=False,
+        )
+    ]
+    states = [
+        CoverState(
+            key=1,
+            position=0.5,
+            tilt=0.5,
+            current_operation=CoverOperation.IS_OPENING,
+        )
+    ]
+    user_service = []
+    await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("cover.test_my_cover")
+    assert state is not None
+    assert state.state == STATE_OPENING
+    assert ATTR_CURRENT_TILT_POSITION not in state.attributes
+    assert ATTR_CURRENT_POSITION not in state.attributes
diff --git a/tests/components/esphome/test_dashboard.py b/tests/components/esphome/test_dashboard.py
index 580e741e03f..d16bf7c4d00 100644
--- a/tests/components/esphome/test_dashboard.py
+++ b/tests/components/esphome/test_dashboard.py
@@ -1,4 +1,5 @@
 """Test ESPHome dashboard features."""
+import asyncio
 from unittest.mock import patch
 
 from aioesphomeapi import DeviceInfo, InvalidAuthAPIError
@@ -10,6 +11,86 @@ from homeassistant.data_entry_flow import FlowResultType
 
 from . import VALID_NOISE_PSK
 
+from tests.common import MockConfigEntry
+
+
+async def test_dashboard_storage(
+    hass: HomeAssistant, init_integration, mock_dashboard, hass_storage
+) -> None:
+    """Test dashboard storage."""
+    assert hass_storage[dashboard.STORAGE_KEY]["data"] == {
+        "info": {"addon_slug": "mock-slug", "host": "mock-host", "port": 1234}
+    }
+    await dashboard.async_set_dashboard_info(hass, "test-slug", "new-host", 6052)
+    assert hass_storage[dashboard.STORAGE_KEY]["data"] == {
+        "info": {"addon_slug": "test-slug", "host": "new-host", "port": 6052}
+    }
+
+
+async def test_restore_dashboard_storage(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, hass_storage
+) -> MockConfigEntry:
+    """Restore dashboard url and slug from storage."""
+    hass_storage[dashboard.STORAGE_KEY] = {
+        "version": dashboard.STORAGE_VERSION,
+        "minor_version": dashboard.STORAGE_VERSION,
+        "key": dashboard.STORAGE_KEY,
+        "data": {"info": {"addon_slug": "test-slug", "host": "new-host", "port": 6052}},
+    }
+    with patch.object(
+        dashboard, "async_get_or_create_dashboard_manager"
+    ) as mock_get_or_create:
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+        assert mock_get_or_create.call_count == 1
+
+
+async def test_setup_dashboard_fails(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, hass_storage
+) -> MockConfigEntry:
+    """Test that nothing is stored on failed dashboard setup when there was no dashboard before."""
+    with patch.object(
+        dashboard.ESPHomeDashboardAPI, "get_devices", side_effect=asyncio.TimeoutError
+    ) as mock_get_devices:
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+        await dashboard.async_set_dashboard_info(hass, "test-slug", "test-host", 6052)
+        assert mock_config_entry.state == ConfigEntryState.LOADED
+        assert mock_get_devices.call_count == 1
+
+    assert dashboard.STORAGE_KEY not in hass_storage
+
+
+async def test_setup_dashboard_fails_when_already_setup(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, hass_storage
+) -> MockConfigEntry:
+    """Test failed dashboard setup still reloads entries if one existed before."""
+    with patch.object(dashboard.ESPHomeDashboardAPI, "get_devices") as mock_get_devices:
+        await dashboard.async_set_dashboard_info(
+            hass, "test-slug", "working-host", 6052
+        )
+        await hass.async_block_till_done()
+
+    assert mock_get_devices.call_count == 1
+    assert dashboard.STORAGE_KEY in hass_storage
+
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    with patch.object(
+        dashboard.ESPHomeDashboardAPI, "get_devices", side_effect=asyncio.TimeoutError
+    ) as mock_get_devices, patch(
+        "homeassistant.components.esphome.async_setup_entry", return_value=True
+    ) as mock_setup:
+        await dashboard.async_set_dashboard_info(hass, "test-slug", "test-host", 6052)
+        await hass.async_block_till_done()
+
+    assert mock_config_entry.state == ConfigEntryState.LOADED
+    assert mock_get_devices.call_count == 1
+    # We still setup, and reload, but we do not do the reauths
+    assert dashboard.STORAGE_KEY in hass_storage
+    assert len(mock_setup.mock_calls) == 1
+
 
 async def test_new_info_reload_config_entries(
     hass: HomeAssistant, init_integration, mock_dashboard
diff --git a/tests/components/esphome/test_entity.py b/tests/components/esphome/test_entity.py
new file mode 100644
index 00000000000..39bfec852e7
--- /dev/null
+++ b/tests/components/esphome/test_entity.py
@@ -0,0 +1,103 @@
+"""Test ESPHome binary sensors."""
+from collections.abc import Awaitable, Callable
+from typing import Any
+
+from aioesphomeapi import (
+    APIClient,
+    BinarySensorInfo,
+    BinarySensorState,
+    EntityInfo,
+    EntityState,
+    UserService,
+)
+
+from homeassistant.const import ATTR_RESTORED, STATE_ON
+from homeassistant.core import HomeAssistant
+
+from .conftest import MockESPHomeDevice
+
+
+async def test_entities_removed(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    hass_storage: dict[str, Any],
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test a generic binary_sensor where has_state is false."""
+    entity_info = [
+        BinarySensorInfo(
+            object_id="mybinary_sensor",
+            key=1,
+            name="my binary_sensor",
+            unique_id="my_binary_sensor",
+        ),
+        BinarySensorInfo(
+            object_id="mybinary_sensor_to_be_removed",
+            key=2,
+            name="my binary_sensor to be removed",
+            unique_id="mybinary_sensor_to_be_removed",
+        ),
+    ]
+    states = [
+        BinarySensorState(key=1, state=True, missing_state=False),
+        BinarySensorState(key=2, state=True, missing_state=False),
+    ]
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    entry = mock_device.entry
+    entry_id = entry.entry_id
+    storage_key = f"esphome.{entry_id}"
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == STATE_ON
+    state = hass.states.get("binary_sensor.test_my_binary_sensor_to_be_removed")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert len(hass_storage[storage_key]["data"]["binary_sensor"]) == 2
+
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.attributes[ATTR_RESTORED] is True
+    state = hass.states.get("binary_sensor.test_my_binary_sensor_to_be_removed")
+    assert state is not None
+    assert state.attributes[ATTR_RESTORED] is True
+
+    entity_info = [
+        BinarySensorInfo(
+            object_id="mybinary_sensor",
+            key=1,
+            name="my binary_sensor",
+            unique_id="my_binary_sensor",
+        ),
+    ]
+    states = [
+        BinarySensorState(key=1, state=True, missing_state=False),
+    ]
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+        entry=entry,
+    )
+    assert mock_device.entry.entry_id == entry_id
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == STATE_ON
+    state = hass.states.get("binary_sensor.test_my_binary_sensor_to_be_removed")
+    assert state is None
+    await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
+    assert len(hass_storage[storage_key]["data"]["binary_sensor"]) == 1
diff --git a/tests/components/esphome/test_fan.py b/tests/components/esphome/test_fan.py
new file mode 100644
index 00000000000..4f8f3918a1b
--- /dev/null
+++ b/tests/components/esphome/test_fan.py
@@ -0,0 +1,318 @@
+"""Test ESPHome fans."""
+
+
+from unittest.mock import call
+
+from aioesphomeapi import (
+    APIClient,
+    APIVersion,
+    FanDirection,
+    FanInfo,
+    FanSpeed,
+    FanState,
+)
+
+from homeassistant.components.fan import (
+    ATTR_DIRECTION,
+    ATTR_OSCILLATING,
+    ATTR_PERCENTAGE,
+    DOMAIN as FAN_DOMAIN,
+    SERVICE_DECREASE_SPEED,
+    SERVICE_INCREASE_SPEED,
+    SERVICE_OSCILLATE,
+    SERVICE_SET_DIRECTION,
+    SERVICE_SET_PERCENTAGE,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    STATE_ON,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+
+async def test_fan_entity_with_all_features_old_api(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic fan entity that uses the old api and has all features."""
+    entity_info = [
+        FanInfo(
+            object_id="myfan",
+            key=1,
+            name="my fan",
+            unique_id="my_fan",
+            supports_direction=True,
+            supports_speed=True,
+            supports_oscillation=True,
+        )
+    ]
+    states = [
+        FanState(
+            key=1,
+            state=True,
+            oscillating=True,
+            speed=FanSpeed.MEDIUM,
+            direction=FanDirection.REVERSE,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("fan.test_my_fan")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 20},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, speed=FanSpeed.LOW, state=True)]
+    )
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 50},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, speed=FanSpeed.MEDIUM, state=True)]
+    )
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_DECREASE_SPEED,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, speed=FanSpeed.LOW, state=True)]
+    )
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_INCREASE_SPEED,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, speed=FanSpeed.HIGH, state=True)]
+    )
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_SET_PERCENTAGE,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 100},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, speed=FanSpeed.HIGH, state=True)]
+    )
+    mock_client.fan_command.reset_mock()
+
+
+async def test_fan_entity_with_all_features_new_api(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic fan entity that uses the new api and has all features."""
+    mock_client.api_version = APIVersion(1, 4)
+    entity_info = [
+        FanInfo(
+            object_id="myfan",
+            key=1,
+            name="my fan",
+            unique_id="my_fan",
+            supported_speed_levels=4,
+            supports_direction=True,
+            supports_speed=True,
+            supports_oscillation=True,
+        )
+    ]
+    states = [
+        FanState(
+            key=1,
+            state=True,
+            oscillating=True,
+            speed_level=3,
+            direction=FanDirection.REVERSE,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("fan.test_my_fan")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 20},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, speed_level=1, state=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 50},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, speed_level=2, state=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_DECREASE_SPEED,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, speed_level=2, state=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_INCREASE_SPEED,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, speed_level=4, state=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_SET_PERCENTAGE,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 100},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, speed_level=4, state=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_SET_PERCENTAGE,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 0},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_OSCILLATE,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_OSCILLATING: True},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, oscillating=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_OSCILLATE,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_OSCILLATING: False},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, oscillating=False)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_SET_DIRECTION,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_DIRECTION: "forward"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, direction=FanDirection.FORWARD)]
+    )
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_SET_DIRECTION,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_DIRECTION: "reverse"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, direction=FanDirection.REVERSE)]
+    )
+    mock_client.fan_command.reset_mock()
+
+
+async def test_fan_entity_with_no_features_new_api(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic fan entity that uses the new api and has no features."""
+    mock_client.api_version = APIVersion(1, 4)
+    entity_info = [
+        FanInfo(
+            object_id="myfan",
+            key=1,
+            name="my fan",
+            unique_id="my_fan",
+            supports_direction=False,
+            supports_speed=False,
+            supports_oscillation=False,
+        )
+    ]
+    states = [FanState(key=1, state=True)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("fan.test_my_fan")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, state=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.fan_command.reset_mock()
diff --git a/tests/components/esphome/test_light.py b/tests/components/esphome/test_light.py
new file mode 100644
index 00000000000..a0998898e75
--- /dev/null
+++ b/tests/components/esphome/test_light.py
@@ -0,0 +1,1678 @@
+"""Test ESPHome lights."""
+
+
+from unittest.mock import call
+
+from aioesphomeapi import (
+    APIClient,
+    APIVersion,
+    LightColorCapability,
+    LightInfo,
+    LightState,
+)
+import pytest
+
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS,
+    ATTR_COLOR_MODE,
+    ATTR_COLOR_TEMP_KELVIN,
+    ATTR_EFFECT,
+    ATTR_EFFECT_LIST,
+    ATTR_FLASH,
+    ATTR_HS_COLOR,
+    ATTR_MAX_COLOR_TEMP_KELVIN,
+    ATTR_MAX_MIREDS,
+    ATTR_MIN_COLOR_TEMP_KELVIN,
+    ATTR_MIN_MIREDS,
+    ATTR_RGB_COLOR,
+    ATTR_RGBW_COLOR,
+    ATTR_RGBWW_COLOR,
+    ATTR_SUPPORTED_COLOR_MODES,
+    ATTR_TRANSITION,
+    DOMAIN as LIGHT_DOMAIN,
+    FLASH_LONG,
+    FLASH_SHORT,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    STATE_ON,
+    ColorMode,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+
+async def test_light_on_off(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that only supports on/off."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[LightColorCapability.ON_OFF],
+        )
+    ]
+    states = [LightState(key=1, state=True)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [call(key=1, state=True, color_mode=LightColorCapability.ON_OFF)]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_brightness(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that only supports brightness."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[LightColorCapability.BRIGHTNESS],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [call(key=1, state=True, color_mode=LightColorCapability.BRIGHTNESS)]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_TRANSITION: 2},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [call(key=1, state=False, transition_length=2.0)]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_FLASH: FLASH_LONG},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [call(key=1, state=False, flash_length=10.0)]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_TRANSITION: 2},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                transition_length=2.0,
+                color_mode=LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_FLASH: FLASH_SHORT},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                flash_length=2.0,
+                color_mode=LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_brightness_on_off(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that only supports brightness."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[
+                LightColorCapability.ON_OFF | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_legacy_white_converted_to_brightness(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that only supports legacy white."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[
+                LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+                | LightColorCapability.WHITE
+            ],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+                | LightColorCapability.WHITE,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_brightness_on_off_with_unknown_color_mode(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that only supports brightness along with an unknown color mode."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[
+                LightColorCapability.ON_OFF | LightColorCapability.BRIGHTNESS | 1 << 8
+            ],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+                | 1 << 8,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+                | 1 << 8,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_on_and_brightness(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that supports on and on and brightness."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[
+                LightColorCapability.ON_OFF | LightColorCapability.BRIGHTNESS,
+                LightColorCapability.ON_OFF,
+            ],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [call(key=1, state=True, color_mode=LightColorCapability.ON_OFF)]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_rgb_color_temp_light(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light that supports color temp and RGB."""
+    color_modes = [
+        LightColorCapability.ON_OFF | LightColorCapability.BRIGHTNESS,
+        LightColorCapability.ON_OFF
+        | LightColorCapability.BRIGHTNESS
+        | LightColorCapability.COLOR_TEMPERATURE,
+        LightColorCapability.ON_OFF
+        | LightColorCapability.BRIGHTNESS
+        | LightColorCapability.RGB,
+    ]
+
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=color_modes,
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_COLOR_TEMP_KELVIN: 2500},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+                | LightColorCapability.COLOR_TEMPERATURE,
+                color_temperature=400,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_rgb(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic RGB light entity."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            supported_color_modes=[
+                LightColorCapability.RGB
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100, red=1, green=1, blue=1)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: "light.test_my_light",
+            ATTR_BRIGHTNESS: 127,
+            ATTR_HS_COLOR: (100, 100),
+        },
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1.0,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(pytest.approx(0.32941176470588235), 1.0, 0.0),
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGB_COLOR: (255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1.0,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(1, 1, 1),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_rgbw(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic RGBW light entity."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            supported_color_modes=[
+                LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            brightness=100,
+            red=1,
+            green=1,
+            blue=1,
+            white=1,
+            color_mode=LightColorCapability.RGB
+            | LightColorCapability.WHITE
+            | LightColorCapability.ON_OFF
+            | LightColorCapability.BRIGHTNESS,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.RGBW]
+    assert state.attributes[ATTR_COLOR_MODE] == ColorMode.RGBW
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: "light.test_my_light",
+            ATTR_BRIGHTNESS: 127,
+            ATTR_HS_COLOR: (100, 100),
+        },
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1.0,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                white=0,
+                rgb=(pytest.approx(0.32941176470588235), 1.0, 0.0),
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGB_COLOR: (255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=0.0,
+                white=1,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, 0, 0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGBW_COLOR: (255, 255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1.0,
+                white=1,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(1, 1, 1),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_rgbww_with_cold_warm_white_support(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic RGBWW light entity with cold warm white support."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[
+                LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            color_brightness=1,
+            brightness=100,
+            red=1,
+            green=1,
+            blue=1,
+            warm_white=1,
+            cold_white=1,
+            color_mode=LightColorCapability.RGB
+            | LightColorCapability.WHITE
+            | LightColorCapability.COLOR_TEMPERATURE
+            | LightColorCapability.COLD_WARM_WHITE
+            | LightColorCapability.ON_OFF
+            | LightColorCapability.BRIGHTNESS,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.RGBWW]
+    assert state.attributes[ATTR_COLOR_MODE] == ColorMode.RGBWW
+    assert state.attributes[ATTR_RGBWW_COLOR] == (255, 255, 255, 255, 255)
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: "light.test_my_light",
+            ATTR_BRIGHTNESS: 127,
+            ATTR_HS_COLOR: (100, 100),
+        },
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1.0,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                cold_white=0,
+                warm_white=0,
+                rgb=(pytest.approx(0.32941176470588235), 1.0, 0.0),
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGB_COLOR: (255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=pytest.approx(0.4235294117647059),
+                cold_white=1,
+                warm_white=1,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, pytest.approx(0.5462962962962963), 1.0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGBW_COLOR: (255, 255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=pytest.approx(0.4235294117647059),
+                cold_white=1,
+                warm_white=1,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, pytest.approx(0.5462962962962963), 1.0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: "light.test_my_light",
+            ATTR_RGBWW_COLOR: (255, 255, 255, 255, 255),
+        },
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1,
+                cold_white=1,
+                warm_white=1,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(1, 1, 1),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_COLOR_TEMP_KELVIN: 2500},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=0,
+                cold_white=0,
+                warm_white=100,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, 0, 0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_rgbww_without_cold_warm_white_support(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic RGBWW light entity without cold warm white support."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[
+                LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            color_brightness=1,
+            brightness=100,
+            red=1,
+            green=1,
+            blue=1,
+            white=1,
+            color_mode=LightColorCapability.RGB
+            | LightColorCapability.WHITE
+            | LightColorCapability.COLOR_TEMPERATURE
+            | LightColorCapability.ON_OFF
+            | LightColorCapability.BRIGHTNESS,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.RGBWW]
+    assert state.attributes[ATTR_COLOR_MODE] == ColorMode.RGBWW
+    assert state.attributes[ATTR_RGBWW_COLOR] == (255, 255, 255, 255, 0)
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: "light.test_my_light",
+            ATTR_BRIGHTNESS: 127,
+            ATTR_HS_COLOR: (100, 100),
+        },
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1.0,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                white=0,
+                rgb=(pytest.approx(0.32941176470588235), 1.0, 0.0),
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGB_COLOR: (255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=pytest.approx(0.4235294117647059),
+                color_temperature=276.5,
+                white=1,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, pytest.approx(0.5462962962962963), 1.0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGBW_COLOR: (255, 255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=pytest.approx(0.4235294117647059),
+                white=1,
+                color_temperature=276.5,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, pytest.approx(0.5462962962962963), 1.0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: "light.test_my_light",
+            ATTR_RGBWW_COLOR: (255, 255, 255, 255, 255),
+        },
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1,
+                white=1,
+                color_temperature=276.5,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(1, 1, 1),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_COLOR_TEMP_KELVIN: 2500},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=0,
+                white=100,
+                color_temperature=400.0,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, 0, 0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_color_temp(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that does supports color temp."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153.846161,
+            max_mireds=370.370361,
+            supported_color_modes=[
+                LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            brightness=100,
+            color_temperature=153.846161,
+            color_mode=LightColorCapability.COLOR_TEMPERATURE,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    attributes = state.attributes
+
+    assert attributes[ATTR_MIN_MIREDS] == 153
+    assert attributes[ATTR_MAX_MIREDS] == 370
+
+    assert attributes[ATTR_MIN_COLOR_TEMP_KELVIN] == 2700
+    assert attributes[ATTR_MAX_COLOR_TEMP_KELVIN] == 6500
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_color_temp_no_mireds_set(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic color temp with no mireds set uses the defaults."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=0,
+            max_mireds=0,
+            supported_color_modes=[
+                LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            brightness=100,
+            color_temperature=153.846161,
+            color_mode=LightColorCapability.COLOR_TEMPERATURE,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    attributes = state.attributes
+
+    assert attributes[ATTR_MIN_MIREDS] is None
+    assert attributes[ATTR_MAX_MIREDS] is None
+
+    assert attributes[ATTR_MIN_COLOR_TEMP_KELVIN] == 0
+    assert attributes[ATTR_MAX_COLOR_TEMP_KELVIN] == 0
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_COLOR_TEMP_KELVIN: 6000},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_temperature=pytest.approx(166.66666666666666),
+                color_mode=LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_color_temp_legacy(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a legacy light entity that does supports color temp."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153.846161,
+            max_mireds=370.370361,
+            supported_color_modes=[
+                LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+            legacy_supports_brightness=True,
+            legacy_supports_color_temperature=True,
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            brightness=100,
+            red=1,
+            green=1,
+            blue=1,
+            white=1,
+            cold_white=1,
+            color_temperature=153.846161,
+            color_mode=19,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    attributes = state.attributes
+
+    assert attributes[ATTR_COLOR_MODE] == ColorMode.COLOR_TEMP
+    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.COLOR_TEMP]
+    assert attributes[ATTR_MIN_MIREDS] == 153
+    assert attributes[ATTR_MAX_MIREDS] == 370
+
+    assert attributes[ATTR_MIN_COLOR_TEMP_KELVIN] == 2700
+    assert attributes[ATTR_MAX_COLOR_TEMP_KELVIN] == 6500
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_rgb_legacy(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a legacy light entity that supports rgb."""
+    mock_client.api_version = APIVersion(1, 5)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153.846161,
+            max_mireds=370.370361,
+            supported_color_modes=[
+                LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+                | LightColorCapability.RGB
+            ],
+            legacy_supports_brightness=True,
+            legacy_supports_color_temperature=True,
+            legacy_supports_rgb=True,
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            brightness=100,
+            red=1,
+            green=1,
+            blue=1,
+            color_mode=LightColorCapability.COLOR_TEMPERATURE
+            | LightColorCapability.ON_OFF
+            | LightColorCapability.BRIGHTNESS
+            | LightColorCapability.RGB,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    attributes = state.attributes
+    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.RGB]
+    assert attributes[ATTR_COLOR_MODE] == ColorMode.RGB
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGB_COLOR: (255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                rgb=(1.0, 1.0, 1.0),
+                color_brightness=1.0,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_effects(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that supports on and on and brightness."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            effects=["effect1", "effect2"],
+            supported_color_modes=[
+                LightColorCapability.ON_OFF | LightColorCapability.BRIGHTNESS,
+            ],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_EFFECT_LIST] == ["effect1", "effect2"]
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_EFFECT: "effect1"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                effect="effect1",
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
diff --git a/tests/components/esphome/test_lock.py b/tests/components/esphome/test_lock.py
new file mode 100644
index 00000000000..6e6461d34b1
--- /dev/null
+++ b/tests/components/esphome/test_lock.py
@@ -0,0 +1,132 @@
+"""Test ESPHome locks."""
+
+
+from unittest.mock import call
+
+from aioesphomeapi import APIClient, LockCommand, LockEntityState, LockInfo, LockState
+
+from homeassistant.components.lock import (
+    DOMAIN as LOCK_DOMAIN,
+    SERVICE_LOCK,
+    SERVICE_OPEN,
+    SERVICE_UNLOCK,
+    STATE_LOCKED,
+    STATE_LOCKING,
+    STATE_UNLOCKING,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+
+async def test_lock_entity_no_open(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic lock entity that does not support open."""
+    entity_info = [
+        LockInfo(
+            object_id="mylock",
+            key=1,
+            name="my lock",
+            unique_id="my_lock",
+            supports_open=False,
+            requires_code=False,
+        )
+    ]
+    states = [LockEntityState(key=1, state=LockState.UNLOCKING)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("lock.test_my_lock")
+    assert state is not None
+    assert state.state == STATE_UNLOCKING
+
+    await hass.services.async_call(
+        LOCK_DOMAIN,
+        SERVICE_LOCK,
+        {ATTR_ENTITY_ID: "lock.test_my_lock"},
+        blocking=True,
+    )
+    mock_client.lock_command.assert_has_calls([call(1, LockCommand.LOCK)])
+    mock_client.lock_command.reset_mock()
+
+
+async def test_lock_entity_start_locked(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic lock entity that does not support open."""
+    entity_info = [
+        LockInfo(
+            object_id="mylock",
+            key=1,
+            name="my lock",
+            unique_id="my_lock",
+        )
+    ]
+    states = [LockEntityState(key=1, state=LockState.LOCKED)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("lock.test_my_lock")
+    assert state is not None
+    assert state.state == STATE_LOCKED
+
+
+async def test_lock_entity_supports_open(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic lock entity that supports open."""
+    entity_info = [
+        LockInfo(
+            object_id="mylock",
+            key=1,
+            name="my lock",
+            unique_id="my_lock",
+            supports_open=True,
+            requires_code=True,
+        )
+    ]
+    states = [LockEntityState(key=1, state=LockState.LOCKING)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("lock.test_my_lock")
+    assert state is not None
+    assert state.state == STATE_LOCKING
+
+    await hass.services.async_call(
+        LOCK_DOMAIN,
+        SERVICE_LOCK,
+        {ATTR_ENTITY_ID: "lock.test_my_lock"},
+        blocking=True,
+    )
+    mock_client.lock_command.assert_has_calls([call(1, LockCommand.LOCK)])
+    mock_client.lock_command.reset_mock()
+
+    await hass.services.async_call(
+        LOCK_DOMAIN,
+        SERVICE_UNLOCK,
+        {ATTR_ENTITY_ID: "lock.test_my_lock"},
+        blocking=True,
+    )
+    mock_client.lock_command.assert_has_calls([call(1, LockCommand.UNLOCK, None)])
+
+    mock_client.lock_command.reset_mock()
+    await hass.services.async_call(
+        LOCK_DOMAIN,
+        SERVICE_OPEN,
+        {ATTR_ENTITY_ID: "lock.test_my_lock"},
+        blocking=True,
+    )
+    mock_client.lock_command.assert_has_calls([call(1, LockCommand.OPEN)])
diff --git a/tests/components/esphome/test_media_player.py b/tests/components/esphome/test_media_player.py
new file mode 100644
index 00000000000..bcef78e9345
--- /dev/null
+++ b/tests/components/esphome/test_media_player.py
@@ -0,0 +1,250 @@
+"""Test ESPHome media_players."""
+
+from unittest.mock import AsyncMock, Mock, call
+
+from aioesphomeapi import (
+    APIClient,
+    MediaPlayerCommand,
+    MediaPlayerEntityState,
+    MediaPlayerInfo,
+    MediaPlayerState,
+)
+import pytest
+
+from homeassistant.components import media_source
+from homeassistant.components.media_player import (
+    ATTR_MEDIA_CONTENT_ID,
+    ATTR_MEDIA_CONTENT_TYPE,
+    ATTR_MEDIA_VOLUME_LEVEL,
+    ATTR_MEDIA_VOLUME_MUTED,
+    DOMAIN as MEDIA_PLAYER_DOMAIN,
+    SERVICE_MEDIA_PAUSE,
+    SERVICE_MEDIA_PLAY,
+    SERVICE_MEDIA_STOP,
+    SERVICE_PLAY_MEDIA,
+    SERVICE_VOLUME_MUTE,
+    SERVICE_VOLUME_SET,
+    BrowseMedia,
+    MediaClass,
+    MediaType,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import (
+    mock_platform,
+)
+from tests.typing import WebSocketGenerator
+
+
+async def test_media_player_entity(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic media_player entity."""
+    entity_info = [
+        MediaPlayerInfo(
+            object_id="mymedia_player",
+            key=1,
+            name="my media_player",
+            unique_id="my_media_player",
+            supports_pause=True,
+        )
+    ]
+    states = [
+        MediaPlayerEntityState(
+            key=1, volume=50, muted=True, state=MediaPlayerState.PAUSED
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("media_player.test_my_media_player")
+    assert state is not None
+    assert state.state == "paused"
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_VOLUME_MUTE,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+            ATTR_MEDIA_VOLUME_MUTED: True,
+        },
+        blocking=True,
+    )
+    mock_client.media_player_command.assert_has_calls(
+        [call(1, command=MediaPlayerCommand.MUTE)]
+    )
+    mock_client.media_player_command.reset_mock()
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_VOLUME_MUTE,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+            ATTR_MEDIA_VOLUME_MUTED: True,
+        },
+        blocking=True,
+    )
+    mock_client.media_player_command.assert_has_calls(
+        [call(1, command=MediaPlayerCommand.MUTE)]
+    )
+    mock_client.media_player_command.reset_mock()
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_VOLUME_SET,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+            ATTR_MEDIA_VOLUME_LEVEL: 0.5,
+        },
+        blocking=True,
+    )
+    mock_client.media_player_command.assert_has_calls([call(1, volume=0.5)])
+    mock_client.media_player_command.reset_mock()
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_MEDIA_PAUSE,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+        },
+        blocking=True,
+    )
+    mock_client.media_player_command.assert_has_calls(
+        [call(1, command=MediaPlayerCommand.PAUSE)]
+    )
+    mock_client.media_player_command.reset_mock()
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_MEDIA_PLAY,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+        },
+        blocking=True,
+    )
+    mock_client.media_player_command.assert_has_calls(
+        [call(1, command=MediaPlayerCommand.PLAY)]
+    )
+    mock_client.media_player_command.reset_mock()
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_MEDIA_STOP,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+        },
+        blocking=True,
+    )
+    mock_client.media_player_command.assert_has_calls(
+        [call(1, command=MediaPlayerCommand.STOP)]
+    )
+    mock_client.media_player_command.reset_mock()
+
+
+async def test_media_player_entity_with_source(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    hass_ws_client: WebSocketGenerator,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic media_player entity media source."""
+    esphome_platform_mock = Mock(
+        async_get_media_browser_root_object=AsyncMock(
+            return_value=[
+                BrowseMedia(
+                    title="Spotify",
+                    media_class=MediaClass.APP,
+                    media_content_id="",
+                    media_content_type="spotify",
+                    thumbnail="https://brands.home-assistant.io/_/spotify/logo.png",
+                    can_play=False,
+                    can_expand=True,
+                )
+            ]
+        ),
+        async_browse_media=AsyncMock(
+            return_value=BrowseMedia(
+                title="Spotify Favourites",
+                media_class=MediaClass.PLAYLIST,
+                media_content_id="",
+                media_content_type="spotify",
+                can_play=True,
+                can_expand=False,
+            )
+        ),
+        async_play_media=AsyncMock(return_value=False),
+    )
+    mock_platform(hass, "test.esphome", esphome_platform_mock)
+    await async_setup_component(hass, "test", {"test": {}})
+    await async_setup_component(hass, "media_source", {"media_source": {}})
+    await hass.async_block_till_done()
+
+    entity_info = [
+        MediaPlayerInfo(
+            object_id="mymedia_player",
+            key=1,
+            name="my media_player",
+            unique_id="my_media_player",
+            supports_pause=True,
+        )
+    ]
+    states = [
+        MediaPlayerEntityState(
+            key=1, volume=50, muted=True, state=MediaPlayerState.PLAYING
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("media_player.test_my_media_player")
+    assert state is not None
+    assert state.state == "playing"
+
+    with pytest.raises(media_source.error.Unresolvable):
+        await hass.services.async_call(
+            MEDIA_PLAYER_DOMAIN,
+            SERVICE_PLAY_MEDIA,
+            {
+                ATTR_ENTITY_ID: "media_player.test_my_media_player",
+                ATTR_MEDIA_CONTENT_TYPE: MediaType.MUSIC,
+                ATTR_MEDIA_CONTENT_ID: "media-source://local/xz",
+            },
+            blocking=True,
+        )
+
+    mock_client.media_player_command.reset_mock()
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "media_player/browse_media",
+            "entity_id": "media_player.test_my_media_player",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_PLAY_MEDIA,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+            ATTR_MEDIA_CONTENT_TYPE: MediaType.URL,
+            ATTR_MEDIA_CONTENT_ID: "media-source://tts?message=hello",
+        },
+        blocking=True,
+    )
+
+    mock_client.media_player_command.assert_has_calls(
+        [call(1, media_url="media-source://tts?message=hello")]
+    )
diff --git a/tests/components/esphome/test_number.py b/tests/components/esphome/test_number.py
new file mode 100644
index 00000000000..8157c5f5c3d
--- /dev/null
+++ b/tests/components/esphome/test_number.py
@@ -0,0 +1,91 @@
+"""Test ESPHome numbers."""
+
+import math
+from unittest.mock import call
+
+from aioesphomeapi import (
+    APIClient,
+    NumberInfo,
+    NumberMode as ESPHomeNumberMode,
+    NumberState,
+)
+
+from homeassistant.components.number import (
+    ATTR_VALUE,
+    DOMAIN as NUMBER_DOMAIN,
+    SERVICE_SET_VALUE,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
+from homeassistant.core import HomeAssistant
+
+
+async def test_generic_number_entity(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic number entity."""
+    entity_info = [
+        NumberInfo(
+            object_id="mynumber",
+            key=1,
+            name="my number",
+            unique_id="my_number",
+            max_value=100,
+            min_value=0,
+            step=1,
+            unit_of_measurement="%",
+        )
+    ]
+    states = [NumberState(key=1, state=50)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("number.test_my_number")
+    assert state is not None
+    assert state.state == "50"
+
+    await hass.services.async_call(
+        NUMBER_DOMAIN,
+        SERVICE_SET_VALUE,
+        {ATTR_ENTITY_ID: "number.test_my_number", ATTR_VALUE: 50},
+        blocking=True,
+    )
+    mock_client.number_command.assert_has_calls([call(1, 50)])
+    mock_client.number_command.reset_mock()
+
+
+async def test_generic_number_nan(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic number entity with nan state."""
+    entity_info = [
+        NumberInfo(
+            object_id="mynumber",
+            key=1,
+            name="my number",
+            unique_id="my_number",
+            max_value=100,
+            min_value=0,
+            step=1,
+            unit_of_measurement="%",
+            mode=ESPHomeNumberMode.SLIDER,
+        )
+    ]
+    states = [NumberState(key=1, state=math.nan)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("number.test_my_number")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
diff --git a/tests/components/esphome/test_select.py b/tests/components/esphome/test_select.py
index dec321ced86..8d17276c304 100644
--- a/tests/components/esphome/test_select.py
+++ b/tests/components/esphome/test_select.py
@@ -1,6 +1,16 @@
 """Test ESPHome selects."""
 
 
+from unittest.mock import call
+
+from aioesphomeapi import APIClient, SelectInfo, SelectState
+
+from homeassistant.components.select import (
+    ATTR_OPTION,
+    DOMAIN as SELECT_DOMAIN,
+    SERVICE_SELECT_OPTION,
+)
+from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
 
 
@@ -13,3 +23,51 @@ async def test_pipeline_selector(
     state = hass.states.get("select.test_assist_pipeline")
     assert state is not None
     assert state.state == "preferred"
+
+
+async def test_vad_sensitivity_select(
+    hass: HomeAssistant,
+    mock_voice_assistant_v1_entry,
+) -> None:
+    """Test VAD sensitivity select.
+
+    Functionality is tested in assist_pipeline/test_select.py.
+    This test is only to ensure it is set up.
+    """
+    state = hass.states.get("select.test_finished_speaking_detection")
+    assert state is not None
+    assert state.state == "default"
+
+
+async def test_select_generic_entity(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic select entity."""
+    entity_info = [
+        SelectInfo(
+            object_id="myselect",
+            key=1,
+            name="my select",
+            unique_id="my_select",
+            options=["a", "b"],
+        )
+    ]
+    states = [SelectState(key=1, state="a")]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("select.test_my_select")
+    assert state is not None
+    assert state.state == "a"
+
+    await hass.services.async_call(
+        SELECT_DOMAIN,
+        SERVICE_SELECT_OPTION,
+        {ATTR_ENTITY_ID: "select.test_my_select", ATTR_OPTION: "b"},
+        blocking=True,
+    )
+    mock_client.select_command.assert_has_calls([call(1, "b")])
diff --git a/tests/components/esphome/test_sensor.py b/tests/components/esphome/test_sensor.py
new file mode 100644
index 00000000000..8f4eb0f9513
--- /dev/null
+++ b/tests/components/esphome/test_sensor.py
@@ -0,0 +1,277 @@
+"""Test ESPHome sensors."""
+import math
+
+from aioesphomeapi import (
+    APIClient,
+    EntityCategory as ESPHomeEntityCategory,
+    LastResetType,
+    SensorInfo,
+    SensorState,
+    SensorStateClass as ESPHomeSensorStateClass,
+    TextSensorInfo,
+    TextSensorState,
+)
+
+from homeassistant.components.sensor import ATTR_STATE_CLASS, SensorStateClass
+from homeassistant.const import ATTR_ICON, STATE_UNKNOWN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity import EntityCategory
+
+
+async def test_generic_numeric_sensor(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic sensor entity."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+        )
+    ]
+    states = [SensorState(key=1, state=50)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == "50"
+
+
+async def test_generic_numeric_sensor_with_entity_category_and_icon(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic sensor entity."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+            entity_category=ESPHomeEntityCategory.CONFIG,
+            icon="mdi:leaf",
+        )
+    ]
+    states = [SensorState(key=1, state=50)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == "50"
+    assert state.attributes[ATTR_ICON] == "mdi:leaf"
+    entity_reg = er.async_get(hass)
+    entry = entity_reg.async_get("sensor.test_my_sensor")
+    assert entry is not None
+    assert entry.unique_id == "my_sensor"
+    assert entry.entity_category is EntityCategory.CONFIG
+
+
+async def test_generic_numeric_sensor_state_class_measurement(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic sensor entity."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+            state_class=ESPHomeSensorStateClass.MEASUREMENT,
+            device_class="power",
+            unit_of_measurement="W",
+        )
+    ]
+    states = [SensorState(key=1, state=50)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == "50"
+    assert state.attributes[ATTR_STATE_CLASS] == SensorStateClass.MEASUREMENT
+    entity_reg = er.async_get(hass)
+    entry = entity_reg.async_get("sensor.test_my_sensor")
+    assert entry is not None
+    assert entry.unique_id == "my_sensor"
+    assert entry.entity_category is None
+
+
+async def test_generic_numeric_sensor_device_class_timestamp(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a sensor entity that uses timestamp (epoch)."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+            device_class="timestamp",
+        )
+    ]
+    states = [SensorState(key=1, state=1687459432.466624)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == "2023-06-22T18:43:52+00:00"
+
+
+async def test_generic_numeric_sensor_legacy_last_reset_convert(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a state class of measurement with last reset type of auto is converted to total increasing."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+            last_reset_type=LastResetType.AUTO,
+            state_class=ESPHomeSensorStateClass.MEASUREMENT,
+        )
+    ]
+    states = [SensorState(key=1, state=50)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == "50"
+    assert state.attributes[ATTR_STATE_CLASS] == SensorStateClass.TOTAL_INCREASING
+
+
+async def test_generic_numeric_sensor_no_state(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic numeric sensor that has no state."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+        )
+    ]
+    states = []
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+
+async def test_generic_numeric_sensor_nan_state(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic numeric sensor that has nan state."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+        )
+    ]
+    states = [SensorState(key=1, state=math.nan, missing_state=False)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+
+async def test_generic_numeric_sensor_missing_state(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic numeric sensor that is missing state."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+        )
+    ]
+    states = [SensorState(key=1, state=True, missing_state=True)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+
+async def test_generic_text_sensor(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic text sensor entity."""
+    entity_info = [
+        TextSensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+        )
+    ]
+    states = [TextSensorState(key=1, state="i am a teapot")]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == "i am a teapot"
diff --git a/tests/components/esphome/test_switch.py b/tests/components/esphome/test_switch.py
new file mode 100644
index 00000000000..39e01a7d07c
--- /dev/null
+++ b/tests/components/esphome/test_switch.py
@@ -0,0 +1,55 @@
+"""Test ESPHome switches."""
+
+
+from unittest.mock import call
+
+from aioesphomeapi import APIClient, SwitchInfo, SwitchState
+
+from homeassistant.components.switch import (
+    DOMAIN as SWITCH_DOMAIN,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_ON
+from homeassistant.core import HomeAssistant
+
+
+async def test_switch_generic_entity(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic switch entity."""
+    entity_info = [
+        SwitchInfo(
+            object_id="myswitch",
+            key=1,
+            name="my switch",
+            unique_id="my_switch",
+        )
+    ]
+    states = [SwitchState(key=1, state=True)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("switch.test_my_switch")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "switch.test_my_switch"},
+        blocking=True,
+    )
+    mock_client.switch_command.assert_has_calls([call(1, True)])
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "switch.test_my_switch"},
+        blocking=True,
+    )
+    mock_client.switch_command.assert_has_calls([call(1, False)])
diff --git a/tests/components/esphome/test_update.py b/tests/components/esphome/test_update.py
index 5410af96bd7..dd0daf1c455 100644
--- a/tests/components/esphome/test_update.py
+++ b/tests/components/esphome/test_update.py
@@ -7,6 +7,7 @@ import pytest
 
 from homeassistant.components.esphome.dashboard import async_get_dashboard
 from homeassistant.components.update import UpdateEntityFeature
+from homeassistant.const import STATE_ON, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
@@ -149,8 +150,12 @@ async def test_update_static_info(
     assert state.state == "off"
 
 
+@pytest.mark.parametrize(
+    "expected_disconnect_state", [(True, STATE_ON), (False, STATE_UNAVAILABLE)]
+)
 async def test_update_device_state_for_availability(
     hass: HomeAssistant,
+    expected_disconnect_state: tuple[bool, str],
     mock_config_entry,
     mock_device_info,
     mock_dashboard,
@@ -167,6 +172,7 @@ async def test_update_device_state_for_availability(
     signal_device_updated = f"esphome_{mock_config_entry.entry_id}_on_device_update"
     runtime_data = Mock(
         available=True,
+        expected_disconnect=False,
         device_info=mock_device_info,
         signal_device_updated=signal_device_updated,
     )
@@ -183,11 +189,14 @@ async def test_update_device_state_for_availability(
     assert state is not None
     assert state.state == "on"
 
+    expected_disconnect, expected_state = expected_disconnect_state
+
     runtime_data.available = False
+    runtime_data.expected_disconnect = expected_disconnect
     async_dispatcher_send(hass, signal_device_updated)
 
     state = hass.states.get("update.none_firmware")
-    assert state.state == "unavailable"
+    assert state.state == expected_state
 
     # Deep sleep devices should still be available
     runtime_data.device_info = dataclasses.replace(
diff --git a/tests/components/esphome/test_voice_assistant.py b/tests/components/esphome/test_voice_assistant.py
index f8c2d62d095..08750d06dd0 100644
--- a/tests/components/esphome/test_voice_assistant.py
+++ b/tests/components/esphome/test_voice_assistant.py
@@ -68,7 +68,9 @@ async def test_pipeline_events(
 ) -> None:
     """Test that the pipeline function is called."""
 
-    async def async_pipeline_from_audio_stream(*args, **kwargs):
+    async def async_pipeline_from_audio_stream(*args, device_id, **kwargs):
+        assert device_id == "mock-device-id"
+
         event_callback = kwargs["event_callback"]
 
         # Fake events
@@ -121,7 +123,9 @@ async def test_pipeline_events(
     ):
         voice_assistant_udp_server_v1.transport = Mock()
 
-        await voice_assistant_udp_server_v1.run_pipeline(conversation_id=None)
+        await voice_assistant_udp_server_v1.run_pipeline(
+            device_id="mock-device-id", conversation_id=None
+        )
 
 
 async def test_udp_server(
@@ -380,7 +384,7 @@ async def test_speech_detection(
         voice_assistant_udp_server_v2.queue.put_nowait(bytes(_ONE_SECOND))
 
         await voice_assistant_udp_server_v2.run_pipeline(
-            conversation_id=None, use_vad=True, pipeline_timeout=1.0
+            device_id="", conversation_id=None, use_vad=True, pipeline_timeout=1.0
         )
 
 
@@ -412,7 +416,7 @@ async def test_no_speech(
         voice_assistant_udp_server_v2.queue.put_nowait(bytes(_ONE_SECOND))
 
         await voice_assistant_udp_server_v2.run_pipeline(
-            conversation_id=None, use_vad=True, pipeline_timeout=1.0
+            device_id="", conversation_id=None, use_vad=True, pipeline_timeout=1.0
         )
 
 
@@ -452,7 +456,7 @@ async def test_speech_timeout(
         voice_assistant_udp_server_v2.queue.put_nowait(bytes([255] * (_ONE_SECOND * 2)))
 
         await voice_assistant_udp_server_v2.run_pipeline(
-            conversation_id=None, use_vad=True, pipeline_timeout=1.0
+            device_id="", conversation_id=None, use_vad=True, pipeline_timeout=1.0
         )
 
 
@@ -467,7 +471,7 @@ async def test_cancelled(
     voice_assistant_udp_server_v2.queue.put_nowait(b"")
 
     await voice_assistant_udp_server_v2.run_pipeline(
-        conversation_id=None, use_vad=True, pipeline_timeout=1.0
+        device_id="", conversation_id=None, use_vad=True, pipeline_timeout=1.0
     )
 
     # No events should be sent if cancelled while waiting for speech
diff --git a/tests/components/fan/test_device_action.py b/tests/components/fan/test_device_action.py
index 80d3dfd2b50..5404c80340e 100644
--- a/tests/components/fan/test_device_action.py
+++ b/tests/components/fan/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Fan device actions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -12,7 +13,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -35,7 +35,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = []
@@ -44,7 +44,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in ["turn_on", "turn_off", "toggle"]
@@ -52,7 +52,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -78,7 +78,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -92,7 +92,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["turn_on", "turn_off", "toggle"]
@@ -100,11 +100,13 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -118,7 +120,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "fan.entity",
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                 },
@@ -130,7 +132,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "fan.entity",
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                 },
@@ -142,7 +144,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "fan.entity",
+                        "entity_id": entry.id,
                         "type": "toggle",
                     },
                 },
@@ -171,3 +173,37 @@ async def test_action(hass: HomeAssistant) -> None:
     assert len(turn_off_calls) == 1
     assert len(turn_on_calls) == 1
     assert len(toggle_calls) == 1
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_turn_off",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "turn_off",
+                    },
+                },
+            ]
+        },
+    )
+
+    turn_off_calls = async_mock_service(hass, "fan", "turn_off")
+
+    hass.bus.async_fire("test_event_turn_off")
+    await hass.async_block_till_done()
+    assert len(turn_off_calls) == 1
diff --git a/tests/components/fan/test_device_condition.py b/tests/components/fan/test_device_condition.py
index acb206741b3..20c84eb1436 100644
--- a/tests/components/fan/test_device_condition.py
+++ b/tests/components/fan/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Fan device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -12,7 +13,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -41,7 +41,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -50,7 +50,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in ["is_off", "is_on"]
@@ -58,7 +58,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -84,7 +84,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -98,7 +98,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_off", "is_on"]
@@ -106,12 +106,16 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("fan.entity", STATE_ON)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -125,7 +129,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "fan.entity",
+                            "entity_id": entry.id,
                             "type": "is_on",
                         }
                     ],
@@ -147,7 +151,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "fan.entity",
+                            "entity_id": entry.id,
                             "type": "is_off",
                         }
                     ],
@@ -171,9 +175,53 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on - event - test_event1"
 
-    hass.states.async_set("fan.entity", STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_off - event - test_event2"
+
+
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_on",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "is_on "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.event.event_type }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_on - event - test_event1"
diff --git a/tests/components/fan/test_device_trigger.py b/tests/components/fan/test_device_trigger.py
index 61c49e7e6ea..f1de07a9e97 100644
--- a/tests/components/fan/test_device_trigger.py
+++ b/tests/components/fan/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -15,7 +16,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
@@ -46,7 +46,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -55,7 +55,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["turned_off", "turned_on", "changed_states"]
@@ -63,7 +63,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -89,7 +89,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -103,7 +103,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["turned_off", "turned_on", "changed_states"]
@@ -111,7 +111,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -144,9 +144,44 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a switch trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
+
+
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
-    hass.states.async_set("fan.entity", STATE_OFF)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
 
     assert await async_setup_component(
         hass,
@@ -158,7 +193,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "fan.entity",
+                        "entity_id": entry.id,
                         "type": "turned_on",
                     },
                     "action": {
@@ -180,7 +215,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "fan.entity",
+                        "entity_id": entry.id,
                         "type": "turned_off",
                     },
                     "action": {
@@ -202,7 +237,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "fan.entity",
+                        "entity_id": entry.id,
                         "type": "changed_states",
                     },
                     "action": {
@@ -224,28 +259,31 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Fake that the entity is turning on.
-    hass.states.async_set("fan.entity", STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert {calls[0].data["some"], calls[1].data["some"]} == {
-        "turn_on - device - fan.entity - off - on - None",
-        "turn_on_or_off - device - fan.entity - off - on - None",
+        f"turn_on - device - {entry.entity_id} - off - on - None",
+        f"turn_on_or_off - device - {entry.entity_id} - off - on - None",
     }
 
     # Fake that the entity is turning off.
-    hass.states.async_set("fan.entity", STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert {calls[2].data["some"], calls[3].data["some"]} == {
-        "turn_off - device - fan.entity - on - off - None",
-        "turn_on_or_off - device - fan.entity - on - off - None",
+        f"turn_off - device - {entry.entity_id} - on - off - None",
+        f"turn_on_or_off - device - {entry.entity_id} - on - off - None",
     }
 
 
-async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) -> None:
-    """Test for triggers firing with delay."""
-    entity_id = "fan.entity"
-    hass.states.async_set(entity_id, STATE_ON)
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
 
     assert await async_setup_component(
         hass,
@@ -257,7 +295,56 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
+                        "type": "turned_on",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "turn_on "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.entity_id }} "
+                                "- {{ trigger.from_state.state }} "
+                                "- {{ trigger.to_state.state }} "
+                                "- {{ trigger.for }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the entity is turning on.
+    hass.states.async_set(entry.entity_id, STATE_ON)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"turn_on - device - {entry.entity_id} - off - on - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
                         "type": "turned_off",
                         "for": {"seconds": 5},
                     },
@@ -281,10 +368,9 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -292,5 +378,6 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     assert len(calls) == 1
     await hass.async_block_till_done()
     assert (
-        calls[0].data["some"] == f"turn_off device - {entity_id} - on - off - 0:00:05"
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - 0:00:05"
     )
diff --git a/tests/components/fan/test_recorder.py b/tests/components/fan/test_recorder.py
index f60a06cb4c5..d75e1e18511 100644
--- a/tests/components/fan/test_recorder.py
+++ b/tests/components/fan/test_recorder.py
@@ -2,12 +2,15 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import fan
 from homeassistant.components.fan import ATTR_PRESET_MODES
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -16,6 +19,16 @@ from tests.common import async_fire_time_changed
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def fan_only() -> None:
+    """Enable only the fan platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.FAN],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test fan registered attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/flipr/test_sensor.py b/tests/components/flipr/test_sensor.py
index cd31ec33c12..54684722802 100644
--- a/tests/components/flipr/test_sensor.py
+++ b/tests/components/flipr/test_sensor.py
@@ -66,7 +66,7 @@ async def test_sensors(hass: HomeAssistant, entity_registry: er.EntityRegistry)
     assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
     assert state.state == "7.03"
 
-    state = hass.states.get("sensor.flipr_myfliprid_water_temp")
+    state = hass.states.get("sensor.flipr_myfliprid_water_temperature")
     assert state
     assert state.attributes.get(ATTR_ICON) is None
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS
@@ -94,7 +94,7 @@ async def test_sensors(hass: HomeAssistant, entity_registry: er.EntityRegistry)
     assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
     assert state.state == "0.23654886"
 
-    state = hass.states.get("sensor.flipr_myfliprid_battery_level")
+    state = hass.states.get("sensor.flipr_myfliprid_battery")
     assert state
     assert state.attributes.get(ATTR_ICON) is None
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PERCENTAGE
diff --git a/tests/components/flux_led/test_number.py b/tests/components/flux_led/test_number.py
index d0d71cacbe1..ff288c777df 100644
--- a/tests/components/flux_led/test_number.py
+++ b/tests/components/flux_led/test_number.py
@@ -305,6 +305,7 @@ async def test_addressable_light_pixel_config(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: pixels_per_segment_entity_id, ATTR_VALUE: 100},
         blocking=True,
     )
+    await hass.async_block_till_done()
     bulb.async_set_device_config.assert_called_with(pixels_per_segment=100)
     bulb.async_set_device_config.reset_mock()
 
@@ -322,6 +323,7 @@ async def test_addressable_light_pixel_config(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: music_pixels_per_segment_entity_id, ATTR_VALUE: 100},
         blocking=True,
     )
+    await hass.async_block_till_done()
     bulb.async_set_device_config.assert_called_with(music_pixels_per_segment=100)
     bulb.async_set_device_config.reset_mock()
 
@@ -339,6 +341,7 @@ async def test_addressable_light_pixel_config(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: segments_entity_id, ATTR_VALUE: 5},
         blocking=True,
     )
+    await hass.async_block_till_done()
     bulb.async_set_device_config.assert_called_with(segments=5)
     bulb.async_set_device_config.reset_mock()
 
@@ -356,6 +359,7 @@ async def test_addressable_light_pixel_config(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: music_segments_entity_id, ATTR_VALUE: 5},
         blocking=True,
     )
+    await hass.async_block_till_done()
     bulb.async_set_device_config.assert_called_with(music_segments=5)
     bulb.async_set_device_config.reset_mock()
 
diff --git a/tests/components/freedompro/conftest.py b/tests/components/freedompro/conftest.py
index 80e13edb803..30e7968e2fe 100644
--- a/tests/components/freedompro/conftest.py
+++ b/tests/components/freedompro/conftest.py
@@ -28,13 +28,13 @@ def mock_setup_entry() -> Generator[AsyncMock, None, None]:
 def mock_freedompro():
     """Mock freedompro get_list and get_states."""
     with patch(
-        "homeassistant.components.freedompro.get_list",
+        "homeassistant.components.freedompro.coordinator.get_list",
         return_value={
             "state": True,
             "devices": DEVICES,
         },
     ), patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=DEVICES_STATE,
     ):
         yield
@@ -72,13 +72,13 @@ async def init_integration_no_state(hass) -> MockConfigEntry:
     )
 
     with patch(
-        "homeassistant.components.freedompro.get_list",
+        "homeassistant.components.freedompro.coordinator.get_list",
         return_value={
             "state": True,
             "devices": DEVICES,
         },
     ), patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=[],
     ):
         entry.add_to_hass(hass)
diff --git a/tests/components/freedompro/test_binary_sensor.py b/tests/components/freedompro/test_binary_sensor.py
index 70acd5eb320..8a3605782a2 100644
--- a/tests/components/freedompro/test_binary_sensor.py
+++ b/tests/components/freedompro/test_binary_sensor.py
@@ -74,7 +74,7 @@ async def test_binary_sensor_get_state(
     assert state.state == STATE_OFF
 
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=[],
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -100,7 +100,7 @@ async def test_binary_sensor_get_state(
     elif states_response[0]["type"] == "contactSensor":
         states_response[0]["state"]["contactSensorState"] = True
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
diff --git a/tests/components/freedompro/test_climate.py b/tests/components/freedompro/test_climate.py
index a3dbc19d711..ae7c39ed4ba 100644
--- a/tests/components/freedompro/test_climate.py
+++ b/tests/components/freedompro/test_climate.py
@@ -66,7 +66,7 @@ async def test_climate_get_state(hass: HomeAssistant, init_integration) -> None:
     states_response[0]["state"]["currentTemperature"] = 20
     states_response[0]["state"]["targetTemperature"] = 21
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -101,7 +101,7 @@ async def test_climate_set_off(hass: HomeAssistant, init_integration) -> None:
     with patch(
         "homeassistant.components.freedompro.climate.put_state"
     ) as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             CLIMATE_DOMAIN,
             SERVICE_SET_HVAC_MODE,
             {ATTR_ENTITY_ID: [entity_id], ATTR_HVAC_MODE: HVACMode.OFF},
@@ -156,7 +156,7 @@ async def test_climate_set_temperature(hass: HomeAssistant, init_integration) ->
     with patch(
         "homeassistant.components.freedompro.climate.put_state"
     ) as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             CLIMATE_DOMAIN,
             SERVICE_SET_TEMPERATURE,
             {
@@ -174,7 +174,7 @@ async def test_climate_set_temperature(hass: HomeAssistant, init_integration) ->
     states_response[0]["state"]["currentTemperature"] = 20
     states_response[0]["state"]["targetTemperature"] = 21
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -200,7 +200,7 @@ async def test_climate_set_temperature_unsupported_hvac_mode(
     assert entry
     assert entry.unique_id == uid
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {
diff --git a/tests/components/freedompro/test_cover.py b/tests/components/freedompro/test_cover.py
index e4c813e7207..b29e6499fec 100644
--- a/tests/components/freedompro/test_cover.py
+++ b/tests/components/freedompro/test_cover.py
@@ -66,7 +66,7 @@ async def test_cover_get_state(
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["position"] = 100
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -116,7 +116,7 @@ async def test_cover_set_position(
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.cover.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             COVER_DOMAIN,
             SERVICE_SET_COVER_POSITION,
             {ATTR_ENTITY_ID: [entity_id], ATTR_POSITION: 33},
@@ -127,7 +127,7 @@ async def test_cover_set_position(
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["position"] = 33
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -164,7 +164,7 @@ async def test_cover_close(
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["position"] = 100
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         await async_update_entity(hass, entity_id)
@@ -181,7 +181,7 @@ async def test_cover_close(
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.cover.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             COVER_DOMAIN,
             SERVICE_CLOSE_COVER,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -191,7 +191,7 @@ async def test_cover_close(
 
     states_response[0]["state"]["position"] = 0
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -234,7 +234,7 @@ async def test_cover_open(
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.cover.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             COVER_DOMAIN,
             SERVICE_OPEN_COVER,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -245,7 +245,7 @@ async def test_cover_open(
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["position"] = 100
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
diff --git a/tests/components/freedompro/test_fan.py b/tests/components/freedompro/test_fan.py
index 1cfda1359d8..159b495e0f8 100644
--- a/tests/components/freedompro/test_fan.py
+++ b/tests/components/freedompro/test_fan.py
@@ -49,7 +49,7 @@ async def test_fan_get_state(hass: HomeAssistant, init_integration) -> None:
     states_response[0]["state"]["on"] = True
     states_response[0]["state"]["rotationSpeed"] = 50
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -78,7 +78,7 @@ async def test_fan_set_off(hass: HomeAssistant, init_integration) -> None:
     states_response[0]["state"]["on"] = True
     states_response[0]["state"]["rotationSpeed"] = 50
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         await async_update_entity(hass, entity_id)
@@ -96,7 +96,7 @@ async def test_fan_set_off(hass: HomeAssistant, init_integration) -> None:
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.fan.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             FAN_DOMAIN,
             SERVICE_TURN_OFF,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -107,7 +107,7 @@ async def test_fan_set_off(hass: HomeAssistant, init_integration) -> None:
     states_response[0]["state"]["on"] = False
     states_response[0]["state"]["rotationSpeed"] = 0
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         await async_update_entity(hass, entity_id)
@@ -137,7 +137,7 @@ async def test_fan_set_on(hass: HomeAssistant, init_integration) -> None:
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.fan.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             FAN_DOMAIN,
             SERVICE_TURN_ON,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -149,7 +149,7 @@ async def test_fan_set_on(hass: HomeAssistant, init_integration) -> None:
     states_response[0]["state"]["on"] = True
     states_response[0]["state"]["rotationSpeed"] = 50
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -177,7 +177,7 @@ async def test_fan_set_percent(hass: HomeAssistant, init_integration) -> None:
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.fan.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             FAN_DOMAIN,
             SERVICE_SET_PERCENTAGE,
             {ATTR_ENTITY_ID: [entity_id], ATTR_PERCENTAGE: 40},
@@ -189,7 +189,7 @@ async def test_fan_set_percent(hass: HomeAssistant, init_integration) -> None:
     states_response[0]["state"]["on"] = True
     states_response[0]["state"]["rotationSpeed"] = 40
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
diff --git a/tests/components/freedompro/test_init.py b/tests/components/freedompro/test_init.py
index 955d793c41c..5e1b050a4e7 100644
--- a/tests/components/freedompro/test_init.py
+++ b/tests/components/freedompro/test_init.py
@@ -33,7 +33,7 @@ async def test_config_not_ready(hass: HomeAssistant) -> None:
     )
 
     with patch(
-        "homeassistant.components.freedompro.get_list",
+        "homeassistant.components.freedompro.coordinator.get_list",
         return_value={
             "state": False,
         },
diff --git a/tests/components/freedompro/test_lock.py b/tests/components/freedompro/test_lock.py
index b90d7558114..ae208194d2a 100644
--- a/tests/components/freedompro/test_lock.py
+++ b/tests/components/freedompro/test_lock.py
@@ -46,7 +46,7 @@ async def test_lock_get_state(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["lock"] = 1
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -73,7 +73,7 @@ async def test_lock_set_unlock(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["lock"] = 1
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         await async_update_entity(hass, entity_id)
@@ -90,7 +90,7 @@ async def test_lock_set_unlock(hass: HomeAssistant, init_integration) -> None:
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.lock.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             LOCK_DOMAIN,
             SERVICE_UNLOCK,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -101,7 +101,7 @@ async def test_lock_set_unlock(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["lock"] = 0
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -127,7 +127,7 @@ async def test_lock_set_lock(hass: HomeAssistant, init_integration) -> None:
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.lock.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             LOCK_DOMAIN,
             SERVICE_LOCK,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -138,7 +138,7 @@ async def test_lock_set_lock(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["lock"] = 1
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
diff --git a/tests/components/freedompro/test_sensor.py b/tests/components/freedompro/test_sensor.py
index 65db6025c3f..89acfb3cc32 100644
--- a/tests/components/freedompro/test_sensor.py
+++ b/tests/components/freedompro/test_sensor.py
@@ -58,7 +58,7 @@ async def test_sensor_get_state(
     elif states_response[0]["type"] == "humiditySensor":
         states_response[0]["state"]["currentRelativeHumidity"] = "1"
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
diff --git a/tests/components/freedompro/test_switch.py b/tests/components/freedompro/test_switch.py
index f041bebfc30..03647e4389d 100644
--- a/tests/components/freedompro/test_switch.py
+++ b/tests/components/freedompro/test_switch.py
@@ -34,7 +34,7 @@ async def test_switch_get_state(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["on"] = True
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -61,7 +61,7 @@ async def test_switch_set_off(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["on"] = True
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         await async_update_entity(hass, entity_id)
@@ -80,7 +80,7 @@ async def test_switch_set_off(hass: HomeAssistant, init_integration) -> None:
     with patch(
         "homeassistant.components.freedompro.switch.put_state"
     ) as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             SWITCH_DOMAIN,
             SERVICE_TURN_OFF,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -91,7 +91,7 @@ async def test_switch_set_off(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["on"] = False
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -119,7 +119,7 @@ async def test_switch_set_on(hass: HomeAssistant, init_integration) -> None:
     with patch(
         "homeassistant.components.freedompro.switch.put_state"
     ) as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             SWITCH_DOMAIN,
             SERVICE_TURN_ON,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -130,7 +130,7 @@ async def test_switch_set_on(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["on"] = True
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
diff --git a/tests/components/fritz/conftest.py b/tests/components/fritz/conftest.py
index 5e86c3b83f6..66f4cf2b879 100644
--- a/tests/components/fritz/conftest.py
+++ b/tests/components/fritz/conftest.py
@@ -43,6 +43,10 @@ class FritzConnectionMock:  # pylint: disable=too-few-public-methods
         else:
             self.call_action = self._call_action
 
+    def override_services(self, services) -> None:
+        """Overrire services data."""
+        self._services = services
+
     def _call_action(self, service: str, action: str, **kwargs):
         LOGGER.debug(
             "_call_action service: %s, action: %s, **kwargs: %s",
diff --git a/tests/components/fritz/const.py b/tests/components/fritz/const.py
index fb62e14bc6f..7a89aab1af1 100644
--- a/tests/components/fritz/const.py
+++ b/tests/components/fritz/const.py
@@ -195,7 +195,6 @@ MOCK_FB_SERVICES: dict[str, dict] = {
     },
 }
 
-
 MOCK_MESH_DATA = {
     "schema_version": "1.9",
     "nodes": [
diff --git a/tests/components/fritz/snapshots/test_image.ambr b/tests/components/fritz/snapshots/test_image.ambr
new file mode 100644
index 00000000000..b64d8601a8a
--- /dev/null
+++ b/tests/components/fritz/snapshots/test_image.ambr
@@ -0,0 +1,13 @@
+# serializer version: 1
+# name: test_image[fc_data0]
+  b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x94\x00\x00\x00\x94\x01\x00\x00\x00\x00]G=y\x00\x00\x00\xf5IDATx\xda\xedVQ\x0eC!\x0c"\xbb@\xef\x7fKn\xe0\x00\xfd\xdb\xcf6\xf9|\xc6\xc4\xc6\x0f\xd2\x02\xadb},\xe2\xb9\xfb\xe5\x0e\xc0(\x18\xf2\x84/|\xaeo\xef\x847\xda\x14\x1af\x1c\xde\xe3\x19(X\tKxN\xb2\x87\x17j9\x1d<m\x01)\xbbU\xe1\xcf\xa2\x9eU\xd1\xd7\xcbe.\xcc\xf6\xd05\x7f\x02\x82\x1d\xb8\x1c\xdd\xd7\x1b\xef\t\x90\x13an\xf1b\x13P\xb9\x01\xac\xd4k\xee\x04\xa5.\xd1.\xe8+\x90\x88\x1b\x0e\x0b\xfe\x03\xd3 \xd4Y\xe0\xef\x10\xa7z\xe3\xe9F\x7f(?;\xc6\x80\x95\xfc\xe2\x13\x1ddC\x0fZ\x07\xec6f\xc3/.\x94i\xddi\xf8\x8f\x9b9k<\x8d\xf9\xeci`\xfb\xed\xf1R\x99/g\x9e\xaei\xcc\x830\xb7\xf6\x83\xd4\xf1_\x9e\x0f\xf7.*\xf3\xc0\xf6\x1b\x86\xbf\x12\xde\xac\xed\x16\xb0\xf4\xbe\x9dO\x02\xd0\xe1\x8f\xee^\x0f|v\xf4\x15 \x13\xaf\x8e\xff\x9e\x7f\xe2\x9fwo\x06\xf4\x81v\xeb\xb3\xcc\xc3\x00\x00\x00\x00IEND\xaeB`\x82'
+# ---
+# name: test_image_download[fc_data0]
+  b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x94\x00\x00\x00\x94\x01\x00\x00\x00\x00]G=y\x00\x00\x00\xf5IDATx\xda\xedVQ\x0eC!\x0c"\xbb@\xef\x7fKn\xe0\x00\xfd\xdb\xcf6\xf9|\xc6\xc4\xc6\x0f\xd2\x02\xadb},\xe2\xb9\xfb\xe5\x0e\xc0(\x18\xf2\x84/|\xaeo\xef\x847\xda\x14\x1af\x1c\xde\xe3\x19(X\tKxN\xb2\x87\x17j9\x1d<m\x01)\xbbU\xe1\xcf\xa2\x9eU\xd1\xd7\xcbe.\xcc\xf6\xd05\x7f\x02\x82\x1d\xb8\x1c\xdd\xd7\x1b\xef\t\x90\x13an\xf1b\x13P\xb9\x01\xac\xd4k\xee\x04\xa5.\xd1.\xe8+\x90\x88\x1b\x0e\x0b\xfe\x03\xd3 \xd4Y\xe0\xef\x10\xa7z\xe3\xe9F\x7f(?;\xc6\x80\x95\xfc\xe2\x13\x1ddC\x0fZ\x07\xec6f\xc3/.\x94i\xddi\xf8\x8f\x9b9k<\x8d\xf9\xeci`\xfb\xed\xf1R\x99/g\x9e\xaei\xcc\x830\xb7\xf6\x83\xd4\xf1_\x9e\x0f\xf7.*\xf3\xc0\xf6\x1b\x86\xbf\x12\xde\xac\xed\x16\xb0\xf4\xbe\x9dO\x02\xd0\xe1\x8f\xee^\x0f|v\xf4\x15 \x13\xaf\x8e\xff\x9e\x7f\xe2\x9fwo\x06\xf4\x81v\xeb\xb3\xcc\xc3\x00\x00\x00\x00IEND\xaeB`\x82'
+# ---
+# name: test_image_entity[fc_data0]
+  b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x94\x00\x00\x00\x94\x01\x00\x00\x00\x00]G=y\x00\x00\x00\xf5IDATx\xda\xedVQ\x0eC!\x0c"\xbb@\xef\x7fKn\xe0\x00\xfd\xdb\xcf6\xf9|\xc6\xc4\xc6\x0f\xd2\x02\xadb},\xe2\xb9\xfb\xe5\x0e\xc0(\x18\xf2\x84/|\xaeo\xef\x847\xda\x14\x1af\x1c\xde\xe3\x19(X\tKxN\xb2\x87\x17j9\x1d<m\x01)\xbbU\xe1\xcf\xa2\x9eU\xd1\xd7\xcbe.\xcc\xf6\xd05\x7f\x02\x82\x1d\xb8\x1c\xdd\xd7\x1b\xef\t\x90\x13an\xf1b\x13P\xb9\x01\xac\xd4k\xee\x04\xa5.\xd1.\xe8+\x90\x88\x1b\x0e\x0b\xfe\x03\xd3 \xd4Y\xe0\xef\x10\xa7z\xe3\xe9F\x7f(?;\xc6\x80\x95\xfc\xe2\x13\x1ddC\x0fZ\x07\xec6f\xc3/.\x94i\xddi\xf8\x8f\x9b9k<\x8d\xf9\xeci`\xfb\xed\xf1R\x99/g\x9e\xaei\xcc\x830\xb7\xf6\x83\xd4\xf1_\x9e\x0f\xf7.*\xf3\xc0\xf6\x1b\x86\xbf\x12\xde\xac\xed\x16\xb0\xf4\xbe\x9dO\x02\xd0\xe1\x8f\xee^\x0f|v\xf4\x15 \x13\xaf\x8e\xff\x9e\x7f\xe2\x9fwo\x06\xf4\x81v\xeb\xb3\xcc\xc3\x00\x00\x00\x00IEND\xaeB`\x82'
+# ---
+# name: test_image_update[fc_data0]
+  b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x94\x00\x00\x00\x94\x01\x00\x00\x00\x00]G=y\x00\x00\x00\xf9IDATx\xda\xedV\xc1\r\xc40\x0cB\xb7\x80\xf7\xdf\x92\r\\\xb0\xfb\xeb\xe7\xaa\xf0l\xd4\xaaQ\x1e\xc8\x06L\x8a~,\xe2;{s\x06\xa0\xd8z9\xdb\xe6\x0f\xcf\xf5\xef\x99\xf0J\x0f\x85\x86*o\xcf\xf1\x04\x04\x1ak\xb6\x11<\x97\xa6\xa6\x83x&\xb32x\x86\xa4\xab\xeb\x08\x7f\x16\xf5^\x11}\xbd$\xb0\x80k=t\xcc\x9f\xfdg\xfa\xda\xe5\x1d\xe3\t\x8br_\xdb3\x85D}\x063u\x00\x03\xfd\xb6<\xe2\xeaL\xa2y<\xae\xcf\xe3!\x895\xbfL\xf07\x0eT]n7\xc3_{0\xd4\xefx:\xc0\x1f\xc6}\x9e\xb7\x84\x1e\xfb\x91\x0e\x12\x84\t=z\xd2t\x07\x8e\x1d\xc9\x03\xc7\xa9G\xb7\x12\xf3&0\x176\x19\x98\xc8g\x8b;\x88@\xc6\x7f\x93\xa9\xfbVD\xdf\x193\xde9\x1d\xd1\xc3\x9ev`E\xf2oo\xa3\xe1/\x847\xad\x8a?0t\xffN\xb4p\xf35\xf3\x7f\x80\xad\xafS\xf7\x1bD`D\x8f\xef\x9f\xf0\xe0\xec\x02\xa4\xc0\x83\x92\xcf\xf3\xf9a\x00\x00\x00\x00IEND\xaeB`\x82'
+# ---
diff --git a/tests/components/fritz/test_image.py b/tests/components/fritz/test_image.py
new file mode 100644
index 00000000000..e65fcb85457
--- /dev/null
+++ b/tests/components/fritz/test_image.py
@@ -0,0 +1,172 @@
+"""Tests for Fritz!Tools image platform."""
+from datetime import timedelta
+from http import HTTPStatus
+from unittest.mock import patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.fritz.const import DOMAIN
+from homeassistant.components.image import DOMAIN as IMAGE_DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_registry import async_get as async_get_entity_registry
+from homeassistant.setup import async_setup_component
+from homeassistant.util.dt import utcnow
+
+from .const import MOCK_FB_SERVICES, MOCK_USER_DATA
+
+from tests.common import MockConfigEntry, async_fire_time_changed
+from tests.typing import ClientSessionGenerator
+
+GUEST_WIFI_ENABLED: dict[str, dict] = {
+    "WLANConfiguration0": {},
+    "WLANConfiguration1": {
+        "GetInfo": {
+            "NewEnable": True,
+            "NewStatus": "Up",
+            "NewSSID": "GuestWifi",
+            "NewBeaconType": "11iandWPA3",
+            "NewX_AVM-DE_PossibleBeaconTypes": "None,11i,11iandWPA3",
+            "NewStandard": "ax",
+            "NewBSSID": "1C:ED:6F:12:34:13",
+        },
+        "GetSSID": {
+            "NewSSID": "GuestWifi",
+        },
+        "GetSecurityKeys": {"NewKeyPassphrase": "1234567890"},
+    },
+}
+
+GUEST_WIFI_CHANGED: dict[str, dict] = {
+    "WLANConfiguration0": {},
+    "WLANConfiguration1": {
+        "GetInfo": {
+            "NewEnable": True,
+            "NewStatus": "Up",
+            "NewSSID": "GuestWifi",
+            "NewBeaconType": "11iandWPA3",
+            "NewX_AVM-DE_PossibleBeaconTypes": "None,11i,11iandWPA3",
+            "NewStandard": "ax",
+            "NewBSSID": "1C:ED:6F:12:34:13",
+        },
+        "GetSSID": {
+            "NewSSID": "GuestWifi",
+        },
+        "GetSecurityKeys": {"NewKeyPassphrase": "abcdefghij"},
+    },
+}
+
+GUEST_WIFI_DISABLED: dict[str, dict] = {
+    "WLANConfiguration0": {},
+    "WLANConfiguration1": {"GetInfo": {"NewEnable": False}},
+}
+
+
+@pytest.mark.parametrize(("fc_data"), [({**MOCK_FB_SERVICES, **GUEST_WIFI_ENABLED})])
+async def test_image_entity(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    snapshot: SnapshotAssertion,
+    fc_class_mock,
+    fh_class_mock,
+) -> None:
+    """Test image entity."""
+
+    # setup component with image platform only
+    with patch(
+        "homeassistant.components.fritz.PLATFORMS",
+        [Platform.IMAGE],
+    ):
+        entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA)
+        entry.add_to_hass(hass)
+        assert await async_setup_component(hass, DOMAIN, {})
+
+    await hass.async_block_till_done()
+    assert entry.state == ConfigEntryState.LOADED
+
+    # test image entity is generated as expected
+    states = hass.states.async_all(IMAGE_DOMAIN)
+    assert len(states) == 1
+
+    state = states[0]
+    assert state.name == "Mock Title GuestWifi"
+    assert state.entity_id == "image.mock_title_guestwifi"
+
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.mock_title_guestwifi?token={access_token}",
+        "friendly_name": "Mock Title GuestWifi",
+    }
+
+    entity_registry = async_get_entity_registry(hass)
+    entity_entry = entity_registry.async_get("image.mock_title_guestwifi")
+    assert entity_entry.unique_id == "1c_ed_6f_12_34_11_guestwifi_qr_code"
+
+    # test image download
+    client = await hass_client()
+    resp = await client.get("/api/image_proxy/image.mock_title_guestwifi")
+    assert resp.status == HTTPStatus.OK
+
+    body = await resp.read()
+    assert body == snapshot
+
+
+@pytest.mark.parametrize(("fc_data"), [({**MOCK_FB_SERVICES, **GUEST_WIFI_ENABLED})])
+async def test_image_update(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    snapshot: SnapshotAssertion,
+    fc_class_mock,
+    fh_class_mock,
+) -> None:
+    """Test image update."""
+
+    # setup component with image platform only
+    with patch(
+        "homeassistant.components.fritz.PLATFORMS",
+        [Platform.IMAGE],
+    ):
+        entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA)
+        entry.add_to_hass(hass)
+        assert await async_setup_component(hass, DOMAIN, {})
+
+    await hass.async_block_till_done()
+    assert entry.state == ConfigEntryState.LOADED
+
+    client = await hass_client()
+    resp = await client.get("/api/image_proxy/image.mock_title_guestwifi")
+    resp_body = await resp.read()
+    assert resp.status == HTTPStatus.OK
+
+    fc_class_mock().override_services({**MOCK_FB_SERVICES, **GUEST_WIFI_CHANGED})
+    async_fire_time_changed(hass, utcnow() + timedelta(seconds=60))
+    await hass.async_block_till_done()
+
+    resp = await client.get("/api/image_proxy/image.mock_title_guestwifi")
+    resp_body_new = await resp.read()
+
+    assert resp_body != resp_body_new
+    assert resp_body_new == snapshot
+
+
+@pytest.mark.parametrize(("fc_data"), [({**MOCK_FB_SERVICES, **GUEST_WIFI_DISABLED})])
+async def test_image_guest_wifi_disabled(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    fc_class_mock,
+    fh_class_mock,
+) -> None:
+    """Test image entities."""
+
+    entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA)
+    entry.add_to_hass(hass)
+
+    assert await async_setup_component(hass, DOMAIN, {})
+    await hass.async_block_till_done()
+    assert entry.state == ConfigEntryState.LOADED
+
+    images = hass.states.async_all(IMAGE_DOMAIN)
+    assert len(images) == 0
diff --git a/tests/components/fritz/test_update.py b/tests/components/fritz/test_update.py
index b139a86b82d..915a6bb6fd0 100644
--- a/tests/components/fritz/test_update.py
+++ b/tests/components/fritz/test_update.py
@@ -113,7 +113,7 @@ async def test_available_update_can_be_installed(
         assert update is not None
         assert update.state == "on"
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             "update",
             "install",
             {"entity_id": "update.mock_title_fritz_os"},
diff --git a/tests/components/fritzbox/test_button.py b/tests/components/fritzbox/test_button.py
index c6e73b32edc..9c53c895f5d 100644
--- a/tests/components/fritzbox/test_button.py
+++ b/tests/components/fritzbox/test_button.py
@@ -37,7 +37,7 @@ async def test_apply_template(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], fritz=fritz, template=template
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_PRESS, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert fritz().apply_template.call_count == 1
diff --git a/tests/components/fritzbox/test_climate.py b/tests/components/fritzbox/test_climate.py
index edfaf73e3b8..d49b5710a12 100644
--- a/tests/components/fritzbox/test_climate.py
+++ b/tests/components/fritzbox/test_climate.py
@@ -255,7 +255,7 @@ async def test_set_temperature_temperature(hass: HomeAssistant, fritz: Mock) ->
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_TEMPERATURE: 123},
@@ -271,7 +271,7 @@ async def test_set_temperature_mode_off(hass: HomeAssistant, fritz: Mock) -> Non
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {
@@ -291,7 +291,7 @@ async def test_set_temperature_mode_heat(hass: HomeAssistant, fritz: Mock) -> No
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {
@@ -311,7 +311,7 @@ async def test_set_hvac_mode_off(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_HVAC_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVACMode.OFF},
@@ -327,7 +327,7 @@ async def test_set_hvac_mode_heat(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_HVAC_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVACMode.HEAT},
@@ -343,7 +343,7 @@ async def test_set_preset_mode_comfort(hass: HomeAssistant, fritz: Mock) -> None
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_PRESET_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_PRESET_MODE: PRESET_COMFORT},
@@ -359,7 +359,7 @@ async def test_set_preset_mode_eco(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_PRESET_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_PRESET_MODE: PRESET_ECO},
diff --git a/tests/components/fritzbox/test_cover.py b/tests/components/fritzbox/test_cover.py
index d500efb9032..af725ce93da 100644
--- a/tests/components/fritzbox/test_cover.py
+++ b/tests/components/fritzbox/test_cover.py
@@ -38,7 +38,7 @@ async def test_open_cover(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_OPEN_COVER, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert device.set_blind_open.call_count == 1
@@ -51,7 +51,7 @@ async def test_close_cover(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_CLOSE_COVER, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert device.set_blind_close.call_count == 1
@@ -64,7 +64,7 @@ async def test_set_position_cover(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_COVER_POSITION,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_POSITION: 50},
@@ -80,7 +80,7 @@ async def test_stop_cover(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_STOP_COVER, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert device.set_blind_stop.call_count == 1
diff --git a/tests/components/fritzbox/test_light.py b/tests/components/fritzbox/test_light.py
index 074dd902fa1..0192ea7bb00 100644
--- a/tests/components/fritzbox/test_light.py
+++ b/tests/components/fritzbox/test_light.py
@@ -135,7 +135,7 @@ async def test_turn_on(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_BRIGHTNESS: 100, ATTR_COLOR_TEMP_KELVIN: 3000},
@@ -158,7 +158,7 @@ async def test_turn_on_color(hass: HomeAssistant, fritz: Mock) -> None:
     assert await setup_config_entry(
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_BRIGHTNESS: 100, ATTR_HS_COLOR: (100, 70)},
@@ -192,7 +192,7 @@ async def test_turn_on_color_unsupported_api_method(
     assert await setup_config_entry(
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_BRIGHTNESS: 100, ATTR_HS_COLOR: (100, 70)},
@@ -215,7 +215,7 @@ async def test_turn_off(hass: HomeAssistant, fritz: Mock) -> None:
     assert await setup_config_entry(
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert device.set_state_off.call_count == 1
diff --git a/tests/components/fritzbox/test_switch.py b/tests/components/fritzbox/test_switch.py
index 17c51af9d98..4ac36a13284 100644
--- a/tests/components/fritzbox/test_switch.py
+++ b/tests/components/fritzbox/test_switch.py
@@ -107,7 +107,7 @@ async def test_turn_on(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert device.set_switch_state_on.call_count == 1
@@ -120,7 +120,7 @@ async def test_turn_off(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert device.set_switch_state_off.call_count == 1
diff --git a/tests/components/fully_kiosk/test_button.py b/tests/components/fully_kiosk/test_button.py
index 1c839e57dfd..fee39be302e 100644
--- a/tests/components/fully_kiosk/test_button.py
+++ b/tests/components/fully_kiosk/test_button.py
@@ -22,7 +22,7 @@ async def test_buttons(
     entry = entity_registry.async_get("button.amazon_fire_restart_browser")
     assert entry
     assert entry.unique_id == "abcdef-123456-restartApp"
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         button.DOMAIN,
         button.SERVICE_PRESS,
         {ATTR_ENTITY_ID: "button.amazon_fire_restart_browser"},
@@ -30,13 +30,13 @@ async def test_buttons(
     )
     assert len(mock_fully_kiosk.restartApp.mock_calls) == 1
 
-    entry = entity_registry.async_get("button.amazon_fire_reboot_device")
+    entry = entity_registry.async_get("button.amazon_fire_restart_device")
     assert entry
     assert entry.unique_id == "abcdef-123456-rebootDevice"
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         button.DOMAIN,
         button.SERVICE_PRESS,
-        {ATTR_ENTITY_ID: "button.amazon_fire_reboot_device"},
+        {ATTR_ENTITY_ID: "button.amazon_fire_restart_device"},
         blocking=True,
     )
     assert len(mock_fully_kiosk.rebootDevice.mock_calls) == 1
@@ -44,7 +44,7 @@ async def test_buttons(
     entry = entity_registry.async_get("button.amazon_fire_bring_to_foreground")
     assert entry
     assert entry.unique_id == "abcdef-123456-toForeground"
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         button.DOMAIN,
         button.SERVICE_PRESS,
         {ATTR_ENTITY_ID: "button.amazon_fire_bring_to_foreground"},
@@ -55,7 +55,7 @@ async def test_buttons(
     entry = entity_registry.async_get("button.amazon_fire_send_to_background")
     assert entry
     assert entry.unique_id == "abcdef-123456-toBackground"
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         button.DOMAIN,
         button.SERVICE_PRESS,
         {ATTR_ENTITY_ID: "button.amazon_fire_send_to_background"},
@@ -66,7 +66,7 @@ async def test_buttons(
     entry = entity_registry.async_get("button.amazon_fire_load_start_url")
     assert entry
     assert entry.unique_id == "abcdef-123456-loadStartUrl"
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         button.DOMAIN,
         button.SERVICE_PRESS,
         {ATTR_ENTITY_ID: "button.amazon_fire_load_start_url"},
diff --git a/tests/components/fully_kiosk/test_init.py b/tests/components/fully_kiosk/test_init.py
index 956de050e56..c53e4168733 100644
--- a/tests/components/fully_kiosk/test_init.py
+++ b/tests/components/fully_kiosk/test_init.py
@@ -7,6 +7,7 @@ from fullykiosk import FullyKioskError
 import pytest
 
 from homeassistant.components.fully_kiosk.const import DOMAIN
+from homeassistant.components.fully_kiosk.entity import valid_global_mac_address
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_HOST, CONF_MAC, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
@@ -134,3 +135,11 @@ async def test_multiple_kiosk_with_empty_mac(
     assert device2
 
     assert device1 != device2
+
+
+async def test_valid_global_mac_address() -> None:
+    """Test valid_global_mac_address function."""
+    assert valid_global_mac_address("a1:bb:cc:dd:ee:ff")
+    assert not valid_global_mac_address("02:00:00:00:00:00")
+    assert not valid_global_mac_address(None)
+    assert not valid_global_mac_address("foobar")
diff --git a/tests/components/fully_kiosk/test_services.py b/tests/components/fully_kiosk/test_services.py
index 504aa4893e6..11d5a74f3d7 100644
--- a/tests/components/fully_kiosk/test_services.py
+++ b/tests/components/fully_kiosk/test_services.py
@@ -5,9 +5,12 @@ import pytest
 
 from homeassistant.components.fully_kiosk.const import (
     ATTR_APPLICATION,
+    ATTR_KEY,
     ATTR_URL,
+    ATTR_VALUE,
     DOMAIN,
     SERVICE_LOAD_URL,
+    SERVICE_SET_CONFIG,
     SERVICE_START_APPLICATION,
 )
 from homeassistant.const import ATTR_DEVICE_ID
@@ -51,6 +54,52 @@ async def test_services(
 
     mock_fully_kiosk.startApplication.assert_called_once_with(app)
 
+    key = "test_key"
+    value = "test_value"
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_CONFIG,
+        {
+            ATTR_DEVICE_ID: [device_entry.id],
+            ATTR_KEY: key,
+            ATTR_VALUE: value,
+        },
+        blocking=True,
+    )
+
+    mock_fully_kiosk.setConfigurationString.assert_called_once_with(key, value)
+
+    key = "test_key"
+    value = "true"
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_CONFIG,
+        {
+            ATTR_DEVICE_ID: [device_entry.id],
+            ATTR_KEY: key,
+            ATTR_VALUE: value,
+        },
+        blocking=True,
+    )
+
+    mock_fully_kiosk.setConfigurationBool.assert_called_once_with(key, value)
+
+    key = "test_key"
+    value = True
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_CONFIG,
+        {
+            ATTR_DEVICE_ID: [device_entry.id],
+            ATTR_KEY: key,
+            ATTR_VALUE: value,
+        },
+        blocking=True,
+    )
+
+    mock_fully_kiosk.setConfigurationBool.assert_called_with(key, value)
+
 
 async def test_service_unloaded_entry(
     hass: HomeAssistant,
diff --git a/tests/components/generic_hygrostat/test_humidifier.py b/tests/components/generic_hygrostat/test_humidifier.py
index a87f2472fd3..341571fe9ad 100644
--- a/tests/components/generic_hygrostat/test_humidifier.py
+++ b/tests/components/generic_hygrostat/test_humidifier.py
@@ -414,16 +414,26 @@ async def test_set_away_mode_twice_and_restore_prev_humidity(
     assert state.attributes.get("humidity") == 44
 
 
+async def test_sensor_affects_attribute(hass: HomeAssistant, setup_comp_2) -> None:
+    """Test that the sensor changes are reflected in the current_humidity attribute."""
+    state = hass.states.get(ENTITY)
+    assert state.attributes.get("current_humidity") == 45
+
+    _setup_sensor(hass, 47)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY)
+    assert state.attributes.get("current_humidity") == 47
+
+
 async def test_sensor_bad_value(hass: HomeAssistant, setup_comp_2) -> None:
     """Test sensor that have None as state."""
-    state = hass.states.get(ENTITY)
-    humidity = state.attributes.get("current_humidity")
+    assert hass.states.get(ENTITY).state == STATE_ON
 
     _setup_sensor(hass, None)
     await hass.async_block_till_done()
 
-    state = hass.states.get(ENTITY)
-    assert humidity == state.attributes.get("current_humidity")
+    assert hass.states.get(ENTITY).state == STATE_UNAVAILABLE
 
 
 async def test_set_target_humidity_humidifier_on(
diff --git a/tests/components/generic_thermostat/test_climate.py b/tests/components/generic_thermostat/test_climate.py
index 99720ef8527..4eb2e3ce711 100644
--- a/tests/components/generic_thermostat/test_climate.py
+++ b/tests/components/generic_thermostat/test_climate.py
@@ -131,6 +131,7 @@ async def test_heater_input_boolean(hass: HomeAssistant, setup_comp_1) -> None:
     _setup_sensor(hass, 18)
     await hass.async_block_till_done()
     await common.async_set_temperature(hass, 23)
+    await hass.async_block_till_done()
 
     assert hass.states.get(heater_switch).state == STATE_ON
 
diff --git a/tests/components/google_assistant/test_diagnostics.py b/tests/components/google_assistant/test_diagnostics.py
index 5f033319c44..fde7e99025f 100644
--- a/tests/components/google_assistant/test_diagnostics.py
+++ b/tests/components/google_assistant/test_diagnostics.py
@@ -1,8 +1,11 @@
 """Test diagnostics."""
-from unittest.mock import ANY
+from unittest.mock import ANY, patch
+
+import pytest
 
 from homeassistant import setup
 from homeassistant.components import google_assistant as ga, switch
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -12,6 +15,16 @@ from tests.components.diagnostics import get_diagnostics_for_config_entry
 from tests.typing import ClientSessionGenerator
 
 
+@pytest.fixture(autouse=True)
+async def switch_only() -> None:
+    """Enable only the switch platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.SWITCH],
+    ):
+        yield
+
+
 async def test_diagnostics(
     hass: HomeAssistant, hass_client: ClientSessionGenerator
 ) -> None:
diff --git a/tests/components/google_assistant/test_google_assistant.py b/tests/components/google_assistant/test_google_assistant.py
index a6c572c24f0..177220cc02f 100644
--- a/tests/components/google_assistant/test_google_assistant.py
+++ b/tests/components/google_assistant/test_google_assistant.py
@@ -1,26 +1,22 @@
 """The tests for the Google Assistant component."""
 from http import HTTPStatus
 import json
+from unittest.mock import patch
 
 from aiohttp.hdrs import AUTHORIZATION
 import pytest
 
 from homeassistant import const, core, setup
 from homeassistant.components import (
-    alarm_control_panel,
-    climate,
-    cover,
-    fan,
     google_assistant as ga,
     humidifier,
     light,
-    lock,
     media_player,
-    switch,
 )
 from homeassistant.const import (
     CLOUD_NEVER_EXPOSED_ENTITIES,
     EntityCategory,
+    Platform,
     UnitOfTemperature,
 )
 from homeassistant.helpers import entity_registry as er
@@ -65,6 +61,26 @@ def assistant_client(event_loop, hass, hass_client_no_auth):
     return loop.run_until_complete(hass_client_no_auth())
 
 
+@pytest.fixture(autouse=True)
+async def wanted_platforms_only() -> None:
+    """Enable only the wanted demo platforms."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [
+            Platform.ALARM_CONTROL_PANEL,
+            Platform.CLIMATE,
+            Platform.COVER,
+            Platform.FAN,
+            Platform.HUMIDIFIER,
+            Platform.LIGHT,
+            Platform.LOCK,
+            Platform.MEDIA_PLAYER,
+            Platform.SWITCH,
+        ],
+    ):
+        yield
+
+
 @pytest.fixture
 def hass_fixture(event_loop, hass):
     """Set up a Home Assistant instance for these tests."""
@@ -73,55 +89,7 @@ def hass_fixture(event_loop, hass):
     # We need to do this to get access to homeassistant/turn_(on,off)
     loop.run_until_complete(setup.async_setup_component(hass, core.DOMAIN, {}))
 
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass, light.DOMAIN, {"light": [{"platform": "demo"}]}
-        )
-    )
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass, switch.DOMAIN, {"switch": [{"platform": "demo"}]}
-        )
-    )
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass, cover.DOMAIN, {"cover": [{"platform": "demo"}]}
-        )
-    )
-
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass, media_player.DOMAIN, {"media_player": [{"platform": "demo"}]}
-        )
-    )
-
-    loop.run_until_complete(
-        setup.async_setup_component(hass, fan.DOMAIN, {"fan": [{"platform": "demo"}]})
-    )
-
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass, climate.DOMAIN, {"climate": [{"platform": "demo"}]}
-        )
-    )
-
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass, humidifier.DOMAIN, {"humidifier": [{"platform": "demo"}]}
-        )
-    )
-
-    loop.run_until_complete(
-        setup.async_setup_component(hass, lock.DOMAIN, {"lock": [{"platform": "demo"}]})
-    )
-
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass,
-            alarm_control_panel.DOMAIN,
-            {"alarm_control_panel": [{"platform": "demo"}]},
-        )
-    )
+    loop.run_until_complete(setup.async_setup_component(hass, "demo", {}))
 
     return hass
 
@@ -383,11 +351,13 @@ async def test_query_humidifier_request(
         "on": True,
         "online": True,
         "humiditySetpointPercent": 68,
+        "humidityAmbientPercent": 45,
     }
     assert devices["humidifier.dehumidifier"] == {
         "on": True,
         "online": True,
         "humiditySetpointPercent": 54,
+        "humidityAmbientPercent": 59,
     }
     assert devices["humidifier.hygrostat"] == {
         "on": True,
diff --git a/tests/components/google_assistant/test_smart_home.py b/tests/components/google_assistant/test_smart_home.py
index f9ea356216f..849f9e38a68 100644
--- a/tests/components/google_assistant/test_smart_home.py
+++ b/tests/components/google_assistant/test_smart_home.py
@@ -22,7 +22,12 @@ from homeassistant.components.google_assistant import (
     trait,
 )
 from homeassistant.config import async_process_ha_core_config
-from homeassistant.const import ATTR_UNIT_OF_MEASUREMENT, UnitOfTemperature, __version__
+from homeassistant.const import (
+    ATTR_UNIT_OF_MEASUREMENT,
+    Platform,
+    UnitOfTemperature,
+    __version__,
+)
 from homeassistant.core import EVENT_CALL_SERVICE, HomeAssistant, State
 from homeassistant.helpers import (
     area_registry as ar,
@@ -39,6 +44,16 @@ from tests.common import async_capture_events
 REQ_ID = "ff36a3cc-ec34-11e6-b1a0-64510650abcf"
 
 
+@pytest.fixture
+async def light_only() -> None:
+    """Enable only the light platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.LIGHT],
+    ):
+        yield
+
+
 @pytest.fixture
 def registries(
     entity_registry: er.EntityRegistry,
@@ -128,6 +143,8 @@ async def test_sync_message(hass: HomeAssistant, registries) -> None:
     )
     light.hass = hass
     light.entity_id = "light.demo_light"
+    light._attr_device_info = None
+    light._attr_name = "Demo Light"
     light.async_write_ha_state()
 
     # This should not show up in the sync request
@@ -268,6 +285,8 @@ async def test_sync_in_area(area_on_device, hass: HomeAssistant, registries) ->
     )
     light.hass = hass
     light.entity_id = entity.entity_id
+    light._attr_device_info = None
+    light._attr_name = "Demo Light"
     light.async_write_ha_state()
 
     config = MockConfig(should_expose=lambda _: True, entity_config={})
@@ -360,6 +379,8 @@ async def test_query_message(hass: HomeAssistant) -> None:
     )
     light.hass = hass
     light.entity_id = "light.demo_light"
+    light._attr_device_info = None
+    light._attr_name = "Demo Light"
     light.async_write_ha_state()
 
     light2 = DemoLight(
@@ -367,11 +388,15 @@ async def test_query_message(hass: HomeAssistant) -> None:
     )
     light2.hass = hass
     light2.entity_id = "light.another_light"
+    light2._attr_device_info = None
+    light2._attr_name = "Another Light"
     light2.async_write_ha_state()
 
     light3 = DemoLight(None, "Color temp Light", state=True, ct=400, brightness=200)
     light3.hass = hass
     light3.entity_id = "light.color_temp_light"
+    light3._attr_device_info = None
+    light3._attr_name = "Color temp Light"
     light3.async_write_ha_state()
 
     events = async_capture_events(hass, EVENT_QUERY_RECEIVED)
@@ -448,7 +473,7 @@ async def test_query_message(hass: HomeAssistant) -> None:
     [(False, True, 20, 0.2), (True, ANY, ANY, ANY)],
 )
 async def test_execute(
-    hass: HomeAssistant, report_state, on, brightness, value
+    hass: HomeAssistant, light_only, report_state, on, brightness, value
 ) -> None:
     """Test an execute command."""
     await async_setup_component(hass, "homeassistant", {})
@@ -630,7 +655,7 @@ async def test_execute(
     ("report_state", "on", "brightness", "value"), [(False, False, ANY, ANY)]
 )
 async def test_execute_times_out(
-    hass: HomeAssistant, report_state, on, brightness, value
+    hass: HomeAssistant, light_only, report_state, on, brightness, value
 ) -> None:
     """Test an execute command which times out."""
     orig_execute_limit = sh.EXECUTE_LIMIT
@@ -655,7 +680,7 @@ async def test_execute_times_out(
 
     async def slow_turn_on(*args, **kwargs):
         # Make DemoLigt.async_turn_on hang waiting for the turn_on_wait event
-        await turn_on_wait.wait(),
+        await turn_on_wait.wait()
 
     with patch.object(
         hass.services, "async_call", wraps=hass.services.async_call
@@ -719,6 +744,7 @@ async def test_execute_times_out(
 
         turn_on_wait.set()
         await hass.async_block_till_done()
+        await hass.async_block_till_done()
         # The remaining two calls should now have executed
         assert call_service_mock.call_count == 4
         expected_calls.extend(
@@ -933,6 +959,8 @@ async def test_unavailable_state_does_sync(hass: HomeAssistant) -> None:
     light.hass = hass
     light.entity_id = "light.demo_light"
     light._available = False
+    light._attr_device_info = None
+    light._attr_name = "Demo Light"
     light.async_write_ha_state()
 
     events = async_capture_events(hass, EVENT_SYNC_RECEIVED)
@@ -1027,6 +1055,8 @@ async def test_device_class_switch(
     )
     sensor.hass = hass
     sensor.entity_id = "switch.demo_sensor"
+    sensor._attr_device_info = None
+    sensor._attr_name = "Demo Sensor"
     sensor.async_write_ha_state()
 
     result = await sh.async_handle_message(
@@ -1074,6 +1104,8 @@ async def test_device_class_binary_sensor(
     )
     sensor.hass = hass
     sensor.entity_id = "binary_sensor.demo_sensor"
+    sensor._attr_device_info = None
+    sensor._attr_name = "Demo Sensor"
     sensor.async_write_ha_state()
 
     result = await sh.async_handle_message(
@@ -1125,6 +1157,8 @@ async def test_device_class_cover(
     sensor = DemoCover(None, hass, "Demo Sensor", device_class=device_class)
     sensor.hass = hass
     sensor.entity_id = "cover.demo_sensor"
+    sensor._attr_device_info = None
+    sensor._attr_name = "Demo Sensor"
     sensor.async_write_ha_state()
 
     result = await sh.async_handle_message(
@@ -1456,6 +1490,8 @@ async def test_sync_message_recovery(
     )
     light.hass = hass
     light.entity_id = "light.demo_light"
+    light._attr_device_info = None
+    light._attr_name = "Demo Light"
     light.async_write_ha_state()
 
     hass.states.async_set(
diff --git a/tests/components/google_assistant/test_trait.py b/tests/components/google_assistant/test_trait.py
index 33eac82a6ba..fd6b3a6790b 100644
--- a/tests/components/google_assistant/test_trait.py
+++ b/tests/components/google_assistant/test_trait.py
@@ -854,14 +854,18 @@ async def test_temperature_setting_climate_onoff(hass: HomeAssistant) -> None:
                     climate.HVACMode.HEAT,
                     climate.HVACMode.HEAT_COOL,
                 ],
-                climate.ATTR_MIN_TEMP: None,
-                climate.ATTR_MAX_TEMP: None,
+                climate.ATTR_MIN_TEMP: 45,
+                climate.ATTR_MAX_TEMP: 95,
             },
         ),
         BASIC_CONFIG,
     )
     assert trt.sync_attributes() == {
         "availableThermostatModes": ["off", "cool", "heat", "heatcool", "on"],
+        "thermostatTemperatureRange": {
+            "minThresholdCelsius": 7,
+            "maxThresholdCelsius": 35,
+        },
         "thermostatTemperatureUnit": "F",
     }
     assert trt.can_execute(trait.COMMAND_THERMOSTAT_SET_MODE, {})
@@ -893,14 +897,18 @@ async def test_temperature_setting_climate_no_modes(hass: HomeAssistant) -> None
             climate.HVACMode.AUTO,
             {
                 climate.ATTR_HVAC_MODES: [],
-                climate.ATTR_MIN_TEMP: None,
-                climate.ATTR_MAX_TEMP: None,
+                climate.ATTR_MIN_TEMP: climate.DEFAULT_MIN_TEMP,
+                climate.ATTR_MAX_TEMP: climate.DEFAULT_MAX_TEMP,
             },
         ),
         BASIC_CONFIG,
     )
     assert trt.sync_attributes() == {
         "availableThermostatModes": ["heat"],
+        "thermostatTemperatureRange": {
+            "minThresholdCelsius": climate.DEFAULT_MIN_TEMP,
+            "maxThresholdCelsius": climate.DEFAULT_MAX_TEMP,
+        },
         "thermostatTemperatureUnit": "C",
     }
 
@@ -937,6 +945,10 @@ async def test_temperature_setting_climate_range(hass: HomeAssistant) -> None:
     )
     assert trt.sync_attributes() == {
         "availableThermostatModes": ["off", "cool", "heat", "auto", "on"],
+        "thermostatTemperatureRange": {
+            "minThresholdCelsius": 10,
+            "maxThresholdCelsius": 27,
+        },
         "thermostatTemperatureUnit": "F",
     }
     assert trt.query_attributes() == {
@@ -978,12 +990,40 @@ async def test_temperature_setting_climate_range(hass: HomeAssistant) -> None:
 
     with pytest.raises(helpers.SmartHomeError) as err:
         await trt.execute(
-            trait.COMMAND_THERMOSTAT_TEMPERATURE_SETPOINT,
+            trait.COMMAND_THERMOSTAT_TEMPERATURE_SET_RANGE,
             BASIC_DATA,
-            {"thermostatTemperatureSetpoint": -100},
+            {
+                "thermostatTemperatureSetpointHigh": 26,
+                "thermostatTemperatureSetpointLow": -100,
+            },
             {},
         )
     assert err.value.code == const.ERR_VALUE_OUT_OF_RANGE
+
+    with pytest.raises(helpers.SmartHomeError) as err:
+        await trt.execute(
+            trait.COMMAND_THERMOSTAT_TEMPERATURE_SET_RANGE,
+            BASIC_DATA,
+            {
+                "thermostatTemperatureSetpointHigh": 100,
+                "thermostatTemperatureSetpointLow": 18,
+            },
+            {},
+        )
+    assert err.value.code == const.ERR_VALUE_OUT_OF_RANGE
+
+    calls = async_mock_service(hass, climate.DOMAIN, climate.SERVICE_SET_TEMPERATURE)
+    await trt.execute(
+        trait.COMMAND_THERMOSTAT_TEMPERATURE_SETPOINT,
+        BASIC_DATA,
+        {"thermostatTemperatureSetpoint": 23.9},
+        {},
+    )
+    assert len(calls) == 1
+    assert calls[0].data == {
+        ATTR_ENTITY_ID: "climate.bla",
+        climate.ATTR_TEMPERATURE: 75,
+    }
     hass.config.units.temperature_unit = UnitOfTemperature.CELSIUS
 
 
@@ -1000,9 +1040,11 @@ async def test_temperature_setting_climate_setpoint(hass: HomeAssistant) -> None
             "climate.bla",
             climate.HVACMode.COOL,
             {
+                ATTR_SUPPORTED_FEATURES: climate.SUPPORT_TARGET_TEMPERATURE,
                 climate.ATTR_HVAC_MODES: [STATE_OFF, climate.HVACMode.COOL],
                 climate.ATTR_MIN_TEMP: 10,
                 climate.ATTR_MAX_TEMP: 30,
+                climate.ATTR_PRESET_MODE: climate.PRESET_ECO,
                 ATTR_TEMPERATURE: 18,
                 climate.ATTR_CURRENT_TEMPERATURE: 20,
             },
@@ -1011,10 +1053,14 @@ async def test_temperature_setting_climate_setpoint(hass: HomeAssistant) -> None
     )
     assert trt.sync_attributes() == {
         "availableThermostatModes": ["off", "cool", "on"],
+        "thermostatTemperatureRange": {
+            "minThresholdCelsius": 10,
+            "maxThresholdCelsius": 30,
+        },
         "thermostatTemperatureUnit": "C",
     }
     assert trt.query_attributes() == {
-        "thermostatMode": "cool",
+        "thermostatMode": "eco",
         "thermostatTemperatureAmbient": 20,
         "thermostatTemperatureSetpoint": 18,
     }
@@ -1022,7 +1068,6 @@ async def test_temperature_setting_climate_setpoint(hass: HomeAssistant) -> None
     assert trt.can_execute(trait.COMMAND_THERMOSTAT_SET_MODE, {})
 
     calls = async_mock_service(hass, climate.DOMAIN, climate.SERVICE_SET_TEMPERATURE)
-
     with pytest.raises(helpers.SmartHomeError):
         await trt.execute(
             trait.COMMAND_THERMOSTAT_TEMPERATURE_SETPOINT,
@@ -1040,6 +1085,32 @@ async def test_temperature_setting_climate_setpoint(hass: HomeAssistant) -> None
     assert len(calls) == 1
     assert calls[0].data == {ATTR_ENTITY_ID: "climate.bla", ATTR_TEMPERATURE: 19}
 
+    calls = async_mock_service(hass, climate.DOMAIN, climate.SERVICE_SET_PRESET_MODE)
+    await trt.execute(
+        trait.COMMAND_THERMOSTAT_SET_MODE,
+        BASIC_DATA,
+        {"thermostatMode": "eco"},
+        {},
+    )
+    assert len(calls) == 1
+    assert calls[0].data == {
+        ATTR_ENTITY_ID: "climate.bla",
+        climate.ATTR_PRESET_MODE: "eco",
+    }
+
+    calls = async_mock_service(hass, climate.DOMAIN, climate.SERVICE_SET_TEMPERATURE)
+    await trt.execute(
+        trait.COMMAND_THERMOSTAT_TEMPERATURE_SET_RANGE,
+        BASIC_DATA,
+        {
+            "thermostatTemperatureSetpointHigh": 15,
+            "thermostatTemperatureSetpointLow": 22,
+        },
+        {},
+    )
+    assert len(calls) == 1
+    assert calls[0].data == {ATTR_ENTITY_ID: "climate.bla", ATTR_TEMPERATURE: 18.5}
+
 
 async def test_temperature_setting_climate_setpoint_auto(hass: HomeAssistant) -> None:
     """Test TemperatureSetting trait support for climate domain.
@@ -1068,6 +1139,10 @@ async def test_temperature_setting_climate_setpoint_auto(hass: HomeAssistant) ->
     )
     assert trt.sync_attributes() == {
         "availableThermostatModes": ["off", "heatcool", "on"],
+        "thermostatTemperatureRange": {
+            "minThresholdCelsius": 10,
+            "maxThresholdCelsius": 30,
+        },
         "thermostatTemperatureUnit": "C",
     }
     assert trt.query_attributes() == {
@@ -1128,6 +1203,7 @@ async def test_humidity_setting_humidifier_setpoint(hass: HomeAssistant) -> None
                 humidifier.ATTR_MIN_HUMIDITY: 20,
                 humidifier.ATTR_MAX_HUMIDITY: 90,
                 humidifier.ATTR_HUMIDITY: 38,
+                humidifier.ATTR_CURRENT_HUMIDITY: 30,
             },
         ),
         BASIC_CONFIG,
@@ -1137,6 +1213,7 @@ async def test_humidity_setting_humidifier_setpoint(hass: HomeAssistant) -> None
     }
     assert trt.query_attributes() == {
         "humiditySetpointPercent": 38,
+        "humidityAmbientPercent": 30,
     }
     assert trt.can_execute(trait.COMMAND_SET_HUMIDITY, {})
 
@@ -3214,6 +3291,50 @@ async def test_channel(hass: HomeAssistant) -> None:
     assert len(media_player_calls) == 1
 
 
+async def test_air_quality_description_for_aqi(hass: HomeAssistant) -> None:
+    """Test air quality description for a given AQI value."""
+    trt = trait.SensorStateTrait(
+        hass,
+        State(
+            "sensor.test",
+            100.0,
+            {
+                "device_class": sensor.SensorDeviceClass.AQI,
+            },
+        ),
+        BASIC_CONFIG,
+    )
+
+    assert trt._air_quality_description_for_aqi("0") == "healthy"
+    assert trt._air_quality_description_for_aqi("75") == "moderate"
+    assert (
+        trt._air_quality_description_for_aqi("125") == "unhealthy for sensitive groups"
+    )
+    assert trt._air_quality_description_for_aqi("175") == "unhealthy"
+    assert trt._air_quality_description_for_aqi("250") == "very unhealthy"
+    assert trt._air_quality_description_for_aqi("350") == "hazardous"
+    assert trt._air_quality_description_for_aqi("-1") == "unknown"
+    assert trt._air_quality_description_for_aqi("non-numeric") == "unknown"
+
+
+async def test_null_device_class(hass: HomeAssistant) -> None:
+    """Test handling a null device_class in sync_attributes and query_attributes."""
+    trt = trait.SensorStateTrait(
+        hass,
+        State(
+            "sensor.test",
+            100.0,
+            {
+                "device_class": None,
+            },
+        ),
+        BASIC_CONFIG,
+    )
+
+    assert trt.sync_attributes() == {}
+    assert trt.query_attributes() == {}
+
+
 async def test_sensorstate(hass: HomeAssistant) -> None:
     """Test SensorState trait support for sensor domain."""
     sensor_types = {
@@ -3247,16 +3368,52 @@ async def test_sensorstate(hass: HomeAssistant) -> None:
         name = sensor_types[sensor_type][0]
         unit = sensor_types[sensor_type][1]
 
-        assert trt.sync_attributes() == {
-            "sensorStatesSupported": {
-                "name": name,
-                "numericCapabilities": {"rawValueUnit": unit},
+        if sensor_type == sensor.SensorDeviceClass.AQI:
+            assert trt.sync_attributes() == {
+                "sensorStatesSupported": [
+                    {
+                        "name": name,
+                        "numericCapabilities": {"rawValueUnit": unit},
+                        "descriptiveCapabilities": {
+                            "availableStates": [
+                                "healthy",
+                                "moderate",
+                                "unhealthy for sensitive groups",
+                                "unhealthy",
+                                "very unhealthy",
+                                "hazardous",
+                                "unknown",
+                            ],
+                        },
+                    }
+                ]
+            }
+        else:
+            assert trt.sync_attributes() == {
+                "sensorStatesSupported": [
+                    {
+                        "name": name,
+                        "numericCapabilities": {"rawValueUnit": unit},
+                    }
+                ]
             }
-        }
 
-        assert trt.query_attributes() == {
-            "currentSensorStateData": [{"name": name, "rawValue": "100.0"}]
-        }
+        if sensor_type == sensor.SensorDeviceClass.AQI:
+            assert trt.query_attributes() == {
+                "currentSensorStateData": [
+                    {
+                        "name": name,
+                        "currentSensorState": trt._air_quality_description_for_aqi(
+                            trt.state.state
+                        ),
+                        "rawValue": trt.state.state,
+                    },
+                ]
+            }
+        else:
+            assert trt.query_attributes() == {
+                "currentSensorStateData": [{"name": name, "rawValue": trt.state.state}]
+            }
 
     assert helpers.get_google_type(sensor.DOMAIN, None) is not None
     assert (
diff --git a/tests/components/google_assistant_sdk/test_config_flow.py b/tests/components/google_assistant_sdk/test_config_flow.py
index 1d350a8fe4f..c65477b18b1 100644
--- a/tests/components/google_assistant_sdk/test_config_flow.py
+++ b/tests/components/google_assistant_sdk/test_config_flow.py
@@ -223,65 +223,39 @@ async def test_options_flow(
     assert result["type"] == "form"
     assert result["step_id"] == "init"
     data_schema = result["data_schema"].schema
-    assert set(data_schema) == {"enable_conversation_agent", "language_code"}
+    assert set(data_schema) == {"language_code"}
 
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"enable_conversation_agent": False, "language_code": "es-ES"},
+        user_input={"language_code": "es-ES"},
     )
     assert result["type"] == "create_entry"
-    assert config_entry.options == {
-        "enable_conversation_agent": False,
-        "language_code": "es-ES",
-    }
+    assert config_entry.options == {"language_code": "es-ES"}
 
     # Retrigger options flow, not change language
     result = await hass.config_entries.options.async_init(config_entry.entry_id)
     assert result["type"] == "form"
     assert result["step_id"] == "init"
     data_schema = result["data_schema"].schema
-    assert set(data_schema) == {"enable_conversation_agent", "language_code"}
+    assert set(data_schema) == {"language_code"}
 
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"enable_conversation_agent": False, "language_code": "es-ES"},
+        user_input={"language_code": "es-ES"},
     )
     assert result["type"] == "create_entry"
-    assert config_entry.options == {
-        "enable_conversation_agent": False,
-        "language_code": "es-ES",
-    }
+    assert config_entry.options == {"language_code": "es-ES"}
 
     # Retrigger options flow, change language
     result = await hass.config_entries.options.async_init(config_entry.entry_id)
     assert result["type"] == "form"
     assert result["step_id"] == "init"
     data_schema = result["data_schema"].schema
-    assert set(data_schema) == {"enable_conversation_agent", "language_code"}
+    assert set(data_schema) == {"language_code"}
 
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"enable_conversation_agent": False, "language_code": "en-US"},
+        user_input={"language_code": "en-US"},
     )
     assert result["type"] == "create_entry"
-    assert config_entry.options == {
-        "enable_conversation_agent": False,
-        "language_code": "en-US",
-    }
-
-    # Retrigger options flow, enable conversation agent
-    result = await hass.config_entries.options.async_init(config_entry.entry_id)
-    assert result["type"] == "form"
-    assert result["step_id"] == "init"
-    data_schema = result["data_schema"].schema
-    assert set(data_schema) == {"enable_conversation_agent", "language_code"}
-
-    result = await hass.config_entries.options.async_configure(
-        result["flow_id"],
-        user_input={"enable_conversation_agent": True, "language_code": "en-US"},
-    )
-    assert result["type"] == "create_entry"
-    assert config_entry.options == {
-        "enable_conversation_agent": True,
-        "language_code": "en-US",
-    }
+    assert config_entry.options == {"language_code": "en-US"}
diff --git a/tests/components/google_assistant_sdk/test_init.py b/tests/components/google_assistant_sdk/test_init.py
index 884107b7eb9..99f264e4a3a 100644
--- a/tests/components/google_assistant_sdk/test_init.py
+++ b/tests/components/google_assistant_sdk/test_init.py
@@ -9,14 +9,15 @@ import pytest
 
 from homeassistant.components import conversation
 from homeassistant.components.google_assistant_sdk import DOMAIN
+from homeassistant.components.google_assistant_sdk.const import SUPPORTED_LANGUAGE_CODES
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
+from homeassistant.core import Context, HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util.dt import utcnow
 
 from .conftest import ComponentSetup, ExpectedCredentials
 
-from tests.common import async_fire_time_changed, async_mock_service
+from tests.common import MockConfigEntry, async_fire_time_changed, async_mock_service
 from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import ClientSessionGenerator
 
@@ -29,13 +30,9 @@ async def fetch_api_url(hass_client, url):
     return response.status, contents
 
 
-@pytest.mark.parametrize(
-    "enable_conversation_agent", [False, True], ids=["", "enable_conversation_agent"]
-)
 async def test_setup_success(
     hass: HomeAssistant,
     setup_integration: ComponentSetup,
-    enable_conversation_agent: bool,
 ) -> None:
     """Test successful setup and unload."""
     await setup_integration()
@@ -44,12 +41,6 @@ async def test_setup_success(
     assert len(entries) == 1
     assert entries[0].state is ConfigEntryState.LOADED
 
-    if enable_conversation_agent:
-        hass.config_entries.async_update_entry(
-            entries[0], options={"enable_conversation_agent": True}
-        )
-        await hass.async_block_till_done()
-
     await hass.config_entries.async_unload(entries[0].entry_id)
     await hass.async_block_till_done()
 
@@ -230,6 +221,7 @@ async def test_send_text_command_expired_token_refresh_failure(
             {"command": "turn on tv"},
             blocking=True,
         )
+    await hass.async_block_till_done()
 
     assert any(entry.async_get_active_flows(hass, {"reauth"})) == requires_reauth
 
@@ -321,6 +313,7 @@ async def test_send_text_command_media_player(
 async def test_conversation_agent(
     hass: HomeAssistant,
     setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
 ) -> None:
     """Test GoogleAssistantConversationAgent."""
     await setup_integration()
@@ -331,30 +324,21 @@ async def test_conversation_agent(
     assert len(entries) == 1
     entry = entries[0]
     assert entry.state is ConfigEntryState.LOADED
-    hass.config_entries.async_update_entry(
-        entry, options={"enable_conversation_agent": True}
-    )
-    await hass.async_block_till_done()
 
     agent = await conversation._get_agent_manager(hass).async_get_agent(entry.entry_id)
-    assert agent.supported_languages == ["en-US"]
+    assert agent.attribution.keys() == {"name", "url"}
+    assert agent.supported_languages == SUPPORTED_LANGUAGE_CODES
 
     text1 = "tell me a joke"
     text2 = "tell me another one"
     with patch(
         "homeassistant.components.google_assistant_sdk.TextAssistant"
     ) as mock_text_assistant:
-        await hass.services.async_call(
-            "conversation",
-            "process",
-            {"text": text1},
-            blocking=True,
+        await conversation.async_converse(
+            hass, text1, None, Context(), "en-US", config_entry.entry_id
         )
-        await hass.services.async_call(
-            "conversation",
-            "process",
-            {"text": text2},
-            blocking=True,
+        await conversation.async_converse(
+            hass, text2, None, Context(), "en-US", config_entry.entry_id
         )
 
     # Assert constructor is called only once since it's reused across requests
@@ -366,6 +350,7 @@ async def test_conversation_agent(
 
 async def test_conversation_agent_refresh_token(
     hass: HomeAssistant,
+    config_entry: MockConfigEntry,
     setup_integration: ComponentSetup,
     aioclient_mock: AiohttpClientMocker,
 ) -> None:
@@ -378,21 +363,14 @@ async def test_conversation_agent_refresh_token(
     assert len(entries) == 1
     entry = entries[0]
     assert entry.state is ConfigEntryState.LOADED
-    hass.config_entries.async_update_entry(
-        entry, options={"enable_conversation_agent": True}
-    )
-    await hass.async_block_till_done()
 
     text1 = "tell me a joke"
     text2 = "tell me another one"
     with patch(
         "homeassistant.components.google_assistant_sdk.TextAssistant"
     ) as mock_text_assistant:
-        await hass.services.async_call(
-            "conversation",
-            "process",
-            {"text": text1},
-            blocking=True,
+        await conversation.async_converse(
+            hass, text1, None, Context(), "en-US", config_entry.entry_id
         )
 
         # Expire the token between requests
@@ -408,11 +386,8 @@ async def test_conversation_agent_refresh_token(
             },
         )
 
-        await hass.services.async_call(
-            "conversation",
-            "process",
-            {"text": text2},
-            blocking=True,
+        await conversation.async_converse(
+            hass, text2, None, Context(), "en-US", config_entry.entry_id
         )
 
     # Assert constructor is called twice since the token was expired
@@ -423,3 +398,38 @@ async def test_conversation_agent_refresh_token(
     )
     mock_text_assistant.assert_has_calls([call().assist(text1)])
     mock_text_assistant.assert_has_calls([call().assist(text2)])
+
+
+async def test_conversation_agent_language_changed(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    setup_integration: ComponentSetup,
+) -> None:
+    """Test GoogleAssistantConversationAgent when language is changed."""
+    await setup_integration()
+
+    assert await async_setup_component(hass, "conversation", {})
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    entry = entries[0]
+    assert entry.state is ConfigEntryState.LOADED
+
+    text1 = "tell me a joke"
+    text2 = "cuéntame un chiste"
+    with patch(
+        "homeassistant.components.google_assistant_sdk.TextAssistant"
+    ) as mock_text_assistant:
+        await conversation.async_converse(
+            hass, text1, None, Context(), "en-US", config_entry.entry_id
+        )
+        await conversation.async_converse(
+            hass, text2, None, Context(), "es-ES", config_entry.entry_id
+        )
+
+    # Assert constructor is called twice since the language was changed
+    assert mock_text_assistant.call_count == 2
+    mock_text_assistant.assert_has_calls([call(ExpectedCredentials(), "en-US")])
+    mock_text_assistant.assert_has_calls([call(ExpectedCredentials(), "es-ES")])
+    mock_text_assistant.assert_has_calls([call().assist(text1)])
+    mock_text_assistant.assert_has_calls([call().assist(text2)])
diff --git a/tests/components/google_generative_ai_conversation/test_init.py b/tests/components/google_generative_ai_conversation/test_init.py
index 7335903b43b..e8da4cf3920 100644
--- a/tests/components/google_generative_ai_conversation/test_init.py
+++ b/tests/components/google_generative_ai_conversation/test_init.py
@@ -13,6 +13,7 @@ from tests.common import MockConfigEntry
 
 async def test_default_prompt(
     hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
     mock_init_component,
     area_registry: ar.AreaRegistry,
     device_registry: dr.DeviceRegistry,
@@ -89,16 +90,22 @@ async def test_default_prompt(
         suggested_area="Test Area 2",
     )
     with patch("google.generativeai.chat_async") as mock_chat:
-        result = await conversation.async_converse(hass, "hello", None, Context())
+        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
     assert mock_chat.mock_calls[0][2] == snapshot
 
 
-async def test_error_handling(hass: HomeAssistant, mock_init_component) -> None:
+async def test_error_handling(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_init_component
+) -> None:
     """Test that the default prompt works."""
     with patch("google.generativeai.chat_async", side_effect=ClientError("")):
-        result = await conversation.async_converse(hass, "hello", None, Context())
+        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
@@ -119,7 +126,9 @@ async def test_template_error(
     ), patch("google.generativeai.chat_async"):
         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())
+        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
diff --git a/tests/components/google_mail/test_services.py b/tests/components/google_mail/test_services.py
index 2523e7a9591..b9fefa805e6 100644
--- a/tests/components/google_mail/test_services.py
+++ b/tests/components/google_mail/test_services.py
@@ -81,6 +81,9 @@ async def test_reauth_trigger(
             blocking=True,
         )
 
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
     flows = hass.config_entries.flow.async_progress()
 
     assert len(flows) == 1
diff --git a/tests/components/google_translate/conftest.py b/tests/components/google_translate/conftest.py
new file mode 100644
index 00000000000..34132fc5c1d
--- /dev/null
+++ b/tests/components/google_translate/conftest.py
@@ -0,0 +1,14 @@
+"""Common fixtures for the Google Translate text-to-speech tests."""
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.google_translate.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
diff --git a/tests/components/google_translate/test_config_flow.py b/tests/components/google_translate/test_config_flow.py
new file mode 100644
index 00000000000..e9a41e8eea6
--- /dev/null
+++ b/tests/components/google_translate/test_config_flow.py
@@ -0,0 +1,86 @@
+"""Test the Google Translate text-to-speech config flow."""
+from unittest.mock import AsyncMock
+
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.google_translate.const import CONF_TLD, DOMAIN
+from homeassistant.components.tts import CONF_LANG
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from tests.common import MockConfigEntry
+
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
+
+
+async def test_user_step(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> None:
+    """Test user step create entry result."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_LANG: "de",
+            CONF_TLD: "de",
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Google Translate text-to-speech"
+    assert result["data"] == {
+        CONF_LANG: "de",
+        CONF_TLD: "de",
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_already_configured(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
+) -> None:
+    """Test user step already configured entry."""
+    config_entry = MockConfigEntry(
+        domain=DOMAIN, data={CONF_LANG: "de", CONF_TLD: "de"}
+    )
+    config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_LANG: "de",
+            CONF_TLD: "de",
+        },
+    )
+
+    assert result["type"] == FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+    assert len(mock_setup_entry.mock_calls) == 0
+
+
+async def test_onboarding_flow(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
+) -> None:
+    """Test the onboarding configuration flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": "onboarding"}
+    )
+
+    assert result.get("type") == FlowResultType.CREATE_ENTRY
+    assert result.get("title") == "Google Translate text-to-speech"
+    assert result.get("data") == {
+        CONF_LANG: "en",
+        CONF_TLD: "com",
+    }
+
+    assert len(mock_setup_entry.mock_calls) == 1
diff --git a/tests/components/google_translate/test_tts.py b/tests/components/google_translate/test_tts.py
index 6597507d334..d6669ee3c5f 100644
--- a/tests/components/google_translate/test_tts.py
+++ b/tests/components/google_translate/test_tts.py
@@ -1,21 +1,27 @@
 """The tests for the Google speech platform."""
-from unittest.mock import patch
+from __future__ import annotations
+
+from collections.abc import Generator
+from typing import Any
+from unittest.mock import MagicMock, patch
 
 from gtts import gTTSError
 import pytest
 
 from homeassistant.components import media_source, tts
+from homeassistant.components.google_translate.const import CONF_TLD, DOMAIN
 from homeassistant.components.media_player import (
     ATTR_MEDIA_CONTENT_ID,
     DOMAIN as DOMAIN_MP,
     SERVICE_PLAY_MEDIA,
 )
 from homeassistant.config import async_process_ha_core_config
-from homeassistant.core import HomeAssistant
+from homeassistant.const import ATTR_ENTITY_ID, CONF_PLATFORM
+from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
 
-from tests.common import async_mock_service
+from tests.common import MockConfigEntry, async_mock_service
 
 
 @pytest.fixture(autouse=True)
@@ -29,7 +35,7 @@ def mock_tts_cache_dir_autouse(mock_tts_cache_dir):
     return mock_tts_cache_dir
 
 
-async def get_media_source_url(hass, media_content_id):
+async def get_media_source_url(hass: HomeAssistant, media_content_id: str) -> str:
     """Get the media source url."""
     if media_source.DOMAIN not in hass.config.components:
         assert await async_setup_component(hass, media_source.DOMAIN, {})
@@ -39,13 +45,13 @@ async def get_media_source_url(hass, media_content_id):
 
 
 @pytest.fixture
-async def calls(hass):
+async def calls(hass: HomeAssistant) -> list[ServiceCall]:
     """Mock media player calls."""
     return async_mock_service(hass, DOMAIN_MP, SERVICE_PLAY_MEDIA)
 
 
 @pytest.fixture(autouse=True)
-async def setup_internal_url(hass):
+async def setup_internal_url(hass: HomeAssistant) -> None:
     """Set up internal url."""
     await async_process_ha_core_config(
         hass, {"internal_url": "http://example.local:8123"}
@@ -53,26 +59,85 @@ async def setup_internal_url(hass):
 
 
 @pytest.fixture
-def mock_gtts():
+def mock_gtts() -> Generator[MagicMock, None, None]:
     """Mock gtts."""
     with patch("homeassistant.components.google_translate.tts.gTTS") as mock_gtts:
         yield mock_gtts
 
 
-async def test_service_say(hass: HomeAssistant, mock_gtts, calls) -> None:
-    """Test service call say."""
+@pytest.fixture(name="setup")
+async def setup_fixture(
+    hass: HomeAssistant,
+    config: dict[str, Any],
+    request: pytest.FixtureRequest,
+) -> None:
+    """Set up the test environment."""
+    if request.param == "mock_setup":
+        await mock_setup(hass, config)
+    elif request.param == "mock_config_entry_setup":
+        await mock_config_entry_setup(hass, config)
+    else:
+        raise RuntimeError("Invalid setup fixture")
 
-    await async_setup_component(
-        hass, tts.DOMAIN, {tts.DOMAIN: {"platform": "google_translate"}}
+
+@pytest.fixture(name="config")
+def config_fixture() -> dict[str, Any]:
+    """Return config."""
+    return {}
+
+
+async def mock_setup(hass: HomeAssistant, config: dict[str, Any]) -> None:
+    """Mock setup."""
+    assert await async_setup_component(
+        hass, tts.DOMAIN, {tts.DOMAIN: {CONF_PLATFORM: DOMAIN} | config}
     )
 
+
+async def mock_config_entry_setup(hass: HomeAssistant, config: dict[str, Any]) -> None:
+    """Mock config entry setup."""
+    default_config = {tts.CONF_LANG: "en", CONF_TLD: "com"}
+    config_entry = MockConfigEntry(domain=DOMAIN, data=default_config | config)
+    config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+
+
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_en_com",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
+async def test_tts_service(
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
+) -> None:
+    """Test tts service."""
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_translate_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
@@ -88,22 +153,43 @@ async def test_service_say(hass: HomeAssistant, mock_gtts, calls) -> None:
     }
 
 
-async def test_service_say_german_config(hass: HomeAssistant, mock_gtts, calls) -> None:
+@pytest.mark.parametrize("config", [{tts.CONF_LANG: "de"}])
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_de_com",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
+async def test_service_say_german_config(
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
+) -> None:
     """Test service call say with german code in the config."""
-
-    await async_setup_component(
-        hass,
-        tts.DOMAIN,
-        {tts.DOMAIN: {"platform": "google_translate", "language": "de"}},
-    )
-
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_translate_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
@@ -117,25 +203,44 @@ async def test_service_say_german_config(hass: HomeAssistant, mock_gtts, calls)
     }
 
 
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+                tts.ATTR_LANGUAGE: "de",
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_en_com",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+                tts.ATTR_LANGUAGE: "de",
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
 async def test_service_say_german_service(
-    hass: HomeAssistant, mock_gtts, calls
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
 ) -> None:
     """Test service call say with german code in the service."""
-
-    config = {
-        tts.DOMAIN: {"platform": "google_translate", "service_name": "google_say"}
-    }
-
-    await async_setup_component(hass, tts.DOMAIN, config)
-
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-            tts.ATTR_LANGUAGE: "de",
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
@@ -149,22 +254,43 @@ async def test_service_say_german_service(
     }
 
 
-async def test_service_say_en_uk_config(hass: HomeAssistant, mock_gtts, calls) -> None:
+@pytest.mark.parametrize("config", [{tts.CONF_LANG: "en-uk"}])
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_en_co_uk",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
+async def test_service_say_en_uk_config(
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
+) -> None:
     """Test service call say with en-uk code in the config."""
-
-    await async_setup_component(
-        hass,
-        tts.DOMAIN,
-        {tts.DOMAIN: {"platform": "google_translate", "language": "en-uk"}},
-    )
-
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_translate_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
@@ -178,23 +304,44 @@ async def test_service_say_en_uk_config(hass: HomeAssistant, mock_gtts, calls) -
     }
 
 
-async def test_service_say_en_uk_service(hass: HomeAssistant, mock_gtts, calls) -> None:
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+                tts.ATTR_LANGUAGE: "en-uk",
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_en_com",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+                tts.ATTR_LANGUAGE: "en-uk",
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
+async def test_service_say_en_uk_service(
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
+) -> None:
     """Test service call say with en-uk code in the config."""
-
-    await async_setup_component(
-        hass,
-        tts.DOMAIN,
-        {tts.DOMAIN: {"platform": "google_translate"}},
-    )
-
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_translate_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-            tts.ATTR_LANGUAGE: "en-uk",
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
@@ -208,21 +355,44 @@ async def test_service_say_en_uk_service(hass: HomeAssistant, mock_gtts, calls)
     }
 
 
-async def test_service_say_en_couk(hass: HomeAssistant, mock_gtts, calls) -> None:
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+                tts.ATTR_OPTIONS: {"tld": "co.uk"},
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_en_com",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+                tts.ATTR_OPTIONS: {"tld": "co.uk"},
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
+async def test_service_say_en_couk(
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
+) -> None:
     """Test service call say in co.uk tld accent."""
-
-    await async_setup_component(
-        hass, tts.DOMAIN, {tts.DOMAIN: {"platform": "google_translate"}}
-    )
-
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_translate_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-            tts.ATTR_OPTIONS: {"tld": "co.uk"},
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
@@ -238,20 +408,44 @@ async def test_service_say_en_couk(hass: HomeAssistant, mock_gtts, calls) -> Non
     }
 
 
-async def test_service_say_error(hass: HomeAssistant, mock_gtts, calls) -> None:
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_en_com",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
+async def test_service_say_error(
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
+) -> None:
     """Test service call say with http response 400."""
     mock_gtts.return_value.write_to_fp.side_effect = gTTSError
-    await async_setup_component(
-        hass, tts.DOMAIN, {tts.DOMAIN: {"platform": "google_translate"}}
-    )
 
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_translate_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
diff --git a/tests/components/google_wifi/test_sensor.py b/tests/components/google_wifi/test_sensor.py
index 868631e9c27..3eceac64904 100644
--- a/tests/components/google_wifi/test_sensor.py
+++ b/tests/components/google_wifi/test_sensor.py
@@ -30,7 +30,7 @@ MOCK_DATA_NEXT = (
     '"ipAddress":false}}'
 )
 
-MOCK_DATA_MISSING = '{"software": {},' '"system": {},' '"wan": {}}'
+MOCK_DATA_MISSING = '{"software": {},"system": {},"wan": {}}'
 
 
 async def test_setup_minimum(
diff --git a/tests/components/gree/test_climate.py b/tests/components/gree/test_climate.py
index afed01c1a08..fe64b0ee7ef 100644
--- a/tests/components/gree/test_climate.py
+++ b/tests/components/gree/test_climate.py
@@ -326,7 +326,7 @@ async def test_send_command_device_timeout(
     device().push_state_update.side_effect = DeviceTimeoutError
 
     # Send failure should not raise exceptions or change device state
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: ENTITY_ID},
@@ -342,7 +342,7 @@ async def test_send_power_on(hass: HomeAssistant, discovery, device, mock_now) -
     """Test for sending power on command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: ENTITY_ID},
@@ -362,7 +362,7 @@ async def test_send_power_off_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: ENTITY_ID},
@@ -393,7 +393,7 @@ async def test_send_target_temperature(
     # Make sure we're trying to test something that isn't the default
     assert fake_device.current_temperature != temperature
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_TEMPERATURE: temperature},
@@ -428,7 +428,7 @@ async def test_send_target_temperature_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_TEMPERATURE: temperature},
@@ -475,7 +475,7 @@ async def test_send_preset_mode(
     """Test for sending preset mode command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_PRESET_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_PRESET_MODE: preset},
@@ -517,7 +517,7 @@ async def test_send_preset_mode_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_PRESET_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_PRESET_MODE: preset},
@@ -565,7 +565,7 @@ async def test_send_hvac_mode(
     """Test for sending hvac mode command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_HVAC_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: hvac_mode},
@@ -589,7 +589,7 @@ async def test_send_hvac_mode_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_HVAC_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: hvac_mode},
@@ -636,7 +636,7 @@ async def test_send_fan_mode(
     """Test for sending fan mode command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_FAN_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_FAN_MODE: fan_mode},
@@ -679,7 +679,7 @@ async def test_send_fan_mode_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_FAN_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_FAN_MODE: fan_mode},
@@ -717,7 +717,7 @@ async def test_send_swing_mode(
     """Test for sending swing mode command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_SWING_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_SWING_MODE: swing_mode},
@@ -759,7 +759,7 @@ async def test_send_swing_mode_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_SWING_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_SWING_MODE: swing_mode},
diff --git a/tests/components/gree/test_switch.py b/tests/components/gree/test_switch.py
index aee9c985e8c..d8160d99040 100644
--- a/tests/components/gree/test_switch.py
+++ b/tests/components/gree/test_switch.py
@@ -66,7 +66,7 @@ async def test_send_switch_on(
     """Test for sending power on command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: entity},
@@ -96,7 +96,7 @@ async def test_send_switch_on_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: entity},
@@ -124,7 +124,7 @@ async def test_send_switch_off(
     """Test for sending power on command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: entity},
@@ -153,7 +153,7 @@ async def test_send_switch_toggle(
     await async_setup_gree(hass)
 
     # Turn the service on first
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: entity},
@@ -165,7 +165,7 @@ async def test_send_switch_toggle(
     assert state.state == STATE_ON
 
     # Toggle it off
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TOGGLE,
         {ATTR_ENTITY_ID: entity},
@@ -177,7 +177,7 @@ async def test_send_switch_toggle(
     assert state.state == STATE_OFF
 
     # Toggle is back on
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TOGGLE,
         {ATTR_ENTITY_ID: entity},
diff --git a/tests/components/habitica/test_init.py b/tests/components/habitica/test_init.py
index 69fe2e6fc39..91fa6f90e9f 100644
--- a/tests/components/habitica/test_init.py
+++ b/tests/components/habitica/test_init.py
@@ -123,7 +123,7 @@ async def test_service_call(
         ATTR_PATH: ["tasks", "user", "post"],
         ATTR_ARGS: TEST_API_CALL_ARGS,
     }
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_API_CALL, TEST_SERVICE_DATA, blocking=True
     )
 
diff --git a/tests/components/hassio/test_init.py b/tests/components/hassio/test_init.py
index 9d83537859a..0dff261d864 100644
--- a/tests/components/hassio/test_init.py
+++ b/tests/components/hassio/test_init.py
@@ -483,6 +483,7 @@ async def test_service_register(hassio_env, hass: HomeAssistant) -> None:
     assert hass.services.has_service("hassio", "restore_partial")
 
 
+@pytest.mark.freeze_time("2021-11-13 11:48:00")
 async def test_service_calls(
     hassio_env,
     hass: HomeAssistant,
@@ -541,6 +542,7 @@ async def test_service_calls(
 
     assert aioclient_mock.call_count == 14
     assert aioclient_mock.mock_calls[-1][2] == {
+        "name": "2021-11-13 11:48:00",
         "homeassistant": True,
         "addons": ["test"],
         "folders": ["ssl"],
@@ -575,6 +577,7 @@ async def test_service_calls(
         "hassio",
         "backup_full",
         {
+            "name": "backup_name",
             "location": "backup_share",
         },
     )
@@ -582,6 +585,7 @@ async def test_service_calls(
 
     assert aioclient_mock.call_count == 17
     assert aioclient_mock.mock_calls[-1][2] == {
+        "name": "backup_name",
         "location": "backup_share",
     }
 
@@ -596,6 +600,7 @@ async def test_service_calls(
 
     assert aioclient_mock.call_count == 18
     assert aioclient_mock.mock_calls[-1][2] == {
+        "name": "2021-11-13 11:48:00",
         "location": None,
     }
 
diff --git a/tests/components/hassio/test_update.py b/tests/components/hassio/test_update.py
index 547e32dfddb..3f12874ef52 100644
--- a/tests/components/hassio/test_update.py
+++ b/tests/components/hassio/test_update.py
@@ -247,7 +247,7 @@ async def test_update_addon(
         json={"result": "ok", "data": {}},
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "update",
         "install",
         {"entity_id": "update.test_update"},
@@ -276,7 +276,7 @@ async def test_update_os(
         json={"result": "ok", "data": {}},
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "update",
         "install",
         {"entity_id": "update.home_assistant_operating_system_update"},
@@ -305,7 +305,7 @@ async def test_update_core(
         json={"result": "ok", "data": {}},
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "update",
         "install",
         {"entity_id": "update.home_assistant_os_update"},
@@ -334,7 +334,7 @@ async def test_update_supervisor(
         json={"result": "ok", "data": {}},
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "update",
         "install",
         {"entity_id": "update.home_assistant_supervisor_update"},
diff --git a/tests/components/homeassistant/test_scene.py b/tests/components/homeassistant/test_scene.py
index 4e2e9641128..085ed4f0641 100644
--- a/tests/components/homeassistant/test_scene.py
+++ b/tests/components/homeassistant/test_scene.py
@@ -49,13 +49,13 @@ async def test_apply_service(hass: HomeAssistant) -> None:
     assert await async_setup_component(hass, "light", {"light": {"platform": "demo"}})
     await hass.async_block_till_done()
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene", "apply", {"entities": {"light.bed_light": "off"}}, blocking=True
     )
 
     assert hass.states.get("light.bed_light").state == "off"
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "apply",
         {"entities": {"light.bed_light": {"state": "on", "brightness": 50}}},
@@ -67,7 +67,7 @@ async def test_apply_service(hass: HomeAssistant) -> None:
     assert state.attributes["brightness"] == 50
 
     turn_on_calls = async_mock_service(hass, "light", "turn_on")
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "apply",
         {
@@ -98,7 +98,7 @@ async def test_create_service(
     assert hass.states.get("scene.hallo") is None
     assert hass.states.get("scene.hallo_2") is not None
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {"scene_id": "hallo", "entities": {}, "snapshot_entities": []},
@@ -108,7 +108,7 @@ async def test_create_service(
     assert "Empty scenes are not allowed" in caplog.text
     assert hass.states.get("scene.hallo") is None
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {
@@ -126,7 +126,7 @@ async def test_create_service(
     assert scene.state == STATE_UNKNOWN
     assert scene.attributes.get("entity_id") == ["light.bed_light"]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {
@@ -144,7 +144,7 @@ async def test_create_service(
     assert scene.state == STATE_UNKNOWN
     assert scene.attributes.get("entity_id") == ["light.kitchen_light"]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {
@@ -173,7 +173,7 @@ async def test_snapshot_service(
     hass.states.async_set("light.my_light", "on", {"hs_color": (345, 75)})
     assert hass.states.get("scene.hallo") is None
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {"scene_id": "hallo", "snapshot_entities": ["light.my_light"]},
@@ -186,7 +186,7 @@ async def test_snapshot_service(
 
     hass.states.async_set("light.my_light", "off", {"hs_color": (123, 45)})
     turn_on_calls = async_mock_service(hass, "light", "turn_on")
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene", "turn_on", {"entity_id": "scene.hallo"}, blocking=True
     )
     await hass.async_block_till_done()
@@ -194,7 +194,7 @@ async def test_snapshot_service(
     assert turn_on_calls[0].data.get("entity_id") == "light.my_light"
     assert turn_on_calls[0].data.get("hs_color") == (345, 75)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {"scene_id": "hallo_2", "snapshot_entities": ["light.not_existent"]},
@@ -207,7 +207,7 @@ async def test_snapshot_service(
         in caplog.text
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {
@@ -230,7 +230,7 @@ async def test_ensure_no_intersection(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
 
     with pytest.raises(vol.MultipleInvalid) as ex:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             "scene",
             "create",
             {
diff --git a/tests/components/homeassistant/triggers/test_numeric_state.py b/tests/components/homeassistant/triggers/test_numeric_state.py
index ff82fa3e69c..2098d266f0d 100644
--- a/tests/components/homeassistant/triggers/test_numeric_state.py
+++ b/tests/components/homeassistant/triggers/test_numeric_state.py
@@ -10,7 +10,12 @@ import homeassistant.components.automation as automation
 from homeassistant.components.homeassistant.triggers import (
     numeric_state as numeric_state_trigger,
 )
-from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, SERVICE_TURN_OFF
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ENTITY_MATCH_ALL,
+    SERVICE_TURN_OFF,
+    STATE_UNAVAILABLE,
+)
 from homeassistant.core import Context, HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
@@ -1090,7 +1095,7 @@ async def test_if_fails_setup_bad_for(hass: HomeAssistant, calls, above, below)
     hass.states.async_set("test.entity", 5)
     await hass.async_block_till_done()
 
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -1107,13 +1112,14 @@ async def test_if_fails_setup_bad_for(hass: HomeAssistant, calls, above, below)
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 async def test_if_fails_setup_for_without_above_below(
     hass: HomeAssistant, calls
 ) -> None:
     """Test for setup failures for missing above or below."""
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -1128,6 +1134,7 @@ async def test_if_fails_setup_for_without_above_below(
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/homeassistant/triggers/test_state.py b/tests/components/homeassistant/triggers/test_state.py
index a16d542becd..d58e3dd7c6e 100644
--- a/tests/components/homeassistant/triggers/test_state.py
+++ b/tests/components/homeassistant/triggers/test_state.py
@@ -6,7 +6,12 @@ import pytest
 
 import homeassistant.components.automation as automation
 from homeassistant.components.homeassistant.triggers import state as state_trigger
-from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, SERVICE_TURN_OFF
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ENTITY_MATCH_ALL,
+    SERVICE_TURN_OFF,
+    STATE_UNAVAILABLE,
+)
 from homeassistant.core import Context, HomeAssistant, ServiceCall
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
@@ -554,7 +559,7 @@ async def test_if_action(hass: HomeAssistant, calls) -> None:
 
 async def test_if_fails_setup_if_to_boolean_value(hass: HomeAssistant, calls) -> None:
     """Test for setup failure for boolean to."""
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -569,11 +574,12 @@ async def test_if_fails_setup_if_to_boolean_value(hass: HomeAssistant, calls) ->
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 async def test_if_fails_setup_if_from_boolean_value(hass: HomeAssistant, calls) -> None:
     """Test for setup failure for boolean from."""
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -588,11 +594,12 @@ async def test_if_fails_setup_if_from_boolean_value(hass: HomeAssistant, calls)
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 async def test_if_fails_setup_bad_for(hass: HomeAssistant, calls) -> None:
     """Test for setup failure for bad for."""
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -608,6 +615,7 @@ async def test_if_fails_setup_bad_for(hass: HomeAssistant, calls) -> None:
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 async def test_if_not_fires_on_entity_change_with_for(
@@ -1018,7 +1026,7 @@ async def test_if_fires_on_for_condition_attribute_change(
 
 async def test_if_fails_setup_for_without_time(hass: HomeAssistant, calls) -> None:
     """Test for setup failure if no time is provided."""
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -1035,11 +1043,12 @@ async def test_if_fails_setup_for_without_time(hass: HomeAssistant, calls) -> No
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 async def test_if_fails_setup_for_without_entity(hass: HomeAssistant, calls) -> None:
     """Test for setup failure if no entity is provided."""
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -1055,6 +1064,7 @@ async def test_if_fails_setup_for_without_entity(hass: HomeAssistant, calls) ->
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 async def test_wait_template_with_trigger(hass: HomeAssistant, calls) -> None:
diff --git a/tests/components/homeassistant/triggers/test_time.py b/tests/components/homeassistant/triggers/test_time.py
index 1af687a4f5d..0a41df17c8d 100644
--- a/tests/components/homeassistant/triggers/test_time.py
+++ b/tests/components/homeassistant/triggers/test_time.py
@@ -8,7 +8,12 @@ import voluptuous as vol
 from homeassistant.components import automation
 from homeassistant.components.homeassistant.triggers import time
 from homeassistant.components.sensor import SensorDeviceClass
-from homeassistant.const import ATTR_DEVICE_CLASS, ATTR_ENTITY_ID, SERVICE_TURN_OFF
+from homeassistant.const import (
+    ATTR_DEVICE_CLASS,
+    ATTR_ENTITY_ID,
+    SERVICE_TURN_OFF,
+    STATE_UNAVAILABLE,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
@@ -210,7 +215,7 @@ async def test_if_not_fires_using_wrong_at(hass: HomeAssistant, calls) -> None:
     with patch(
         "homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away
     ):
-        with assert_setup_component(0, automation.DOMAIN):
+        with assert_setup_component(1, automation.DOMAIN):
             assert await async_setup_component(
                 hass,
                 automation.DOMAIN,
@@ -226,6 +231,7 @@ async def test_if_not_fires_using_wrong_at(hass: HomeAssistant, calls) -> None:
                 },
             )
         await hass.async_block_till_done()
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
     async_fire_time_changed(
         hass, now.replace(year=now.year + 1, hour=1, minute=0, second=5)
diff --git a/tests/components/homeassistant_alerts/test_init.py b/tests/components/homeassistant_alerts/test_init.py
index 7f060b09cf9..c772c088505 100644
--- a/tests/components/homeassistant_alerts/test_init.py
+++ b/tests/components/homeassistant_alerts/test_init.py
@@ -7,6 +7,7 @@ from unittest.mock import ANY, patch
 
 from freezegun.api import FrozenDateTimeFactory
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components.homeassistant_alerts import (
     COMPONENT_LOADED_COOLDOWN,
@@ -19,7 +20,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.setup import ATTR_COMPONENT, async_setup_component
 from homeassistant.util import dt as dt_util
 
-from tests.common import assert_lists_same, async_fire_time_changed, load_fixture
+from tests.common import async_fire_time_changed, load_fixture
 from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import WebSocketGenerator
 
@@ -613,8 +614,7 @@ async def test_alerts_change(
     await client.send_json({"id": 1, "type": "repairs/list_issues"})
     msg = await client.receive_json()
     assert msg["success"]
-    assert_lists_same(
-        msg["result"]["issues"],
+    assert msg["result"]["issues"] == unordered(
         [
             {
                 "breaks_in_ha_version": None,
@@ -634,7 +634,7 @@ async def test_alerts_change(
                 },
             }
             for alert_id, integration in expected_alerts_1
-        ],
+        ]
     )
 
     fixture_2_content = load_fixture(fixture_2, "homeassistant_alerts")
@@ -653,8 +653,7 @@ async def test_alerts_change(
     await client.send_json({"id": 2, "type": "repairs/list_issues"})
     msg = await client.receive_json()
     assert msg["success"]
-    assert_lists_same(
-        msg["result"]["issues"],
+    assert msg["result"]["issues"] == unordered(
         [
             {
                 "breaks_in_ha_version": None,
@@ -674,5 +673,5 @@ async def test_alerts_change(
                 },
             }
             for alert_id, integration in expected_alerts_2
-        ],
+        ]
     )
diff --git a/tests/components/homekit/test_diagnostics.py b/tests/components/homekit/test_diagnostics.py
index 69e2aa2c8e2..2f18c7a5a89 100644
--- a/tests/components/homekit/test_diagnostics.py
+++ b/tests/components/homekit/test_diagnostics.py
@@ -190,7 +190,7 @@ async def test_config_entry_accessory(
                                 "iid": 3,
                                 "perms": ["pr"],
                                 "type": "20",
-                                "value": "Home Assistant " "Light",
+                                "value": "Home Assistant Light",
                             },
                             {
                                 "format": "string",
@@ -475,7 +475,7 @@ async def test_config_entry_with_trigger_accessory(
                                 "iid": 10,
                                 "perms": ["pr"],
                                 "type": "23",
-                                "value": "Ceiling Lights " "Changed States",
+                                "value": "Ceiling Lights Changed States",
                             },
                             {
                                 "format": "uint8",
@@ -521,7 +521,7 @@ async def test_config_entry_with_trigger_accessory(
                                 "iid": 16,
                                 "perms": ["pr"],
                                 "type": "23",
-                                "value": "Ceiling Lights " "Turned Off",
+                                "value": "Ceiling Lights Turned Off",
                             },
                             {
                                 "format": "uint8",
@@ -567,7 +567,7 @@ async def test_config_entry_with_trigger_accessory(
                                 "iid": 22,
                                 "perms": ["pr"],
                                 "type": "23",
-                                "value": "Ceiling Lights " "Turned On",
+                                "value": "Ceiling Lights Turned On",
                             },
                             {
                                 "format": "uint8",
diff --git a/tests/components/homekit/test_homekit.py b/tests/components/homekit/test_homekit.py
index 0ffa7893fbd..112c138a843 100644
--- a/tests/components/homekit/test_homekit.py
+++ b/tests/components/homekit/test_homekit.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import asyncio
+from typing import Any
 from unittest.mock import ANY, AsyncMock, MagicMock, Mock, patch
 from uuid import uuid1
 
@@ -24,6 +25,7 @@ from homeassistant.components.homekit.accessories import HomeBridge
 from homeassistant.components.homekit.const import (
     BRIDGE_NAME,
     BRIDGE_SERIAL_NUMBER,
+    CONF_ADVERTISE_IP,
     DEFAULT_PORT,
     DOMAIN,
     HOMEKIT,
@@ -116,7 +118,7 @@ def _mock_homekit(hass, entry, homekit_mode, entity_filter=None, devices=None):
         exclude_accessory_mode=False,
         entity_config={},
         homekit_mode=homekit_mode,
-        advertise_ip=None,
+        advertise_ips=None,
         entry_id=entry.entry_id,
         entry_title=entry.title,
         devices=devices,
@@ -170,7 +172,7 @@ async def test_setup_min(hass: HomeAssistant, mock_async_zeroconf: None) -> None
         ANY,
         {},
         HOMEKIT_MODE_BRIDGE,
-        "1.2.3.4",
+        ["1.2.3.4", "10.10.10.10"],
         entry.entry_id,
         entry.title,
         devices=[],
@@ -212,7 +214,7 @@ async def test_removing_entry(
         ANY,
         {},
         HOMEKIT_MODE_BRIDGE,
-        "1.2.3.4",
+        ["1.2.3.4", "10.10.10.10"],
         entry.entry_id,
         entry.title,
         devices=[],
@@ -245,7 +247,7 @@ async def test_homekit_setup(
         {},
         {},
         HOMEKIT_MODE_BRIDGE,
-        advertise_ip=None,
+        advertise_ips=None,
         entry_id=entry.entry_id,
         entry_title=entry.title,
     )
@@ -322,7 +324,81 @@ async def test_homekit_setup_ip_address(
     )
 
 
-async def test_homekit_setup_advertise_ip(
+async def test_homekit_with_single_advertise_ips(
+    hass: HomeAssistant,
+    hk_driver,
+    mock_async_zeroconf: None,
+    hass_storage: dict[str, Any],
+) -> None:
+    """Test setup with a single advertise ips."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_NAME: "mock_name", CONF_PORT: 12345, CONF_ADVERTISE_IP: "1.3.4.4"},
+        source=SOURCE_IMPORT,
+    )
+    entry.add_to_hass(hass)
+    with patch(f"{PATH_HOMEKIT}.HomeDriver", return_value=hk_driver) as mock_driver:
+        mock_driver.async_start = AsyncMock()
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    mock_driver.assert_called_with(
+        hass,
+        entry.entry_id,
+        ANY,
+        entry.title,
+        loop=hass.loop,
+        address=[None],
+        port=ANY,
+        persist_file=ANY,
+        advertised_address="1.3.4.4",
+        async_zeroconf_instance=mock_async_zeroconf,
+        zeroconf_server=ANY,
+        loader=ANY,
+        iid_storage=ANY,
+    )
+
+
+async def test_homekit_with_many_advertise_ips(
+    hass: HomeAssistant,
+    hk_driver,
+    mock_async_zeroconf: None,
+    hass_storage: dict[str, Any],
+) -> None:
+    """Test setup with many advertise ips."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_NAME: "mock_name",
+            CONF_PORT: 12345,
+            CONF_ADVERTISE_IP: ["1.3.4.4", "4.3.2.2"],
+        },
+        source=SOURCE_IMPORT,
+    )
+    entry.add_to_hass(hass)
+    with patch(f"{PATH_HOMEKIT}.HomeDriver", return_value=hk_driver) as mock_driver:
+        mock_driver.async_start = AsyncMock()
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    mock_driver.assert_called_with(
+        hass,
+        entry.entry_id,
+        ANY,
+        entry.title,
+        loop=hass.loop,
+        address=[None],
+        port=ANY,
+        persist_file=ANY,
+        advertised_address=["1.3.4.4", "4.3.2.2"],
+        async_zeroconf_instance=mock_async_zeroconf,
+        zeroconf_server=ANY,
+        loader=ANY,
+        iid_storage=ANY,
+    )
+
+
+async def test_homekit_setup_advertise_ips(
     hass: HomeAssistant, hk_driver, mock_async_zeroconf: None
 ) -> None:
     """Test setup with given IP address to advertise."""
@@ -1485,7 +1561,7 @@ async def test_yaml_updates_update_config_entry_for_name(
         ANY,
         {},
         HOMEKIT_MODE_BRIDGE,
-        "1.2.3.4",
+        ["1.2.3.4", "10.10.10.10"],
         entry.entry_id,
         entry.title,
         devices=[],
@@ -1647,7 +1723,6 @@ async def test_homekit_ignored_missing_devices(
     light = entity_registry.async_get_or_create(
         "light", "powerwall", "demo", device_id=device_entry.id
     )
-    before_removal = entity_registry.entities.copy()
     # Delete the device to make sure we fallback
     # to using the platform
     device_registry.async_remove_device(device_entry.id)
@@ -1655,7 +1730,23 @@ async def test_homekit_ignored_missing_devices(
     await asyncio.sleep(0)
     await asyncio.sleep(0)
     # Restore the registry
-    entity_registry.entities = before_removal
+    entity_registry.async_get_or_create(
+        "binary_sensor",
+        "powerwall",
+        "battery_charging",
+        device_id=device_entry.id,
+        original_device_class=BinarySensorDeviceClass.BATTERY_CHARGING,
+    )
+    entity_registry.async_get_or_create(
+        "sensor",
+        "powerwall",
+        "battery",
+        device_id=device_entry.id,
+        original_device_class=SensorDeviceClass.BATTERY,
+    )
+    light = entity_registry.async_get_or_create(
+        "light", "powerwall", "demo", device_id=device_entry.id
+    )
 
     hass.states.async_set(light.entity_id, STATE_ON)
     hass.states.async_set("light.two", STATE_ON)
@@ -1843,7 +1934,7 @@ async def test_reload(hass: HomeAssistant, mock_async_zeroconf: None) -> None:
         False,
         {},
         HOMEKIT_MODE_BRIDGE,
-        "1.2.3.4",
+        ["1.2.3.4", "10.10.10.10"],
         entry.entry_id,
         entry.title,
         devices=[],
@@ -1878,7 +1969,7 @@ async def test_reload(hass: HomeAssistant, mock_async_zeroconf: None) -> None:
         False,
         {},
         HOMEKIT_MODE_BRIDGE,
-        "1.2.3.4",
+        ["1.2.3.4", "10.10.10.10"],
         entry.entry_id,
         entry.title,
         devices=[],
diff --git a/tests/components/homekit_controller/test_device_trigger.py b/tests/components/homekit_controller/test_device_trigger.py
index d98c07a1728..757823aba9b 100644
--- a/tests/components/homekit_controller/test_device_trigger.py
+++ b/tests/components/homekit_controller/test_device_trigger.py
@@ -2,6 +2,7 @@
 from aiohomekit.model.characteristics import CharacteristicsTypes
 from aiohomekit.model.services import ServicesTypes
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -14,7 +15,6 @@ from homeassistant.setup import async_setup_component
 from .common import setup_test_component
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -91,16 +91,17 @@ async def test_enumerate_remote(hass: HomeAssistant, utcnow) -> None:
     await setup_test_component(hass, create_remote)
 
     entity_registry = er.async_get(hass)
-    entry = entity_registry.async_get("sensor.testdevice_battery")
+    bat_sensor = entity_registry.async_get("sensor.testdevice_battery")
+    identify_button = entity_registry.async_get("button.testdevice_identify")
 
     device_registry = dr.async_get(hass)
-    device = device_registry.async_get(entry.device_id)
+    device = device_registry.async_get(bat_sensor.device_id)
 
     expected = [
         {
             "device_id": device.id,
             "domain": "sensor",
-            "entity_id": "sensor.testdevice_battery",
+            "entity_id": bat_sensor.id,
             "platform": "device",
             "type": "battery_level",
             "metadata": {"secondary": True},
@@ -108,7 +109,7 @@ async def test_enumerate_remote(hass: HomeAssistant, utcnow) -> None:
         {
             "device_id": device.id,
             "domain": "button",
-            "entity_id": "button.testdevice_identify",
+            "entity_id": identify_button.id,
             "platform": "device",
             "type": "pressed",
             "metadata": {"secondary": True},
@@ -131,7 +132,7 @@ async def test_enumerate_remote(hass: HomeAssistant, utcnow) -> None:
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device.id
     )
-    assert_lists_same(triggers, expected)
+    assert triggers == unordered(expected)
 
 
 async def test_enumerate_button(hass: HomeAssistant, utcnow) -> None:
@@ -139,16 +140,17 @@ async def test_enumerate_button(hass: HomeAssistant, utcnow) -> None:
     await setup_test_component(hass, create_button)
 
     entity_registry = er.async_get(hass)
-    entry = entity_registry.async_get("sensor.testdevice_battery")
+    bat_sensor = entity_registry.async_get("sensor.testdevice_battery")
+    identify_button = entity_registry.async_get("button.testdevice_identify")
 
     device_registry = dr.async_get(hass)
-    device = device_registry.async_get(entry.device_id)
+    device = device_registry.async_get(bat_sensor.device_id)
 
     expected = [
         {
             "device_id": device.id,
             "domain": "sensor",
-            "entity_id": "sensor.testdevice_battery",
+            "entity_id": bat_sensor.id,
             "platform": "device",
             "type": "battery_level",
             "metadata": {"secondary": True},
@@ -156,7 +158,7 @@ async def test_enumerate_button(hass: HomeAssistant, utcnow) -> None:
         {
             "device_id": device.id,
             "domain": "button",
-            "entity_id": "button.testdevice_identify",
+            "entity_id": identify_button.id,
             "platform": "device",
             "type": "pressed",
             "metadata": {"secondary": True},
@@ -178,7 +180,7 @@ async def test_enumerate_button(hass: HomeAssistant, utcnow) -> None:
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device.id
     )
-    assert_lists_same(triggers, expected)
+    assert triggers == unordered(expected)
 
 
 async def test_enumerate_doorbell(hass: HomeAssistant, utcnow) -> None:
@@ -186,16 +188,17 @@ async def test_enumerate_doorbell(hass: HomeAssistant, utcnow) -> None:
     await setup_test_component(hass, create_doorbell)
 
     entity_registry = er.async_get(hass)
-    entry = entity_registry.async_get("sensor.testdevice_battery")
+    bat_sensor = entity_registry.async_get("sensor.testdevice_battery")
+    identify_button = entity_registry.async_get("button.testdevice_identify")
 
     device_registry = dr.async_get(hass)
-    device = device_registry.async_get(entry.device_id)
+    device = device_registry.async_get(bat_sensor.device_id)
 
     expected = [
         {
             "device_id": device.id,
             "domain": "sensor",
-            "entity_id": "sensor.testdevice_battery",
+            "entity_id": bat_sensor.id,
             "platform": "device",
             "type": "battery_level",
             "metadata": {"secondary": True},
@@ -203,7 +206,7 @@ async def test_enumerate_doorbell(hass: HomeAssistant, utcnow) -> None:
         {
             "device_id": device.id,
             "domain": "button",
-            "entity_id": "button.testdevice_identify",
+            "entity_id": identify_button.id,
             "platform": "device",
             "type": "pressed",
             "metadata": {"secondary": True},
@@ -225,7 +228,7 @@ async def test_enumerate_doorbell(hass: HomeAssistant, utcnow) -> None:
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device.id
     )
-    assert_lists_same(triggers, expected)
+    assert triggers == unordered(expected)
 
 
 async def test_handle_events(hass: HomeAssistant, utcnow, calls) -> None:
diff --git a/tests/components/homekit_controller/test_diagnostics.py b/tests/components/homekit_controller/test_diagnostics.py
index 3978f46a72e..7fd5b11d5d6 100644
--- a/tests/components/homekit_controller/test_diagnostics.py
+++ b/tests/components/homekit_controller/test_diagnostics.py
@@ -519,9 +519,7 @@ async def test_device(
                     "original_icon": None,
                     "original_name": "Koogeek-LS1-20833F Identify",
                     "state": {
-                        "attributes": {
-                            "friendly_name": "Koogeek-LS1-20833F " "Identify"
-                        },
+                        "attributes": {"friendly_name": "Koogeek-LS1-20833F Identify"},
                         "entity_id": "button.koogeek_ls1_20833f_identify",
                         "last_changed": ANY,
                         "last_updated": ANY,
diff --git a/tests/components/homekit_controller/test_humidifier.py b/tests/components/homekit_controller/test_humidifier.py
index a1909158d33..e412fed0878 100644
--- a/tests/components/homekit_controller/test_humidifier.py
+++ b/tests/components/homekit_controller/test_humidifier.py
@@ -118,20 +118,24 @@ async def test_humidifier_read_humidity(hass: HomeAssistant, utcnow) -> None:
         {
             CharacteristicsTypes.ACTIVE: True,
             CharacteristicsTypes.RELATIVE_HUMIDITY_HUMIDIFIER_THRESHOLD: 75,
+            CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT: 45,
         },
     )
     assert state.state == "on"
     assert state.attributes["humidity"] == 75
+    assert state.attributes["current_humidity"] == 45
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
         {
             CharacteristicsTypes.ACTIVE: False,
             CharacteristicsTypes.RELATIVE_HUMIDITY_HUMIDIFIER_THRESHOLD: 10,
+            CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT: 30,
         },
     )
     assert state.state == "off"
     assert state.attributes["humidity"] == 10
+    assert state.attributes["current_humidity"] == 30
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -140,6 +144,7 @@ async def test_humidifier_read_humidity(hass: HomeAssistant, utcnow) -> None:
         },
     )
     assert state.attributes["humidity"] == 10
+    assert state.attributes["current_humidity"] == 30
     assert state.state == "off"
 
 
@@ -152,20 +157,24 @@ async def test_dehumidifier_read_humidity(hass: HomeAssistant, utcnow) -> None:
         {
             CharacteristicsTypes.ACTIVE: True,
             CharacteristicsTypes.RELATIVE_HUMIDITY_DEHUMIDIFIER_THRESHOLD: 75,
+            CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT: 45,
         },
     )
     assert state.state == "on"
     assert state.attributes["humidity"] == 75
+    assert state.attributes["current_humidity"] == 45
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
         {
             CharacteristicsTypes.ACTIVE: False,
             CharacteristicsTypes.RELATIVE_HUMIDITY_DEHUMIDIFIER_THRESHOLD: 40,
+            CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT: 39,
         },
     )
     assert state.state == "off"
     assert state.attributes["humidity"] == 40
+    assert state.attributes["current_humidity"] == 39
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -368,6 +377,7 @@ async def test_humidifier_target_humidity_modes(hass: HomeAssistant, utcnow) ->
     )
     assert state.attributes["mode"] == "auto"
     assert state.attributes["humidity"] == 37
+    assert state.attributes["current_humidity"] == 51
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -377,6 +387,7 @@ async def test_humidifier_target_humidity_modes(hass: HomeAssistant, utcnow) ->
     )
     assert state.attributes["mode"] == "normal"
     assert state.attributes["humidity"] == 37
+    assert state.attributes["current_humidity"] == 51
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -411,6 +422,7 @@ async def test_dehumidifier_target_humidity_modes(hass: HomeAssistant, utcnow) -
     )
     assert state.attributes["mode"] == "auto"
     assert state.attributes["humidity"] == 73
+    assert state.attributes["current_humidity"] == 51
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -420,6 +432,7 @@ async def test_dehumidifier_target_humidity_modes(hass: HomeAssistant, utcnow) -
     )
     assert state.attributes["mode"] == "normal"
     assert state.attributes["humidity"] == 73
+    assert state.attributes["current_humidity"] == 51
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -429,6 +442,7 @@ async def test_dehumidifier_target_humidity_modes(hass: HomeAssistant, utcnow) -
     )
     assert state.attributes["mode"] == "normal"
     assert state.attributes["humidity"] == 73
+    assert state.attributes["current_humidity"] == 51
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -438,6 +452,7 @@ async def test_dehumidifier_target_humidity_modes(hass: HomeAssistant, utcnow) -
     )
     assert state.attributes["mode"] == "normal"
     assert state.attributes["humidity"] == 73
+    assert state.attributes["current_humidity"] == 51
 
 
 async def test_migrate_entity_ids(hass: HomeAssistant, utcnow) -> None:
diff --git a/tests/components/homewizard/test_sensor.py b/tests/components/homewizard/test_sensor.py
index 264d4dbb939..7ad5140b815 100644
--- a/tests/components/homewizard/test_sensor.py
+++ b/tests/components/homewizard/test_sensor.py
@@ -254,7 +254,7 @@ async def test_sensor_entity_wifi_strength(
     assert entry.disabled
 
 
-async def test_sensor_entity_total_power_import_t1_kwh(
+async def test_sensor_entity_total_power_import_tariff_1_kwh(
     hass: HomeAssistant, mock_config_entry_data, mock_config_entry
 ) -> None:
     """Test entity loads total power import t1."""
@@ -277,9 +277,11 @@ async def test_sensor_entity_total_power_import_t1_kwh(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_total_power_import_t1")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_total_power_import_t1"
+        "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
     )
     assert entry
     assert state
@@ -288,7 +290,7 @@ async def test_sensor_entity_total_power_import_t1_kwh(
     assert state.state == "1234.123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Total power import T1"
+        == "Product Name (aabbccddeeff) Total power import tariff 1"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
@@ -296,7 +298,7 @@ async def test_sensor_entity_total_power_import_t1_kwh(
     assert ATTR_ICON not in state.attributes
 
 
-async def test_sensor_entity_total_power_import_t2_kwh(
+async def test_sensor_entity_total_power_import_tariff_2_kwh(
     hass: HomeAssistant, mock_config_entry_data, mock_config_entry
 ) -> None:
     """Test entity loads total power import t2."""
@@ -319,9 +321,11 @@ async def test_sensor_entity_total_power_import_t2_kwh(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_total_power_import_t2")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_total_power_import_tariff_2"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_total_power_import_t2"
+        "sensor.product_name_aabbccddeeff_total_power_import_tariff_2"
     )
     assert entry
     assert state
@@ -330,7 +334,7 @@ async def test_sensor_entity_total_power_import_t2_kwh(
     assert state.state == "1234.123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Total power import T2"
+        == "Product Name (aabbccddeeff) Total power import tariff 2"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
@@ -338,7 +342,7 @@ async def test_sensor_entity_total_power_import_t2_kwh(
     assert ATTR_ICON not in state.attributes
 
 
-async def test_sensor_entity_total_power_export_t1_kwh(
+async def test_sensor_entity_total_power_export_tariff_1_kwh(
     hass: HomeAssistant, mock_config_entry_data, mock_config_entry
 ) -> None:
     """Test entity loads total power export t1."""
@@ -361,9 +365,11 @@ async def test_sensor_entity_total_power_export_t1_kwh(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_total_power_export_t1")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_total_power_export_tariff_1"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_total_power_export_t1"
+        "sensor.product_name_aabbccddeeff_total_power_export_tariff_1"
     )
     assert entry
     assert state
@@ -372,7 +378,7 @@ async def test_sensor_entity_total_power_export_t1_kwh(
     assert state.state == "1234.123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Total power export T1"
+        == "Product Name (aabbccddeeff) Total power export tariff 1"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
@@ -380,7 +386,7 @@ async def test_sensor_entity_total_power_export_t1_kwh(
     assert ATTR_ICON not in state.attributes
 
 
-async def test_sensor_entity_total_power_export_t2_kwh(
+async def test_sensor_entity_total_power_export_tariff_2_kwh(
     hass: HomeAssistant, mock_config_entry_data, mock_config_entry
 ) -> None:
     """Test entity loads total power export t2."""
@@ -403,9 +409,11 @@ async def test_sensor_entity_total_power_export_t2_kwh(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_total_power_export_t2")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_total_power_export_tariff_2"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_total_power_export_t2"
+        "sensor.product_name_aabbccddeeff_total_power_export_tariff_2"
     )
     assert entry
     assert state
@@ -414,7 +422,7 @@ async def test_sensor_entity_total_power_export_t2_kwh(
     assert state.state == "1234.123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Total power export T2"
+        == "Product Name (aabbccddeeff) Total power export tariff 2"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
@@ -481,9 +489,9 @@ async def test_sensor_entity_active_power_l1(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_active_power_l1")
+    state = hass.states.get("sensor.product_name_aabbccddeeff_active_power_phase_1")
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_active_power_l1"
+        "sensor.product_name_aabbccddeeff_active_power_phase_1"
     )
     assert entry
     assert state
@@ -492,7 +500,7 @@ async def test_sensor_entity_active_power_l1(
     assert state.state == "123.123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Active power L1"
+        == "Product Name (aabbccddeeff) Active power phase 1"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
@@ -521,9 +529,9 @@ async def test_sensor_entity_active_power_l2(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_active_power_l2")
+    state = hass.states.get("sensor.product_name_aabbccddeeff_active_power_phase_2")
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_active_power_l2"
+        "sensor.product_name_aabbccddeeff_active_power_phase_2"
     )
     assert entry
     assert state
@@ -532,7 +540,7 @@ async def test_sensor_entity_active_power_l2(
     assert state.state == "456.456"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Active power L2"
+        == "Product Name (aabbccddeeff) Active power phase 2"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
@@ -561,9 +569,9 @@ async def test_sensor_entity_active_power_l3(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_active_power_l3")
+    state = hass.states.get("sensor.product_name_aabbccddeeff_active_power_phase_3")
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_active_power_l3"
+        "sensor.product_name_aabbccddeeff_active_power_phase_3"
     )
     assert entry
     assert state
@@ -572,7 +580,7 @@ async def test_sensor_entity_active_power_l3(
     assert state.state == "789.789"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Active power L3"
+        == "Product Name (aabbccddeeff) Active power phase 3"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
@@ -680,7 +688,7 @@ async def test_sensor_entity_active_voltage_l1(
         entity_registry = er.async_get(hass)
 
         disabled_entry = entity_registry.async_get(
-            "sensor.product_name_aabbccddeeff_active_voltage_l1"
+            "sensor.product_name_aabbccddeeff_active_voltage_phase_1"
         )
         assert disabled_entry
         assert disabled_entry.disabled
@@ -701,12 +709,14 @@ async def test_sensor_entity_active_voltage_l1(
         )
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.product_name_aabbccddeeff_active_voltage_l1")
+        state = hass.states.get(
+            "sensor.product_name_aabbccddeeff_active_voltage_phase_1"
+        )
         assert state
         assert state.state == "230.123"
         assert (
             state.attributes.get(ATTR_FRIENDLY_NAME)
-            == "Product Name (aabbccddeeff) Active voltage L1"
+            == "Product Name (aabbccddeeff) Active voltage phase 1"
         )
         assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
         assert (
@@ -739,7 +749,7 @@ async def test_sensor_entity_active_voltage_l2(
         entity_registry = er.async_get(hass)
 
         disabled_entry = entity_registry.async_get(
-            "sensor.product_name_aabbccddeeff_active_voltage_l2"
+            "sensor.product_name_aabbccddeeff_active_voltage_phase_2"
         )
         assert disabled_entry
         assert disabled_entry.disabled
@@ -760,12 +770,14 @@ async def test_sensor_entity_active_voltage_l2(
         )
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.product_name_aabbccddeeff_active_voltage_l2")
+        state = hass.states.get(
+            "sensor.product_name_aabbccddeeff_active_voltage_phase_2"
+        )
         assert state
         assert state.state == "230.123"
         assert (
             state.attributes.get(ATTR_FRIENDLY_NAME)
-            == "Product Name (aabbccddeeff) Active voltage L2"
+            == "Product Name (aabbccddeeff) Active voltage phase 2"
         )
         assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
         assert (
@@ -798,7 +810,7 @@ async def test_sensor_entity_active_voltage_l3(
         entity_registry = er.async_get(hass)
 
         disabled_entry = entity_registry.async_get(
-            "sensor.product_name_aabbccddeeff_active_voltage_l3"
+            "sensor.product_name_aabbccddeeff_active_voltage_phase_3"
         )
         assert disabled_entry
         assert disabled_entry.disabled
@@ -819,12 +831,14 @@ async def test_sensor_entity_active_voltage_l3(
         )
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.product_name_aabbccddeeff_active_voltage_l3")
+        state = hass.states.get(
+            "sensor.product_name_aabbccddeeff_active_voltage_phase_3"
+        )
         assert state
         assert state.state == "230.123"
         assert (
             state.attributes.get(ATTR_FRIENDLY_NAME)
-            == "Product Name (aabbccddeeff) Active voltage L3"
+            == "Product Name (aabbccddeeff) Active voltage phase 3"
         )
         assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
         assert (
@@ -857,7 +871,7 @@ async def test_sensor_entity_active_current_l1(
         entity_registry = er.async_get(hass)
 
         disabled_entry = entity_registry.async_get(
-            "sensor.product_name_aabbccddeeff_active_current_l1"
+            "sensor.product_name_aabbccddeeff_active_current_phase_1"
         )
         assert disabled_entry
         assert disabled_entry.disabled
@@ -878,12 +892,14 @@ async def test_sensor_entity_active_current_l1(
         )
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.product_name_aabbccddeeff_active_current_l1")
+        state = hass.states.get(
+            "sensor.product_name_aabbccddeeff_active_current_phase_1"
+        )
         assert state
         assert state.state == "12.34"
         assert (
             state.attributes.get(ATTR_FRIENDLY_NAME)
-            == "Product Name (aabbccddeeff) Active current L1"
+            == "Product Name (aabbccddeeff) Active current phase 1"
         )
         assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
         assert (
@@ -916,7 +932,7 @@ async def test_sensor_entity_active_current_l2(
         entity_registry = er.async_get(hass)
 
         disabled_entry = entity_registry.async_get(
-            "sensor.product_name_aabbccddeeff_active_current_l2"
+            "sensor.product_name_aabbccddeeff_active_current_phase_2"
         )
         assert disabled_entry
         assert disabled_entry.disabled
@@ -937,12 +953,14 @@ async def test_sensor_entity_active_current_l2(
         )
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.product_name_aabbccddeeff_active_current_l2")
+        state = hass.states.get(
+            "sensor.product_name_aabbccddeeff_active_current_phase_2"
+        )
         assert state
         assert state.state == "12.34"
         assert (
             state.attributes.get(ATTR_FRIENDLY_NAME)
-            == "Product Name (aabbccddeeff) Active current L2"
+            == "Product Name (aabbccddeeff) Active current phase 2"
         )
         assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
         assert (
@@ -975,7 +993,7 @@ async def test_sensor_entity_active_current_l3(
         entity_registry = er.async_get(hass)
 
         disabled_entry = entity_registry.async_get(
-            "sensor.product_name_aabbccddeeff_active_current_l3"
+            "sensor.product_name_aabbccddeeff_active_current_phase_3"
         )
         assert disabled_entry
         assert disabled_entry.disabled
@@ -996,12 +1014,14 @@ async def test_sensor_entity_active_current_l3(
         )
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.product_name_aabbccddeeff_active_current_l3")
+        state = hass.states.get(
+            "sensor.product_name_aabbccddeeff_active_current_phase_3"
+        )
         assert state
         assert state.state == "12.34"
         assert (
             state.attributes.get(ATTR_FRIENDLY_NAME)
-            == "Product Name (aabbccddeeff) Active current L3"
+            == "Product Name (aabbccddeeff) Active current phase 3"
         )
         assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
         assert (
@@ -1089,9 +1109,11 @@ async def test_sensor_entity_voltage_sag_count_l1(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_voltage_sags_detected_l1")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_voltage_sags_detected_phase_1"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_voltage_sags_detected_l1"
+        "sensor.product_name_aabbccddeeff_voltage_sags_detected_phase_1"
     )
     assert entry
     assert state
@@ -1100,7 +1122,7 @@ async def test_sensor_entity_voltage_sag_count_l1(
     assert state.state == "123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Voltage sags detected L1"
+        == "Product Name (aabbccddeeff) Voltage sags detected phase 1"
     )
     assert ATTR_STATE_CLASS not in state.attributes
     assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
@@ -1128,9 +1150,11 @@ async def test_sensor_entity_voltage_sag_count_l2(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_voltage_sags_detected_l2")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_voltage_sags_detected_phase_2"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_voltage_sags_detected_l2"
+        "sensor.product_name_aabbccddeeff_voltage_sags_detected_phase_2"
     )
     assert entry
     assert state
@@ -1139,7 +1163,7 @@ async def test_sensor_entity_voltage_sag_count_l2(
     assert state.state == "123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Voltage sags detected L2"
+        == "Product Name (aabbccddeeff) Voltage sags detected phase 2"
     )
     assert ATTR_STATE_CLASS not in state.attributes
     assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
@@ -1167,9 +1191,11 @@ async def test_sensor_entity_voltage_sag_count_l3(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_voltage_sags_detected_l3")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_voltage_sags_detected_phase_3"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_voltage_sags_detected_l3"
+        "sensor.product_name_aabbccddeeff_voltage_sags_detected_phase_3"
     )
     assert entry
     assert state
@@ -1178,7 +1204,7 @@ async def test_sensor_entity_voltage_sag_count_l3(
     assert state.state == "123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Voltage sags detected L3"
+        == "Product Name (aabbccddeeff) Voltage sags detected phase 3"
     )
     assert ATTR_STATE_CLASS not in state.attributes
     assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
@@ -1207,10 +1233,10 @@ async def test_sensor_entity_voltage_swell_count_l1(
     entity_registry = er.async_get(hass)
 
     state = hass.states.get(
-        "sensor.product_name_aabbccddeeff_voltage_swells_detected_l1"
+        "sensor.product_name_aabbccddeeff_voltage_swells_detected_phase_1"
     )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_voltage_swells_detected_l1"
+        "sensor.product_name_aabbccddeeff_voltage_swells_detected_phase_1"
     )
     assert entry
     assert state
@@ -1219,7 +1245,7 @@ async def test_sensor_entity_voltage_swell_count_l1(
     assert state.state == "123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Voltage swells detected L1"
+        == "Product Name (aabbccddeeff) Voltage swells detected phase 1"
     )
     assert ATTR_STATE_CLASS not in state.attributes
     assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
@@ -1248,10 +1274,10 @@ async def test_sensor_entity_voltage_swell_count_l2(
     entity_registry = er.async_get(hass)
 
     state = hass.states.get(
-        "sensor.product_name_aabbccddeeff_voltage_swells_detected_l2"
+        "sensor.product_name_aabbccddeeff_voltage_swells_detected_phase_2"
     )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_voltage_swells_detected_l2"
+        "sensor.product_name_aabbccddeeff_voltage_swells_detected_phase_2"
     )
     assert entry
     assert state
@@ -1260,7 +1286,7 @@ async def test_sensor_entity_voltage_swell_count_l2(
     assert state.state == "123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Voltage swells detected L2"
+        == "Product Name (aabbccddeeff) Voltage swells detected phase 2"
     )
     assert ATTR_STATE_CLASS not in state.attributes
     assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
@@ -1289,10 +1315,10 @@ async def test_sensor_entity_voltage_swell_count_l3(
     entity_registry = er.async_get(hass)
 
     state = hass.states.get(
-        "sensor.product_name_aabbccddeeff_voltage_swells_detected_l3"
+        "sensor.product_name_aabbccddeeff_voltage_swells_detected_phase_3"
     )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_voltage_swells_detected_l3"
+        "sensor.product_name_aabbccddeeff_voltage_swells_detected_phase_3"
     )
     assert entry
     assert state
@@ -1301,7 +1327,7 @@ async def test_sensor_entity_voltage_swell_count_l3(
     assert state.state == "123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Voltage swells detected L3"
+        == "Product Name (aabbccddeeff) Voltage swells detected phase 3"
     )
     assert ATTR_STATE_CLASS not in state.attributes
     assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
@@ -1582,12 +1608,12 @@ async def test_sensor_entity_disabled_when_null(
     entity_registry = er.async_get(hass)
 
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_active_power_l2"
+        "sensor.product_name_aabbccddeeff_active_power_phase_2"
     )
     assert entry is None
 
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_active_power_l3"
+        "sensor.product_name_aabbccddeeff_active_power_phase_3"
     )
     assert entry is None
 
@@ -1633,13 +1659,13 @@ async def test_sensor_entity_export_disabled_when_unused(
     assert entry.disabled
 
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_total_power_export_t1"
+        "sensor.product_name_aabbccddeeff_total_power_export_tariff_1"
     )
     assert entry
     assert entry.disabled
 
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_total_power_export_t2"
+        "sensor.product_name_aabbccddeeff_total_power_export_tariff_2"
     )
     assert entry
     assert entry.disabled
@@ -1669,7 +1695,7 @@ async def test_sensors_unreachable(
 
         assert (
             hass.states.get(
-                "sensor.product_name_aabbccddeeff_total_power_import_t1"
+                "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
             ).state
             == "1234.123"
         )
@@ -1679,7 +1705,7 @@ async def test_sensors_unreachable(
         await hass.async_block_till_done()
         assert (
             hass.states.get(
-                "sensor.product_name_aabbccddeeff_total_power_import_t1"
+                "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
             ).state
             == "unavailable"
         )
@@ -1689,7 +1715,7 @@ async def test_sensors_unreachable(
         await hass.async_block_till_done()
         assert (
             hass.states.get(
-                "sensor.product_name_aabbccddeeff_total_power_import_t1"
+                "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
             ).state
             == "1234.123"
         )
@@ -1719,7 +1745,7 @@ async def test_api_disabled(
 
         assert (
             hass.states.get(
-                "sensor.product_name_aabbccddeeff_total_power_import_t1"
+                "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
             ).state
             == "1234.123"
         )
@@ -1729,7 +1755,7 @@ async def test_api_disabled(
         await hass.async_block_till_done()
         assert (
             hass.states.get(
-                "sensor.product_name_aabbccddeeff_total_power_import_t1"
+                "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
             ).state
             == "unavailable"
         )
diff --git a/tests/components/honeywell/test_climate.py b/tests/components/honeywell/test_climate.py
index 01472144c59..afb49cbffca 100644
--- a/tests/components/honeywell/test_climate.py
+++ b/tests/components/honeywell/test_climate.py
@@ -296,6 +296,7 @@ async def test_service_calls_off_mode(
 
     device.set_setpoint_heat.reset_mock()
     device.set_setpoint_heat.side_effect = aiosomecomfort.SomeComfortError
+    caplog.clear()
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_TEMPERATURE,
@@ -308,8 +309,9 @@ async def test_service_calls_off_mode(
     )
     device.set_setpoint_cool.assert_called_with(95)
     device.set_setpoint_heat.assert_called_with(77)
-    assert "Invalid temperature" in caplog.messages[-1]
+    assert "Invalid temperature" in caplog.text
 
+    caplog.clear()
     reset_mock(device)
     await hass.services.async_call(
         CLIMATE_DOMAIN,
@@ -436,6 +438,7 @@ async def test_service_calls_cool_mode(
     device.set_setpoint_cool.assert_called_with(95)
     device.set_setpoint_heat.assert_called_with(77)
 
+    caplog.clear()
     device.set_setpoint_cool.reset_mock()
     device.set_setpoint_cool.side_effect = aiosomecomfort.SomeComfortError
     await hass.services.async_call(
@@ -450,7 +453,7 @@ async def test_service_calls_cool_mode(
     )
     device.set_setpoint_cool.assert_called_with(95)
     device.set_setpoint_heat.assert_called_with(77)
-    assert "Invalid temperature" in caplog.messages[-1]
+    assert "Invalid temperature" in caplog.text
 
     reset_mock(device)
     await hass.services.async_call(
@@ -467,6 +470,7 @@ async def test_service_calls_cool_mode(
     reset_mock(device)
 
     device.set_hold_cool.side_effect = aiosomecomfort.SomeComfortError
+    caplog.clear()
 
     await hass.services.async_call(
         CLIMATE_DOMAIN,
@@ -478,7 +482,7 @@ async def test_service_calls_cool_mode(
     device.set_hold_cool.assert_called_once_with(True, 12)
     device.set_hold_heat.assert_not_called()
     device.set_setpoint_heat.assert_not_called()
-    assert "Temperature out of range" in caplog.messages[-1]
+    assert "Temperature out of range" in caplog.text
 
     reset_mock(device)
 
@@ -512,6 +516,7 @@ async def test_service_calls_cool_mode(
 
     device.raw_ui_data["StatusHeat"] = 2
     device.raw_ui_data["StatusCool"] = 2
+    caplog.clear()
 
     await hass.services.async_call(
         CLIMATE_DOMAIN,
@@ -521,7 +526,7 @@ async def test_service_calls_cool_mode(
     )
     device.set_hold_cool.assert_called_once_with(True)
     device.set_hold_heat.assert_not_called()
-    assert "Couldn't set permanent hold" in caplog.messages[-1]
+    assert "Couldn't set permanent hold" in caplog.text
 
     reset_mock(device)
 
@@ -536,6 +541,7 @@ async def test_service_calls_cool_mode(
     device.set_hold_cool.assert_called_once_with(False)
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_hold_cool.side_effect = aiosomecomfort.SomeComfortError
 
@@ -548,7 +554,7 @@ async def test_service_calls_cool_mode(
 
     device.set_hold_heat.assert_not_called()
     device.set_hold_cool.assert_called_once_with(False)
-    assert "Can not stop hold mode" in caplog.messages[-1]
+    assert "Can not stop hold mode" in caplog.text
 
     reset_mock(device)
 
@@ -566,6 +572,8 @@ async def test_service_calls_cool_mode(
     device.set_hold_heat.assert_not_called()
 
     reset_mock(device)
+    caplog.clear()
+
     device.set_hold_cool.side_effect = aiosomecomfort.SomeComfortError
 
     device.raw_ui_data["StatusHeat"] = 2
@@ -580,9 +588,10 @@ async def test_service_calls_cool_mode(
 
     device.set_hold_cool.assert_called_once_with(True)
     device.set_hold_heat.assert_not_called()
-    assert "Couldn't set permanent hold" in caplog.messages[-1]
+    assert "Couldn't set permanent hold" in caplog.text
 
     reset_mock(device)
+    caplog.clear()
 
     device.raw_ui_data["StatusHeat"] = 2
     device.raw_ui_data["StatusCool"] = 2
@@ -597,7 +606,7 @@ async def test_service_calls_cool_mode(
 
     device.set_hold_cool.assert_not_called()
     device.set_hold_heat.assert_not_called()
-    assert "Invalid system mode returned" in caplog.messages[-2]
+    assert "Invalid system mode returned" in caplog.text
 
 
 async def test_service_calls_heat_mode(
@@ -638,8 +647,9 @@ async def test_service_calls_heat_mode(
     )
     device.set_hold_heat.assert_called_once_with(datetime.time(2, 30), 59)
     device.set_hold_heat.reset_mock()
-    assert "Invalid temperature" in caplog.messages[-1]
+    assert "Invalid temperature" in caplog.text
 
+    caplog.clear()
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_TEMPERATURE,
@@ -667,7 +677,7 @@ async def test_service_calls_heat_mode(
     )
     device.set_setpoint_cool.assert_called_with(95)
     device.set_setpoint_heat.assert_called_with(77)
-    assert "Invalid temperature" in caplog.messages[-1]
+    assert "Invalid temperature" in caplog.text
 
     reset_mock(device)
     device.raw_ui_data["StatusHeat"] = 2
@@ -696,6 +706,7 @@ async def test_service_calls_heat_mode(
     device.set_setpoint_heat.assert_called_once()
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_hold_heat.side_effect = aiosomecomfort.SomeComfortError
 
@@ -710,7 +721,7 @@ async def test_service_calls_heat_mode(
     )
     device.set_hold_heat.assert_called_once_with(True)
     device.set_hold_cool.assert_not_called()
-    assert "Couldn't set permanent hold" in caplog.messages[-1]
+    assert "Couldn't set permanent hold" in caplog.text
 
     reset_mock(device)
 
@@ -726,6 +737,7 @@ async def test_service_calls_heat_mode(
     device.set_setpoint_cool.assert_not_called()
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_hold_heat.side_effect = aiosomecomfort.SomeComfortError
 
@@ -739,9 +751,10 @@ async def test_service_calls_heat_mode(
     device.set_hold_heat.assert_called_once_with(True, 22)
     device.set_hold_cool.assert_not_called()
     device.set_setpoint_cool.assert_not_called()
-    assert "Temperature out of range" in caplog.messages[-1]
+    assert "Temperature out of range" in caplog.text
 
     reset_mock(device)
+    caplog.clear()
 
     await hass.services.async_call(
         CLIMATE_DOMAIN,
@@ -765,7 +778,7 @@ async def test_service_calls_heat_mode(
     )
 
     device.set_hold_heat.assert_called_once_with(False)
-    assert "Can not stop hold mode" in caplog.messages[-1]
+    assert "Can not stop hold mode" in caplog.text
 
     reset_mock(device)
     device.raw_ui_data["StatusHeat"] = 2
@@ -844,6 +857,7 @@ async def test_service_calls_auto_mode(
     device.set_setpoint_heat.assert_called_once_with(77)
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_hold_cool.side_effect = aiosomecomfort.SomeComfortError
     device.set_hold_heat.side_effect = aiosomecomfort.SomeComfortError
@@ -855,9 +869,10 @@ async def test_service_calls_auto_mode(
         blocking=True,
     )
     device.set_setpoint_heat.assert_not_called()
-    assert "Invalid temperature" in caplog.messages[-1]
+    assert "Invalid temperature" in caplog.text
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_setpoint_heat.side_effect = aiosomecomfort.SomeComfortError
     device.set_setpoint_cool.side_effect = aiosomecomfort.SomeComfortError
@@ -872,9 +887,10 @@ async def test_service_calls_auto_mode(
         blocking=True,
     )
     device.set_setpoint_heat.assert_not_called()
-    assert "Invalid temperature" in caplog.messages[-1]
+    assert "Invalid temperature" in caplog.text
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_hold_heat.side_effect = None
     device.set_hold_cool.side_effect = None
@@ -893,6 +909,7 @@ async def test_service_calls_auto_mode(
     device.set_hold_heat.assert_called_once_with(True)
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_hold_heat.side_effect = aiosomecomfort.SomeComfortError
     device.raw_ui_data["StatusHeat"] = 2
@@ -906,7 +923,7 @@ async def test_service_calls_auto_mode(
     )
     device.set_hold_cool.assert_called_once_with(True)
     device.set_hold_heat.assert_called_once_with(True)
-    assert "Couldn't set permanent hold" in caplog.messages[-1]
+    assert "Couldn't set permanent hold" in caplog.text
 
     reset_mock(device)
     device.set_setpoint_heat.side_effect = None
@@ -923,6 +940,7 @@ async def test_service_calls_auto_mode(
     device.set_hold_heat.assert_called_once_with(True, 22)
 
     reset_mock(device)
+    caplog.clear()
 
     await hass.services.async_call(
         CLIMATE_DOMAIN,
@@ -946,9 +964,10 @@ async def test_service_calls_auto_mode(
 
     device.set_hold_heat.assert_not_called()
     device.set_hold_cool.assert_called_once_with(False)
-    assert "Can not stop hold mode" in caplog.messages[-1]
+    assert "Can not stop hold mode" in caplog.text
 
     reset_mock(device)
+    caplog.clear()
 
     device.raw_ui_data["StatusHeat"] = 2
     device.raw_ui_data["StatusCool"] = 2
@@ -978,7 +997,7 @@ async def test_service_calls_auto_mode(
 
     device.set_hold_cool.assert_called_once_with(True)
     device.set_hold_heat.assert_not_called()
-    assert "Couldn't set permanent hold" in caplog.messages[-1]
+    assert "Couldn't set permanent hold" in caplog.text
 
 
 async def test_async_update_errors(
diff --git a/tests/components/hue/test_device_trigger_v1.py b/tests/components/hue/test_device_trigger_v1.py
index 01add6a7dfd..aea91c06e88 100644
--- a/tests/components/hue/test_device_trigger_v1.py
+++ b/tests/components/hue/test_device_trigger_v1.py
@@ -1,19 +1,24 @@
 """The tests for Philips Hue device triggers for V1 bridge."""
+from pytest_unordered import unordered
+
 from homeassistant.components import automation, hue
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.hue.v1 import device_trigger
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
 
 from .conftest import setup_platform
 from .test_sensor_v1 import HUE_DIMMER_REMOTE_1, HUE_TAP_REMOTE_1
 
-from tests.common import assert_lists_same, async_get_device_automations
+from tests.common import async_get_device_automations
 
 REMOTES_RESPONSE = {"7": HUE_TAP_REMOTE_1, "8": HUE_DIMMER_REMOTE_1}
 
 
-async def test_get_triggers(hass: HomeAssistant, mock_bridge_v1, device_reg) -> None:
+async def test_get_triggers(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, mock_bridge_v1, device_reg
+) -> None:
     """Test we get the expected triggers from a hue remote."""
     mock_bridge_v1.mock_sensor_responses.append(REMOTES_RESPONSE)
     await setup_platform(hass, mock_bridge_v1, ["sensor", "binary_sensor"])
@@ -41,12 +46,15 @@ async def test_get_triggers(hass: HomeAssistant, mock_bridge_v1, device_reg) ->
         }
         for t_type, t_subtype in device_trigger.HUE_TAP_REMOTE
     ]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
     # Get triggers for specific dimmer switch
     hue_dimmer_device = device_reg.async_get_device(
         {(hue.DOMAIN, "00:17:88:01:10:3e:3a:dc")}
     )
+    hue_bat_sensor = entity_registry.async_get(
+        "sensor.hue_dimmer_switch_1_battery_level"
+    )
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, hue_dimmer_device.id
     )
@@ -56,7 +64,7 @@ async def test_get_triggers(hass: HomeAssistant, mock_bridge_v1, device_reg) ->
         "domain": "sensor",
         "device_id": hue_dimmer_device.id,
         "type": "battery_level",
-        "entity_id": "sensor.hue_dimmer_switch_1_battery_level",
+        "entity_id": hue_bat_sensor.id,
         "metadata": {"secondary": True},
     }
     expected_triggers = [
@@ -73,7 +81,7 @@ async def test_get_triggers(hass: HomeAssistant, mock_bridge_v1, device_reg) ->
             for t_type, t_subtype in device_trigger.HUE_DIMMER_REMOTE
         ),
     ]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_if_fires_on_state_change(
diff --git a/tests/components/hue/test_device_trigger_v2.py b/tests/components/hue/test_device_trigger_v2.py
index 81410b0658f..26c323617d2 100644
--- a/tests/components/hue/test_device_trigger_v2.py
+++ b/tests/components/hue/test_device_trigger_v2.py
@@ -1,16 +1,17 @@
 """The tests for Philips Hue device triggers for V2 bridge."""
 from aiohue.v2.models.button import ButtonEvent
+from pytest_unordered import unordered
 
 from homeassistant.components import hue
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.hue.v2.device import async_setup_devices
 from homeassistant.components.hue.v2.hue_event import async_setup_hue_events
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 
 from .conftest import setup_platform
 
 from tests.common import (
-    assert_lists_same,
     async_capture_events,
     async_get_device_automations,
 )
@@ -47,7 +48,11 @@ async def test_hue_event(
 
 
 async def test_get_triggers(
-    hass: HomeAssistant, mock_bridge_v2, v2_resources_test_data, device_reg
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    mock_bridge_v2,
+    v2_resources_test_data,
+    device_reg,
 ) -> None:
     """Test we get the expected triggers from a hue remote."""
     await mock_bridge_v2.api.load_test_data(v2_resources_test_data)
@@ -57,6 +62,9 @@ async def test_get_triggers(
     hue_wall_switch_device = device_reg.async_get_device(
         {(hue.DOMAIN, "3ff06175-29e8-44a8-8fe7-af591b0025da")}
     )
+    hue_bat_sensor = entity_registry.async_get(
+        "sensor.wall_switch_with_2_controls_battery"
+    )
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, hue_wall_switch_device.id
     )
@@ -66,7 +74,7 @@ async def test_get_triggers(
         "domain": "sensor",
         "device_id": hue_wall_switch_device.id,
         "type": "battery_level",
-        "entity_id": "sensor.wall_switch_with_2_controls_battery",
+        "entity_id": hue_bat_sensor.id,
         "metadata": {"secondary": True},
     }
 
@@ -96,4 +104,4 @@ async def test_get_triggers(
         ),
     ]
 
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
diff --git a/tests/components/huisbaasje/test_sensor.py b/tests/components/huisbaasje/test_sensor.py
index d3a65a0be6d..b324a5be970 100644
--- a/tests/components/huisbaasje/test_sensor.py
+++ b/tests/components/huisbaasje/test_sensor.py
@@ -54,7 +54,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
         # Assert data is loaded
-        current_power = hass.states.get("sensor.huisbaasje_current_power")
+        current_power = hass.states.get("sensor.current_power")
         assert current_power.state == "1012.0"
         assert (
             current_power.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
@@ -68,7 +68,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             current_power.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
         )
 
-        current_power_in = hass.states.get("sensor.huisbaasje_current_power_in_peak")
+        current_power_in = hass.states.get("sensor.current_power_in_peak")
         assert current_power_in.state == "1012.0"
         assert (
             current_power_in.attributes.get(ATTR_DEVICE_CLASS)
@@ -84,9 +84,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfPower.WATT
         )
 
-        current_power_in_low = hass.states.get(
-            "sensor.huisbaasje_current_power_in_off_peak"
-        )
+        current_power_in_low = hass.states.get("sensor.current_power_in_off_peak")
         assert current_power_in_low.state == "unknown"
         assert (
             current_power_in_low.attributes.get(ATTR_DEVICE_CLASS)
@@ -102,7 +100,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfPower.WATT
         )
 
-        current_power_out = hass.states.get("sensor.huisbaasje_current_power_out_peak")
+        current_power_out = hass.states.get("sensor.current_power_out_peak")
         assert current_power_out.state == "unknown"
         assert (
             current_power_out.attributes.get(ATTR_DEVICE_CLASS)
@@ -118,9 +116,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfPower.WATT
         )
 
-        current_power_out_low = hass.states.get(
-            "sensor.huisbaasje_current_power_out_off_peak"
-        )
+        current_power_out_low = hass.states.get("sensor.current_power_out_off_peak")
         assert current_power_out_low.state == "unknown"
         assert (
             current_power_out_low.attributes.get(ATTR_DEVICE_CLASS)
@@ -137,7 +133,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
         )
 
         energy_consumption_peak_today = hass.states.get(
-            "sensor.huisbaasje_energy_consumption_peak_today"
+            "sensor.energy_consumption_peak_today"
         )
         assert energy_consumption_peak_today.state == "2.67"
         assert (
@@ -158,7 +154,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
         )
 
         energy_consumption_off_peak_today = hass.states.get(
-            "sensor.huisbaasje_energy_consumption_off_peak_today"
+            "sensor.energy_consumption_off_peak_today"
         )
         assert energy_consumption_off_peak_today.state == "0.627"
         assert (
@@ -179,7 +175,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
         )
 
         energy_production_peak_today = hass.states.get(
-            "sensor.huisbaasje_energy_production_peak_today"
+            "sensor.energy_production_peak_today"
         )
         assert energy_production_peak_today.state == "1.512"
         assert (
@@ -200,7 +196,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
         )
 
         energy_production_off_peak_today = hass.states.get(
-            "sensor.huisbaasje_energy_production_off_peak_today"
+            "sensor.energy_production_off_peak_today"
         )
         assert energy_production_off_peak_today.state == "1.093"
         assert (
@@ -220,7 +216,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfEnergy.KILO_WATT_HOUR
         )
 
-        energy_today = hass.states.get("sensor.huisbaasje_energy_today")
+        energy_today = hass.states.get("sensor.energy_today")
         assert energy_today.state == "3.3"
         assert (
             energy_today.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
@@ -235,7 +231,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfEnergy.KILO_WATT_HOUR
         )
 
-        energy_this_week = hass.states.get("sensor.huisbaasje_energy_this_week")
+        energy_this_week = hass.states.get("sensor.energy_this_week")
         assert energy_this_week.state == "17.5"
         assert (
             energy_this_week.attributes.get(ATTR_DEVICE_CLASS)
@@ -251,7 +247,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfEnergy.KILO_WATT_HOUR
         )
 
-        energy_this_month = hass.states.get("sensor.huisbaasje_energy_this_month")
+        energy_this_month = hass.states.get("sensor.energy_this_month")
         assert energy_this_month.state == "103.3"
         assert (
             energy_this_month.attributes.get(ATTR_DEVICE_CLASS)
@@ -267,7 +263,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfEnergy.KILO_WATT_HOUR
         )
 
-        energy_this_year = hass.states.get("sensor.huisbaasje_energy_this_year")
+        energy_this_year = hass.states.get("sensor.energy_this_year")
         assert energy_this_year.state == "673.0"
         assert (
             energy_this_year.attributes.get(ATTR_DEVICE_CLASS)
@@ -283,7 +279,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfEnergy.KILO_WATT_HOUR
         )
 
-        current_gas = hass.states.get("sensor.huisbaasje_current_gas")
+        current_gas = hass.states.get("sensor.current_gas")
         assert current_gas.state == "0.0"
         assert current_gas.attributes.get(ATTR_DEVICE_CLASS) is None
         assert current_gas.attributes.get(ATTR_ICON) == "mdi:fire"
@@ -295,7 +291,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR
         )
 
-        gas_today = hass.states.get("sensor.huisbaasje_gas_today")
+        gas_today = hass.states.get("sensor.gas_today")
         assert gas_today.state == "1.1"
         assert gas_today.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.GAS
         assert gas_today.attributes.get(ATTR_ICON) == "mdi:counter"
@@ -308,7 +304,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfVolume.CUBIC_METERS
         )
 
-        gas_this_week = hass.states.get("sensor.huisbaasje_gas_this_week")
+        gas_this_week = hass.states.get("sensor.gas_this_week")
         assert gas_this_week.state == "5.6"
         assert gas_this_week.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.GAS
         assert gas_this_week.attributes.get(ATTR_ICON) == "mdi:counter"
@@ -321,7 +317,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfVolume.CUBIC_METERS
         )
 
-        gas_this_month = hass.states.get("sensor.huisbaasje_gas_this_month")
+        gas_this_month = hass.states.get("sensor.gas_this_month")
         assert gas_this_month.state == "39.1"
         assert gas_this_month.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.GAS
         assert gas_this_month.attributes.get(ATTR_ICON) == "mdi:counter"
@@ -334,7 +330,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfVolume.CUBIC_METERS
         )
 
-        gas_this_year = hass.states.get("sensor.huisbaasje_gas_this_year")
+        gas_this_year = hass.states.get("sensor.gas_this_year")
         assert gas_this_year.state == "116.7"
         assert gas_this_year.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.GAS
         assert gas_this_year.attributes.get(ATTR_ICON) == "mdi:counter"
@@ -381,42 +377,26 @@ async def test_setup_entry_absent_measurement(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
         # Assert data is loaded
-        assert hass.states.get("sensor.huisbaasje_current_power").state == "1012.0"
+        assert hass.states.get("sensor.current_power").state == "1012.0"
+        assert hass.states.get("sensor.current_power_in_peak").state == "unknown"
+        assert hass.states.get("sensor.current_power_in_off_peak").state == "unknown"
+        assert hass.states.get("sensor.current_power_out_peak").state == "unknown"
+        assert hass.states.get("sensor.current_power_out_off_peak").state == "unknown"
+        assert hass.states.get("sensor.current_gas").state == "unknown"
+        assert hass.states.get("sensor.energy_today").state == "3.3"
         assert (
-            hass.states.get("sensor.huisbaasje_current_power_in_peak").state
-            == "unknown"
+            hass.states.get("sensor.energy_consumption_peak_today").state == "unknown"
         )
         assert (
-            hass.states.get("sensor.huisbaasje_current_power_in_off_peak").state
+            hass.states.get("sensor.energy_consumption_off_peak_today").state
             == "unknown"
         )
+        assert hass.states.get("sensor.energy_production_peak_today").state == "unknown"
         assert (
-            hass.states.get("sensor.huisbaasje_current_power_out_peak").state
+            hass.states.get("sensor.energy_production_off_peak_today").state
             == "unknown"
         )
-        assert (
-            hass.states.get("sensor.huisbaasje_current_power_out_off_peak").state
-            == "unknown"
-        )
-        assert hass.states.get("sensor.huisbaasje_current_gas").state == "unknown"
-        assert hass.states.get("sensor.huisbaasje_energy_today").state == "3.3"
-        assert (
-            hass.states.get("sensor.huisbaasje_energy_consumption_peak_today").state
-            == "unknown"
-        )
-        assert (
-            hass.states.get("sensor.huisbaasje_energy_consumption_off_peak_today").state
-            == "unknown"
-        )
-        assert (
-            hass.states.get("sensor.huisbaasje_energy_production_peak_today").state
-            == "unknown"
-        )
-        assert (
-            hass.states.get("sensor.huisbaasje_energy_production_off_peak_today").state
-            == "unknown"
-        )
-        assert hass.states.get("sensor.huisbaasje_gas_today").state == "unknown"
+        assert hass.states.get("sensor.gas_today").state == "unknown"
 
         # Assert mocks are called
         assert len(mock_authenticate.mock_calls) == 1
diff --git a/tests/components/humidifier/test_device_action.py b/tests/components/humidifier/test_device_action.py
index 3312c263458..600be154fc7 100644
--- a/tests/components/humidifier/test_device_action.py
+++ b/tests/components/humidifier/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Humidifier device actions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -17,7 +18,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -53,7 +53,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -65,13 +65,13 @@ async def test_get_actions(
             f"{DOMAIN}.test_5678", "attributes", {"supported_features": features_state}
         )
     expected_actions = []
-    basic_action_types = ["turn_on", "turn_off", "toggle", "set_humidity"]
+    basic_action_types = ["set_humidity", "turn_on", "turn_off", "toggle"]
     expected_actions += [
         {
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in basic_action_types
@@ -81,7 +81,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in expected_action_types
@@ -89,7 +89,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -115,7 +115,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -124,27 +124,30 @@ async def test_get_actions_hidden_auxiliary(
         hidden_by=hidden_by,
         supported_features=0,
     )
+    basic_action_types = ["set_humidity", "turn_on", "turn_off", "toggle"]
     expected_actions = []
     expected_actions += [
         {
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
-        for action in ["turn_on", "turn_off", "toggle", "set_humidity"]
+        for action in basic_action_types
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "humidifier.entity",
+        entry.entity_id,
         STATE_ON,
         {const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY]},
     )
@@ -162,7 +165,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                 },
@@ -174,7 +177,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                 },
@@ -183,7 +186,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "toggle",
                     },
                 },
@@ -195,7 +198,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "set_humidity",
                         "humidity": 35,
                     },
@@ -208,7 +211,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "set_mode",
                         "mode": const.MODE_AWAY,
                     },
@@ -269,6 +272,67 @@ async def test_action(hass: HomeAssistant) -> None:
     assert len(turn_off_calls) == 1
     assert len(toggle_calls) == 1
 
+    assert set_humidity_calls[0].domain == DOMAIN
+    assert set_humidity_calls[0].service == "set_humidity"
+    assert set_humidity_calls[0].data == {"entity_id": entry.entity_id, "humidity": 35}
+    assert set_mode_calls[0].domain == DOMAIN
+    assert set_mode_calls[0].service == "set_mode"
+    assert set_mode_calls[0].data == {"entity_id": entry.entity_id, "mode": "away"}
+    assert turn_on_calls[0].domain == DOMAIN
+    assert turn_on_calls[0].service == "turn_on"
+    assert turn_on_calls[0].data == {"entity_id": entry.entity_id}
+    assert turn_off_calls[0].domain == DOMAIN
+    assert turn_off_calls[0].service == "turn_off"
+    assert turn_off_calls[0].data == {"entity_id": entry.entity_id}
+    assert toggle_calls[0].domain == DOMAIN
+    assert toggle_calls[0].service == "toggle"
+    assert toggle_calls[0].data == {"entity_id": entry.entity_id}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY]},
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_set_mode",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "set_mode",
+                        "mode": const.MODE_AWAY,
+                    },
+                },
+            ]
+        },
+    )
+
+    set_mode_calls = async_mock_service(hass, "humidifier", "set_mode")
+
+    hass.bus.async_fire("test_event_set_mode")
+    await hass.async_block_till_done()
+    assert len(set_mode_calls) == 1
+
+    assert set_mode_calls[0].domain == DOMAIN
+    assert set_mode_calls[0].service == "set_mode"
+    assert set_mode_calls[0].data == {"entity_id": entry.entity_id, "mode": "away"}
+
 
 @pytest.mark.parametrize(
     (
@@ -380,7 +444,7 @@ async def test_capabilities(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -399,7 +463,151 @@ async def test_capabilities(
         {
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
+            "type": action,
+        },
+    )
+
+    assert capabilities and "extra_fields" in capabilities
+
+    assert (
+        voluptuous_serialize.convert(
+            capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+        )
+        == expected_capabilities
+    )
+
+
+@pytest.mark.parametrize(
+    (
+        "set_state",
+        "capabilities_reg",
+        "capabilities_state",
+        "action",
+        "expected_capabilities",
+    ),
+    [
+        (
+            False,
+            {},
+            {},
+            "set_humidity",
+            [
+                {
+                    "name": "humidity",
+                    "required": True,
+                    "type": "integer",
+                }
+            ],
+        ),
+        (
+            False,
+            {},
+            {},
+            "set_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            False,
+            {const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY]},
+            {},
+            "set_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {},
+            "set_humidity",
+            [
+                {
+                    "name": "humidity",
+                    "required": True,
+                    "type": "integer",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {},
+            "set_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY]},
+            "set_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+    ],
+)
+async def test_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    capabilities_reg,
+    capabilities_state,
+    action,
+    expected_capabilities,
+) -> None:
+    """Test getting capabilities."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        "5678",
+        device_id=device_entry.id,
+        capabilities=capabilities_reg,
+    )
+    if set_state:
+        hass.states.async_set(
+            f"{DOMAIN}.test_5678",
+            STATE_ON,
+            capabilities_state,
+        )
+
+    capabilities = await device_action.async_get_action_capabilities(
+        hass,
+        {
+            "domain": DOMAIN,
+            "device_id": "abcdefgh",
+            "entity_id": entity_entry.entity_id,
             "type": action,
         },
     )
@@ -418,7 +626,6 @@ async def test_capabilities(
     ("action", "capability_name", "extra"),
     [
         ("set_humidity", "humidity", {"type": "integer"}),
-        ("set_mode", "mode", {"type": "select", "options": []}),
     ],
 )
 async def test_capabilities_missing_entity(
diff --git a/tests/components/humidifier/test_device_condition.py b/tests/components/humidifier/test_device_condition.py
index dcd4245e401..bf8eb98f456 100644
--- a/tests/components/humidifier/test_device_condition.py
+++ b/tests/components/humidifier/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Humidifier device conditions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -17,7 +18,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -59,7 +59,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -78,7 +78,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in basic_condition_types
@@ -89,7 +89,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in expected_condition_types
@@ -97,7 +97,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -123,7 +123,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -137,7 +137,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_off", "is_on"]
@@ -145,12 +145,16 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("humidifier.entity", STATE_ON, {ATTR_MODE: const.MODE_AWAY})
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON, {ATTR_MODE: const.MODE_AWAY})
 
     assert await async_setup_component(
         hass,
@@ -164,7 +168,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "humidifier.entity",
+                            "entity_id": entry.id,
                             "type": "is_on",
                         }
                     ],
@@ -183,7 +187,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "humidifier.entity",
+                            "entity_id": entry.id,
                             "type": "is_off",
                         }
                     ],
@@ -202,7 +206,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "humidifier.entity",
+                            "entity_id": entry.id,
                             "type": "is_mode",
                             "mode": "away",
                         }
@@ -218,7 +222,6 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get("humidifier.entity").state == STATE_ON
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
@@ -227,14 +230,14 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on event - test_event1"
 
-    hass.states.async_set("humidifier.entity", STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_off event - test_event2"
 
-    hass.states.async_set("humidifier.entity", STATE_ON, {ATTR_MODE: const.MODE_AWAY})
+    hass.states.async_set(entry.entity_id, STATE_ON, {ATTR_MODE: const.MODE_AWAY})
 
     hass.bus.async_fire("test_event3")
     await hass.async_block_till_done()
@@ -242,7 +245,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 3
     assert calls[2].data["some"] == "is_mode - event - test_event3"
 
-    hass.states.async_set("humidifier.entity", STATE_ON, {ATTR_MODE: const.MODE_HOME})
+    hass.states.async_set(entry.entity_id, STATE_ON, {ATTR_MODE: const.MODE_HOME})
 
     # Should not fire
     hass.bus.async_fire("test_event3")
@@ -250,6 +253,53 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 3
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON, {ATTR_MODE: const.MODE_AWAY})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_mode",
+                            "mode": "away",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_mode - {{ trigger.platform }} - {{ trigger.event.event_type }}"
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, STATE_ON, {ATTR_MODE: const.MODE_AWAY})
+
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_mode - event - test_event1"
+
+
 @pytest.mark.parametrize(
     (
         "set_state",
@@ -386,7 +436,7 @@ async def test_capabilities(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -395,7 +445,7 @@ async def test_capabilities(
     )
     if set_state:
         hass.states.async_set(
-            f"{DOMAIN}.test_5678",
+            entity_entry.entity_id,
             STATE_ON,
             capabilities_state,
         )
@@ -405,7 +455,177 @@ async def test_capabilities(
         {
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
+            "type": condition,
+        },
+    )
+
+    assert capabilities and "extra_fields" in capabilities
+
+    assert (
+        voluptuous_serialize.convert(
+            capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+        )
+        == expected_capabilities
+    )
+
+
+@pytest.mark.parametrize(
+    (
+        "set_state",
+        "capabilities_reg",
+        "capabilities_state",
+        "condition",
+        "expected_capabilities",
+    ),
+    [
+        (
+            False,
+            {},
+            {},
+            "is_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            False,
+            {const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY]},
+            {},
+            "is_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            False,
+            {},
+            {},
+            "is_off",
+            [
+                {
+                    "name": "for",
+                    "optional": True,
+                    "type": "positive_time_period_dict",
+                }
+            ],
+        ),
+        (
+            False,
+            {},
+            {},
+            "is_on",
+            [
+                {
+                    "name": "for",
+                    "optional": True,
+                    "type": "positive_time_period_dict",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {},
+            "is_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY]},
+            "is_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {},
+            "is_off",
+            [
+                {
+                    "name": "for",
+                    "optional": True,
+                    "type": "positive_time_period_dict",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {},
+            "is_on",
+            [
+                {
+                    "name": "for",
+                    "optional": True,
+                    "type": "positive_time_period_dict",
+                }
+            ],
+        ),
+    ],
+)
+async def test_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    capabilities_reg,
+    capabilities_state,
+    condition,
+    expected_capabilities,
+) -> None:
+    """Test getting capabilities."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        "5678",
+        device_id=device_entry.id,
+        capabilities=capabilities_reg,
+    )
+    if set_state:
+        hass.states.async_set(
+            entity_entry.entity_id,
+            STATE_ON,
+            capabilities_state,
+        )
+
+    capabilities = await device_condition.async_get_condition_capabilities(
+        hass,
+        {
+            "domain": DOMAIN,
+            "device_id": "abcdefgh",
+            "entity_id": entity_entry.entity_id,
             "type": condition,
         },
     )
@@ -438,7 +658,7 @@ async def test_capabilities_missing_entity(
         {
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": "0123456789",
             "type": condition,
         },
     )
diff --git a/tests/components/humidifier/test_device_trigger.py b/tests/components/humidifier/test_device_trigger.py
index e6e0d4bdb4d..1953494e0c0 100644
--- a/tests/components/humidifier/test_device_trigger.py
+++ b/tests/components/humidifier/test_device_trigger.py
@@ -2,6 +2,7 @@
 import datetime
 
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -26,7 +27,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automations,
     async_mock_service,
@@ -56,40 +56,48 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
-    entity_id = f"{DOMAIN}.test_5678"
     hass.states.async_set(
-        entity_id,
+        entity_entry.entity_id,
         STATE_ON,
         {
             const.ATTR_HUMIDITY: 23,
+            const.ATTR_CURRENT_HUMIDITY: 48,
             ATTR_MODE: "home",
             const.ATTR_AVAILABLE_MODES: ["home", "away"],
             ATTR_SUPPORTED_FEATURES: 1,
         },
     )
+    humidifier_trigger_types = ["current_humidity_changed", "target_humidity_changed"]
+    toggle_trigger_types = ["turned_on", "turned_off", "changed_states"]
     expected_triggers = [
         {
             "platform": "device",
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": entity_id,
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
-        for trigger in [
-            "target_humidity_changed",
-            "turned_off",
-            "turned_on",
-            "changed_states",
-        ]
+        for trigger in humidifier_trigger_types
+    ]
+    expected_triggers += [
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "type": trigger,
+            "device_id": device_entry.id,
+            "entity_id": entity_entry.id,
+            "metadata": {"secondary": False},
+        }
+        for trigger in toggle_trigger_types
     ]
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -115,7 +123,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -123,35 +131,48 @@ async def test_get_triggers_hidden_auxiliary(
         entity_category=entity_category,
         hidden_by=hidden_by,
     )
+    humidifier_trigger_types = ["target_humidity_changed"]
+    toggle_trigger_types = ["turned_on", "turned_off", "changed_states"]
     expected_triggers = [
         {
             "platform": "device",
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
-        for trigger in [
-            "target_humidity_changed",
-            "turned_off",
-            "turned_on",
-            "changed_states",
-        ]
+        for trigger in humidifier_trigger_types
+    ]
+    expected_triggers += [
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "type": trigger,
+            "device_id": device_entry.id,
+            "entity_id": entity_entry.id,
+            "metadata": {"secondary": True},
+        }
+        for trigger in toggle_trigger_types
     ]
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "humidifier.entity",
+        entry.entity_id,
         STATE_ON,
         {
             const.ATTR_HUMIDITY: 23,
+            const.ATTR_CURRENT_HUMIDITY: 35,
             ATTR_MODE: "home",
             const.ATTR_AVAILABLE_MODES: ["home", "away"],
             ATTR_SUPPORTED_FEATURES: 1,
@@ -168,7 +189,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "target_humidity_changed",
                         "below": 20,
                     },
@@ -182,7 +203,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "target_humidity_changed",
                         "above": 30,
                     },
@@ -196,7 +217,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "target_humidity_changed",
                         "above": 30,
                         "for": {"seconds": 5},
@@ -211,7 +232,50 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
+                        "type": "current_humidity_changed",
+                        "below": 30,
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": "current_humidity_changed_below"},
+                    },
+                },
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
+                        "type": "current_humidity_changed",
+                        "above": 40,
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": "current_humidity_changed_above"},
+                    },
+                },
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
+                        "type": "current_humidity_changed",
+                        "above": 40,
+                        "for": {"seconds": 5},
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": "current_humidity_changed_above_for"},
+                    },
+                },
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
                         "type": "turned_on",
                     },
                     "action": {
@@ -235,7 +299,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "turned_off",
                     },
                     "action": {
@@ -259,7 +323,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "changed_states",
                     },
                     "action": {
@@ -282,47 +346,90 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
         },
     )
 
-    # Fake that the humidity is changing
-    hass.states.async_set("humidifier.entity", STATE_ON, {const.ATTR_HUMIDITY: 7})
+    # Fake that the humidity target is changing
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {const.ATTR_HUMIDITY: 7, const.ATTR_CURRENT_HUMIDITY: 35},
+    )
     await hass.async_block_till_done()
     assert len(calls) == 1
     assert calls[0].data["some"] == "target_humidity_changed_below"
 
-    # Fake that the humidity is changing
-    hass.states.async_set("humidifier.entity", STATE_ON, {const.ATTR_HUMIDITY: 37})
+    # Fake that the current humidity is changing
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {const.ATTR_HUMIDITY: 7, const.ATTR_CURRENT_HUMIDITY: 18},
+    )
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data["some"] == "target_humidity_changed_above"
+    assert calls[1].data["some"] == "current_humidity_changed_below"
+
+    # Fake that the humidity target is changing
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {const.ATTR_HUMIDITY: 37, const.ATTR_CURRENT_HUMIDITY: 18},
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 3
+    assert calls[2].data["some"] == "target_humidity_changed_above"
+
+    # Fake that the current humidity is changing
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {const.ATTR_HUMIDITY: 37, const.ATTR_CURRENT_HUMIDITY: 41},
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 4
+    assert calls[3].data["some"] == "current_humidity_changed_above"
 
     # Wait 6 minutes
     async_fire_time_changed(hass, dt_util.utcnow() + datetime.timedelta(minutes=6))
     await hass.async_block_till_done()
-    assert len(calls) == 3
-    assert calls[2].data["some"] == "target_humidity_changed_above_for"
+    assert len(calls) == 6
+    assert {calls[4].data["some"], calls[5].data["some"]} == {
+        "current_humidity_changed_above_for",
+        "target_humidity_changed_above_for",
+    }
 
     # Fake turn off
-    hass.states.async_set("humidifier.entity", STATE_OFF, {const.ATTR_HUMIDITY: 37})
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_OFF,
+        {const.ATTR_HUMIDITY: 37, const.ATTR_CURRENT_HUMIDITY: 41},
+    )
     await hass.async_block_till_done()
-    assert len(calls) == 5
-    assert {calls[3].data["some"], calls[4].data["some"]} == {
-        "turn_off device - humidifier.entity - on - off - None",
-        "turn_on_or_off device - humidifier.entity - on - off - None",
+    assert len(calls) == 8
+    assert {calls[6].data["some"], calls[7].data["some"]} == {
+        "turn_off device - humidifier.test_5678 - on - off - None",
+        "turn_on_or_off device - humidifier.test_5678 - on - off - None",
     }
 
     # Fake turn on
-    hass.states.async_set("humidifier.entity", STATE_ON, {const.ATTR_HUMIDITY: 37})
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {const.ATTR_HUMIDITY: 37, const.ATTR_CURRENT_HUMIDITY: 41},
+    )
     await hass.async_block_till_done()
-    assert len(calls) == 7
-    assert {calls[5].data["some"], calls[6].data["some"]} == {
-        "turn_on device - humidifier.entity - off - on - None",
-        "turn_on_or_off device - humidifier.entity - off - on - None",
+    assert len(calls) == 10
+    assert {calls[8].data["some"], calls[9].data["some"]} == {
+        "turn_on device - humidifier.test_5678 - off - on - None",
+        "turn_on_or_off device - humidifier.test_5678 - off - on - None",
     }
 
 
-async def test_invalid_config(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "humidifier.entity",
+        entry.entity_id,
         STATE_ON,
         {
             const.ATTR_HUMIDITY: 23,
@@ -342,7 +449,54 @@ async def test_invalid_config(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.entity_id,
+                        "type": "target_humidity_changed",
+                        "below": 20,
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": "target_humidity_changed_below"},
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the humidity is changing
+    hass.states.async_set(entry.entity_id, STATE_ON, {const.ATTR_HUMIDITY: 7})
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "target_humidity_changed_below"
+
+
+async def test_invalid_config(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {
+            const.ATTR_HUMIDITY: 23,
+            ATTR_MODE: "home",
+            const.ATTR_AVAILABLE_MODES: ["home", "away"],
+            ATTR_SUPPORTED_FEATURES: 1,
+        },
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
                         "type": "target_humidity_changed",
                         "below": 20,
                         "invalid": "invalid",
@@ -357,7 +511,7 @@ async def test_invalid_config(hass: HomeAssistant, calls) -> None:
     )
 
     # Fake that the humidity is changing
-    hass.states.async_set("humidifier.entity", STATE_ON, {const.ATTR_HUMIDITY: 7})
+    hass.states.async_set(entry.entity_id, STATE_ON, {const.ATTR_HUMIDITY: 7})
     await hass.async_block_till_done()
     # Should not trigger for invalid config
     assert len(calls) == 0
@@ -371,7 +525,7 @@ async def test_get_trigger_capabilities_on(hass: HomeAssistant) -> None:
             "platform": "device",
             "domain": "humidifier",
             "type": "turned_on",
-            "entity_id": "humidifier.upstairs",
+            "entity_id": "01234568901234568901234568901",
             "above": "23",
         },
     )
@@ -391,7 +545,7 @@ async def test_get_trigger_capabilities_off(hass: HomeAssistant) -> None:
             "platform": "device",
             "domain": "humidifier",
             "type": "turned_off",
-            "entity_id": "humidifier.upstairs",
+            "entity_id": "01234568901234568901234568901",
             "above": "23",
         },
     )
@@ -411,7 +565,7 @@ async def test_get_trigger_capabilities_humidity(hass: HomeAssistant) -> None:
             "platform": "device",
             "domain": "humidifier",
             "type": "target_humidity_changed",
-            "entity_id": "humidifier.upstairs",
+            "entity_id": "01234568901234568901234568901",
             "above": "23",
         },
     )
diff --git a/tests/components/hyperion/__init__.py b/tests/components/hyperion/__init__.py
index 80a585f9740..382a168bc44 100644
--- a/tests/components/hyperion/__init__.py
+++ b/tests/components/hyperion/__init__.py
@@ -27,7 +27,6 @@ TEST_PRIORITY = 180
 TEST_ENTITY_ID_1 = "light.test_instance_1"
 TEST_ENTITY_ID_2 = "light.test_instance_2"
 TEST_ENTITY_ID_3 = "light.test_instance_3"
-TEST_PRIORITY_LIGHT_ENTITY_ID_1 = "light.test_instance_1_priority"
 TEST_TITLE = f"{TEST_HOST}:{TEST_PORT}"
 
 TEST_TOKEN = "sekr1t"
diff --git a/tests/components/hyperion/test_config_flow.py b/tests/components/hyperion/test_config_flow.py
index ad71f392bc6..f9cef677ead 100644
--- a/tests/components/hyperion/test_config_flow.py
+++ b/tests/components/hyperion/test_config_flow.py
@@ -150,8 +150,6 @@ async def _configure_flow(
     user_input = user_input or {}
 
     with patch(
-        "homeassistant.components.hyperion.async_setup", return_value=True
-    ), patch(
         "homeassistant.components.hyperion.async_setup_entry",
         return_value=True,
     ):
@@ -797,10 +795,8 @@ async def test_options_effect_show_list(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
         assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
 
-        # effect1 and effect3 only, so effect2 & external sources are hidden.
-        assert result["data"][CONF_EFFECT_HIDE_LIST] == sorted(
-            ["effect2"] + const.KEY_COMPONENTID_EXTERNAL_SOURCES
-        )
+        # effect1 and effect3 only, so effect2 is hidden.
+        assert result["data"][CONF_EFFECT_HIDE_LIST] == ["effect2"]
 
 
 async def test_options_effect_hide_list_cannot_connect(hass: HomeAssistant) -> None:
@@ -836,9 +832,7 @@ async def test_reauth_success(hass: HomeAssistant) -> None:
 
     with patch(
         "homeassistant.components.hyperion.client.HyperionClient", return_value=client
-    ), patch("homeassistant.components.hyperion.async_setup", return_value=True), patch(
-        "homeassistant.components.hyperion.async_setup_entry", return_value=True
-    ):
+    ), patch("homeassistant.components.hyperion.async_setup_entry", return_value=True):
         result = await _init_flow(
             hass,
             source=SOURCE_REAUTH,
diff --git a/tests/components/hyperion/test_light.py b/tests/components/hyperion/test_light.py
index 33f6acf995f..667c73a20ac 100644
--- a/tests/components/hyperion/test_light.py
+++ b/tests/components/hyperion/test_light.py
@@ -1,7 +1,6 @@
 """Tests for the Hyperion integration."""
 from __future__ import annotations
 
-from datetime import timedelta
 from unittest.mock import AsyncMock, Mock, call, patch
 
 from hyperion import const
@@ -17,7 +16,6 @@ from homeassistant.components.hyperion.const import (
     DOMAIN,
     HYPERION_MANUFACTURER_NAME,
     HYPERION_MODEL_NAME,
-    TYPE_HYPERION_PRIORITY_LIGHT,
 )
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
@@ -27,12 +25,7 @@ from homeassistant.components.light import (
     ColorMode,
     LightEntityFeature,
 )
-from homeassistant.config_entries import (
-    RELOAD_AFTER_UPDATE_DELAY,
-    SOURCE_REAUTH,
-    ConfigEntry,
-    ConfigEntryState,
-)
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntry, ConfigEntryState
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_HOST,
@@ -44,8 +37,6 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.util import dt as dt_util
-import homeassistant.util.color as color_util
 
 from . import (
     TEST_AUTH_NOT_REQUIRED_RESP,
@@ -62,19 +53,13 @@ from . import (
     TEST_INSTANCE_3,
     TEST_PORT,
     TEST_PRIORITY,
-    TEST_PRIORITY_LIGHT_ENTITY_ID_1,
     TEST_SYSINFO_ID,
     add_test_config_entry,
     call_registered_callback,
     create_mock_client,
-    register_test_entity,
     setup_test_config_entry,
 )
 
-from tests.common import async_fire_time_changed
-
-COLOR_BLACK = color_util.COLORS["black"]
-
 
 def _get_config_entry_from_unique_id(
     hass: HomeAssistant, unique_id: str
@@ -247,6 +232,7 @@ async def test_setup_config_entry_dynamic_instances(hass: HomeAssistant) -> None
 async def test_light_basic_properties(hass: HomeAssistant) -> None:
     """Test the basic properties."""
     client = create_mock_client()
+    client.priorities = [{const.KEY_PRIORITY: TEST_PRIORITY}]
     await setup_test_config_entry(hass, hyperion_client=client)
 
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
@@ -257,8 +243,8 @@ async def test_light_basic_properties(hass: HomeAssistant) -> None:
     assert entity_state.attributes["icon"] == hyperion_light.ICON_LIGHTBULB
     assert entity_state.attributes["effect"] == hyperion_light.KEY_EFFECT_SOLID
 
-    # By default the effect list is the 3 external sources + 'Solid'.
-    assert len(entity_state.attributes["effect_list"]) == 4
+    # By default the effect list contains only 'Solid'.
+    assert len(entity_state.attributes["effect_list"]) == 1
 
     assert entity_state.attributes["color_mode"] == ColorMode.HS
     assert entity_state.attributes["supported_color_modes"] == [ColorMode.HS]
@@ -268,6 +254,7 @@ async def test_light_basic_properties(hass: HomeAssistant) -> None:
 async def test_light_async_turn_on(hass: HomeAssistant) -> None:
     """Test turning the light on."""
     client = create_mock_client()
+    client.priorities = [{const.KEY_PRIORITY: TEST_PRIORITY}]
     await setup_test_config_entry(hass, hyperion_client=client)
 
     # On (=), 100% (=), solid (=), [255,255,255] (=)
@@ -345,10 +332,13 @@ async def test_light_async_turn_on(hass: HomeAssistant) -> None:
     )
 
     # Simulate a state callback from Hyperion.
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-        const.KEY_VALUE: {const.KEY_RGB: (0, 255, 255)},
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
+            const.KEY_VALUE: {const.KEY_RGB: (0, 255, 255)},
+        }
+    ]
 
     call_registered_callback(client, "priorities-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
@@ -385,54 +375,6 @@ async def test_light_async_turn_on(hass: HomeAssistant) -> None:
     assert entity_state
     assert entity_state.attributes["brightness"] == brightness
 
-    # On (=), 100% (=), "USB Capture (!), [0,255,255] (=)
-    component = "V4L"
-    effect = const.KEY_COMPONENTID_TO_NAME[component]
-    client.async_send_clear = AsyncMock(return_value=True)
-    client.async_send_set_component = AsyncMock(return_value=True)
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: TEST_ENTITY_ID_1, ATTR_EFFECT: effect},
-        blocking=True,
-    )
-
-    assert client.async_send_clear.call_args == call(
-        **{const.KEY_PRIORITY: TEST_PRIORITY}
-    )
-    assert client.async_send_set_component.call_args_list == [
-        call(
-            **{
-                const.KEY_COMPONENTSTATE: {
-                    const.KEY_COMPONENT: const.KEY_COMPONENTID_EXTERNAL_SOURCES[0],
-                    const.KEY_STATE: False,
-                }
-            }
-        ),
-        call(
-            **{
-                const.KEY_COMPONENTSTATE: {
-                    const.KEY_COMPONENT: const.KEY_COMPONENTID_EXTERNAL_SOURCES[1],
-                    const.KEY_STATE: False,
-                }
-            }
-        ),
-        call(
-            **{
-                const.KEY_COMPONENTSTATE: {
-                    const.KEY_COMPONENT: const.KEY_COMPONENTID_EXTERNAL_SOURCES[2],
-                    const.KEY_STATE: True,
-                }
-            }
-        ),
-    ]
-    client.visible_priority = {const.KEY_COMPONENTID: component}
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.attributes["icon"] == hyperion_light.ICON_EXTERNAL_SOURCE
-    assert entity_state.attributes["effect"] == effect
-
     # On (=), 100% (=), "Warm Blobs" (!), [0,255,255] (=)
     effect = "Warm Blobs"
     client.async_send_clear = AsyncMock(return_value=True)
@@ -445,9 +387,6 @@ async def test_light_async_turn_on(hass: HomeAssistant) -> None:
         blocking=True,
     )
 
-    assert client.async_send_clear.call_args == call(
-        **{const.KEY_PRIORITY: TEST_PRIORITY}
-    )
     assert client.async_send_set_effect.call_args == call(
         **{
             const.KEY_PRIORITY: TEST_PRIORITY,
@@ -455,10 +394,13 @@ async def test_light_async_turn_on(hass: HomeAssistant) -> None:
             const.KEY_ORIGIN: DEFAULT_ORIGIN,
         }
     )
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_EFFECT,
-        const.KEY_OWNER: effect,
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_EFFECT,
+            const.KEY_OWNER: effect,
+        }
+    ]
     call_registered_callback(client, "priorities-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
     assert entity_state
@@ -484,10 +426,13 @@ async def test_light_async_turn_on(hass: HomeAssistant) -> None:
         }
     )
     # Simulate a state callback from Hyperion.
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-        const.KEY_VALUE: {const.KEY_RGB: (0, 0, 255)},
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
+            const.KEY_VALUE: {const.KEY_RGB: (0, 0, 255)},
+        }
+    ]
     call_registered_callback(client, "priorities-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
     assert entity_state
@@ -509,82 +454,6 @@ async def test_light_async_turn_on(hass: HomeAssistant) -> None:
     assert not client.async_send_set_effect.called
 
 
-async def test_light_async_turn_on_fail_async_send_set_component(
-    hass: HomeAssistant,
-) -> None:
-    """Test set_component failure when turning the light on."""
-    client = create_mock_client()
-    client.async_send_set_component = AsyncMock(return_value=False)
-    client.is_on = Mock(return_value=False)
-    await setup_test_config_entry(hass, hyperion_client=client)
-    await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: TEST_ENTITY_ID_1}, blocking=True
-    )
-    assert client.method_calls[-1] == call.async_send_set_component(
-        componentstate={"component": "ALL", "state": True}
-    )
-
-
-async def test_light_async_turn_on_fail_async_send_set_component_source(
-    hass: HomeAssistant,
-) -> None:
-    """Test async_send_set_component failure when selecting the source."""
-    client = create_mock_client()
-    client.async_send_clear = AsyncMock(return_value=True)
-    client.async_send_set_component = AsyncMock(return_value=False)
-    client.is_on = Mock(return_value=True)
-    await setup_test_config_entry(hass, hyperion_client=client)
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_ON,
-        {
-            ATTR_ENTITY_ID: TEST_ENTITY_ID_1,
-            ATTR_EFFECT: const.KEY_COMPONENTID_TO_NAME["V4L"],
-        },
-        blocking=True,
-    )
-    assert client.method_calls[-1] == call.async_send_set_component(
-        componentstate={"component": "BOBLIGHTSERVER", "state": False}
-    )
-
-
-async def test_light_async_turn_on_fail_async_send_clear_source(
-    hass: HomeAssistant,
-) -> None:
-    """Test async_send_clear failure when turning the light on."""
-    client = create_mock_client()
-    client.is_on = Mock(return_value=True)
-    client.async_send_clear = AsyncMock(return_value=False)
-    await setup_test_config_entry(hass, hyperion_client=client)
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_ON,
-        {
-            ATTR_ENTITY_ID: TEST_ENTITY_ID_1,
-            ATTR_EFFECT: const.KEY_COMPONENTID_TO_NAME["V4L"],
-        },
-        blocking=True,
-    )
-    assert client.method_calls[-1] == call.async_send_clear(priority=180)
-
-
-async def test_light_async_turn_on_fail_async_send_clear_effect(
-    hass: HomeAssistant,
-) -> None:
-    """Test async_send_clear failure when turning on an effect."""
-    client = create_mock_client()
-    client.is_on = Mock(return_value=True)
-    client.async_send_clear = AsyncMock(return_value=False)
-    await setup_test_config_entry(hass, hyperion_client=client)
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: TEST_ENTITY_ID_1, ATTR_EFFECT: "Warm Mood Blobs"},
-        blocking=True,
-    )
-    assert client.method_calls[-1] == call.async_send_clear(priority=180)
-
-
 async def test_light_async_turn_on_fail_async_send_set_effect(
     hass: HomeAssistant,
 ) -> None:
@@ -625,12 +494,12 @@ async def test_light_async_turn_on_fail_async_send_set_color(
     )
 
 
-async def test_light_async_turn_off_fail_async_send_set_component(
+async def test_light_async_turn_off_fail_async_send_send_clear(
     hass: HomeAssistant,
 ) -> None:
-    """Test async_send_set_component failure when turning off the light."""
+    """Test async_send_clear failure when turning off the light."""
     client = create_mock_client()
-    client.async_send_set_component = AsyncMock(return_value=False)
+    client.async_send_clear = AsyncMock(return_value=False)
     await setup_test_config_entry(hass, hyperion_client=client)
 
     await hass.services.async_call(
@@ -639,30 +508,7 @@ async def test_light_async_turn_off_fail_async_send_set_component(
         {ATTR_ENTITY_ID: TEST_ENTITY_ID_1},
         blocking=True,
     )
-    assert client.method_calls[-1] == call.async_send_set_component(
-        componentstate={"component": "LEDDEVICE", "state": False}
-    )
-
-
-async def test_priority_light_async_turn_off_fail_async_send_clear(
-    hass: HomeAssistant,
-) -> None:
-    """Test async_send_clear failure when turning off a priority light."""
-    client = create_mock_client()
-    client.async_send_clear = AsyncMock(return_value=False)
-    with patch(
-        "homeassistant.components.hyperion.light.HyperionPriorityLight.entity_registry_enabled_default"
-    ) as enabled_by_default_mock:
-        enabled_by_default_mock.return_value = True
-        await setup_test_config_entry(hass, hyperion_client=client)
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: TEST_PRIORITY_LIGHT_ENTITY_ID_1},
-        blocking=True,
-    )
-    assert client.method_calls[-1] == call.async_send_clear(priority=180)
+    assert client.method_calls[-1] == call.async_send_clear(priority=TEST_PRIORITY)
 
 
 async def test_light_async_turn_off(hass: HomeAssistant) -> None:
@@ -670,7 +516,7 @@ async def test_light_async_turn_off(hass: HomeAssistant) -> None:
     client = create_mock_client()
     await setup_test_config_entry(hass, hyperion_client=client)
 
-    client.async_send_set_component = AsyncMock(return_value=True)
+    client.async_send_clear = AsyncMock(return_value=True)
     await hass.services.async_call(
         LIGHT_DOMAIN,
         SERVICE_TURN_OFF,
@@ -678,40 +524,18 @@ async def test_light_async_turn_off(hass: HomeAssistant) -> None:
         blocking=True,
     )
 
-    assert client.async_send_set_component.call_args == call(
-        **{
-            const.KEY_COMPONENTSTATE: {
-                const.KEY_COMPONENT: const.KEY_COMPONENTID_LEDDEVICE,
-                const.KEY_STATE: False,
-            }
-        }
+    assert client.async_send_clear.called
+    assert client.async_send_clear.call_args == call(
+        **{const.KEY_PRIORITY: TEST_PRIORITY}
     )
 
-    call_registered_callback(client, "components-update")
-    entity_state = hass.states.get(TEST_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.attributes["icon"] == hyperion_light.ICON_LIGHTBULB
-
-    # No calls if no state loaded.
-    client.has_loaded_state = False
-    client.async_send_set_component = AsyncMock(return_value=True)
-    call_registered_callback(client, "client-update", {"loaded-state": False})
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: TEST_ENTITY_ID_1},
-        blocking=True,
-    )
-
-    assert not client.async_send_set_component.called
-
 
 async def test_light_async_updates_from_hyperion_client(
     hass: HomeAssistant,
 ) -> None:
     """Test receiving a variety of Hyperion client callbacks."""
     client = create_mock_client()
+    client.priorities = [{const.KEY_PRIORITY: TEST_PRIORITY}]
     await setup_test_config_entry(hass, hyperion_client=client)
 
     # Bright change gets accepted.
@@ -720,6 +544,7 @@ async def test_light_async_updates_from_hyperion_client(
     call_registered_callback(client, "adjustment-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
     assert entity_state
+    assert entity_state.state == "on"
     assert entity_state.attributes["brightness"] == round(255 * (brightness / 100.0))
 
     # Broken brightness value is ignored.
@@ -728,40 +553,18 @@ async def test_light_async_updates_from_hyperion_client(
     call_registered_callback(client, "adjustment-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
     assert entity_state
-    assert entity_state.attributes["brightness"] == round(255 * (brightness / 100.0))
-
-    # Update components.
-    client.is_on.return_value = True
-    call_registered_callback(client, "components-update")
-    entity_state = hass.states.get(TEST_ENTITY_ID_1)
-    assert entity_state
     assert entity_state.state == "on"
-
-    client.is_on.return_value = False
-    call_registered_callback(client, "components-update")
-    entity_state = hass.states.get(TEST_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # Update priorities (V4L)
-    client.is_on.return_value = True
-    client.visible_priority = {const.KEY_COMPONENTID: const.KEY_COMPONENTID_V4L}
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.attributes["icon"] == hyperion_light.ICON_EXTERNAL_SOURCE
-    assert entity_state.attributes["hs_color"] == (0.0, 0.0)
-    assert (
-        entity_state.attributes["effect"]
-        == const.KEY_COMPONENTID_TO_NAME[const.KEY_COMPONENTID_V4L]
-    )
+    assert entity_state.attributes["brightness"] == round(255 * (brightness / 100.0))
 
     # Update priorities (Effect)
     effect = "foo"
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_EFFECT,
-        const.KEY_OWNER: effect,
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_EFFECT,
+            const.KEY_OWNER: effect,
+        }
+    ]
 
     call_registered_callback(client, "priorities-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
@@ -772,10 +575,13 @@ async def test_light_async_updates_from_hyperion_client(
 
     # Update priorities (Color)
     rgb = (0, 100, 100)
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-        const.KEY_VALUE: {const.KEY_RGB: rgb},
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
+            const.KEY_VALUE: {const.KEY_RGB: rgb},
+        }
+    ]
 
     call_registered_callback(client, "priorities-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
@@ -785,7 +591,7 @@ async def test_light_async_updates_from_hyperion_client(
     assert entity_state.attributes["hs_color"] == (180.0, 100.0)
 
     # Update priorities (None)
-    client.visible_priority = None
+    client.priorities = []
 
     call_registered_callback(client, "priorities-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
@@ -800,12 +606,7 @@ async def test_light_async_updates_from_hyperion_client(
     assert entity_state
     assert entity_state.attributes["effect_list"] == [
         hyperion_light.KEY_EFFECT_SOLID
-    ] + [
-        const.KEY_COMPONENTID_TO_NAME[component]
-        for component in const.KEY_COMPONENTID_EXTERNAL_SOURCES
-    ] + [
-        effect[const.KEY_NAME] for effect in effects
-    ]
+    ] + [effect[const.KEY_NAME] for effect in effects]
 
     # Update connection status (e.g. disconnection).
 
@@ -818,10 +619,13 @@ async def test_light_async_updates_from_hyperion_client(
 
     # Update connection status (e.g. re-connection)
     client.has_loaded_state = True
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-        const.KEY_VALUE: {const.KEY_RGB: rgb},
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
+            const.KEY_VALUE: {const.KEY_RGB: rgb},
+        }
+    ]
     call_registered_callback(client, "client-update", {"loaded-state": True})
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
     assert entity_state
@@ -835,10 +639,13 @@ async def test_full_state_loaded_on_start(hass: HomeAssistant) -> None:
     # Update full state (should call all update methods).
     brightness = 25
     client.adjustment = [{const.KEY_BRIGHTNESS: brightness}]
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-        const.KEY_VALUE: {const.KEY_RGB: (0, 100, 100)},
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
+            const.KEY_VALUE: {const.KEY_RGB: (0, 100, 100)},
+        }
+    ]
     client.effects = [{const.KEY_NAME: "One"}, {const.KEY_NAME: "Two"}]
 
     await setup_test_config_entry(hass, hyperion_client=client)
@@ -940,358 +747,6 @@ async def test_setup_entry_bad_token_reauth(hass: HomeAssistant) -> None:
         assert config_entry.state is ConfigEntryState.SETUP_ERROR
 
 
-async def test_priority_light_async_updates(
-    hass: HomeAssistant,
-) -> None:
-    """Test receiving a variety of Hyperion client callbacks to a HyperionPriorityLight."""
-    priority_template = {
-        const.KEY_ACTIVE: True,
-        const.KEY_VISIBLE: True,
-        const.KEY_PRIORITY: TEST_PRIORITY,
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-        const.KEY_VALUE: {const.KEY_RGB: (100, 100, 100)},
-    }
-
-    client = create_mock_client()
-    client.priorities = [{**priority_template}]
-
-    register_test_entity(
-        hass,
-        LIGHT_DOMAIN,
-        TYPE_HYPERION_PRIORITY_LIGHT,
-        TEST_PRIORITY_LIGHT_ENTITY_ID_1,
-    )
-    await setup_test_config_entry(hass, hyperion_client=client)
-
-    # == Scenario: Color at HA priority will show light as on.
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "on"
-    assert entity_state.attributes["hs_color"] == (0.0, 0.0)
-
-    # == Scenario: Color going to black shows the light as off.
-    client.priorities = [
-        {
-            **priority_template,
-            const.KEY_VALUE: {const.KEY_RGB: COLOR_BLACK},
-        }
-    ]
-    client.visible_priority = client.priorities[0]
-
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # == Scenario: Lower priority than HA priority should have no impact on what HA
-    # shows when the HA priority is present.
-    client.priorities = [
-        {**priority_template, const.KEY_PRIORITY: TEST_PRIORITY - 1},
-        {
-            **priority_template,
-            const.KEY_VALUE: {const.KEY_RGB: COLOR_BLACK},
-        },
-    ]
-    client.visible_priority = client.priorities[0]
-
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # == Scenario: Fresh color at HA priority should turn HA entity on (even though
-    # there's a lower priority enabled/visible in Hyperion).
-    client.priorities = [
-        {**priority_template, const.KEY_PRIORITY: TEST_PRIORITY - 1},
-        {
-            **priority_template,
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_VALUE: {const.KEY_RGB: (100, 100, 150)},
-        },
-    ]
-    client.visible_priority = client.priorities[0]
-
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "on"
-    assert entity_state.attributes["hs_color"] == (240.0, 33.333)
-
-    # == Scenario: V4L at a higher priority, with no other HA priority at all, should
-    # have no effect.
-
-    # Emulate HA turning the light off with black at the HA priority.
-    client.priorities = []
-    client.visible_priority = None
-
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # Emulate V4L turning on.
-    client.priorities = [
-        {
-            **priority_template,
-            const.KEY_PRIORITY: 240,
-            const.KEY_COMPONENTID: const.KEY_COMPONENTID_V4L,
-            const.KEY_VALUE: {const.KEY_RGB: (100, 100, 150)},
-        },
-    ]
-    client.visible_priority = client.priorities[0]
-
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # == Scenario: A lower priority input (lower priority than HA) should have no effect.
-
-    client.priorities = [
-        {
-            **priority_template,
-            const.KEY_VISIBLE: True,
-            const.KEY_PRIORITY: TEST_PRIORITY - 1,
-            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-            const.KEY_VALUE: {const.KEY_RGB: (255, 0, 0)},
-        },
-        {
-            **priority_template,
-            const.KEY_PRIORITY: 240,
-            const.KEY_COMPONENTID: const.KEY_COMPONENTID_V4L,
-            const.KEY_VALUE: {const.KEY_RGB: (100, 100, 150)},
-            const.KEY_VISIBLE: False,
-        },
-    ]
-
-    client.visible_priority = client.priorities[0]
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # == Scenario: A non-active priority is ignored.
-    client.priorities = [
-        {
-            const.KEY_ACTIVE: False,
-            const.KEY_VISIBLE: False,
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-            const.KEY_VALUE: {const.KEY_RGB: (100, 100, 100)},
-        }
-    ]
-    client.visible_priority = None
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # == Scenario: A priority with no ... priority ... is ignored.
-    client.priorities = [
-        {
-            const.KEY_ACTIVE: True,
-            const.KEY_VISIBLE: True,
-            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-            const.KEY_VALUE: {const.KEY_RGB: (100, 100, 100)},
-        }
-    ]
-    client.visible_priority = None
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-
-async def test_priority_light_async_updates_off_sets_black(
-    hass: HomeAssistant,
-) -> None:
-    """Test turning the HyperionPriorityLight off."""
-    client = create_mock_client()
-    client.priorities = [
-        {
-            const.KEY_ACTIVE: True,
-            const.KEY_VISIBLE: True,
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-            const.KEY_VALUE: {const.KEY_RGB: (100, 100, 100)},
-        }
-    ]
-
-    register_test_entity(
-        hass,
-        LIGHT_DOMAIN,
-        TYPE_HYPERION_PRIORITY_LIGHT,
-        TEST_PRIORITY_LIGHT_ENTITY_ID_1,
-    )
-    await setup_test_config_entry(hass, hyperion_client=client)
-
-    client.async_send_clear = AsyncMock(return_value=True)
-    client.async_send_set_color = AsyncMock(return_value=True)
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: TEST_PRIORITY_LIGHT_ENTITY_ID_1},
-        blocking=True,
-    )
-
-    assert client.async_send_clear.call_args == call(
-        **{
-            const.KEY_PRIORITY: TEST_PRIORITY,
-        }
-    )
-
-    assert client.async_send_set_color.call_args == call(
-        **{
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_COLOR: COLOR_BLACK,
-            const.KEY_ORIGIN: DEFAULT_ORIGIN,
-        }
-    )
-
-
-async def test_priority_light_prior_color_preserved_after_black(
-    hass: HomeAssistant,
-) -> None:
-    """Test that color is preserved in an on->off->on cycle for a HyperionPriorityLight.
-
-    For a HyperionPriorityLight the color black is used to indicate off. This test
-    ensures that a cycle through 'off' will preserve the original color.
-    """
-    priority_template = {
-        const.KEY_ACTIVE: True,
-        const.KEY_VISIBLE: True,
-        const.KEY_PRIORITY: TEST_PRIORITY,
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-    }
-
-    client = create_mock_client()
-    client.async_send_set_color = AsyncMock(return_value=True)
-    client.async_send_clear = AsyncMock(return_value=True)
-    client.priorities = []
-    client.visible_priority = None
-
-    register_test_entity(
-        hass,
-        LIGHT_DOMAIN,
-        TYPE_HYPERION_PRIORITY_LIGHT,
-        TEST_PRIORITY_LIGHT_ENTITY_ID_1,
-    )
-    await setup_test_config_entry(hass, hyperion_client=client)
-
-    # Turn the light on full green...
-    # On (=), 100% (=), solid (=), [0,0,255] (=)
-    hs_color = (240.0, 100.0)
-    rgb_color = (0, 0, 255)
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: TEST_PRIORITY_LIGHT_ENTITY_ID_1, ATTR_HS_COLOR: hs_color},
-        blocking=True,
-    )
-
-    assert client.async_send_set_color.call_args == call(
-        **{
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_COLOR: rgb_color,
-            const.KEY_ORIGIN: DEFAULT_ORIGIN,
-        }
-    )
-
-    client.priorities = [
-        {
-            **priority_template,
-            const.KEY_VALUE: {const.KEY_RGB: rgb_color},
-        }
-    ]
-    client.visible_priority = client.priorities[0]
-    call_registered_callback(client, "priorities-update")
-
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "on"
-    assert entity_state.attributes["hs_color"] == hs_color
-
-    # Then turn it off.
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: TEST_PRIORITY_LIGHT_ENTITY_ID_1},
-        blocking=True,
-    )
-
-    assert client.async_send_set_color.call_args == call(
-        **{
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_COLOR: COLOR_BLACK,
-            const.KEY_ORIGIN: DEFAULT_ORIGIN,
-        }
-    )
-
-    client.priorities = [
-        {
-            **priority_template,
-            const.KEY_VALUE: {const.KEY_RGB: COLOR_BLACK},
-        }
-    ]
-    client.visible_priority = client.priorities[0]
-    call_registered_callback(client, "priorities-update")
-
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # Then turn it back on and ensure it's still green.
-    # On (=), 100% (=), solid (=), [0,0,255] (=)
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: TEST_PRIORITY_LIGHT_ENTITY_ID_1},
-        blocking=True,
-    )
-
-    assert client.async_send_set_color.call_args == call(
-        **{
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_COLOR: rgb_color,
-            const.KEY_ORIGIN: DEFAULT_ORIGIN,
-        }
-    )
-
-    client.priorities = [
-        {
-            **priority_template,
-            const.KEY_VALUE: {const.KEY_RGB: rgb_color},
-        }
-    ]
-    client.visible_priority = client.priorities[0]
-    call_registered_callback(client, "priorities-update")
-
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "on"
-    assert entity_state.attributes["hs_color"] == hs_color
-
-
-async def test_priority_light_has_no_external_sources(hass: HomeAssistant) -> None:
-    """Ensure a HyperionPriorityLight does not list external sources."""
-    client = create_mock_client()
-    client.priorities = []
-
-    register_test_entity(
-        hass,
-        LIGHT_DOMAIN,
-        TYPE_HYPERION_PRIORITY_LIGHT,
-        TEST_PRIORITY_LIGHT_ENTITY_ID_1,
-    )
-    await setup_test_config_entry(hass, hyperion_client=client)
-
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.attributes["effect_list"] == [hyperion_light.KEY_EFFECT_SOLID]
-
-
 async def test_light_option_effect_hide_list(hass: HomeAssistant) -> None:
     """Test the effect_hide_list option."""
     client = create_mock_client()
@@ -1300,15 +755,13 @@ async def test_light_option_effect_hide_list(hass: HomeAssistant) -> None:
     await setup_test_config_entry(
         hass,
         hyperion_client=client,
-        options={CONF_EFFECT_HIDE_LIST: ["Two", "USB Capture"]},
+        options={CONF_EFFECT_HIDE_LIST: ["Two", "Three"]},
     )
 
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
     assert entity_state
     assert entity_state.attributes["effect_list"] == [
         "Solid",
-        "Boblight Server",
-        "Platform Capture",
         "One",
     ]
 
@@ -1317,12 +770,6 @@ async def test_device_info(hass: HomeAssistant) -> None:
     """Verify device information includes expected details."""
     client = create_mock_client()
 
-    register_test_entity(
-        hass,
-        LIGHT_DOMAIN,
-        TYPE_HYPERION_PRIORITY_LIGHT,
-        TEST_PRIORITY_LIGHT_ENTITY_ID_1,
-    )
     await setup_test_config_entry(hass, hyperion_client=client)
 
     device_id = get_hyperion_device_id(TEST_SYSINFO_ID, TEST_INSTANCE)
@@ -1341,82 +788,4 @@ async def test_device_info(hass: HomeAssistant) -> None:
         entry.entity_id
         for entry in er.async_entries_for_device(entity_registry, device.id)
     ]
-    assert TEST_PRIORITY_LIGHT_ENTITY_ID_1 in entities_from_device
     assert TEST_ENTITY_ID_1 in entities_from_device
-
-
-async def test_lights_can_be_enabled(hass: HomeAssistant) -> None:
-    """Verify lights can be enabled."""
-    client = create_mock_client()
-    await setup_test_config_entry(hass, hyperion_client=client)
-
-    entity_registry = er.async_get(hass)
-    entry = entity_registry.async_get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entry
-    assert entry.disabled
-    assert entry.disabled_by is er.RegistryEntryDisabler.INTEGRATION
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert not entity_state
-
-    with patch(
-        "homeassistant.components.hyperion.client.HyperionClient",
-        return_value=client,
-    ):
-        updated_entry = entity_registry.async_update_entity(
-            TEST_PRIORITY_LIGHT_ENTITY_ID_1, disabled_by=None
-        )
-        assert not updated_entry.disabled
-        await hass.async_block_till_done()
-
-        async_fire_time_changed(
-            hass,
-            dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
-        )
-        await hass.async_block_till_done()
-
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-
-
-async def test_deprecated_effect_names(
-    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
-) -> None:
-    """Test deprecated effects function and issue a warning."""
-    client = create_mock_client()
-    client.async_send_clear = AsyncMock(return_value=True)
-    client.async_send_set_component = AsyncMock(return_value=True)
-
-    await setup_test_config_entry(hass, hyperion_client=client)
-
-    for component in const.KEY_COMPONENTID_EXTERNAL_SOURCES:
-        await hass.services.async_call(
-            LIGHT_DOMAIN,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: TEST_ENTITY_ID_1, ATTR_EFFECT: component},
-            blocking=True,
-        )
-        assert f"Use of Hyperion effect '{component}' is deprecated" in caplog.text
-
-        # Simulate a state callback from Hyperion.
-        client.visible_priority = {
-            const.KEY_COMPONENTID: component,
-        }
-        call_registered_callback(client, "priorities-update")
-
-        entity_state = hass.states.get(TEST_ENTITY_ID_1)
-        assert entity_state
-        assert (
-            entity_state.attributes["effect"]
-            == const.KEY_COMPONENTID_TO_NAME[component]
-        )
-
-
-async def test_deprecated_effect_names_not_in_effect_list(
-    hass: HomeAssistant,
-) -> None:
-    """Test deprecated effects are not in shown effect list."""
-    await setup_test_config_entry(hass)
-    entity_state = hass.states.get(TEST_ENTITY_ID_1)
-    assert entity_state
-    for component in const.KEY_COMPONENTID_EXTERNAL_SOURCES:
-        assert component not in entity_state.attributes["effect_list"]
diff --git a/tests/components/ibeacon/test_sensor.py b/tests/components/ibeacon/test_sensor.py
index fbe8d4b5236..30a50305d2d 100644
--- a/tests/components/ibeacon/test_sensor.py
+++ b/tests/components/ibeacon/test_sensor.py
@@ -56,7 +56,7 @@ async def test_sensors_updates_fixed_mac_address(hass: HomeAssistant) -> None:
     assert distance_sensor.state == "2"
     assert (
         distance_attributes[ATTR_FRIENDLY_NAME]
-        == "BlueCharm_177999 8105 Estimated Distance"
+        == "BlueCharm_177999 8105 Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
@@ -70,7 +70,7 @@ async def test_sensors_updates_fixed_mac_address(hass: HomeAssistant) -> None:
     assert distance_sensor.state == "0"
     assert (
         distance_attributes[ATTR_FRIENDLY_NAME]
-        == "BlueCharm_177999 8105 Estimated Distance"
+        == "BlueCharm_177999 8105 Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
@@ -97,7 +97,7 @@ async def test_sensors_updates_fixed_mac_address(hass: HomeAssistant) -> None:
     assert distance_sensor.state == "14"
     assert (
         distance_attributes[ATTR_FRIENDLY_NAME]
-        == "BlueCharm_177999 8105 Estimated Distance"
+        == "BlueCharm_177999 8105 Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
@@ -204,7 +204,7 @@ async def test_multiple_uuids_same_beacon(hass: HomeAssistant) -> None:
     distance_attributes = distance_sensor.attributes
     assert distance_sensor.state == "400"
     assert (
-        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated Distance"
+        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
@@ -217,7 +217,7 @@ async def test_multiple_uuids_same_beacon(hass: HomeAssistant) -> None:
     distance_attributes = distance_sensor.attributes
     assert distance_sensor.state == "0"
     assert (
-        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated Distance"
+        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
@@ -230,7 +230,7 @@ async def test_multiple_uuids_same_beacon(hass: HomeAssistant) -> None:
     distance_attributes = distance_sensor.attributes
     assert distance_sensor.state == "400"
     assert (
-        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated Distance"
+        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
@@ -239,7 +239,7 @@ async def test_multiple_uuids_same_beacon(hass: HomeAssistant) -> None:
     distance_attributes = distance_sensor.attributes
     assert distance_sensor.state == "0"
     assert (
-        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated Distance"
+        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
diff --git a/tests/components/image/__init__.py b/tests/components/image/__init__.py
new file mode 100644
index 00000000000..eacf56cc206
--- /dev/null
+++ b/tests/components/image/__init__.py
@@ -0,0 +1 @@
+"""The tests for the image integration."""
diff --git a/tests/components/image/conftest.py b/tests/components/image/conftest.py
new file mode 100644
index 00000000000..6c9deea852f
--- /dev/null
+++ b/tests/components/image/conftest.py
@@ -0,0 +1,190 @@
+"""Test helpers for image."""
+from collections.abc import Generator
+
+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.typing import ConfigType, DiscoveryInfoType
+from homeassistant.setup import async_setup_component
+from homeassistant.util import dt as dt_util
+
+from tests.common import (
+    MockConfigEntry,
+    MockModule,
+    mock_config_flow,
+    mock_integration,
+    mock_platform,
+)
+
+TEST_DOMAIN = "test"
+
+
+class MockImageEntity(image.ImageEntity):
+    """Mock image entity."""
+
+    _attr_name = "Test"
+
+    async def async_added_to_hass(self):
+        """Set the update time."""
+        self._attr_image_last_updated = dt_util.utcnow()
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+        return b"Test"
+
+
+class MockImageEntityInvalidContentType(image.ImageEntity):
+    """Mock image entity."""
+
+    _attr_name = "Test"
+
+    async def async_added_to_hass(self):
+        """Set the update time and assign and incorrect content type."""
+        self._attr_content_type = "text/json"
+        self._attr_image_last_updated = dt_util.utcnow()
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+        return b"Test"
+
+
+class MockURLImageEntity(image.ImageEntity):
+    """Mock image entity."""
+
+    _attr_image_url = "https://example.com/myimage.jpg"
+    _attr_name = "Test"
+
+    async def async_added_to_hass(self):
+        """Set the update time."""
+        self._attr_image_last_updated = dt_util.utcnow()
+
+
+class MockImageNoStateEntity(image.ImageEntity):
+    """Mock image entity."""
+
+    _attr_name = "Test"
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+        return b"Test"
+
+
+class MockImageSyncEntity(image.ImageEntity):
+    """Mock image entity."""
+
+    _attr_name = "Test"
+
+    async def async_added_to_hass(self):
+        """Set the update time."""
+        self._attr_image_last_updated = dt_util.utcnow()
+
+    def image(self) -> bytes | None:
+        """Return bytes of image."""
+        return b"Test"
+
+
+class MockImageConfigEntry:
+    """A mock image config entry."""
+
+    def __init__(self, entities: list[image.ImageEntity]) -> None:
+        """Initialize."""
+        self._entities = entities
+
+    async def async_setup_entry(
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        async_add_entities: AddEntitiesCallback,
+    ) -> None:
+        """Set up test image platform via config entry."""
+        async_add_entities([self._entities])
+
+
+class MockImagePlatform:
+    """A mock image platform."""
+
+    PLATFORM_SCHEMA = image.PLATFORM_SCHEMA
+
+    def __init__(self, entities: list[image.ImageEntity]) -> None:
+        """Initialize."""
+        self._entities = entities
+
+    async def async_setup_platform(
+        self,
+        hass: HomeAssistant,
+        config: ConfigType,
+        async_add_entities: AddEntitiesCallback,
+        discovery_info: DiscoveryInfoType | None = None,
+    ) -> None:
+        """Set up the mock image platform."""
+        async_add_entities(self._entities)
+
+
+@pytest.fixture(name="config_flow")
+def config_flow_fixture(hass: HomeAssistant) -> Generator[None, None, None]:
+    """Mock config flow."""
+
+    class MockFlow(ConfigFlow):
+        """Test flow."""
+
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+
+    with mock_config_flow(TEST_DOMAIN, MockFlow):
+        yield
+
+
+@pytest.fixture(name="mock_image_config_entry")
+async def mock_image_config_entry_fixture(
+    hass: HomeAssistant, config_flow: None
+) -> ConfigEntry:
+    """Initialize a mock image config_entry."""
+
+    async def async_setup_entry_init(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> bool:
+        """Set up test config entry."""
+        await hass.config_entries.async_forward_entry_setup(config_entry, image.DOMAIN)
+        return True
+
+    async def async_unload_entry_init(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> bool:
+        """Unload test config entry."""
+        await hass.config_entries.async_forward_entry_unload(config_entry, image.DOMAIN)
+        return True
+
+    mock_integration(
+        hass,
+        MockModule(
+            TEST_DOMAIN,
+            async_setup_entry=async_setup_entry_init,
+            async_unload_entry=async_unload_entry_init,
+        ),
+    )
+
+    mock_platform(
+        hass,
+        f"{TEST_DOMAIN}.{image.DOMAIN}",
+        MockImageConfigEntry(MockImageEntity(hass)),
+    )
+
+    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
+
+
+@pytest.fixture(name="mock_image_platform")
+async def mock_image_platform_fixture(hass: HomeAssistant) -> None:
+    """Initialize a mock image platform."""
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(hass, "test.image", MockImagePlatform([MockImageEntity(hass)]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
diff --git a/tests/components/image/test_init.py b/tests/components/image/test_init.py
new file mode 100644
index 00000000000..0950d6f42e5
--- /dev/null
+++ b/tests/components/image/test_init.py
@@ -0,0 +1,289 @@
+"""The tests for the image component."""
+from http import HTTPStatus
+import ssl
+from unittest.mock import MagicMock, patch
+
+from aiohttp import hdrs
+import httpx
+import pytest
+import respx
+
+from homeassistant.components import image
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from .conftest import (
+    MockImageEntity,
+    MockImageEntityInvalidContentType,
+    MockImageNoStateEntity,
+    MockImagePlatform,
+    MockImageSyncEntity,
+    MockURLImageEntity,
+)
+
+from tests.common import MockModule, mock_integration, mock_platform
+from tests.typing import ClientSessionGenerator
+
+
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_state(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, mock_image_platform: None
+) -> None:
+    """Test image state."""
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_config_entry(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_image_config_entry: ConfigEntry,
+) -> None:
+    """Test setting up an image platform from a config entry."""
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_state_attr(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test image state with entity picture from attr."""
+    mock_integration(hass, MockModule(domain="test"))
+    entity = MockImageEntity(hass)
+    entity._attr_entity_picture = "abcd"
+    mock_platform(hass, "test.image", MockImagePlatform([entity]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": "abcd",
+        "friendly_name": "Test",
+    }
+
+
+async def test_no_state(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test image state."""
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(hass, "test.image", MockImagePlatform([MockImageNoStateEntity(hass)]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("image.test")
+    assert state.state == "unknown"
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+
+async def test_no_valid_content_type(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test invalid content type."""
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(
+        hass, "test.image", MockImagePlatform([MockImageEntityInvalidContentType(hass)])
+    )
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    state = hass.states.get("image.test")
+    # assert state.state == "unknown"
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+    resp = await client.get(f"/api/image_proxy/image.test?token={access_token}")
+    assert resp.status == HTTPStatus.INTERNAL_SERVER_ERROR
+
+
+async def test_fetch_image_authenticated(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, mock_image_platform: None
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    client = await hass_client()
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == b"Test"
+
+    resp = await client.get("/api/image_proxy/image.unknown")
+    assert resp.status == HTTPStatus.NOT_FOUND
+
+
+async def test_fetch_image_fail(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, mock_image_platform: None
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    client = await hass_client()
+
+    with patch.object(MockImageEntity, "async_image", side_effect=TimeoutError):
+        resp = await client.get("/api/image_proxy/image.test")
+        assert resp.status == HTTPStatus.INTERNAL_SERVER_ERROR
+
+
+async def test_fetch_image_sync(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(hass, "test.image", MockImagePlatform([MockImageSyncEntity(hass)]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == b"Test"
+
+
+async def test_fetch_image_unauthenticated(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mock_image_platform: None,
+) -> None:
+    """Test fetching an image with an unauthenticated client."""
+    client = await hass_client_no_auth()
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.FORBIDDEN
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.FORBIDDEN
+
+    resp = await client.get(
+        "/api/image_proxy/image.test", headers={hdrs.AUTHORIZATION: "blabla"}
+    )
+    assert resp.status == HTTPStatus.UNAUTHORIZED
+
+    state = hass.states.get("image.test")
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == b"Test"
+
+    resp = await client.get("/api/image_proxy/image.unknown")
+    assert resp.status == HTTPStatus.NOT_FOUND
+
+
+@respx.mock
+async def test_fetch_image_url_success(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    respx.get("https://example.com/myimage.jpg").respond(
+        status_code=HTTPStatus.OK, content_type="image/png", content=b"Test"
+    )
+
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(hass, "test.image", MockImagePlatform([MockURLImageEntity(hass)]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == b"Test"
+
+
+@respx.mock
+@pytest.mark.parametrize(
+    "side_effect",
+    [
+        httpx.RequestError("server offline", request=MagicMock()),
+        httpx.TimeoutException,
+        ssl.SSLError,
+    ],
+)
+async def test_fetch_image_url_exception(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    side_effect: Exception,
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    respx.get("https://example.com/myimage.jpg").mock(side_effect=side_effect)
+
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(hass, "test.image", MockImagePlatform([MockURLImageEntity(hass)]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.INTERNAL_SERVER_ERROR
+
+
+@respx.mock
+@pytest.mark.parametrize(
+    "content_type",
+    [
+        None,
+        "text/plain",
+    ],
+)
+async def test_fetch_image_url_wrong_content_type(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    content_type: str | None,
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    respx.get("https://example.com/myimage.jpg").respond(
+        status_code=HTTPStatus.OK, content_type=content_type, content=b"Test"
+    )
+
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(hass, "test.image", MockImagePlatform([MockURLImageEntity(hass)]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.INTERNAL_SERVER_ERROR
diff --git a/tests/components/image/test_recorder.py b/tests/components/image/test_recorder.py
new file mode 100644
index 00000000000..f0ecc43e6dc
--- /dev/null
+++ b/tests/components/image/test_recorder.py
@@ -0,0 +1,40 @@
+"""The tests for image recorder."""
+from __future__ import annotations
+
+from datetime import timedelta
+
+from homeassistant.components.recorder import Recorder
+from homeassistant.components.recorder.history import get_significant_states
+from homeassistant.const import (
+    ATTR_ATTRIBUTION,
+    ATTR_ENTITY_PICTURE,
+    ATTR_FRIENDLY_NAME,
+    ATTR_SUPPORTED_FEATURES,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.util import dt as dt_util
+
+from tests.common import async_fire_time_changed
+from tests.components.recorder.common import async_wait_recording_done
+
+
+async def test_exclude_attributes(
+    recorder_mock: Recorder, hass: HomeAssistant, mock_image_platform
+) -> None:
+    """Test camera registered attributes to be excluded."""
+    now = dt_util.utcnow()
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5))
+    await hass.async_block_till_done()
+    await async_wait_recording_done(hass)
+
+    states = await hass.async_add_executor_job(
+        get_significant_states, hass, now, None, hass.states.async_entity_ids()
+    )
+    assert len(states) == 1
+    for entity_states in states.values():
+        for state in entity_states:
+            assert "access_token" not in state.attributes
+            assert ATTR_ENTITY_PICTURE not in state.attributes
+            assert ATTR_ATTRIBUTION not in state.attributes
+            assert ATTR_SUPPORTED_FEATURES not in state.attributes
+            assert ATTR_FRIENDLY_NAME in state.attributes
diff --git a/tests/components/imap/const.py b/tests/components/imap/const.py
index 5dcce782a41..e7fca106ff7 100644
--- a/tests/components/imap/const.py
+++ b/tests/components/imap/const.py
@@ -41,7 +41,7 @@ TEST_INVALID_DATE3 = (
     TEST_MESSAGE_HEADERS1 + DATE_HEADER_INVALID3 + TEST_MESSAGE_HEADERS2
 )
 
-TEST_CONTENT_TEXT_BARE = b"\r\n" b"Test body\r\n" b"\r\n"
+TEST_CONTENT_TEXT_BARE = b"\r\nTest body\r\n\r\n"
 
 TEST_CONTENT_BINARY = (
     b"Content-Type: application/binary\r\n"
diff --git a/tests/components/imap/test_init.py b/tests/components/imap/test_init.py
index 2b7514cd3ea..ff949423614 100644
--- a/tests/components/imap/test_init.py
+++ b/tests/components/imap/test_init.py
@@ -9,6 +9,7 @@ import pytest
 
 from homeassistant.components.imap import DOMAIN
 from homeassistant.components.imap.errors import InvalidAuth, InvalidFolder
+from homeassistant.components.sensor.const import SensorStateClass
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.util.dt import utcnow
@@ -135,6 +136,7 @@ async def test_receiving_message_successfully(
     # we should have received one message
     assert state is not None
     assert state.state == "1"
+    assert state.attributes["state_class"] == SensorStateClass.MEASUREMENT
 
     # we should have received one event
     assert len(event_called) == 1
diff --git a/tests/components/insteon/const.py b/tests/components/insteon/const.py
index eb25f2ed43e..e731c51d6c6 100644
--- a/tests/components/insteon/const.py
+++ b/tests/components/insteon/const.py
@@ -3,11 +3,8 @@ from homeassistant.components.insteon.const import (
     CONF_CAT,
     CONF_DIM_STEPS,
     CONF_HOUSECODE,
-    CONF_HUB_VERSION,
-    CONF_OVERRIDE,
     CONF_SUBCAT,
     CONF_UNITCODE,
-    CONF_X10,
     X10_PLATFORMS,
 )
 from homeassistant.const import (
@@ -73,28 +70,6 @@ MOCK_X10_CONFIG_2 = {
     CONF_DIM_STEPS: MOCK_X10_STEPS,
 }
 
-MOCK_IMPORT_CONFIG_PLM = {CONF_PORT: MOCK_DEVICE}
-
-MOCK_IMPORT_MINIMUM_HUB_V2 = {
-    CONF_HOST: MOCK_HOSTNAME,
-    CONF_USERNAME: MOCK_USERNAME,
-    CONF_PASSWORD: MOCK_PASSWORD,
-}
-MOCK_IMPORT_MINIMUM_HUB_V1 = {CONF_HOST: MOCK_HOSTNAME, CONF_HUB_VERSION: 1}
-MOCK_IMPORT_FULL_CONFIG_PLM = MOCK_IMPORT_CONFIG_PLM.copy()
-MOCK_IMPORT_FULL_CONFIG_PLM[CONF_OVERRIDE] = [MOCK_DEVICE_OVERRIDE_CONFIG]
-MOCK_IMPORT_FULL_CONFIG_PLM[CONF_X10] = [MOCK_X10_CONFIG_1, MOCK_X10_CONFIG_2]
-
-MOCK_IMPORT_FULL_CONFIG_HUB_V2 = MOCK_USER_INPUT_HUB_V2.copy()
-MOCK_IMPORT_FULL_CONFIG_HUB_V2[CONF_HUB_VERSION] = 2
-MOCK_IMPORT_FULL_CONFIG_HUB_V2[CONF_OVERRIDE] = [MOCK_DEVICE_OVERRIDE_CONFIG]
-MOCK_IMPORT_FULL_CONFIG_HUB_V2[CONF_X10] = [MOCK_X10_CONFIG_1, MOCK_X10_CONFIG_2]
-
-MOCK_IMPORT_FULL_CONFIG_HUB_V1 = MOCK_USER_INPUT_HUB_V1.copy()
-MOCK_IMPORT_FULL_CONFIG_HUB_V1[CONF_HUB_VERSION] = 1
-MOCK_IMPORT_FULL_CONFIG_HUB_V1[CONF_OVERRIDE] = [MOCK_DEVICE_OVERRIDE_CONFIG]
-MOCK_IMPORT_FULL_CONFIG_HUB_V1[CONF_X10] = [MOCK_X10_CONFIG_1, MOCK_X10_CONFIG_2]
-
 PATCH_CONNECTION = "homeassistant.components.insteon.config_flow.async_connect"
 PATCH_CONNECTION_CLOSE = "homeassistant.components.insteon.config_flow.async_close"
 PATCH_DEVICES = "homeassistant.components.insteon.config_flow.devices"
diff --git a/tests/components/insteon/test_config_flow.py b/tests/components/insteon/test_config_flow.py
index 70bb8fb37e2..e15b7b2a287 100644
--- a/tests/components/insteon/test_config_flow.py
+++ b/tests/components/insteon/test_config_flow.py
@@ -42,15 +42,9 @@ from homeassistant.core import HomeAssistant
 
 from .const import (
     MOCK_DEVICE,
-    MOCK_HOSTNAME,
-    MOCK_IMPORT_CONFIG_PLM,
-    MOCK_IMPORT_MINIMUM_HUB_V1,
-    MOCK_IMPORT_MINIMUM_HUB_V2,
-    MOCK_PASSWORD,
     MOCK_USER_INPUT_HUB_V1,
     MOCK_USER_INPUT_HUB_V2,
     MOCK_USER_INPUT_PLM,
-    MOCK_USERNAME,
     PATCH_ASYNC_SETUP,
     PATCH_ASYNC_SETUP_ENTRY,
     PATCH_CONNECTION,
@@ -243,30 +237,6 @@ async def test_failed_connection_hub(hass: HomeAssistant) -> None:
     assert result2["errors"] == {"base": "cannot_connect"}
 
 
-async def _import_config(hass, config):
-    """Run the import step."""
-    with patch(
-        PATCH_CONNECTION,
-        new=mock_successful_connection,
-    ), patch(
-        PATCH_ASYNC_SETUP, return_value=True
-    ), patch(PATCH_ASYNC_SETUP_ENTRY, return_value=True):
-        return await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=config
-        )
-
-
-async def test_import_plm(hass: HomeAssistant) -> None:
-    """Test importing a minimum PLM config from yaml."""
-
-    result = await _import_config(hass, MOCK_IMPORT_CONFIG_PLM)
-
-    assert result["type"] == "create_entry"
-    assert hass.config_entries.async_entries(DOMAIN)
-    for entry in hass.config_entries.async_entries(DOMAIN):
-        assert entry.data == MOCK_IMPORT_CONFIG_PLM
-
-
 async def _options_init_form(hass, entry_id, step):
     """Run the init options form."""
     with patch(PATCH_ASYNC_SETUP_ENTRY, return_value=True):
@@ -282,75 +252,6 @@ async def _options_init_form(hass, entry_id, step):
     return result2
 
 
-async def test_import_min_hub_v2(hass: HomeAssistant) -> None:
-    """Test importing a minimum Hub v2 config from yaml."""
-
-    result = await _import_config(
-        hass, {**MOCK_IMPORT_MINIMUM_HUB_V2, CONF_PORT: 25105, CONF_HUB_VERSION: 2}
-    )
-
-    assert result["type"] == "create_entry"
-    assert hass.config_entries.async_entries(DOMAIN)
-    for entry in hass.config_entries.async_entries(DOMAIN):
-        assert entry.data[CONF_HOST] == MOCK_HOSTNAME
-        assert entry.data[CONF_PORT] == 25105
-        assert entry.data[CONF_USERNAME] == MOCK_USERNAME
-        assert entry.data[CONF_PASSWORD] == MOCK_PASSWORD
-        assert entry.data[CONF_HUB_VERSION] == 2
-
-
-async def test_import_min_hub_v1(hass: HomeAssistant) -> None:
-    """Test importing a minimum Hub v1 config from yaml."""
-
-    result = await _import_config(
-        hass, {**MOCK_IMPORT_MINIMUM_HUB_V1, CONF_PORT: 9761, CONF_HUB_VERSION: 1}
-    )
-
-    assert result["type"] == "create_entry"
-    assert hass.config_entries.async_entries(DOMAIN)
-    for entry in hass.config_entries.async_entries(DOMAIN):
-        assert entry.data[CONF_HOST] == MOCK_HOSTNAME
-        assert entry.data[CONF_PORT] == 9761
-        assert entry.data[CONF_HUB_VERSION] == 1
-
-
-async def test_import_existing(hass: HomeAssistant) -> None:
-    """Test we fail on an existing config imported."""
-    config_entry = MockConfigEntry(
-        domain=DOMAIN,
-        entry_id="abcde12345",
-        data={**MOCK_USER_INPUT_HUB_V2, CONF_HUB_VERSION: 2},
-        options={},
-    )
-    config_entry.add_to_hass(hass)
-    assert config_entry.state is config_entries.ConfigEntryState.NOT_LOADED
-
-    result = await _import_config(
-        hass, {**MOCK_IMPORT_MINIMUM_HUB_V2, CONF_PORT: 25105, CONF_HUB_VERSION: 2}
-    )
-    assert result["type"] == data_entry_flow.FlowResultType.ABORT
-    assert result["reason"] == "single_instance_allowed"
-
-
-async def test_import_failed_connection(hass: HomeAssistant) -> None:
-    """Test a failed connection on import."""
-
-    with patch(
-        PATCH_CONNECTION,
-        new=mock_failed_connection,
-    ), patch(
-        PATCH_ASYNC_SETUP, return_value=True
-    ), patch(PATCH_ASYNC_SETUP_ENTRY, return_value=True):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_IMPORT},
-            data={**MOCK_IMPORT_MINIMUM_HUB_V2, CONF_PORT: 25105, CONF_HUB_VERSION: 2},
-        )
-
-    assert result["type"] == data_entry_flow.FlowResultType.ABORT
-    assert result["reason"] == "cannot_connect"
-
-
 async def _options_form(
     hass, flow_id, user_input, connection=mock_successful_connection
 ):
diff --git a/tests/components/insteon/test_init.py b/tests/components/insteon/test_init.py
index ecab741d5fe..1c4e2abf123 100644
--- a/tests/components/insteon/test_init.py
+++ b/tests/components/insteon/test_init.py
@@ -2,45 +2,15 @@
 import asyncio
 from unittest.mock import patch
 
-from pyinsteon.address import Address
 import pytest
 
 from homeassistant.components import insteon
-from homeassistant.components.insteon.const import (
-    CONF_CAT,
-    CONF_DEV_PATH,
-    CONF_OVERRIDE,
-    CONF_SUBCAT,
-    CONF_X10,
-    DOMAIN,
-    PORT_HUB_V1,
-    PORT_HUB_V2,
-)
-from homeassistant.const import (
-    CONF_ADDRESS,
-    CONF_DEVICE,
-    CONF_HOST,
-    CONF_PASSWORD,
-    CONF_PORT,
-    CONF_USERNAME,
-    EVENT_HOMEASSISTANT_STOP,
-)
+from homeassistant.components.insteon.const import CONF_DEV_PATH, DOMAIN
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
-from .const import (
-    MOCK_ADDRESS,
-    MOCK_CAT,
-    MOCK_IMPORT_CONFIG_PLM,
-    MOCK_IMPORT_FULL_CONFIG_HUB_V1,
-    MOCK_IMPORT_FULL_CONFIG_HUB_V2,
-    MOCK_IMPORT_FULL_CONFIG_PLM,
-    MOCK_IMPORT_MINIMUM_HUB_V1,
-    MOCK_IMPORT_MINIMUM_HUB_V2,
-    MOCK_SUBCAT,
-    MOCK_USER_INPUT_PLM,
-    PATCH_CONNECTION,
-)
+from .const import MOCK_USER_INPUT_PLM, PATCH_CONNECTION
 from .mock_devices import MockDevices
 
 from tests.common import MockConfigEntry
@@ -79,137 +49,6 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
         assert mock_close.called
 
 
-async def test_import_plm(hass: HomeAssistant) -> None:
-    """Test setting up the entry from YAML to a PLM."""
-    config = {}
-    config[DOMAIN] = MOCK_IMPORT_CONFIG_PLM
-
-    with patch.object(
-        insteon, "async_connect", new=mock_successful_connection
-    ), patch.object(insteon, "close_insteon_connection"), patch.object(
-        insteon, "devices", new=MockDevices()
-    ), patch(
-        PATCH_CONNECTION, new=mock_successful_connection
-    ):
-        assert await async_setup_component(
-            hass,
-            insteon.DOMAIN,
-            config,
-        )
-        await hass.async_block_till_done()
-        await asyncio.sleep(0.01)
-    assert hass.config_entries.async_entries(DOMAIN)
-    data = hass.config_entries.async_entries(DOMAIN)[0].data
-    assert data[CONF_DEVICE] == MOCK_IMPORT_CONFIG_PLM[CONF_PORT]
-    assert CONF_PORT not in data
-
-
-async def test_import_hub1(hass: HomeAssistant) -> None:
-    """Test setting up the entry from YAML to a hub v1."""
-    config = {}
-    config[DOMAIN] = MOCK_IMPORT_MINIMUM_HUB_V1
-
-    with patch.object(
-        insteon, "async_connect", new=mock_successful_connection
-    ), patch.object(insteon, "close_insteon_connection"), patch.object(
-        insteon, "devices", new=MockDevices()
-    ), patch(
-        PATCH_CONNECTION, new=mock_successful_connection
-    ):
-        assert await async_setup_component(
-            hass,
-            insteon.DOMAIN,
-            config,
-        )
-        await hass.async_block_till_done()
-        await asyncio.sleep(0.01)
-        assert hass.config_entries.async_entries(DOMAIN)
-    data = hass.config_entries.async_entries(DOMAIN)[0].data
-    assert data[CONF_HOST] == MOCK_IMPORT_FULL_CONFIG_HUB_V1[CONF_HOST]
-    assert data[CONF_PORT] == PORT_HUB_V1
-    assert CONF_USERNAME not in data
-    assert CONF_PASSWORD not in data
-
-
-async def test_import_hub2(hass: HomeAssistant) -> None:
-    """Test setting up the entry from YAML to a hub v2."""
-    config = {}
-    config[DOMAIN] = MOCK_IMPORT_MINIMUM_HUB_V2
-
-    with patch.object(
-        insteon, "async_connect", new=mock_successful_connection
-    ), patch.object(insteon, "close_insteon_connection"), patch.object(
-        insteon, "devices", new=MockDevices()
-    ), patch(
-        PATCH_CONNECTION, new=mock_successful_connection
-    ):
-        assert await async_setup_component(
-            hass,
-            insteon.DOMAIN,
-            config,
-        )
-        await hass.async_block_till_done()
-        await asyncio.sleep(0.01)
-        assert hass.config_entries.async_entries(DOMAIN)
-    data = hass.config_entries.async_entries(DOMAIN)[0].data
-    assert data[CONF_HOST] == MOCK_IMPORT_FULL_CONFIG_HUB_V2[CONF_HOST]
-    assert data[CONF_PORT] == PORT_HUB_V2
-    assert data[CONF_USERNAME] == MOCK_IMPORT_MINIMUM_HUB_V2[CONF_USERNAME]
-    assert data[CONF_PASSWORD] == MOCK_IMPORT_MINIMUM_HUB_V2[CONF_PASSWORD]
-
-
-async def test_import_options(hass: HomeAssistant) -> None:
-    """Test setting up the entry from YAML including options."""
-    config = {}
-    config[DOMAIN] = MOCK_IMPORT_FULL_CONFIG_PLM
-
-    with patch.object(
-        insteon, "async_connect", new=mock_successful_connection
-    ), patch.object(insteon, "close_insteon_connection"), patch.object(
-        insteon, "devices", new=MockDevices()
-    ), patch(
-        PATCH_CONNECTION, new=mock_successful_connection
-    ):
-        assert await async_setup_component(
-            hass,
-            insteon.DOMAIN,
-            config,
-        )
-        await hass.async_block_till_done()
-        await asyncio.sleep(0.01)  # Need to yield to async processes
-        # pylint: disable=no-member
-        assert insteon.devices.add_x10_device.call_count == 2
-        assert insteon.devices.set_id.call_count == 1
-    options = hass.config_entries.async_entries(DOMAIN)[0].options
-    assert len(options[CONF_OVERRIDE]) == 1
-    assert options[CONF_OVERRIDE][0][CONF_ADDRESS] == str(Address(MOCK_ADDRESS))
-    assert options[CONF_OVERRIDE][0][CONF_CAT] == MOCK_CAT
-    assert options[CONF_OVERRIDE][0][CONF_SUBCAT] == MOCK_SUBCAT
-
-    assert len(options[CONF_X10]) == 2
-    assert options[CONF_X10][0] == MOCK_IMPORT_FULL_CONFIG_PLM[CONF_X10][0]
-    assert options[CONF_X10][1] == MOCK_IMPORT_FULL_CONFIG_PLM[CONF_X10][1]
-
-
-async def test_import_failed_connection(hass: HomeAssistant) -> None:
-    """Test a failed connection in import does not create a config entry."""
-    config = {}
-    config[DOMAIN] = MOCK_IMPORT_CONFIG_PLM
-
-    with patch.object(
-        insteon, "async_connect", new=mock_failed_connection
-    ), patch.object(insteon, "async_close"), patch.object(
-        insteon, "devices", new=MockDevices(connected=False)
-    ):
-        assert await async_setup_component(
-            hass,
-            insteon.DOMAIN,
-            config,
-        )
-        await hass.async_block_till_done()
-        assert not hass.config_entries.async_entries(DOMAIN)
-
-
 async def test_setup_entry_failed_connection(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
diff --git a/tests/components/integration/test_sensor.py b/tests/components/integration/test_sensor.py
index 355d13c84d6..a552d401681 100644
--- a/tests/components/integration/test_sensor.py
+++ b/tests/components/integration/test_sensor.py
@@ -4,6 +4,7 @@ from datetime import timedelta
 from freezegun import freeze_time
 import pytest
 
+from homeassistant.components.integration.const import DOMAIN
 from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
@@ -16,10 +17,15 @@ from homeassistant.const import (
     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 tests.common import mock_restore_cache, mock_restore_cache_with_extra_data
+from tests.common import (
+    MockConfigEntry,
+    mock_restore_cache,
+    mock_restore_cache_with_extra_data,
+)
 
 
 @pytest.mark.parametrize("method", ["trapezoidal", "left", "right"])
@@ -671,3 +677,48 @@ async def test_calc_errors(hass: HomeAssistant, method) -> None:
     state = hass.states.get("sensor.integration")
     assert state is not None
     assert round(float(state.state)) == 0 if method != "right" else 1
+
+
+async def test_device_id(hass: HomeAssistant) -> None:
+    """Test for source entity device for Riemann sum integral."""
+    device_registry = dr.async_get(hass)
+    entity_registry = er.async_get(hass)
+
+    source_config_entry = MockConfigEntry()
+    source_device_entry = device_registry.async_get_or_create(
+        config_entry_id=source_config_entry.entry_id,
+        identifiers={("sensor", "identifier_test")},
+        connections={("mac", "30:31:32:33:34:35")},
+    )
+    source_entity = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source",
+        config_entry=source_config_entry,
+        device_id=source_device_entry.id,
+    )
+    await hass.async_block_till_done()
+    assert entity_registry.async_get("sensor.test_source") is not None
+
+    integration_config_entry = MockConfigEntry(
+        data={},
+        domain=DOMAIN,
+        options={
+            "method": "trapezoidal",
+            "name": "integration",
+            "round": 1.0,
+            "source": "sensor.test_source",
+            "unit_prefix": "k",
+            "unit_time": "min",
+        },
+        title="Integration",
+    )
+
+    integration_config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(integration_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    integration_entity = entity_registry.async_get("sensor.integration")
+    assert integration_entity is not None
+    assert integration_entity.device_id == source_entity.device_id
diff --git a/tests/components/intent_script/fixtures/configuration.yaml b/tests/components/intent_script/fixtures/configuration.yaml
new file mode 100644
index 00000000000..93b4ebe5e26
--- /dev/null
+++ b/tests/components/intent_script/fixtures/configuration.yaml
@@ -0,0 +1,4 @@
+intent_script:
+  NewIntent2:
+    speech:
+      text: Hello World
diff --git a/tests/components/intent_script/fixtures/configuration_no_entry.yaml b/tests/components/intent_script/fixtures/configuration_no_entry.yaml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/components/intent_script/test_init.py b/tests/components/intent_script/test_init.py
index 044bbcaa7e7..a68b2a9be24 100644
--- a/tests/components/intent_script/test_init.py
+++ b/tests/components/intent_script/test_init.py
@@ -1,9 +1,14 @@
 """Test intent_script component."""
+from unittest.mock import patch
+
+from homeassistant import config as hass_config
 from homeassistant.bootstrap import async_setup_component
+from homeassistant.components.intent_script import DOMAIN
+from homeassistant.const import SERVICE_RELOAD
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import intent
 
-from tests.common import async_mock_service
+from tests.common import async_mock_service, get_fixture_path
 
 
 async def test_intent_script(hass: HomeAssistant) -> None:
@@ -134,3 +139,49 @@ async def test_intent_script_falsy_reprompt(hass: HomeAssistant) -> None:
 
     assert response.card["simple"]["title"] == "Hello Paulus"
     assert response.card["simple"]["content"] == "Content for Paulus"
+
+
+async def test_reload(hass: HomeAssistant) -> None:
+    """Verify we can reload intent config."""
+
+    config = {"intent_script": {"NewIntent1": {"speech": {"text": "HelloWorld123"}}}}
+
+    await async_setup_component(hass, "intent_script", config)
+    await hass.async_block_till_done()
+
+    intents = hass.data.get(intent.DATA_KEY)
+
+    assert len(intents) == 1
+    assert intents.get("NewIntent1")
+
+    yaml_path = get_fixture_path("configuration.yaml", "intent_script")
+
+    with patch.object(hass_config, "YAML_CONFIG_FILE", yaml_path):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_RELOAD,
+            {},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+
+    assert len(intents) == 1
+
+    assert intents.get("NewIntent1") is None
+    assert intents.get("NewIntent2")
+
+    yaml_path = get_fixture_path("configuration_no_entry.yaml", "intent_script")
+
+    with patch.object(hass_config, "YAML_CONFIG_FILE", yaml_path):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_RELOAD,
+            {},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+
+    # absence of intent_script from the configuration.yaml should delete all intents.
+    assert len(intents) == 0
+    assert intents.get("NewIntent1") is None
+    assert intents.get("NewIntent2") is None
diff --git a/tests/components/ipma/__init__.py b/tests/components/ipma/__init__.py
index 4a002140437..ba172fc7bb8 100644
--- a/tests/components/ipma/__init__.py
+++ b/tests/components/ipma/__init__.py
@@ -15,6 +15,18 @@ ENTRY_CONFIG = {
 class MockLocation:
     """Mock Location from pyipma."""
 
+    async def fire_risk(self, api):
+        """Mock Fire Risk."""
+        RCM = namedtuple(
+            "RCM",
+            [
+                "dico",
+                "rcm",
+                "coordinates",
+            ],
+        )
+        return RCM("some place", 3, (0, 0))
+
     async def observation(self, api):
         """Mock Observation."""
         Observation = namedtuple(
diff --git a/tests/components/ipma/test_sensor.py b/tests/components/ipma/test_sensor.py
new file mode 100644
index 00000000000..cbbad9c590f
--- /dev/null
+++ b/tests/components/ipma/test_sensor.py
@@ -0,0 +1,24 @@
+"""The sensor tests for the IPMA platform."""
+
+from unittest.mock import patch
+
+from . import ENTRY_CONFIG, MockLocation
+
+from tests.common import MockConfigEntry
+
+
+async def test_ipma_fire_risk_create_sensors(hass):
+    """Test creation of fire risk sensors."""
+
+    with patch(
+        "pyipma.location.Location.get",
+        return_value=MockLocation(),
+    ):
+        entry = MockConfigEntry(domain="ipma", data=ENTRY_CONFIG)
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.hometown_fire_risk")
+
+    assert state.state == "3"
diff --git a/tests/components/kitchen_sink/snapshots/test_lock.ambr b/tests/components/kitchen_sink/snapshots/test_lock.ambr
new file mode 100644
index 00000000000..9303401bdd5
--- /dev/null
+++ b/tests/components/kitchen_sink/snapshots/test_lock.ambr
@@ -0,0 +1,49 @@
+# serializer version: 1
+# name: test_states
+  set({
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Another basic lock',
+        'supported_features': <LockEntityFeature: 0>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'lock.another_basic_lock',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unlocked',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Another openable lock',
+        'supported_features': <LockEntityFeature: 1>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'lock.another_openable_lock',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unlocked',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Basic lock',
+        'supported_features': <LockEntityFeature: 0>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'lock.basic_lock',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'locked',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Openable lock',
+        'supported_features': <LockEntityFeature: 1>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'lock.openable_lock',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'locked',
+    }),
+  })
+# ---
diff --git a/tests/components/kitchen_sink/snapshots/test_sensor.ambr b/tests/components/kitchen_sink/snapshots/test_sensor.ambr
new file mode 100644
index 00000000000..de3297b7fd8
--- /dev/null
+++ b/tests/components/kitchen_sink/snapshots/test_sensor.ambr
@@ -0,0 +1,40 @@
+# serializer version: 1
+# name: test_states
+  set({
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Statistics issue 1',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.statistics_issue_1',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': '100',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Statistics issue 2',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': 'dogs',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.statistics_issue_2',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': '100',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Statistics issue 3',
+        'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.statistics_issue_3',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': '100',
+    }),
+  })
+# ---
diff --git a/tests/components/kitchen_sink/test_image.py b/tests/components/kitchen_sink/test_image.py
new file mode 100644
index 00000000000..4c64bd77eb2
--- /dev/null
+++ b/tests/components/kitchen_sink/test_image.py
@@ -0,0 +1,60 @@
+"""The tests for the kitchen_sink image platform."""
+from http import HTTPStatus
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.components.kitchen_sink import DOMAIN, image
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.typing import ClientSessionGenerator
+
+
+@pytest.fixture
+async def image_only() -> None:
+    """Enable only the image platform."""
+    with patch(
+        "homeassistant.components.kitchen_sink.COMPONENTS_WITH_DEMO_PLATFORM",
+        [Platform.IMAGE],
+    ):
+        yield
+
+
+@pytest.fixture(autouse=True)
+async def setup_comp(hass: HomeAssistant, image_only):
+    """Set up demo component."""
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {}})
+    await hass.async_block_till_done()
+
+
+async def test_states(hass: HomeAssistant) -> None:
+    """Test the expected image entities are added."""
+    states = hass.states.async_all()
+    assert len(states) == 1
+    state = states[0]
+
+    access_token = state.attributes["access_token"]
+    assert state.entity_id == "image.qr_code"
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.qr_code?token={access_token}",
+        "friendly_name": "QR Code",
+    }
+
+
+async def test_fetch_image(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    client = await hass_client()
+
+    image_path = Path(image.__file__).parent / "qr_code.png"
+    expected_data = await hass.async_add_executor_job(image_path.read_bytes)
+
+    resp = await client.get("/api/image_proxy/image.qr_code")
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == expected_data
diff --git a/tests/components/kitchen_sink/test_lock.py b/tests/components/kitchen_sink/test_lock.py
new file mode 100644
index 00000000000..a74c9a19a23
--- /dev/null
+++ b/tests/components/kitchen_sink/test_lock.py
@@ -0,0 +1,105 @@
+"""The tests for the kitchen_sink lock platform."""
+from unittest.mock import patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.kitchen_sink import DOMAIN
+from homeassistant.components.lock import (
+    DOMAIN as LOCK_DOMAIN,
+    SERVICE_LOCK,
+    SERVICE_OPEN,
+    SERVICE_UNLOCK,
+    STATE_LOCKED,
+    STATE_LOCKING,
+    STATE_UNLOCKED,
+    STATE_UNLOCKING,
+)
+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, async_mock_service
+
+LOCKED_LOCK = "lock.basic_lock"
+OPENABLE_LOCK = "lock.openable_lock"
+UNLOCKED_LOCK = "lock.another_basic_lock"
+
+
+@pytest.fixture
+async def lock_only() -> None:
+    """Enable only the lock platform."""
+    with patch(
+        "homeassistant.components.kitchen_sink.COMPONENTS_WITH_DEMO_PLATFORM",
+        [Platform.LOCK],
+    ):
+        yield
+
+
+@pytest.fixture(autouse=True)
+async def setup_comp(hass: HomeAssistant, lock_only):
+    """Set up demo component."""
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {}})
+    await hass.async_block_till_done()
+
+
+async def test_states(hass: HomeAssistant, snapshot: SnapshotAssertion) -> None:
+    """Test the expected lock entities are added."""
+    states = hass.states.async_all()
+    assert set(states) == snapshot
+
+
+async def test_locking(hass: HomeAssistant) -> None:
+    """Test the locking of a lock."""
+    state = hass.states.get(UNLOCKED_LOCK)
+    assert state.state == STATE_UNLOCKED
+    await hass.async_block_till_done()
+
+    state_changes = async_capture_events(hass, EVENT_STATE_CHANGED)
+    await hass.services.async_call(
+        LOCK_DOMAIN, SERVICE_LOCK, {ATTR_ENTITY_ID: UNLOCKED_LOCK}, blocking=False
+    )
+    await hass.async_block_till_done()
+
+    assert state_changes[0].data["entity_id"] == UNLOCKED_LOCK
+    assert state_changes[0].data["new_state"].state == STATE_LOCKING
+
+    assert state_changes[1].data["entity_id"] == UNLOCKED_LOCK
+    assert state_changes[1].data["new_state"].state == STATE_LOCKED
+
+
+async def test_unlocking(hass: HomeAssistant) -> None:
+    """Test the unlocking of a lock."""
+    state = hass.states.get(LOCKED_LOCK)
+    assert state.state == STATE_LOCKED
+    await hass.async_block_till_done()
+
+    state_changes = async_capture_events(hass, EVENT_STATE_CHANGED)
+    await hass.services.async_call(
+        LOCK_DOMAIN, SERVICE_UNLOCK, {ATTR_ENTITY_ID: LOCKED_LOCK}, blocking=False
+    )
+    await hass.async_block_till_done()
+
+    assert state_changes[0].data["entity_id"] == LOCKED_LOCK
+    assert state_changes[0].data["new_state"].state == STATE_UNLOCKING
+
+    assert state_changes[1].data["entity_id"] == LOCKED_LOCK
+    assert state_changes[1].data["new_state"].state == STATE_UNLOCKED
+
+
+async def test_opening_mocked(hass: HomeAssistant) -> None:
+    """Test the opening of a lock."""
+    calls = async_mock_service(hass, LOCK_DOMAIN, SERVICE_OPEN)
+    await hass.services.async_call(
+        LOCK_DOMAIN, SERVICE_OPEN, {ATTR_ENTITY_ID: OPENABLE_LOCK}, blocking=True
+    )
+    assert len(calls) == 1
+
+
+async def test_opening(hass: HomeAssistant) -> None:
+    """Test the opening of a lock."""
+    await hass.services.async_call(
+        LOCK_DOMAIN, SERVICE_OPEN, {ATTR_ENTITY_ID: OPENABLE_LOCK}, blocking=True
+    )
+    state = hass.states.get(OPENABLE_LOCK)
+    assert state.state == STATE_UNLOCKED
diff --git a/tests/components/kitchen_sink/test_sensor.py b/tests/components/kitchen_sink/test_sensor.py
new file mode 100644
index 00000000000..8d3f611f15d
--- /dev/null
+++ b/tests/components/kitchen_sink/test_sensor.py
@@ -0,0 +1,33 @@
+"""The tests for the kitchen_sink sensor platform."""
+from unittest.mock import patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.kitchen_sink import DOMAIN
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+
+@pytest.fixture
+async def sensor_only() -> None:
+    """Enable only the sensor platform."""
+    with patch(
+        "homeassistant.components.kitchen_sink.COMPONENTS_WITH_DEMO_PLATFORM",
+        [Platform.SENSOR],
+    ):
+        yield
+
+
+@pytest.fixture(autouse=True)
+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()
+
+
+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
diff --git a/tests/components/knx/conftest.py b/tests/components/knx/conftest.py
index 084a3a37c27..a06206fd982 100644
--- a/tests/components/knx/conftest.py
+++ b/tests/components/knx/conftest.py
@@ -140,11 +140,11 @@ class KNXTestKit:
         await self.hass.async_block_till_done()
         try:
             telegram = self._outgoing_telegrams.get_nowait()
-        except asyncio.QueueEmpty:
+        except asyncio.QueueEmpty as err:
             raise AssertionError(
                 f"No Telegram found. Expected: {apci_type.__name__} -"
                 f" {group_address} - {payload}"
-            )
+            ) from err
 
         assert isinstance(
             telegram.payload, apci_type
diff --git a/tests/components/knx/test_services.py b/tests/components/knx/test_services.py
index 5e6f856ee44..5796eae8393 100644
--- a/tests/components/knx/test_services.py
+++ b/tests/components/knx/test_services.py
@@ -1,7 +1,10 @@
 """Test KNX services."""
+from unittest.mock import patch
+
 import pytest
 from xknx.telegram.apci import GroupValueResponse, GroupValueWrite
 
+from homeassistant.components.knx import async_unload_entry as knx_async_unload_entry
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 
@@ -250,3 +253,24 @@ async def test_exposure_register(hass: HomeAssistant, knx: KNXTestKit) -> None:
     hass.states.async_set(test_entity, STATE_OFF, {test_attribute: 25})
     await knx.assert_telegram_count(1)
     await knx.assert_write(test_address, (25,))
+
+
+async def test_reload_service(
+    hass: HomeAssistant,
+    knx: KNXTestKit,
+) -> None:
+    """Test reload service."""
+    await knx.setup_integration({})
+
+    with patch(
+        "homeassistant.components.knx.async_unload_entry", wraps=knx_async_unload_entry
+    ) as mock_unload_entry, patch(
+        "homeassistant.components.knx.async_setup_entry"
+    ) as mock_setup_entry:
+        await hass.services.async_call(
+            "knx",
+            "reload",
+            blocking=True,
+        )
+        mock_unload_entry.assert_called_once()
+        mock_setup_entry.assert_called_once()
diff --git a/tests/components/knx/test_time.py b/tests/components/knx/test_time.py
new file mode 100644
index 00000000000..25a22fe8146
--- /dev/null
+++ b/tests/components/knx/test_time.py
@@ -0,0 +1,86 @@
+"""Test KNX time."""
+from homeassistant.components.knx.const import CONF_RESPOND_TO_READ, KNX_ADDRESS
+from homeassistant.components.knx.schema import TimeSchema
+from homeassistant.components.time import ATTR_TIME, DOMAIN, SERVICE_SET_VALUE
+from homeassistant.const import CONF_NAME
+from homeassistant.core import HomeAssistant, State
+
+from .conftest import KNXTestKit
+
+from tests.common import mock_restore_cache
+
+
+async def test_time(hass: HomeAssistant, knx: KNXTestKit) -> None:
+    """Test KNX time."""
+    test_address = "1/1/1"
+    await knx.setup_integration(
+        {
+            TimeSchema.PLATFORM: {
+                CONF_NAME: "test",
+                KNX_ADDRESS: test_address,
+            }
+        }
+    )
+    # set value
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_VALUE,
+        {"entity_id": "time.test", ATTR_TIME: "01:02:03"},
+        blocking=True,
+    )
+    await knx.assert_write(
+        test_address,
+        (0x01, 0x02, 0x03),
+    )
+    state = hass.states.get("time.test")
+    assert state.state == "01:02:03"
+
+    # update from KNX
+    await knx.receive_write(
+        test_address,
+        (0x0C, 0x10, 0x3B),
+    )
+    state = hass.states.get("time.test")
+    assert state.state == "12:16:59"
+
+
+async def test_time_restore_and_respond(hass: HomeAssistant, knx: KNXTestKit) -> None:
+    """Test KNX time with passive_address, restoring state and respond_to_read."""
+    test_address = "1/1/1"
+    test_passive_address = "3/3/3"
+
+    fake_state = State("time.test", "01:02:03")
+    mock_restore_cache(hass, (fake_state,))
+
+    await knx.setup_integration(
+        {
+            TimeSchema.PLATFORM: {
+                CONF_NAME: "test",
+                KNX_ADDRESS: [test_address, test_passive_address],
+                CONF_RESPOND_TO_READ: True,
+            }
+        }
+    )
+    # restored state - doesn't send telegram
+    state = hass.states.get("time.test")
+    assert state.state == "01:02:03"
+    await knx.assert_telegram_count(0)
+
+    # respond with restored state
+    await knx.receive_read(test_address)
+    await knx.assert_response(
+        test_address,
+        (0x01, 0x02, 0x03),
+    )
+
+    # don't respond to passive address
+    await knx.receive_read(test_passive_address)
+    await knx.assert_no_telegram()
+
+    # update from KNX passive address
+    await knx.receive_write(
+        test_passive_address,
+        (0x0C, 0x00, 0x00),
+    )
+    state = hass.states.get("time.test")
+    assert state.state == "12:00:00"
diff --git a/tests/components/knx/test_websocket.py b/tests/components/knx/test_websocket.py
index 115b92f70e8..76a9544552f 100644
--- a/tests/components/knx/test_websocket.py
+++ b/tests/components/knx/test_websocket.py
@@ -183,22 +183,22 @@ async def test_knx_subscribe_telegrams_command_recent_telegrams(
 
     recent_tgs = res["result"]["recent_telegrams"]
     assert len(recent_tgs) == 2
-    # telegrams are sorted from newest to oldest
-    assert recent_tgs[0]["destination_address"] == "1/2/4"
-    assert recent_tgs[0]["payload"] == "1"
-    assert recent_tgs[0]["type"] == "GroupValueWrite"
-    assert (
-        recent_tgs[0]["source_address"] == "0.0.0"
-    )  # needs to be the IA currently connected to
-    assert recent_tgs[0]["direction"] == "group_monitor_outgoing"
-    assert recent_tgs[0]["timestamp"] is not None
+    # telegrams are sorted from oldest to newest
+    assert recent_tgs[0]["destination"] == "1/3/4"
+    assert recent_tgs[0]["payload"] == 1
+    assert recent_tgs[0]["telegramtype"] == "GroupValueWrite"
+    assert recent_tgs[0]["source"] == "1.2.3"
+    assert recent_tgs[0]["direction"] == "Incoming"
+    assert isinstance(recent_tgs[0]["timestamp"], str)
 
-    assert recent_tgs[1]["destination_address"] == "1/3/4"
-    assert recent_tgs[1]["payload"] == "1"
-    assert recent_tgs[1]["type"] == "GroupValueWrite"
-    assert recent_tgs[1]["source_address"] == "1.2.3"
-    assert recent_tgs[1]["direction"] == "group_monitor_incoming"
-    assert recent_tgs[1]["timestamp"] is not None
+    assert recent_tgs[1]["destination"] == "1/2/4"
+    assert recent_tgs[1]["payload"] == 1
+    assert recent_tgs[1]["telegramtype"] == "GroupValueWrite"
+    assert (
+        recent_tgs[1]["source"] == "0.0.0"
+    )  # needs to be the IA currently connected to
+    assert recent_tgs[1]["direction"] == "Outgoing"
+    assert isinstance(recent_tgs[1]["timestamp"], str)
 
 
 async def test_knx_subscribe_telegrams_command_no_project(
@@ -231,45 +231,45 @@ async def test_knx_subscribe_telegrams_command_no_project(
 
     # receive events
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "1/2/3"
-    assert res["event"]["payload"] == ""
-    assert res["event"]["type"] == "GroupValueRead"
-    assert res["event"]["source_address"] == "1.2.3"
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["destination"] == "1/2/3"
+    assert res["event"]["payload"] is None
+    assert res["event"]["telegramtype"] == "GroupValueRead"
+    assert res["event"]["source"] == "1.2.3"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
 
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "1/3/4"
-    assert res["event"]["payload"] == "1"
-    assert res["event"]["type"] == "GroupValueWrite"
-    assert res["event"]["source_address"] == "1.2.3"
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["destination"] == "1/3/4"
+    assert res["event"]["payload"] == 1
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
+    assert res["event"]["source"] == "1.2.3"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
 
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "1/3/4"
-    assert res["event"]["payload"] == "0"
-    assert res["event"]["type"] == "GroupValueWrite"
-    assert res["event"]["source_address"] == "1.2.3"
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["destination"] == "1/3/4"
+    assert res["event"]["payload"] == 0
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
+    assert res["event"]["source"] == "1.2.3"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
 
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "1/3/8"
-    assert res["event"]["payload"] == "0x3445"
-    assert res["event"]["type"] == "GroupValueWrite"
-    assert res["event"]["source_address"] == "1.2.3"
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["destination"] == "1/3/8"
+    assert res["event"]["payload"] == [52, 69]
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
+    assert res["event"]["source"] == "1.2.3"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
 
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "1/2/4"
-    assert res["event"]["payload"] == "1"
-    assert res["event"]["type"] == "GroupValueWrite"
+    assert res["event"]["destination"] == "1/2/4"
+    assert res["event"]["payload"] == 1
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
     assert (
-        res["event"]["source_address"] == "0.0.0"
+        res["event"]["source"] == "0.0.0"
     )  # needs to be the IA currently connected to
-    assert res["event"]["direction"] == "group_monitor_outgoing"
+    assert res["event"]["direction"] == "Outgoing"
     assert res["event"]["timestamp"] is not None
 
 
@@ -289,42 +289,45 @@ async def test_knx_subscribe_telegrams_command_project(
     # incoming DPT 1 telegram
     await knx.receive_write("0/0/1", True)
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "0/0/1"
-    assert res["event"]["destination_text"] == "Binary"
-    assert res["event"]["payload"] == "1"
-    assert res["event"]["type"] == "GroupValueWrite"
-    assert res["event"]["source_address"] == "1.2.3"
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["destination"] == "0/0/1"
+    assert res["event"]["destination_name"] == "Binary"
+    assert res["event"]["payload"] == 1
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
+    assert res["event"]["source"] == "1.2.3"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
 
     # incoming DPT 5 telegram
     await knx.receive_write("0/1/1", (0x50,), source="1.1.6")
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "0/1/1"
-    assert res["event"]["destination_text"] == "percent"
-    assert res["event"]["payload"] == "0x50"
-    assert res["event"]["value"] == "31 %"
-    assert res["event"]["type"] == "GroupValueWrite"
-    assert res["event"]["source_address"] == "1.1.6"
+    assert res["event"]["destination"] == "0/1/1"
+    assert res["event"]["destination_name"] == "percent"
+    assert res["event"]["payload"] == [
+        80,
+    ]
+    assert res["event"]["value"] == 31
+    assert res["event"]["unit"] == "%"
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
+    assert res["event"]["source"] == "1.1.6"
     assert (
-        res["event"]["source_text"]
+        res["event"]["source_name"]
         == "Enertex Bayern GmbH Enertex KNX LED Dimmsequenzer 20A/5x REG"
     )
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
 
     # incoming undecodable telegram (wrong payload type)
     await knx.receive_write("0/1/1", True, source="1.1.6")
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "0/1/1"
-    assert res["event"]["destination_text"] == "percent"
-    assert res["event"]["payload"] == "1"
+    assert res["event"]["destination"] == "0/1/1"
+    assert res["event"]["destination_name"] == "percent"
+    assert res["event"]["payload"] == 1
     assert res["event"]["value"] == "Error decoding value"
-    assert res["event"]["type"] == "GroupValueWrite"
-    assert res["event"]["source_address"] == "1.1.6"
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
+    assert res["event"]["source"] == "1.1.6"
     assert (
-        res["event"]["source_text"]
+        res["event"]["source_name"]
         == "Enertex Bayern GmbH Enertex KNX LED Dimmsequenzer 20A/5x REG"
     )
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
diff --git a/tests/components/kodi/test_device_trigger.py b/tests/components/kodi/test_device_trigger.py
index 59d8a5148cf..3181f978112 100644
--- a/tests/components/kodi/test_device_trigger.py
+++ b/tests/components/kodi/test_device_trigger.py
@@ -48,7 +48,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         identifiers={(DOMAIN, "host", 1234)},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         MP_DOMAIN, DOMAIN, "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -57,7 +57,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{MP_DOMAIN}.kodi_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["turn_off", "turn_on"]
@@ -74,9 +74,11 @@ async def test_get_triggers(
 
 
 async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls, kodi_media_player
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls, kodi_media_player
 ) -> None:
     """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get(kodi_media_player)
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -87,7 +89,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": kodi_media_player,
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                     "action": {
@@ -104,7 +106,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": kodi_media_player,
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                     "action": {
@@ -142,3 +144,48 @@ async def test_if_fires_on_state_change(
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert calls[1].data["some"] == f"turn_off - {kodi_media_player} - 0"
+
+
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls, kodi_media_player
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get(kodi_media_player)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "turn_on",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "turn_on - {{ trigger.entity_id }} - {{ trigger.id}}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+
+    await hass.services.async_call(
+        MP_DOMAIN,
+        "turn_on",
+        {"entity_id": kodi_media_player},
+        blocking=True,
+    )
+
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == f"turn_on - {kodi_media_player} - 0"
diff --git a/tests/components/lastfm/__init__.py b/tests/components/lastfm/__init__.py
index 7ee8665e28a..dde914d51cc 100644
--- a/tests/components/lastfm/__init__.py
+++ b/tests/components/lastfm/__init__.py
@@ -22,64 +22,83 @@ CONF_FRIENDS_DATA = {CONF_USERS: [USERNAME_2]}
 class MockNetwork:
     """Mock _Network object for pylast."""
 
-    def __init__(self, username: str):
+    def __init__(self, username: str) -> None:
         """Initialize the mock."""
         self.username = username
 
 
+class MockTopTrack:
+    """Mock TopTrack object for pylast."""
+
+    def __init__(self, item: Track) -> None:
+        """Initialize the mock."""
+        self.item = item
+
+
+class MockLastTrack:
+    """Mock LastTrack object for pylast."""
+
+    def __init__(self, track: Track) -> None:
+        """Initialize the mock."""
+        self.track = track
+
+
 class MockUser:
     """Mock User object for pylast."""
 
-    def __init__(self, now_playing_result, error, has_friends, username):
+    def __init__(
+        self,
+        username: str = USERNAME_1,
+        now_playing_result: Track | None = None,
+        thrown_error: Exception | None = None,
+        friends: list = [],
+        recent_tracks: list[Track] = [],
+        top_tracks: list[Track] = [],
+    ) -> None:
         """Initialize the mock."""
         self._now_playing_result = now_playing_result
-        self._thrown_error = error
-        self._has_friends = has_friends
+        self._thrown_error = thrown_error
+        self._friends = friends
+        self._recent_tracks = recent_tracks
+        self._top_tracks = top_tracks
         self.name = username
 
     def get_name(self, capitalized: bool) -> str:
         """Get name of the user."""
         return self.name
 
-    def get_playcount(self):
+    def get_playcount(self) -> int:
         """Get mock play count."""
         if self._thrown_error:
             raise self._thrown_error
-        return 1
+        return len(self._recent_tracks)
 
-    def get_image(self):
+    def get_image(self) -> str:
         """Get mock image."""
+        return ""
 
-    def get_recent_tracks(self, limit):
+    def get_recent_tracks(self, limit: int) -> list[MockLastTrack]:
         """Get mock recent tracks."""
-        return []
+        return [MockLastTrack(track) for track in self._recent_tracks]
 
-    def get_top_tracks(self, limit):
+    def get_top_tracks(self, limit: int) -> list[MockTopTrack]:
         """Get mock top tracks."""
-        return []
+        return [MockTopTrack(track) for track in self._recent_tracks]
 
-    def get_now_playing(self):
+    def get_now_playing(self) -> Track:
         """Get mock now playing."""
         return self._now_playing_result
 
-    def get_friends(self):
+    def get_friends(self) -> list[any]:
         """Get mock friends."""
-        if self._has_friends is False:
+        if len(self._friends) == 0:
             raise PyLastError("network", "status", "Page not found")
-        return [MockUser(None, None, True, USERNAME_2)]
+        return self._friends
 
 
-def patch_fetch_user(
-    now_playing: Track | None = None,
-    thrown_error: Exception | None = None,
-    has_friends: bool = True,
-    username: str = USERNAME_1,
-) -> MockUser:
+def patch_user(user: MockUser) -> MockUser:
     """Patch interface."""
-    return patch(
-        "pylast.User",
-        return_value=MockUser(now_playing, thrown_error, has_friends, username),
-    )
+    return patch("pylast.User", return_value=user)
 
 
 def patch_setup_entry() -> bool:
diff --git a/tests/components/lastfm/conftest.py b/tests/components/lastfm/conftest.py
new file mode 100644
index 00000000000..119d4796f57
--- /dev/null
+++ b/tests/components/lastfm/conftest.py
@@ -0,0 +1,67 @@
+"""Configure tests for the LastFM integration."""
+from collections.abc import Awaitable, Callable
+from unittest.mock import patch
+
+from pylast import Track
+import pytest
+
+from homeassistant.components.lastfm.const import CONF_MAIN_USER, CONF_USERS, DOMAIN
+from homeassistant.const import CONF_API_KEY
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
+from tests.components.lastfm import (
+    API_KEY,
+    USERNAME_1,
+    USERNAME_2,
+    MockNetwork,
+    MockUser,
+)
+
+ComponentSetup = Callable[[MockConfigEntry, MockUser], Awaitable[None]]
+
+
+@pytest.fixture(name="config_entry")
+def mock_config_entry() -> MockConfigEntry:
+    """Create LastFM entry in Home Assistant."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        data={},
+        options={
+            CONF_API_KEY: API_KEY,
+            CONF_MAIN_USER: USERNAME_1,
+            CONF_USERS: [USERNAME_1, USERNAME_2],
+        },
+    )
+
+
+@pytest.fixture(name="setup_integration")
+async def mock_setup_integration(
+    hass: HomeAssistant,
+) -> Callable[[MockConfigEntry, MockUser], Awaitable[None]]:
+    """Fixture for setting up the component."""
+
+    async def func(mock_config_entry: MockConfigEntry, mock_user: MockUser) -> None:
+        mock_config_entry.add_to_hass(hass)
+        with patch("pylast.User", return_value=mock_user):
+            assert await async_setup_component(hass, DOMAIN, {})
+            await hass.async_block_till_done()
+
+    return func
+
+
+@pytest.fixture(name="default_user")
+def mock_default_user() -> MockUser:
+    """Return default mock user."""
+    return MockUser(
+        now_playing_result=Track("artist", "title", MockNetwork("lastfm")),
+        top_tracks=[Track("artist", "title", MockNetwork("lastfm"))],
+        recent_tracks=[Track("artist", "title", MockNetwork("lastfm"))],
+    )
+
+
+@pytest.fixture(name="first_time_user")
+def mock_first_time_user() -> MockUser:
+    """Return first time mock user."""
+    return MockUser(now_playing_result=None, top_tracks=[], recent_tracks=[])
diff --git a/tests/components/lastfm/test_config_flow.py b/tests/components/lastfm/test_config_flow.py
index 02168449398..ce28638c3f3 100644
--- a/tests/components/lastfm/test_config_flow.py
+++ b/tests/components/lastfm/test_config_flow.py
@@ -1,4 +1,6 @@
 """Test Lastfm config flow."""
+from unittest.mock import patch
+
 from pylast import WSError
 import pytest
 
@@ -21,16 +23,17 @@ from . import (
     CONF_USER_DATA,
     USERNAME_1,
     USERNAME_2,
-    patch_fetch_user,
+    MockUser,
     patch_setup_entry,
 )
+from .conftest import ComponentSetup
 
 from tests.common import MockConfigEntry
 
 
-async def test_full_user_flow(hass: HomeAssistant) -> None:
+async def test_full_user_flow(hass: HomeAssistant, default_user: MockUser) -> None:
     """Test the full user configuration flow."""
-    with patch_fetch_user(), patch_setup_entry():
+    with patch("pylast.User", return_value=default_user), patch_setup_entry():
         result = await hass.config_entries.flow.async_init(
             DOMAIN,
             context={"source": SOURCE_USER},
@@ -68,9 +71,11 @@ async def test_full_user_flow(hass: HomeAssistant) -> None:
         (WSError("network", "status", "Something strange"), "unknown"),
     ],
 )
-async def test_flow_fails(hass: HomeAssistant, error: Exception, message: str) -> None:
+async def test_flow_fails(
+    hass: HomeAssistant, error: Exception, message: str, default_user: MockUser
+) -> None:
     """Test user initialized flow with invalid username."""
-    with patch_fetch_user(thrown_error=error):
+    with patch("pylast.User", return_value=MockUser(thrown_error=error)):
         result = await hass.config_entries.flow.async_init(
             DOMAIN, context={"source": SOURCE_USER}, data=CONF_USER_DATA
         )
@@ -78,7 +83,7 @@ async def test_flow_fails(hass: HomeAssistant, error: Exception, message: str) -
         assert result["step_id"] == "user"
         assert result["errors"]["base"] == message
 
-    with patch_fetch_user(), patch_setup_entry():
+    with patch("pylast.User", return_value=default_user), patch_setup_entry():
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input=CONF_USER_DATA,
@@ -95,9 +100,11 @@ async def test_flow_fails(hass: HomeAssistant, error: Exception, message: str) -
         assert result["options"] == CONF_DATA
 
 
-async def test_flow_friends_invalid_username(hass: HomeAssistant) -> None:
+async def test_flow_friends_invalid_username(
+    hass: HomeAssistant, default_user: MockUser
+) -> None:
     """Test user initialized flow with invalid username."""
-    with patch_fetch_user(), patch_setup_entry():
+    with patch("pylast.User", return_value=default_user), patch_setup_entry():
         result = await hass.config_entries.flow.async_init(
             DOMAIN,
             context={"source": SOURCE_USER},
@@ -109,7 +116,12 @@ async def test_flow_friends_invalid_username(hass: HomeAssistant) -> None:
         assert result["type"] == data_entry_flow.FlowResultType.FORM
         assert result["step_id"] == "friends"
 
-    with patch_fetch_user(thrown_error=WSError("network", "status", "User not found")):
+    with patch(
+        "pylast.User",
+        return_value=MockUser(
+            thrown_error=WSError("network", "status", "User not found")
+        ),
+    ):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"], user_input=CONF_FRIENDS_DATA
         )
@@ -117,7 +129,7 @@ async def test_flow_friends_invalid_username(hass: HomeAssistant) -> None:
         assert result["step_id"] == "friends"
         assert result["errors"]["base"] == "invalid_account"
 
-    with patch_fetch_user(), patch_setup_entry():
+    with patch("pylast.User", return_value=default_user), patch_setup_entry():
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"], user_input=CONF_FRIENDS_DATA
         )
@@ -126,9 +138,11 @@ async def test_flow_friends_invalid_username(hass: HomeAssistant) -> None:
         assert result["options"] == CONF_DATA
 
 
-async def test_flow_friends_no_friends(hass: HomeAssistant) -> None:
+async def test_flow_friends_no_friends(
+    hass: HomeAssistant, default_user: MockUser
+) -> None:
     """Test options is empty when user has no friends."""
-    with patch_fetch_user(has_friends=False), patch_setup_entry():
+    with patch("pylast.User", return_value=default_user), patch_setup_entry():
         result = await hass.config_entries.flow.async_init(
             DOMAIN,
             context={"source": SOURCE_USER},
@@ -142,9 +156,9 @@ async def test_flow_friends_no_friends(hass: HomeAssistant) -> None:
         assert len(result["data_schema"].schema[CONF_USERS].config["options"]) == 0
 
 
-async def test_import_flow_success(hass: HomeAssistant) -> None:
+async def test_import_flow_success(hass: HomeAssistant, default_user: MockUser) -> None:
     """Test import flow."""
-    with patch_fetch_user():
+    with patch("pylast.User", return_value=default_user):
         result = await hass.config_entries.flow.async_init(
             DOMAIN,
             context={"source": SOURCE_IMPORT},
@@ -160,16 +174,16 @@ async def test_import_flow_success(hass: HomeAssistant) -> None:
     }
 
 
-async def test_import_flow_already_exist(hass: HomeAssistant) -> None:
+async def test_import_flow_already_exist(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
     """Test import of yaml already exist."""
+    await setup_integration(config_entry, default_user)
 
-    MockConfigEntry(
-        domain=DOMAIN,
-        data={},
-        options={CONF_API_KEY: API_KEY, CONF_USERS: ["test"]},
-    ).add_to_hass(hass)
-
-    with patch_fetch_user():
+    with patch("pylast.User", return_value=default_user):
         result = await hass.config_entries.flow.async_init(
             DOMAIN,
             context={"source": SOURCE_IMPORT},
@@ -181,20 +195,16 @@ async def test_import_flow_already_exist(hass: HomeAssistant) -> None:
     assert result["reason"] == "already_configured"
 
 
-async def test_options_flow(hass: HomeAssistant) -> None:
+async def test_options_flow(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
     """Test updating options."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={},
-        options={
-            CONF_API_KEY: API_KEY,
-            CONF_MAIN_USER: USERNAME_1,
-            CONF_USERS: [USERNAME_1, USERNAME_2],
-        },
-    )
-    entry.add_to_hass(hass)
-    with patch_fetch_user():
-        await hass.config_entries.async_setup(entry.entry_id)
+    await setup_integration(config_entry, default_user)
+    with patch("pylast.User", return_value=default_user):
+        entry = hass.config_entries.async_entries(DOMAIN)[0]
         result = await hass.config_entries.options.async_init(entry.entry_id)
         await hass.async_block_till_done()
 
@@ -215,27 +225,28 @@ async def test_options_flow(hass: HomeAssistant) -> None:
     }
 
 
-async def test_options_flow_incorrect_username(hass: HomeAssistant) -> None:
+async def test_options_flow_incorrect_username(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
     """Test updating options doesn't work with incorrect username."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={},
-        options={
-            CONF_API_KEY: API_KEY,
-            CONF_MAIN_USER: USERNAME_1,
-            CONF_USERS: [USERNAME_1],
-        },
-    )
-    entry.add_to_hass(hass)
-    with patch_fetch_user():
-        await hass.config_entries.async_setup(entry.entry_id)
+    await setup_integration(config_entry, default_user)
+    with patch("pylast.User", return_value=default_user):
+        entry = hass.config_entries.async_entries(DOMAIN)[0]
         result = await hass.config_entries.options.async_init(entry.entry_id)
         await hass.async_block_till_done()
 
         assert result["type"] == data_entry_flow.FlowResultType.FORM
         assert result["step_id"] == "init"
 
-    with patch_fetch_user(thrown_error=WSError("network", "status", "User not found")):
+    with patch(
+        "pylast.User",
+        return_value=MockUser(
+            thrown_error=WSError("network", "status", "User not found")
+        ),
+    ):
         result = await hass.config_entries.options.async_configure(
             result["flow_id"],
             user_input={CONF_USERS: [USERNAME_1]},
@@ -246,7 +257,7 @@ async def test_options_flow_incorrect_username(hass: HomeAssistant) -> None:
         assert result["step_id"] == "init"
         assert result["errors"]["base"] == "invalid_account"
 
-    with patch_fetch_user():
+    with patch("pylast.User", return_value=default_user):
         result = await hass.config_entries.options.async_configure(
             result["flow_id"],
             user_input={CONF_USERS: [USERNAME_1]},
@@ -261,20 +272,16 @@ async def test_options_flow_incorrect_username(hass: HomeAssistant) -> None:
     }
 
 
-async def test_options_flow_from_import(hass: HomeAssistant) -> None:
+async def test_options_flow_from_import(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
     """Test updating options gained from import."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={},
-        options={
-            CONF_API_KEY: API_KEY,
-            CONF_MAIN_USER: None,
-            CONF_USERS: [USERNAME_1],
-        },
-    )
-    entry.add_to_hass(hass)
-    with patch_fetch_user():
-        await hass.config_entries.async_setup(entry.entry_id)
+    await setup_integration(config_entry, default_user)
+    with patch("pylast.User", return_value=default_user):
+        entry = hass.config_entries.async_entries(DOMAIN)[0]
         result = await hass.config_entries.options.async_init(entry.entry_id)
         await hass.async_block_till_done()
 
@@ -283,20 +290,16 @@ async def test_options_flow_from_import(hass: HomeAssistant) -> None:
         assert len(result["data_schema"].schema[CONF_USERS].config["options"]) == 0
 
 
-async def test_options_flow_without_friends(hass: HomeAssistant) -> None:
+async def test_options_flow_without_friends(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
     """Test updating options for someone without friends."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={},
-        options={
-            CONF_API_KEY: API_KEY,
-            CONF_MAIN_USER: USERNAME_1,
-            CONF_USERS: [USERNAME_1],
-        },
-    )
-    entry.add_to_hass(hass)
-    with patch_fetch_user(has_friends=False):
-        await hass.config_entries.async_setup(entry.entry_id)
+    await setup_integration(config_entry, default_user)
+    with patch("pylast.User", return_value=default_user):
+        entry = hass.config_entries.async_entries(DOMAIN)[0]
         result = await hass.config_entries.options.async_init(entry.entry_id)
         await hass.async_block_till_done()
 
diff --git a/tests/components/lastfm/test_init.py b/tests/components/lastfm/test_init.py
index 832494f28de..8f731385e6f 100644
--- a/tests/components/lastfm/test_init.py
+++ b/tests/components/lastfm/test_init.py
@@ -1,30 +1,24 @@
 """Test LastFM component setup process."""
 from __future__ import annotations
 
-from homeassistant.components.lastfm.const import CONF_MAIN_USER, CONF_USERS, DOMAIN
-from homeassistant.const import CONF_API_KEY
+from homeassistant.components.lastfm.const import DOMAIN
 from homeassistant.core import HomeAssistant
 
-from . import USERNAME_1, USERNAME_2, patch_fetch_user
+from . import MockUser
+from .conftest import ComponentSetup
 
 from tests.common import MockConfigEntry
 
 
-async def test_load_unload_entry(hass: HomeAssistant) -> None:
+async def test_load_unload_entry(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
     """Test load and unload entry."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={},
-        options={
-            CONF_API_KEY: "12345678",
-            CONF_MAIN_USER: [USERNAME_1],
-            CONF_USERS: [USERNAME_1, USERNAME_2],
-        },
-    )
-    entry.add_to_hass(hass)
-    with patch_fetch_user():
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
+    await setup_integration(config_entry, default_user)
+    entry = hass.config_entries.async_entries(DOMAIN)[0]
 
     state = hass.states.get("sensor.testaccount1")
     assert state
diff --git a/tests/components/lastfm/test_sensor.py b/tests/components/lastfm/test_sensor.py
index 06e8e812ca7..e46cf99ffdc 100644
--- a/tests/components/lastfm/test_sensor.py
+++ b/tests/components/lastfm/test_sensor.py
@@ -1,22 +1,92 @@
 """Tests for the lastfm sensor."""
+from unittest.mock import patch
 
-from pylast import Track
+from pylast import WSError
 
-from homeassistant.components.lastfm.const import DOMAIN, STATE_NOT_SCROBBLING
+from homeassistant.components.lastfm.const import (
+    ATTR_LAST_PLAYED,
+    ATTR_PLAY_COUNT,
+    ATTR_TOP_PLAYED,
+    CONF_USERS,
+    DOMAIN,
+    STATE_NOT_SCROBBLING,
+)
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import CONF_API_KEY, CONF_PLATFORM, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import issue_registry as ir
+from homeassistant.setup import async_setup_component
 
-from . import CONF_DATA, MockNetwork, patch_fetch_user
+from . import API_KEY, USERNAME_1, MockUser
+from .conftest import ComponentSetup
 
 from tests.common import MockConfigEntry
 
+LEGACY_CONFIG = {
+    Platform.SENSOR: [
+        {CONF_PLATFORM: DOMAIN, CONF_API_KEY: API_KEY, CONF_USERS: [USERNAME_1]}
+    ]
+}
 
-async def test_update_not_playing(hass: HomeAssistant) -> None:
-    """Test update when no playing song."""
-    entry = MockConfigEntry(domain=DOMAIN, data={}, options=CONF_DATA)
-    entry.add_to_hass(hass)
-    with patch_fetch_user(None):
-        await hass.config_entries.async_setup(entry.entry_id)
+
+async def test_legacy_migration(hass: HomeAssistant) -> None:
+    """Test migration from yaml to config flow."""
+    with patch("pylast.User", return_value=None):
+        assert await async_setup_component(hass, Platform.SENSOR, LEGACY_CONFIG)
         await hass.async_block_till_done()
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    assert entries[0].state is ConfigEntryState.LOADED
+    issue_registry = ir.async_get(hass)
+    assert len(issue_registry.issues) == 1
+
+
+async def test_user_unavailable(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test update when user can't be fetched."""
+    await setup_integration(
+        config_entry,
+        MockUser(thrown_error=WSError("network", "status", "User not found")),
+    )
+
+    entity_id = "sensor.testaccount1"
+
+    state = hass.states.get(entity_id)
+
+    assert state.state == "unavailable"
+
+
+async def test_first_time_user(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    first_time_user: MockUser,
+) -> None:
+    """Test first time user."""
+    await setup_integration(config_entry, first_time_user)
+
+    entity_id = "sensor.testaccount1"
+
+    state = hass.states.get(entity_id)
+
+    assert state.state == STATE_NOT_SCROBBLING
+    assert state.attributes[ATTR_LAST_PLAYED] is None
+    assert state.attributes[ATTR_TOP_PLAYED] is None
+    assert state.attributes[ATTR_PLAY_COUNT] == 0
+
+
+async def test_update_not_playing(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    first_time_user: MockUser,
+) -> None:
+    """Test update when no playing song."""
+    await setup_integration(config_entry, first_time_user)
+
     entity_id = "sensor.testaccount1"
 
     state = hass.states.get(entity_id)
@@ -24,15 +94,20 @@ async def test_update_not_playing(hass: HomeAssistant) -> None:
     assert state.state == STATE_NOT_SCROBBLING
 
 
-async def test_update_playing(hass: HomeAssistant) -> None:
+async def test_update_playing(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
     """Test update when playing a song."""
-    entry = MockConfigEntry(domain=DOMAIN, data={}, options=CONF_DATA)
-    entry.add_to_hass(hass)
-    with patch_fetch_user(Track("artist", "title", MockNetwork("test"))):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
+    await setup_integration(config_entry, default_user)
+
     entity_id = "sensor.testaccount1"
 
     state = hass.states.get(entity_id)
 
     assert state.state == "artist - title"
+    assert state.attributes[ATTR_LAST_PLAYED] == "artist - title"
+    assert state.attributes[ATTR_TOP_PLAYED] == "artist - title"
+    assert state.attributes[ATTR_PLAY_COUNT] == 1
diff --git a/tests/components/lcn/test_device_trigger.py b/tests/components/lcn/test_device_trigger.py
index a4fb396c700..637aeec1b0b 100644
--- a/tests/components/lcn/test_device_trigger.py
+++ b/tests/components/lcn/test_device_trigger.py
@@ -2,6 +2,7 @@
 from pypck.inputs import ModSendKeysHost, ModStatusAccessControl
 from pypck.lcn_addr import LcnAddr
 from pypck.lcn_defs import AccessControlPeriphery, KeyAction, SendKeyCommand
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 from homeassistant.components import automation
@@ -15,7 +16,7 @@ from homeassistant.setup import async_setup_component
 
 from .conftest import get_device
 
-from tests.common import assert_lists_same, async_get_device_automations
+from tests.common import async_get_device_automations
 
 
 async def test_get_triggers_module_device(
@@ -44,7 +45,7 @@ async def test_get_triggers_module_device(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_non_module_device(
diff --git a/tests/components/lifx/test_light.py b/tests/components/lifx/test_light.py
index 67bf2754d11..f64af98c9b5 100644
--- a/tests/components/lifx/test_light.py
+++ b/tests/components/lifx/test_light.py
@@ -683,7 +683,7 @@ async def test_matrix_flame_morph_effects(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: entity_id, ATTR_EFFECT: "effect_flame"},
         blocking=True,
     )
-
+    await hass.async_block_till_done()
     assert len(bulb.set_power.calls) == 1
     assert len(bulb.set_tile_effect.calls) == 1
 
@@ -824,7 +824,7 @@ async def test_lightstrip_move_effect(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: entity_id, ATTR_EFFECT: "effect_move"},
         blocking=True,
     )
-
+    await hass.async_block_till_done()
     assert len(bulb.set_power.calls) == 1
     assert len(bulb.set_multizone_effect.calls) == 1
 
@@ -881,6 +881,7 @@ async def test_lightstrip_move_effect(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: entity_id, ATTR_EFFECT: "effect_stop"},
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(bulb.set_power.calls) == 0
     assert len(bulb.set_multizone_effect.calls) == 1
     call_dict = bulb.set_multizone_effect.calls[0][1]
diff --git a/tests/components/light/test_device_action.py b/tests/components/light/test_device_action.py
index ef1d653fbd9..dcb52d68a79 100644
--- a/tests/components/light/test_device_action.py
+++ b/tests/components/light/test_device_action.py
@@ -1,5 +1,6 @@
 """The test for light device automation."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -11,15 +12,17 @@ from homeassistant.components.light import (
     ColorMode,
     LightEntityFeature,
 )
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
+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
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
@@ -49,7 +52,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -57,28 +60,27 @@ async def test_get_actions(
         supported_features=LightEntityFeature.FLASH,
         capabilities={"supported_color_modes": ["brightness"]},
     )
-    expected_actions = []
-    expected_actions += [
+    expected_actions = [
         {
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in [
-            "turn_off",
-            "turn_on",
-            "toggle",
             "brightness_decrease",
             "brightness_increase",
             "flash",
+            "turn_off",
+            "turn_on",
+            "toggle",
         ]
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -104,7 +106,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -120,7 +122,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["turn_on", "turn_off", "toggle"]
@@ -128,7 +130,7 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_action_capabilities(
@@ -168,7 +170,7 @@ async def test_get_action_capabilities(
         capabilities = await async_get_device_automation_capabilities(
             hass, DeviceAutomationType.ACTION, action
         )
-        assert capabilities == {"extra_fields": []}
+        assert capabilities == {"extra_fields": []} or capabilities == {}
 
 
 @pytest.mark.parametrize(
@@ -318,17 +320,162 @@ async def test_get_action_capabilities_features(
         assert capabilities == expected
 
 
+@pytest.mark.parametrize(
+    (
+        "set_state",
+        "expected_actions",
+        "supported_features_reg",
+        "supported_features_state",
+        "capabilities_reg",
+        "attributes_state",
+        "expected_capabilities",
+    ),
+    [
+        (
+            False,
+            {
+                "turn_on",
+                "toggle",
+                "turn_off",
+                "brightness_increase",
+                "brightness_decrease",
+            },
+            0,
+            0,
+            {ATTR_SUPPORTED_COLOR_MODES: [ColorMode.BRIGHTNESS]},
+            {},
+            {
+                "turn_on": [
+                    {
+                        "name": "brightness_pct",
+                        "optional": True,
+                        "type": "float",
+                        "valueMax": 100,
+                        "valueMin": 0,
+                    }
+                ]
+            },
+        ),
+        (
+            True,
+            {
+                "turn_on",
+                "toggle",
+                "turn_off",
+                "brightness_increase",
+                "brightness_decrease",
+            },
+            0,
+            0,
+            None,
+            {ATTR_SUPPORTED_COLOR_MODES: [ColorMode.BRIGHTNESS]},
+            {
+                "turn_on": [
+                    {
+                        "name": "brightness_pct",
+                        "optional": True,
+                        "type": "float",
+                        "valueMax": 100,
+                        "valueMin": 0,
+                    }
+                ]
+            },
+        ),
+        (
+            False,
+            {"turn_on", "toggle", "turn_off", "flash"},
+            LightEntityFeature.FLASH,
+            0,
+            None,
+            {},
+            {
+                "turn_on": [
+                    {
+                        "name": "flash",
+                        "optional": True,
+                        "type": "select",
+                        "options": [("short", "short"), ("long", "long")],
+                    }
+                ]
+            },
+        ),
+        (
+            True,
+            {"turn_on", "toggle", "turn_off", "flash"},
+            0,
+            LightEntityFeature.FLASH,
+            None,
+            {},
+            {
+                "turn_on": [
+                    {
+                        "name": "flash",
+                        "optional": True,
+                        "type": "select",
+                        "options": [("short", "short"), ("long", "long")],
+                    }
+                ]
+            },
+        ),
+    ],
+)
+async def test_get_action_capabilities_features_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    expected_actions,
+    supported_features_reg,
+    supported_features_state,
+    capabilities_reg,
+    attributes_state,
+    expected_capabilities,
+) -> None:
+    """Test we get the expected capabilities from a light action."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_id = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        "5678",
+        device_id=device_entry.id,
+        supported_features=supported_features_reg,
+        capabilities=capabilities_reg,
+    ).entity_id
+    if set_state:
+        hass.states.async_set(
+            entity_id,
+            None,
+            {"supported_features": supported_features_state, **attributes_state},
+        )
+
+    actions = await async_get_device_automations(
+        hass, DeviceAutomationType.ACTION, device_entry.id
+    )
+    assert len(actions) == len(expected_actions)
+    action_types = {action["type"] for action in actions}
+    assert action_types == expected_actions
+    for action in actions:
+        action["entity_id"] = entity_registry.async_get(action["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.ACTION, action
+        )
+        expected = {"extra_fields": expected_capabilities.get(action["type"], [])}
+        assert capabilities == expected
+
+
 async def test_action(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off actions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1 = platform.ENTITIES[0]
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -340,7 +487,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                 },
@@ -349,7 +496,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                 },
@@ -358,7 +505,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "toggle",
                     },
                 },
@@ -367,7 +514,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "flash",
                     },
                 },
@@ -376,7 +523,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "flash",
                         "flash": "long",
                     },
@@ -389,7 +536,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "brightness_increase",
                     },
                 },
@@ -401,7 +548,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "brightness_decrease",
                     },
                 },
@@ -410,7 +557,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_on",
                         "brightness_pct": 75,
                     },
@@ -419,89 +566,95 @@ async def test_action(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-    assert len(calls) == 0
-
-    hass.bus.async_fire("test_off")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
-
-    hass.bus.async_fire("test_off")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
-
-    hass.bus.async_fire("test_on")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-
-    hass.bus.async_fire("test_on")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-
-    hass.bus.async_fire("test_toggle")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
-
-    hass.bus.async_fire("test_toggle")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-
-    hass.bus.async_fire("test_toggle")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
-
-    hass.bus.async_fire("test_flash_short")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-
-    hass.bus.async_fire("test_toggle")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
-
-    hass.bus.async_fire("test_flash_long")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
 
     turn_on_calls = async_mock_service(hass, DOMAIN, "turn_on")
+    turn_off_calls = async_mock_service(hass, DOMAIN, "turn_off")
+    toggle_calls = async_mock_service(hass, DOMAIN, "toggle")
+
+    hass.bus.async_fire("test_toggle")
+    await hass.async_block_till_done()
+    assert len(toggle_calls) == 1
+    assert toggle_calls[-1].data == {"entity_id": entry.entity_id}
+
+    hass.bus.async_fire("test_off")
+    await hass.async_block_till_done()
+    assert len(turn_off_calls) == 1
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
 
     hass.bus.async_fire("test_brightness_increase")
     await hass.async_block_till_done()
-
     assert len(turn_on_calls) == 1
-    assert turn_on_calls[0].data["entity_id"] == ent1.entity_id
-    assert turn_on_calls[0].data["brightness_step_pct"] == 10
+    assert turn_on_calls[-1].data == {
+        "entity_id": entry.entity_id,
+        "brightness_step_pct": 10,
+    }
 
     hass.bus.async_fire("test_brightness_decrease")
     await hass.async_block_till_done()
-
     assert len(turn_on_calls) == 2
-    assert turn_on_calls[1].data["entity_id"] == ent1.entity_id
-    assert turn_on_calls[1].data["brightness_step_pct"] == -10
+    assert turn_on_calls[-1].data == {
+        "entity_id": entry.entity_id,
+        "brightness_step_pct": -10,
+    }
 
     hass.bus.async_fire("test_brightness")
     await hass.async_block_till_done()
-
     assert len(turn_on_calls) == 3
-    assert turn_on_calls[2].data["entity_id"] == ent1.entity_id
-    assert turn_on_calls[2].data["brightness_pct"] == 75
+    assert turn_on_calls[-1].data == {
+        "entity_id": entry.entity_id,
+        "brightness_pct": 75,
+    }
 
     hass.bus.async_fire("test_on")
     await hass.async_block_till_done()
-
     assert len(turn_on_calls) == 4
-    assert turn_on_calls[3].data["entity_id"] == ent1.entity_id
-    assert "brightness_pct" not in turn_on_calls[3].data
+    assert turn_on_calls[-1].data == {"entity_id": entry.entity_id}
 
     hass.bus.async_fire("test_flash_short")
     await hass.async_block_till_done()
-
     assert len(turn_on_calls) == 5
-    assert turn_on_calls[4].data["entity_id"] == ent1.entity_id
-    assert turn_on_calls[4].data["flash"] == FLASH_SHORT
+    assert turn_on_calls[-1].data == {
+        "entity_id": entry.entity_id,
+        "flash": FLASH_SHORT,
+    }
 
     hass.bus.async_fire("test_flash_long")
     await hass.async_block_till_done()
-
     assert len(turn_on_calls) == 6
-    assert turn_on_calls[5].data["entity_id"] == ent1.entity_id
-    assert turn_on_calls[5].data["flash"] == FLASH_LONG
+    assert turn_on_calls[-1].data == {"entity_id": entry.entity_id, "flash": FLASH_LONG}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_off"},
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "turn_off",
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+
+    turn_off_calls = async_mock_service(hass, DOMAIN, "turn_off")
+
+    hass.bus.async_fire("test_off")
+    await hass.async_block_till_done()
+    assert len(turn_off_calls) == 1
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/light/test_device_condition.py b/tests/components/light/test_device_condition.py
index 42790cc91cb..b38c225347a 100644
--- a/tests/components/light/test_device_condition.py
+++ b/tests/components/light/test_device_condition.py
@@ -3,6 +3,7 @@ from datetime import timedelta
 
 from freezegun import freeze_time
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -16,7 +17,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
@@ -46,7 +46,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -55,7 +55,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in ["is_off", "is_on"]
@@ -89,7 +89,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -103,7 +103,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_off", "is_on"]
@@ -111,7 +111,7 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_get_condition_capabilities(
@@ -144,17 +144,49 @@ async def test_get_condition_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a light condition."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    conditions = await async_get_device_automations(
+        hass, DeviceAutomationType.CONDITION, device_entry.id
+    )
+    for condition in conditions:
+        condition["entity_id"] = entity_registry.async_get(
+            condition["entity_id"]
+        ).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.CONDITION, condition
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_state(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -168,7 +200,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_on",
                         }
                     ],
@@ -187,7 +219,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_off",
                         }
                     ],
@@ -203,7 +235,6 @@ async def test_if_state(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
@@ -212,7 +243,7 @@ async def test_if_state(
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on event - test_event1"
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
@@ -220,10 +251,65 @@ async def test_if_state(
     assert calls[1].data["some"] == "is_off event - test_event2"
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_on",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_on {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(("platform", "event.event_type"))
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_event2")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_on event - test_event1"
+
+
 async def test_if_fires_on_for_condition(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for firing if condition is on with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
     point1 = dt_util.utcnow()
     point2 = point1 + timedelta(seconds=10)
     point3 = point2 + timedelta(seconds=10)
@@ -248,7 +334,7 @@ async def test_if_fires_on_for_condition(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_off",
                             "for": {"seconds": 5},
                         },
@@ -266,7 +352,6 @@ async def test_if_fires_on_for_condition(
             },
         )
         await hass.async_block_till_done()
-        assert hass.states.get(ent1.entity_id).state == STATE_ON
         assert len(calls) == 0
 
         hass.bus.async_fire("test_event1")
@@ -279,7 +364,7 @@ async def test_if_fires_on_for_condition(
         await hass.async_block_till_done()
         assert len(calls) == 0
 
-        hass.states.async_set(ent1.entity_id, STATE_OFF)
+        hass.states.async_set(entry.entity_id, STATE_OFF)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 0
diff --git a/tests/components/light/test_device_trigger.py b/tests/components/light/test_device_trigger.py
index 18f3555aaf7..085193e3b34 100644
--- a/tests/components/light/test_device_trigger.py
+++ b/tests/components/light/test_device_trigger.py
@@ -2,11 +2,12 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.light import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import STATE_OFF, STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -15,7 +16,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
@@ -46,7 +46,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -55,7 +55,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -63,7 +63,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -89,7 +89,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -103,7 +103,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -111,7 +111,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -144,19 +144,47 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a light trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    await hass.async_block_till_done()
-
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -168,7 +196,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_on",
                     },
                     "action": {
@@ -192,7 +220,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_off",
                     },
                     "action": {
@@ -216,7 +244,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "changed_states",
                     },
                     "action": {
@@ -239,39 +267,35 @@ async def test_if_fires_on_state_change(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert {calls[0].data["some"], calls[1].data["some"]} == {
-        f"turn_off device - {ent1.entity_id} - on - off - None",
-        f"turn_on_or_off device - {ent1.entity_id} - on - off - None",
+        f"turn_off device - {entry.entity_id} - on - off - None",
+        f"turn_on_or_off device - {entry.entity_id} - on - off - None",
     }
 
-    hass.states.async_set(ent1.entity_id, STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert {calls[2].data["some"], calls[3].data["some"]} == {
-        f"turn_on device - {ent1.entity_id} - off - on - None",
-        f"turn_on_or_off device - {ent1.entity_id} - off - on - None",
+        f"turn_on device - {entry.entity_id} - off - on - None",
+        f"turn_on_or_off device - {entry.entity_id} - off - on - None",
     }
 
 
-async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
-    """Test for triggers firing with delay."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    await hass.async_block_till_done()
-
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -283,7 +307,61 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.entity_id,
+                        "type": "turned_off",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "turn_on {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"] == f"turn_on device - {entry.entity_id} - on - off - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
                         "type": "turned_off",
                         "for": {"seconds": 5},
                     },
@@ -307,16 +385,16 @@ async def test_if_fires_on_state_change_with_for(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
     await hass.async_block_till_done()
     assert len(calls) == 1
     await hass.async_block_till_done()
-    assert calls[0].data["some"] == "turn_off device - {} - on - off - 0:00:05".format(
-        ent1.entity_id
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - 0:00:05"
     )
diff --git a/tests/components/light/test_init.py b/tests/components/light/test_init.py
index 4b4c027541e..2dc8e504898 100644
--- a/tests/components/light/test_init.py
+++ b/tests/components/light/test_init.py
@@ -872,7 +872,7 @@ async def test_light_context(
 
 
 async def test_light_turn_on_auth(
-    hass: HomeAssistant, hass_admin_user: MockUser, enable_custom_integrations: None
+    hass: HomeAssistant, hass_read_only_user: MockUser, enable_custom_integrations: None
 ) -> None:
     """Test that light context works."""
     platform = getattr(hass.components, "test.light")
@@ -883,7 +883,7 @@ async def test_light_turn_on_auth(
     state = hass.states.get("light.ceiling")
     assert state is not None
 
-    hass_admin_user.mock_policy({})
+    hass_read_only_user.mock_policy({})
 
     with pytest.raises(Unauthorized):
         await hass.services.async_call(
@@ -891,7 +891,7 @@ async def test_light_turn_on_auth(
             "turn_on",
             {"entity_id": state.entity_id},
             blocking=True,
-            context=core.Context(user_id=hass_admin_user.id),
+            context=core.Context(user_id=hass_read_only_user.id),
         )
 
 
diff --git a/tests/components/light/test_recorder.py b/tests/components/light/test_recorder.py
index 2c85dac0bd4..edf691b6099 100644
--- a/tests/components/light/test_recorder.py
+++ b/tests/components/light/test_recorder.py
@@ -2,6 +2,9 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import light
 from homeassistant.components.light import (
@@ -14,7 +17,7 @@ from homeassistant.components.light import (
 )
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -23,6 +26,16 @@ from tests.common import async_fire_time_changed
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def light_only() -> None:
+    """Enable only the light platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.LIGHT],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test light registered attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/litterrobot/test_time.py b/tests/components/litterrobot/test_time.py
new file mode 100644
index 00000000000..6532f2a3bc7
--- /dev/null
+++ b/tests/components/litterrobot/test_time.py
@@ -0,0 +1,35 @@
+"""Test the Litter-Robot time entity."""
+from __future__ import annotations
+
+from datetime import time
+from unittest.mock import MagicMock
+
+from pylitterbot import LitterRobot3
+
+from homeassistant.components.time import DOMAIN as PLATFORM_DOMAIN
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+from .conftest import setup_integration
+
+SLEEP_START_TIME_ENTITY_ID = "time.test_sleep_mode_start_time"
+
+
+async def test_sleep_mode_start_time(
+    hass: HomeAssistant, mock_account: MagicMock
+) -> None:
+    """Tests the sleep mode start time."""
+    await setup_integration(hass, mock_account, PLATFORM_DOMAIN)
+
+    entity = hass.states.get(SLEEP_START_TIME_ENTITY_ID)
+    assert entity
+    assert entity.state == "17:16:00"
+
+    robot: LitterRobot3 = mock_account.robots[0]
+    await hass.services.async_call(
+        PLATFORM_DOMAIN,
+        "set_value",
+        {ATTR_ENTITY_ID: SLEEP_START_TIME_ENTITY_ID, "time": time(23, 0)},
+        blocking=True,
+    )
+    robot.set_sleep_mode.assert_awaited_once_with(True, time(23, 0))
diff --git a/tests/components/local_ip/test_init.py b/tests/components/local_ip/test_init.py
index 21becc39a94..5c9e9b4f551 100644
--- a/tests/components/local_ip/test_init.py
+++ b/tests/components/local_ip/test_init.py
@@ -3,8 +3,7 @@ from __future__ import annotations
 
 from homeassistant import config_entries
 from homeassistant.components.local_ip import DOMAIN
-from homeassistant.components.network import async_get_source_ip
-from homeassistant.components.zeroconf import MDNS_TARGET_IP
+from homeassistant.components.network import MDNS_TARGET_IP, async_get_source_ip
 from homeassistant.core import HomeAssistant
 
 from tests.common import MockConfigEntry
diff --git a/tests/components/lock/test_device_action.py b/tests/components/lock/test_device_action.py
index 682467bf475..f87fa4cc178 100644
--- a/tests/components/lock/test_device_action.py
+++ b/tests/components/lock/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Lock device actions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -12,7 +13,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -48,7 +48,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -66,7 +66,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in basic_action_types
@@ -76,7 +76,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in expected_action_types
@@ -84,7 +84,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -110,7 +110,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -125,7 +125,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["lock", "unlock"]
@@ -133,11 +133,13 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for lock actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -148,7 +150,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "lock.entity",
+                        "entity_id": entry.id,
                         "type": "lock",
                     },
                 },
@@ -157,7 +159,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "lock.entity",
+                        "entity_id": entry.id,
                         "type": "unlock",
                     },
                 },
@@ -166,7 +168,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "lock.entity",
+                        "entity_id": entry.id,
                         "type": "open",
                     },
                 },
@@ -196,3 +198,49 @@ async def test_action(hass: HomeAssistant) -> None:
     assert len(lock_calls) == 1
     assert len(unlock_calls) == 1
     assert len(open_calls) == 1
+
+    assert lock_calls[0].domain == DOMAIN
+    assert lock_calls[0].service == "lock"
+    assert lock_calls[0].data == {"entity_id": entry.entity_id}
+    assert unlock_calls[0].domain == DOMAIN
+    assert unlock_calls[0].service == "unlock"
+    assert unlock_calls[0].data == {"entity_id": entry.entity_id}
+    assert open_calls[0].domain == DOMAIN
+    assert open_calls[0].service == "open"
+    assert open_calls[0].data == {"entity_id": entry.entity_id}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for lock actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event_lock"},
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.id,
+                        "type": "lock",
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+
+    lock_calls = async_mock_service(hass, "lock", "lock")
+
+    hass.bus.async_fire("test_event_lock")
+    await hass.async_block_till_done()
+    assert len(lock_calls) == 1
+
+    assert lock_calls[0].domain == DOMAIN
+    assert lock_calls[0].service == "lock"
+    assert lock_calls[0].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/lock/test_device_condition.py b/tests/components/lock/test_device_condition.py
index 32341d15e7b..43513930f2e 100644
--- a/tests/components/lock/test_device_condition.py
+++ b/tests/components/lock/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Lock device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -19,7 +20,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -48,7 +48,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -57,7 +57,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in [
@@ -71,7 +71,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -97,7 +97,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -111,7 +111,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in [
@@ -125,12 +125,16 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("lock.entity", STATE_LOCKED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_LOCKED)
 
     assert await async_setup_component(
         hass,
@@ -144,7 +148,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "lock.entity",
+                            "entity_id": entry.id,
                             "type": "is_locked",
                         }
                     ],
@@ -162,7 +166,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "lock.entity",
+                            "entity_id": entry.id,
                             "type": "is_unlocked",
                         }
                     ],
@@ -180,7 +184,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "lock.entity",
+                            "entity_id": entry.id,
                             "type": "is_unlocking",
                         }
                     ],
@@ -198,7 +202,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "lock.entity",
+                            "entity_id": entry.id,
                             "type": "is_locking",
                         }
                     ],
@@ -216,7 +220,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "lock.entity",
+                            "entity_id": entry.id,
                             "type": "is_jammed",
                         }
                     ],
@@ -236,27 +240,68 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_locked - event - test_event1"
 
-    hass.states.async_set("lock.entity", STATE_UNLOCKED)
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKED)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_unlocked - event - test_event2"
 
-    hass.states.async_set("lock.entity", STATE_UNLOCKING)
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKING)
     hass.bus.async_fire("test_event3")
     await hass.async_block_till_done()
     assert len(calls) == 3
     assert calls[2].data["some"] == "is_unlocking - event - test_event3"
 
-    hass.states.async_set("lock.entity", STATE_LOCKING)
+    hass.states.async_set(entry.entity_id, STATE_LOCKING)
     hass.bus.async_fire("test_event4")
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert calls[3].data["some"] == "is_locking - event - test_event4"
 
-    hass.states.async_set("lock.entity", STATE_JAMMED)
+    hass.states.async_set(entry.entity_id, STATE_JAMMED)
     hass.bus.async_fire("test_event5")
     await hass.async_block_till_done()
     assert len(calls) == 5
     assert calls[4].data["some"] == "is_jammed - event - test_event5"
+
+
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_LOCKED)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_locked",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_locked - {{ trigger.platform }} - {{ trigger.event.event_type }}"
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_event2")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_locked - event - test_event1"
diff --git a/tests/components/lock/test_device_trigger.py b/tests/components/lock/test_device_trigger.py
index 13340fbe668..107e0924440 100644
--- a/tests/components/lock/test_device_trigger.py
+++ b/tests/components/lock/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -22,7 +23,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
@@ -53,7 +53,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -62,7 +62,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["locked", "unlocked", "unlocking", "locking", "jammed"]
@@ -70,7 +70,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -96,7 +96,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -110,7 +110,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["locked", "unlocked", "unlocking", "locking", "jammed"]
@@ -118,7 +118,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -152,9 +152,45 @@ async def test_get_trigger_capabilities(
         }
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a lock."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    assert len(triggers) == 5
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == {
+            "extra_fields": [
+                {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+            ]
+        }
+
+
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
-    hass.states.async_set("lock.entity", STATE_UNLOCKED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKED)
 
     assert await async_setup_component(
         hass,
@@ -166,7 +202,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "lock.entity",
+                        "entity_id": entry.id,
                         "type": "locked",
                     },
                     "action": {
@@ -185,7 +221,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "lock.entity",
+                        "entity_id": entry.id,
                         "type": "unlocked",
                     },
                     "action": {
@@ -204,26 +240,31 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Fake that the entity is turning on.
-    hass.states.async_set("lock.entity", STATE_LOCKED)
+    hass.states.async_set(entry.entity_id, STATE_LOCKED)
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data[
-        "some"
-    ] == "locked - device - {} - unlocked - locked - None".format("lock.entity")
+    assert (
+        calls[0].data["some"]
+        == f"locked - device - {entry.entity_id} - unlocked - locked - None"
+    )
 
     # Fake that the entity is turning off.
-    hass.states.async_set("lock.entity", STATE_UNLOCKED)
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKED)
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data[
-        "some"
-    ] == "unlocked - device - {} - locked - unlocked - None".format("lock.entity")
+    assert (
+        calls[1].data["some"]
+        == f"unlocked - device - {entry.entity_id} - locked - unlocked - None"
+    )
 
 
-async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) -> None:
-    """Test for triggers firing with delay."""
-    entity_id = f"{DOMAIN}.entity"
-    hass.states.async_set(entity_id, STATE_UNLOCKED)
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKED)
 
     assert await async_setup_component(
         hass,
@@ -235,7 +276,53 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.entity_id,
+                        "type": "locked",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "locked - {{ trigger.platform}} - "
+                                "{{ trigger.entity_id}} - {{ trigger.from_state.state}} - "
+                                "{{ trigger.to_state.state}} - {{ trigger.for }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the entity is turning on.
+    hass.states.async_set(entry.entity_id, STATE_LOCKED)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"locked - device - {entry.entity_id} - unlocked - locked - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKED)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
                         "type": "locked",
                         "for": {"seconds": 5},
                     },
@@ -260,7 +347,7 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
                         "type": "unlocking",
                         "for": {"seconds": 5},
                     },
@@ -285,7 +372,7 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
                         "type": "jammed",
                         "for": {"seconds": 5},
                     },
@@ -310,7 +397,7 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
                         "type": "locking",
                         "for": {"seconds": 5},
                     },
@@ -334,10 +421,9 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == STATE_UNLOCKED
     assert len(calls) == 0
 
-    hass.states.async_set(entity_id, STATE_LOCKED)
+    hass.states.async_set(entry.entity_id, STATE_LOCKED)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -346,10 +432,10 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     await hass.async_block_till_done()
     assert (
         calls[0].data["some"]
-        == f"turn_off device - {entity_id} - unlocked - locked - 0:00:05"
+        == f"turn_off device - {entry.entity_id} - unlocked - locked - 0:00:05"
     )
 
-    hass.states.async_set(entity_id, STATE_UNLOCKING)
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKING)
     await hass.async_block_till_done()
     assert len(calls) == 1
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=16))
@@ -358,10 +444,10 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     await hass.async_block_till_done()
     assert (
         calls[1].data["some"]
-        == f"turn_on device - {entity_id} - locked - unlocking - 0:00:05"
+        == f"turn_on device - {entry.entity_id} - locked - unlocking - 0:00:05"
     )
 
-    hass.states.async_set(entity_id, STATE_JAMMED)
+    hass.states.async_set(entry.entity_id, STATE_JAMMED)
     await hass.async_block_till_done()
     assert len(calls) == 2
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=21))
@@ -370,10 +456,10 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     await hass.async_block_till_done()
     assert (
         calls[2].data["some"]
-        == f"turn_off device - {entity_id} - unlocking - jammed - 0:00:05"
+        == f"turn_off device - {entry.entity_id} - unlocking - jammed - 0:00:05"
     )
 
-    hass.states.async_set(entity_id, STATE_LOCKING)
+    hass.states.async_set(entry.entity_id, STATE_LOCKING)
     await hass.async_block_till_done()
     assert len(calls) == 3
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=27))
@@ -382,5 +468,5 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     await hass.async_block_till_done()
     assert (
         calls[3].data["some"]
-        == f"turn_on device - {entity_id} - jammed - locking - 0:00:05"
+        == f"turn_on device - {entry.entity_id} - jammed - locking - 0:00:05"
     )
diff --git a/tests/components/logbook/test_init.py b/tests/components/logbook/test_init.py
index c961d40574d..2a93e6e1d4c 100644
--- a/tests/components/logbook/test_init.py
+++ b/tests/components/logbook/test_init.py
@@ -2639,7 +2639,7 @@ async def test_get_events_with_device_ids(
 
         @ha.callback
         def async_describe_events(
-            hass: HomeAssistant,
+            hass: HomeAssistant,  # noqa: N805
             async_describe_event: Callable[
                 [str, str, Callable[[Event], dict[str, str]]], None
             ],
diff --git a/tests/components/logbook/test_websocket_api.py b/tests/components/logbook/test_websocket_api.py
index 9e991795083..c68cbedc44a 100644
--- a/tests/components/logbook/test_websocket_api.py
+++ b/tests/components/logbook/test_websocket_api.py
@@ -68,7 +68,7 @@ async def _async_mock_logbook_platform_with_broken_describe(
 
         @core.callback
         def async_describe_events(
-            hass: HomeAssistant,
+            hass: HomeAssistant,  # noqa: N805
             async_describe_event: Callable[
                 [str, str, Callable[[Event], dict[str, str]]], None
             ],
@@ -91,7 +91,7 @@ async def _async_mock_logbook_platform(hass: HomeAssistant) -> None:
 
         @core.callback
         def async_describe_events(
-            hass: HomeAssistant,
+            hass: HomeAssistant,  # noqa: N805
             async_describe_event: Callable[
                 [str, str, Callable[[Event], dict[str, str]]], None
             ],
diff --git a/tests/components/loqed/__init__.py b/tests/components/loqed/__init__.py
new file mode 100644
index 00000000000..c40c0f7c8f5
--- /dev/null
+++ b/tests/components/loqed/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Loqed integration."""
diff --git a/tests/components/loqed/conftest.py b/tests/components/loqed/conftest.py
new file mode 100644
index 00000000000..da7009a5744
--- /dev/null
+++ b/tests/components/loqed/conftest.py
@@ -0,0 +1,72 @@
+"""Contains fixtures for Loqed tests."""
+
+from collections.abc import AsyncGenerator
+import json
+from typing import Any
+from unittest.mock import AsyncMock, Mock, patch
+
+from loqedAPI import loqed
+import pytest
+
+from homeassistant.components.loqed import DOMAIN
+from homeassistant.const import CONF_API_TOKEN, CONF_NAME, CONF_WEBHOOK_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry, load_fixture
+
+
+@pytest.fixture(name="config_entry")
+def config_entry_fixture() -> MockConfigEntry:
+    """Mock config entry."""
+
+    config = load_fixture("loqed/integration_config.json")
+    json_config = json.loads(config)
+    return MockConfigEntry(
+        version=1,
+        domain=DOMAIN,
+        data={
+            "id": "Foo",
+            "bridge_ip": json_config["bridge_ip"],
+            "bridge_mdns_hostname": json_config["bridge_mdns_hostname"],
+            "bridge_key": json_config["bridge_key"],
+            "lock_key_local_id": int(json_config["lock_key_local_id"]),
+            "lock_key_key": json_config["lock_key_key"],
+            CONF_WEBHOOK_ID: "Webhook_id",
+            CONF_API_TOKEN: "Token",
+            CONF_NAME: "Home",
+        },
+    )
+
+
+@pytest.fixture(name="lock")
+def lock_fixture() -> loqed.Lock:
+    """Set up a mock implementation of a Lock."""
+    webhooks_fixture = json.loads(load_fixture("loqed/get_all_webhooks.json"))
+
+    mock_lock = Mock(spec=loqed.Lock, id="Foo", last_key_id=2)
+    mock_lock.name = "LOQED smart lock"
+    mock_lock.getWebhooks = AsyncMock(return_value=webhooks_fixture)
+    mock_lock.bolt_state = "locked"
+    return mock_lock
+
+
+@pytest.fixture(name="integration")
+async def integration_fixture(
+    hass: HomeAssistant, config_entry: MockConfigEntry, lock: loqed.Lock
+) -> AsyncGenerator[MockConfigEntry, None]:
+    """Set up the loqed integration with a config entry."""
+    config: dict[str, Any] = {DOMAIN: {CONF_API_TOKEN: ""}}
+    config_entry.add_to_hass(hass)
+
+    lock_status = json.loads(load_fixture("loqed/status_ok.json"))
+
+    with patch("loqedAPI.loqed.LoqedAPI.async_get_lock", return_value=lock), patch(
+        "loqedAPI.loqed.LoqedAPI.async_get_lock_details", return_value=lock_status
+    ), patch(
+        "homeassistant.components.webhook.async_generate_url",
+        return_value="http://hook_id",
+    ):
+        await async_setup_component(hass, DOMAIN, config)
+        await hass.async_block_till_done()
+        yield config_entry
diff --git a/tests/components/loqed/fixtures/battery_update.json b/tests/components/loqed/fixtures/battery_update.json
new file mode 100644
index 00000000000..be62d7f14f8
--- /dev/null
+++ b/tests/components/loqed/fixtures/battery_update.json
@@ -0,0 +1,6 @@
+{
+  "battery_type": "NICKEL_METAL_HYDRIDE",
+  "battery_percentage": 88,
+  "mac_wifi": "**REDACTED**",
+  "mac_ble": "**REDACTED**"
+}
diff --git a/tests/components/loqed/fixtures/get_all_locks.json b/tests/components/loqed/fixtures/get_all_locks.json
new file mode 100644
index 00000000000..bd8489c5c87
--- /dev/null
+++ b/tests/components/loqed/fixtures/get_all_locks.json
@@ -0,0 +1,26 @@
+{
+  "data": [
+    {
+      "id": "Foo",
+      "name": "MyLock",
+      "battery_percentage": 64,
+      "battery_type": "nickel_metal_hydride",
+      "bolt_state": "day_lock",
+      "party_mode": false,
+      "guest_access_mode": false,
+      "twist_assist": false,
+      "touch_to_connect": true,
+      "lock_direction": "clockwise",
+      "mortise_lock_type": "cylinder_operated_no_handle_on_the_outside",
+      "supported_lock_states": ["open", "day_lock", "night_lock"],
+      "online": true,
+      "bridge_ip": "192.168.12.34",
+      "bridge_hostname": "LOQED-aabbccddeeff.local",
+      "local_id": 1,
+      "key_secret": "SGFsbG8gd2VyZWxk",
+      "backend_key": "aGVsbG8gd29ybGQ=",
+      "bridge_webhook_count": 1,
+      "bridge_key": "Ym9uam91ciBtb25kZQ=="
+    }
+  ]
+}
diff --git a/tests/components/loqed/fixtures/get_all_webhooks.json b/tests/components/loqed/fixtures/get_all_webhooks.json
new file mode 100644
index 00000000000..cf53fcf56a9
--- /dev/null
+++ b/tests/components/loqed/fixtures/get_all_webhooks.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "url": "http://hook_id",
+    "trigger_state_changed_open": 1,
+    "trigger_state_changed_latch": 1,
+    "trigger_state_changed_night_lock": 1,
+    "trigger_state_changed_unknown": 1,
+    "trigger_state_goto_open": 1,
+    "trigger_state_goto_latch": 1,
+    "trigger_state_goto_night_lock": 1,
+    "trigger_battery": 1,
+    "trigger_online_status": 1
+  }
+]
diff --git a/tests/components/loqed/fixtures/integration_config.json b/tests/components/loqed/fixtures/integration_config.json
new file mode 100644
index 00000000000..c4d9f87162c
--- /dev/null
+++ b/tests/components/loqed/fixtures/integration_config.json
@@ -0,0 +1,9 @@
+{
+  "lock_id": "**REDACTED**",
+  "lock_key_local_id": 1,
+  "lock_key_key": "SGFsbG8gd2VyZWxk",
+  "backend_key": "aGVsbG8gd29ybGQ=",
+  "bridge_key": "Ym9uam91ciBtb25kZQ==",
+  "bridge_ip": "192.168.12.34",
+  "bridge_mdns_hostname": "LOQED-aabbccddeeff.local"
+}
diff --git a/tests/components/loqed/fixtures/lock_going_to_daylock.json b/tests/components/loqed/fixtures/lock_going_to_daylock.json
new file mode 100644
index 00000000000..a07ba43d25c
--- /dev/null
+++ b/tests/components/loqed/fixtures/lock_going_to_daylock.json
@@ -0,0 +1,8 @@
+{
+  "go_to_state": "DAY_LOCK",
+  "go_to_state_numeric": 2,
+  "mac_wifi": "**REDACTED**",
+  "mac_ble": "**REDACTED**",
+  "event_type": "GO_TO_STATE_TWIST_ASSIST_LATCH",
+  "key_local_id": 255
+}
diff --git a/tests/components/loqed/fixtures/lock_going_to_nightlock.json b/tests/components/loqed/fixtures/lock_going_to_nightlock.json
new file mode 100644
index 00000000000..8f7ce2ec025
--- /dev/null
+++ b/tests/components/loqed/fixtures/lock_going_to_nightlock.json
@@ -0,0 +1,8 @@
+{
+  "go_to_state": "NIGHT_LOCK",
+  "go_to_state_numeric": 3,
+  "mac_wifi": "**REDACTED**",
+  "mac_ble": "**REDACTED**",
+  "event_type": "GO_TO_STATE_TWIST_ASSIST_LATCH",
+  "key_local_id": 255
+}
diff --git a/tests/components/loqed/fixtures/nightlock_reached.json b/tests/components/loqed/fixtures/nightlock_reached.json
new file mode 100644
index 00000000000..f8ce0d45cae
--- /dev/null
+++ b/tests/components/loqed/fixtures/nightlock_reached.json
@@ -0,0 +1,8 @@
+{
+  "requested_state": "NIGHT_LOCK",
+  "requested_state_numeric": 3,
+  "mac_wifi": "**REDACTED**",
+  "mac_ble": "**REDACTED**",
+  "event_type": "STATE_CHANGED_LATCH",
+  "key_local_id": 255
+}
diff --git a/tests/components/loqed/fixtures/status_ok.json b/tests/components/loqed/fixtures/status_ok.json
new file mode 100644
index 00000000000..4e5362507e6
--- /dev/null
+++ b/tests/components/loqed/fixtures/status_ok.json
@@ -0,0 +1,16 @@
+{
+  "battery_percentage": 78,
+  "battery_type": "NICKEL_METAL_HYDRIDE",
+  "battery_type_numeric": 1,
+  "battery_voltage": 10.37,
+  "bolt_state": "day_lock",
+  "bolt_state_numeric": 2,
+  "bridge_mac_wifi": "***REDACTED***",
+  "bridge_mac_ble": "***REDACTED***",
+  "lock_online": 1,
+  "webhooks_number": 1,
+  "ip_address": "192.168.42.12",
+  "up_timestamp": 1653041994,
+  "wifi_strength": 73,
+  "ble_strength": 20
+}
diff --git a/tests/components/loqed/test_config_flow.py b/tests/components/loqed/test_config_flow.py
new file mode 100644
index 00000000000..c9c577e7199
--- /dev/null
+++ b/tests/components/loqed/test_config_flow.py
@@ -0,0 +1,220 @@
+"""Test the Loqed config flow."""
+import json
+from unittest.mock import Mock, patch
+
+import aiohttp
+from loqedAPI import loqed
+
+from homeassistant import config_entries
+from homeassistant.components import zeroconf
+from homeassistant.components.loqed.const import DOMAIN
+from homeassistant.const import CONF_API_TOKEN, CONF_NAME, CONF_WEBHOOK_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from tests.common import load_fixture
+from tests.test_util.aiohttp import AiohttpClientMocker
+
+zeroconf_data = zeroconf.ZeroconfServiceInfo(
+    host="192.168.12.34",
+    addresses=["127.0.0.1"],
+    hostname="LOQED-ffeeddccbbaa.local",
+    name="mock_name",
+    port=9123,
+    properties={},
+    type="mock_type",
+)
+
+
+async def test_create_entry_zeroconf(hass: HomeAssistant) -> None:
+    """Test we get can create a lock via zeroconf."""
+    lock_result = json.loads(load_fixture("loqed/status_ok.json"))
+
+    with patch(
+        "loqedAPI.loqed.LoqedAPI.async_get_lock_details",
+        return_value=lock_result,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_ZEROCONF},
+            data=zeroconf_data,
+        )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    mock_lock = Mock(spec=loqed.Lock, id="Foo")
+    webhook_id = "Webhook_ID"
+    all_locks_response = json.loads(load_fixture("loqed/get_all_locks.json"))
+
+    with patch(
+        "loqedAPI.cloud_loqed.LoqedCloudAPI.async_get_locks",
+        return_value=all_locks_response,
+    ), patch(
+        "loqedAPI.loqed.LoqedAPI.async_get_lock",
+        return_value=mock_lock,
+    ), patch(
+        "homeassistant.components.loqed.async_setup_entry",
+        return_value=True,
+    ), patch(
+        "homeassistant.components.webhook.async_generate_id", return_value=webhook_id
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_API_TOKEN: "eyadiuyfasiuasf",
+            },
+        )
+        await hass.async_block_till_done()
+    found_lock = all_locks_response["data"][0]
+
+    assert result2["type"] == FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "LOQED Touch Smart Lock"
+    assert result2["data"] == {
+        "id": "Foo",
+        "lock_key_key": found_lock["key_secret"],
+        "bridge_key": found_lock["bridge_key"],
+        "lock_key_local_id": found_lock["local_id"],
+        "bridge_mdns_hostname": found_lock["bridge_hostname"],
+        "bridge_ip": found_lock["bridge_ip"],
+        "name": found_lock["name"],
+        CONF_WEBHOOK_ID: webhook_id,
+        CONF_API_TOKEN: "eyadiuyfasiuasf",
+    }
+    mock_lock.getWebhooks.assert_awaited()
+
+
+async def test_create_entry_user(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we can create a lock via manual entry."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_USER},
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    lock_result = json.loads(load_fixture("loqed/status_ok.json"))
+    mock_lock = Mock(spec=loqed.Lock, id="Foo")
+    webhook_id = "Webhook_ID"
+    all_locks_response = json.loads(load_fixture("loqed/get_all_locks.json"))
+    found_lock = all_locks_response["data"][0]
+
+    with patch(
+        "loqedAPI.cloud_loqed.LoqedCloudAPI.async_get_locks",
+        return_value=all_locks_response,
+    ), patch(
+        "loqedAPI.loqed.LoqedAPI.async_get_lock",
+        return_value=mock_lock,
+    ), patch(
+        "homeassistant.components.loqed.async_setup_entry",
+        return_value=True,
+    ), patch(
+        "homeassistant.components.webhook.async_generate_id", return_value=webhook_id
+    ), patch(
+        "loqedAPI.loqed.LoqedAPI.async_get_lock_details", return_value=lock_result
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_API_TOKEN: "eyadiuyfasiuasf", CONF_NAME: "MyLock"},
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "LOQED Touch Smart Lock"
+    assert result2["data"] == {
+        "id": "Foo",
+        "lock_key_key": found_lock["key_secret"],
+        "bridge_key": found_lock["bridge_key"],
+        "lock_key_local_id": found_lock["local_id"],
+        "bridge_mdns_hostname": found_lock["bridge_hostname"],
+        "bridge_ip": found_lock["bridge_ip"],
+        "name": found_lock["name"],
+        CONF_WEBHOOK_ID: webhook_id,
+        CONF_API_TOKEN: "eyadiuyfasiuasf",
+    }
+    mock_lock.getWebhooks.assert_awaited()
+
+
+async def test_cannot_connect(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we handle cannot connect error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_USER},
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    with patch(
+        "loqedAPI.cloud_loqed.LoqedCloudAPI.async_get_locks",
+        side_effect=aiohttp.ClientError,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_API_TOKEN: "eyadiuyfasiuasf", CONF_NAME: "MyLock"},
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.FORM
+    assert result2["errors"] == {"base": "cannot_connect"}
+
+
+async def test_invalid_auth_when_lock_not_found(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we handle a situation where the user enters an invalid lock name."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_USER},
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    all_locks_response = json.loads(load_fixture("loqed/get_all_locks.json"))
+
+    with patch(
+        "loqedAPI.cloud_loqed.LoqedCloudAPI.async_get_locks",
+        return_value=all_locks_response,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_API_TOKEN: "eyadiuyfasiuasf", CONF_NAME: "MyLock2"},
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.FORM
+    assert result2["errors"] == {"base": "invalid_auth"}
+
+
+async def test_cannot_connect_when_lock_not_reachable(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we handle a situation where the user enters an invalid lock name."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_USER},
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    all_locks_response = json.loads(load_fixture("loqed/get_all_locks.json"))
+
+    with patch(
+        "loqedAPI.cloud_loqed.LoqedCloudAPI.async_get_locks",
+        return_value=all_locks_response,
+    ), patch("loqedAPI.loqed.LoqedAPI.async_get_lock", side_effect=aiohttp.ClientError):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_API_TOKEN: "eyadiuyfasiuasf", CONF_NAME: "MyLock"},
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.FORM
+    assert result2["errors"] == {"base": "cannot_connect"}
diff --git a/tests/components/loqed/test_init.py b/tests/components/loqed/test_init.py
new file mode 100644
index 00000000000..960ad9def6b
--- /dev/null
+++ b/tests/components/loqed/test_init.py
@@ -0,0 +1,78 @@
+"""Tests the init part of the Loqed integration."""
+
+import json
+from typing import Any
+from unittest.mock import AsyncMock, patch
+
+from loqedAPI import loqed
+
+from homeassistant.components.loqed.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import CONF_WEBHOOK_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry, load_fixture
+
+
+async def test_webhook_accepts_valid_message(
+    hass: HomeAssistant,
+    hass_client_no_auth,
+    integration: MockConfigEntry,
+    lock: loqed.Lock,
+):
+    """Test webhook called with valid message."""
+    await async_setup_component(hass, "http", {"http": {}})
+    client = await hass_client_no_auth()
+    processed_message = json.loads(load_fixture("loqed/lock_going_to_nightlock.json"))
+    lock.receiveWebhook = AsyncMock(return_value=processed_message)
+
+    message = load_fixture("loqed/battery_update.json")
+    timestamp = 1653304609
+    await client.post(
+        f"/api/webhook/{integration.data[CONF_WEBHOOK_ID]}",
+        data=message,
+        headers={"timestamp": str(timestamp), "hash": "incorrect hash"},
+    )
+    lock.receiveWebhook.assert_called()
+
+
+async def test_setup_webhook_in_bridge(
+    hass: HomeAssistant, config_entry: MockConfigEntry, lock: loqed.Lock
+):
+    """Test webhook setup in loqed bridge."""
+    config: dict[str, Any] = {DOMAIN: {}}
+    config_entry.add_to_hass(hass)
+
+    lock_status = json.loads(load_fixture("loqed/status_ok.json"))
+    webhooks_fixture = json.loads(load_fixture("loqed/get_all_webhooks.json"))
+    lock.getWebhooks = AsyncMock(side_effect=[[], webhooks_fixture])
+
+    with patch("loqedAPI.loqed.LoqedAPI.async_get_lock", return_value=lock), patch(
+        "loqedAPI.loqed.LoqedAPI.async_get_lock_details", return_value=lock_status
+    ), patch(
+        "homeassistant.components.webhook.async_generate_url",
+        return_value="http://hook_id",
+    ):
+        await async_setup_component(hass, DOMAIN, config)
+        await hass.async_block_till_done()
+
+    lock.registerWebhook.assert_called_with("http://hook_id")
+
+
+async def test_unload_entry(hass, integration: MockConfigEntry, lock: loqed.Lock):
+    """Test successful unload of entry."""
+
+    assert await hass.config_entries.async_unload(integration.entry_id)
+    await hass.async_block_till_done()
+
+    lock.deleteWebhook.assert_called_with(1)
+    assert integration.state is ConfigEntryState.NOT_LOADED
+    assert not hass.data.get(DOMAIN)
+
+
+async def test_unload_entry_fails(hass, integration: MockConfigEntry, lock: loqed.Lock):
+    """Test unsuccessful unload of entry."""
+    lock.deleteWebhook = AsyncMock(side_effect=Exception)
+
+    assert not await hass.config_entries.async_unload(integration.entry_id)
diff --git a/tests/components/loqed/test_lock.py b/tests/components/loqed/test_lock.py
new file mode 100644
index 00000000000..59e70212f92
--- /dev/null
+++ b/tests/components/loqed/test_lock.py
@@ -0,0 +1,87 @@
+"""Tests the lock platform of the Loqed integration."""
+from loqedAPI import loqed
+
+from homeassistant.components.loqed import LoqedDataCoordinator
+from homeassistant.components.loqed.const import DOMAIN
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    SERVICE_LOCK,
+    SERVICE_OPEN,
+    SERVICE_UNLOCK,
+    STATE_LOCKED,
+    STATE_UNLOCKED,
+)
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def test_lock_entity(
+    hass: HomeAssistant,
+    integration: MockConfigEntry,
+) -> None:
+    """Test the lock entity."""
+    entity_id = "lock.home"
+
+    state = hass.states.get(entity_id)
+
+    assert state
+    assert state.state == STATE_UNLOCKED
+
+
+async def test_lock_responds_to_bolt_state_updates(
+    hass: HomeAssistant, integration: MockConfigEntry, lock: loqed.Lock
+) -> None:
+    """Tests the lock responding to updates."""
+    coordinator: LoqedDataCoordinator = hass.data[DOMAIN][integration.entry_id]
+    lock.bolt_state = "night_lock"
+    coordinator.async_update_listeners()
+
+    entity_id = "lock.home"
+
+    state = hass.states.get(entity_id)
+
+    assert state
+    assert state.state == STATE_LOCKED
+
+
+async def test_lock_transition_to_unlocked(
+    hass: HomeAssistant, integration: MockConfigEntry, lock: loqed.Lock
+) -> None:
+    """Tests the lock transitions to unlocked state."""
+
+    entity_id = "lock.home"
+
+    await hass.services.async_call(
+        "lock", SERVICE_UNLOCK, {ATTR_ENTITY_ID: entity_id}, blocking=True
+    )
+    await hass.async_block_till_done()
+    lock.unlock.assert_called()
+
+
+async def test_lock_transition_to_locked(
+    hass: HomeAssistant, integration: MockConfigEntry, lock: loqed.Lock
+) -> None:
+    """Tests the lock transitions to locked state."""
+
+    entity_id = "lock.home"
+
+    await hass.services.async_call(
+        "lock", SERVICE_LOCK, {ATTR_ENTITY_ID: entity_id}, blocking=True
+    )
+    await hass.async_block_till_done()
+    lock.lock.assert_called()
+
+
+async def test_lock_transition_to_open(
+    hass: HomeAssistant, integration: MockConfigEntry, lock: loqed.Lock
+) -> None:
+    """Tests the lock transitions to open state."""
+
+    entity_id = "lock.home"
+
+    await hass.services.async_call(
+        "lock", SERVICE_OPEN, {ATTR_ENTITY_ID: entity_id}, blocking=True
+    )
+    await hass.async_block_till_done()
+    lock.open.assert_called()
diff --git a/tests/components/lutron_caseta/test_device_trigger.py b/tests/components/lutron_caseta/test_device_trigger.py
index 325cb79e1a8..3fafbb8a57f 100644
--- a/tests/components/lutron_caseta/test_device_trigger.py
+++ b/tests/components/lutron_caseta/test_device_trigger.py
@@ -2,6 +2,7 @@
 from unittest.mock import patch
 
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -39,7 +40,6 @@ from . import MockBridge
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -165,7 +165,7 @@ async def test_get_triggers(hass: HomeAssistant) -> None:
         hass, DeviceAutomationType.TRIGGER, device_id
     )
 
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_for_invalid_device_id(
diff --git a/tests/components/matter/common.py b/tests/components/matter/common.py
index 7582b9c415d..a0935154054 100644
--- a/tests/components/matter/common.py
+++ b/tests/components/matter/common.py
@@ -71,6 +71,6 @@ async def trigger_subscription_callback(
     data: Any = None,
 ) -> None:
     """Trigger a subscription callback."""
-    callback = client.subscribe.call_args.kwargs["callback"]
+    callback = client.subscribe_events.call_args.kwargs["callback"]
     callback(event, data)
     await hass.async_block_till_done()
diff --git a/tests/components/matter/fixtures/config_entry_diagnostics.json b/tests/components/matter/fixtures/config_entry_diagnostics.json
index 95ef0b6a850..53477792e43 100644
--- a/tests/components/matter/fixtures/config_entry_diagnostics.json
+++ b/tests/components/matter/fixtures/config_entry_diagnostics.json
@@ -669,7 +669,9 @@
         "1/1030/65529": [],
         "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
       },
-      "available": true
+      "available": true,
+      "is_bridge": false,
+      "attribute_subscriptions": []
     }
   ],
   "events": []
diff --git a/tests/components/matter/fixtures/config_entry_diagnostics_redacted.json b/tests/components/matter/fixtures/config_entry_diagnostics_redacted.json
index 794980a8fd4..3c5b82ad5b8 100644
--- a/tests/components/matter/fixtures/config_entry_diagnostics_redacted.json
+++ b/tests/components/matter/fixtures/config_entry_diagnostics_redacted.json
@@ -482,7 +482,9 @@
           "1/1030/65529": [],
           "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
         },
-        "available": true
+        "available": true,
+        "is_bridge": false,
+        "attribute_subscriptions": []
       }
     ],
     "events": []
diff --git a/tests/components/matter/fixtures/nodes/color-temperature-light.json b/tests/components/matter/fixtures/nodes/color-temperature-light.json
index f5a6d5fd1e9..7552fa833fb 100644
--- a/tests/components/matter/fixtures/nodes/color-temperature-light.json
+++ b/tests/components/matter/fixtures/nodes/color-temperature-light.json
@@ -313,5 +313,6 @@
     "1/4/65529": [0, 5, 2, 4, 3, 1],
     "1/4/65531": [0, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/contact-sensor.json b/tests/components/matter/fixtures/nodes/contact-sensor.json
index 3500c73f790..909f7be2ebe 100644
--- a/tests/components/matter/fixtures/nodes/contact-sensor.json
+++ b/tests/components/matter/fixtures/nodes/contact-sensor.json
@@ -85,5 +85,6 @@
     "1/69/65529": [],
     "1/69/65531": [0, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/device_diagnostics.json b/tests/components/matter/fixtures/nodes/device_diagnostics.json
index c0e1e898028..4b834cd9090 100644
--- a/tests/components/matter/fixtures/nodes/device_diagnostics.json
+++ b/tests/components/matter/fixtures/nodes/device_diagnostics.json
@@ -467,5 +467,7 @@
     "1/1030/65529": [],
     "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "is_bridge": false,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/dimmable-light.json b/tests/components/matter/fixtures/nodes/dimmable-light.json
index 32dfd29e796..e14c922857c 100644
--- a/tests/components/matter/fixtures/nodes/dimmable-light.json
+++ b/tests/components/matter/fixtures/nodes/dimmable-light.json
@@ -407,5 +407,6 @@
     "1/1030/65529": [],
     "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/door-lock.json b/tests/components/matter/fixtures/nodes/door-lock.json
index 62162b3c2d7..1477d78aa67 100644
--- a/tests/components/matter/fixtures/nodes/door-lock.json
+++ b/tests/components/matter/fixtures/nodes/door-lock.json
@@ -505,5 +505,6 @@
       0, 1, 2, 3, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 33, 35, 36,
       37, 38, 41, 43, 48, 49, 51, 65528, 65529, 65530, 65531, 65532, 65533
     ]
-  }
+  },
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/extended-color-light.json b/tests/components/matter/fixtures/nodes/extended-color-light.json
index e8c4603ab9c..f4d83239b6d 100644
--- a/tests/components/matter/fixtures/nodes/extended-color-light.json
+++ b/tests/components/matter/fixtures/nodes/extended-color-light.json
@@ -313,5 +313,6 @@
     "1/4/65529": [0, 5, 2, 4, 3, 1],
     "1/4/65531": [0, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/flow-sensor.json b/tests/components/matter/fixtures/nodes/flow-sensor.json
index 4e9efad2268..e1fc2a36585 100644
--- a/tests/components/matter/fixtures/nodes/flow-sensor.json
+++ b/tests/components/matter/fixtures/nodes/flow-sensor.json
@@ -78,5 +78,6 @@
     "1/1028/65529": [],
     "1/1028/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/humidity-sensor.json b/tests/components/matter/fixtures/nodes/humidity-sensor.json
index 23dcf667c58..a1940fc1857 100644
--- a/tests/components/matter/fixtures/nodes/humidity-sensor.json
+++ b/tests/components/matter/fixtures/nodes/humidity-sensor.json
@@ -77,5 +77,6 @@
     "1/1029/65529": [],
     "1/1029/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/light-sensor.json b/tests/components/matter/fixtures/nodes/light-sensor.json
index 6289cb77da5..93583c34292 100644
--- a/tests/components/matter/fixtures/nodes/light-sensor.json
+++ b/tests/components/matter/fixtures/nodes/light-sensor.json
@@ -85,5 +85,6 @@
     "1/1024/65529": [],
     "1/1024/65531": [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/occupancy-sensor.json b/tests/components/matter/fixtures/nodes/occupancy-sensor.json
index cac06cbae20..d8f2580c2b0 100644
--- a/tests/components/matter/fixtures/nodes/occupancy-sensor.json
+++ b/tests/components/matter/fixtures/nodes/occupancy-sensor.json
@@ -93,5 +93,6 @@
     "1/1030/65529": [],
     "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/on-off-plugin-unit.json b/tests/components/matter/fixtures/nodes/on-off-plugin-unit.json
index 376426057af..43ba486bc29 100644
--- a/tests/components/matter/fixtures/nodes/on-off-plugin-unit.json
+++ b/tests/components/matter/fixtures/nodes/on-off-plugin-unit.json
@@ -136,5 +136,6 @@
     "1/29/65529": [],
     "1/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/onoff-light-alt-name.json b/tests/components/matter/fixtures/nodes/onoff-light-alt-name.json
index 8b1f1004e59..f29361da128 100644
--- a/tests/components/matter/fixtures/nodes/onoff-light-alt-name.json
+++ b/tests/components/matter/fixtures/nodes/onoff-light-alt-name.json
@@ -407,5 +407,6 @@
     "1/1030/65529": [],
     "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/onoff-light-no-name.json b/tests/components/matter/fixtures/nodes/onoff-light-no-name.json
index 3fa4ca49ccd..8a1134409a9 100644
--- a/tests/components/matter/fixtures/nodes/onoff-light-no-name.json
+++ b/tests/components/matter/fixtures/nodes/onoff-light-no-name.json
@@ -407,5 +407,6 @@
     "1/1030/65529": [],
     "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/onoff-light.json b/tests/components/matter/fixtures/nodes/onoff-light.json
index 3db9105562a..65ef0be5c8e 100644
--- a/tests/components/matter/fixtures/nodes/onoff-light.json
+++ b/tests/components/matter/fixtures/nodes/onoff-light.json
@@ -407,5 +407,6 @@
     "1/1030/65529": [],
     "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/pressure-sensor.json b/tests/components/matter/fixtures/nodes/pressure-sensor.json
index 60335aa602d..a47cda28056 100644
--- a/tests/components/matter/fixtures/nodes/pressure-sensor.json
+++ b/tests/components/matter/fixtures/nodes/pressure-sensor.json
@@ -77,5 +77,6 @@
     "1/1027/65529": [],
     "1/1027/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/temperature-sensor.json b/tests/components/matter/fixtures/nodes/temperature-sensor.json
index 426b6653623..c7d372ac2d7 100644
--- a/tests/components/matter/fixtures/nodes/temperature-sensor.json
+++ b/tests/components/matter/fixtures/nodes/temperature-sensor.json
@@ -83,5 +83,6 @@
     "1/1026/65529": [],
     "1/1026/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/thermostat.json b/tests/components/matter/fixtures/nodes/thermostat.json
new file mode 100644
index 00000000000..85ac42e5429
--- /dev/null
+++ b/tests/components/matter/fixtures/nodes/thermostat.json
@@ -0,0 +1,370 @@
+{
+  "node_id": 4,
+  "date_commissioned": "2023-06-28T16:26:35.525058",
+  "last_interview": "2023-06-28T16:26:35.525060",
+  "interview_version": 4,
+  "available": true,
+  "is_bridge": false,
+  "attributes": {
+    "0/29/0": [
+      {
+        "deviceType": 22,
+        "revision": 1
+      }
+    ],
+    "0/29/1": [29, 31, 40, 42, 48, 49, 50, 51, 54, 60, 62, 63, 64],
+    "0/29/2": [41],
+    "0/29/3": [1],
+    "0/29/65532": 0,
+    "0/29/65533": 1,
+    "0/29/65528": [],
+    "0/29/65529": [],
+    "0/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/31/0": [
+      {
+        "privilege": 0,
+        "authMode": 0,
+        "subjects": null,
+        "targets": null,
+        "fabricIndex": 1
+      },
+      {
+        "privilege": 5,
+        "authMode": 2,
+        "subjects": [112233],
+        "targets": null,
+        "fabricIndex": 2
+      }
+    ],
+    "0/31/1": [],
+    "0/31/2": 4,
+    "0/31/3": 3,
+    "0/31/4": 3,
+    "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": 1,
+    "0/40/1": "LONGAN-LINK",
+    "0/40/2": 4895,
+    "0/40/3": "Longan link HVAC",
+    "0/40/4": 8192,
+    "0/40/5": "",
+    "0/40/6": "XX",
+    "0/40/7": 1,
+    "0/40/8": "1.0",
+    "0/40/9": 2,
+    "0/40/10": "v2.0",
+    "0/40/11": "20200101",
+    "0/40/12": "",
+    "0/40/14": "",
+    "0/40/15": "5a1fd2d040f23cf66e3a9d2a88e11f78",
+    "0/40/16": false,
+    "0/40/17": true,
+    "0/40/18": "3D06D025F9E026A0",
+    "0/40/19": {
+      "caseSessionsPerFabric": 3,
+      "subscriptionsPerFabric": 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, 11, 12, 14, 15, 16, 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": {
+      "failSafeExpiryLengthSeconds": 60,
+      "maxCumulativeFailsafeSeconds": 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": [
+      {
+        "networkID": "TE9OR0FOLUlPVA==",
+        "connected": true
+      }
+    ],
+    "0/49/2": 10,
+    "0/49/3": 30,
+    "0/49/4": true,
+    "0/49/5": 0,
+    "0/49/6": "TE9OR0FOLUlPVA==",
+    "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/50/65532": 0,
+    "0/50/65533": 1,
+    "0/50/65528": [1],
+    "0/50/65529": [0],
+    "0/50/65531": [65528, 65529, 65531, 65532, 65533],
+    "0/51/0": [
+      {
+        "name": "WIFI_STA_DEF",
+        "isOperational": true,
+        "offPremiseServicesReachableIPv4": null,
+        "offPremiseServicesReachableIPv6": null,
+        "hardwareAddress": "3FR1X7qs",
+        "IPv4Addresses": ["wKgI7g=="],
+        "IPv6Addresses": [
+          "/oAAAAAAAADeVHX//l+6rA==",
+          "JA4DsgZ9jUDeVHX//l+6rA==",
+          "/UgvJAe/AADeVHX//l+6rA=="
+        ],
+        "type": 1
+      }
+    ],
+    "0/51/1": 4,
+    "0/51/2": 30,
+    "0/51/3": 0,
+    "0/51/4": 0,
+    "0/51/5": [],
+    "0/51/6": [],
+    "0/51/7": [],
+    "0/51/8": true,
+    "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/54/0": "aHckDXAk",
+    "0/54/1": 0,
+    "0/54/2": 3,
+    "0/54/3": 1,
+    "0/54/4": -61,
+    "0/54/5": null,
+    "0/54/6": null,
+    "0/54/7": null,
+    "0/54/8": null,
+    "0/54/9": null,
+    "0/54/10": null,
+    "0/54/11": null,
+    "0/54/12": null,
+    "0/54/65532": 3,
+    "0/54/65533": 1,
+    "0/54/65528": [],
+    "0/54/65529": [0],
+    "0/54/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 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": [
+      {
+        "noc": "",
+        "icac": null,
+        "fabricIndex": 1
+      },
+      {
+        "noc": "FTABAQEkAgE3AyQTAhgmBIAigScmBYAlTTo3BiQVASQRBBgkBwEkCAEwCUEETaqdhs6MRkbh8fdh4EEImZaziiE6anaVp6Mu3P/zIJUB0fHUMxydKRTAC8bIn7vUhBCM47OYlYTkX0zFhoKYrzcKNQEoARgkAgE2AwQCBAEYMAQUrouBLuksQTkLrFhNVAbTHkNvMSEwBRTPlgMACvPdpqPOzuvR0OfPgfUcxBgwC0AcUInETXp/2gIFGDQF2+u+9WtYtvIfo6C3MhoOIV1SrRBZWYxY3CVjPGK7edTibQrVA4GccZKnHhNSBjxktrPiGA==",
+        "icac": "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQTAhgkBwEkCAEwCUEE+rI5XQyifTZbZRK1Z2DOuXdQkmdUkWklTv+G1x4ZfbSupbUDo4l7i/iFdyu//uJThAw1GPEkWe6i98IFKCOQpzcKNQEpARgkAmAwBBTPlgMACvPdpqPOzuvR0OfPgfUcxDAFFJQo6UEBWTLtZVYFZwRBgn+qstpTGDALQK3jYiaxwnYJMwTBQlcVNrGxPtuVTZrp5foZtQCp/JEX2ZWqVxKypilx0ES/CfMHZ0Lllv9QsLs8xV/HNLidllkY",
+        "fabricIndex": 2
+      }
+    ],
+    "0/62/1": [
+      {
+        "rootPublicKey": "BAP9BJt5aQ9N98ClPTdNxpMZ1/Vh8r9usw6C8Ygi79AImsJq4UjAaYad0UI9Lh0OmRA9sWE2aSPbHjf409i/970=",
+        "vendorID": 4996,
+        "fabricID": 1,
+        "nodeID": 1425709672,
+        "label": "",
+        "fabricIndex": 1
+      },
+      {
+        "rootPublicKey": "BJXfyipMp+Jx4pkoTnvYoAYODis4xJktKdQXu8MSpBLIwII58BD0KkIG9NmuHcp0xUQKzqlfyB/bkAanevO73ZI=",
+        "vendorID": 65521,
+        "fabricID": 1,
+        "nodeID": 4,
+        "label": "",
+        "fabricIndex": 2
+      }
+    ],
+    "0/62/2": 5,
+    "0/62/3": 2,
+    "0/62/4": [
+      "FTABAQAkAgE3AycULlZRw4lgwKgkFQEYJgT1e7grJgV1r5ktNwYnFC5WUcOJYMCoJBUBGCQHASQIATAJQQQD/QSbeWkPTffApT03TcaTGdf1YfK/brMOgvGIIu/QCJrCauFIwGmGndFCPS4dDpkQPbFhNmkj2x43+NPYv/e9Nwo1ASkBGCQCYDAEFCqZHzimE2c+jPoEuJoM1rQaAPFRMAUUKpkfOKYTZz6M+gS4mgzWtBoA8VEYMAtANu49PfywV8aJmtxNYZa7SJXGlK1EciiF6vhZsoqdDCwx1VQX8FdyVunw0H3ljzbvucU6o8aY6HwBsPJKCQVHzhg=",
+      "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQUARgkBwEkCAEwCUEEld/KKkyn4nHimShOe9igBg4OKzjEmS0p1Be7wxKkEsjAgjnwEPQqQgb02a4dynTFRArOqV/IH9uQBqd687vdkjcKNQEpARgkAmAwBBSUKOlBAVky7WVWBWcEQYJ/qrLaUzAFFJQo6UEBWTLtZVYFZwRBgn+qstpTGDALQCNU8W3im+pmCBR5A4e15ByjPq2msE05NI9eeFI6BO0p/whhaBSGtjI7Tb1onNNu9AH6AQoji8XDDa7Nj/1w9KoY"
+    ],
+    "0/62/5": 2,
+    "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": 3,
+    "0/63/3": 3,
+    "0/63/65532": 0,
+    "0/63/65533": 1,
+    "0/63/65528": [2, 5],
+    "0/63/65529": [0, 1, 3, 4],
+    "0/63/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/64/0": [
+      {
+        "label": "room",
+        "value": "bedroom 2"
+      },
+      {
+        "label": "orientation",
+        "value": "North"
+      },
+      {
+        "label": "floor",
+        "value": "2"
+      },
+      {
+        "label": "direction",
+        "value": "up"
+      }
+    ],
+    "0/64/65532": 0,
+    "0/64/65533": 1,
+    "0/64/65528": [],
+    "0/64/65529": [],
+    "0/64/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/3/0": 0,
+    "1/3/1": 4,
+    "1/3/65532": 0,
+    "1/3/65533": 4,
+    "1/3/65528": [],
+    "1/3/65529": [0],
+    "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/65532": 0,
+    "1/6/65533": 4,
+    "1/6/65528": [],
+    "1/6/65529": [0, 1, 2],
+    "1/6/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/29/0": [
+      {
+        "deviceType": 769,
+        "revision": 1
+      }
+    ],
+    "1/29/1": [3, 4, 6, 29, 30, 64, 513, 514, 516],
+    "1/29/2": [],
+    "1/29/3": [],
+    "1/29/65532": 0,
+    "1/29/65533": 1,
+    "1/29/65528": [],
+    "1/29/65529": [],
+    "1/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "1/30/0": [],
+    "1/30/65532": 0,
+    "1/30/65533": 1,
+    "1/30/65528": [],
+    "1/30/65529": [],
+    "1/30/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/64/0": [
+      {
+        "label": "room",
+        "value": "bedroom 2"
+      },
+      {
+        "label": "orientation",
+        "value": "North"
+      },
+      {
+        "label": "floor",
+        "value": "2"
+      },
+      {
+        "label": "direction",
+        "value": "up"
+      }
+    ],
+    "1/64/65532": 0,
+    "1/64/65533": 1,
+    "1/64/65528": [],
+    "1/64/65529": [],
+    "1/64/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/513/0": 2830,
+    "1/513/3": null,
+    "1/513/4": null,
+    "1/513/5": null,
+    "1/513/6": null,
+    "1/513/9": 0,
+    "1/513/17": null,
+    "1/513/18": null,
+    "1/513/21": 1600,
+    "1/513/22": 3000,
+    "1/513/23": 1600,
+    "1/513/24": 3000,
+    "1/513/25": 5,
+    "1/513/27": 4,
+    "1/513/28": 3,
+    "1/513/30": 0,
+    "1/513/65532": 35,
+    "1/513/65533": 5,
+    "1/513/65528": [],
+    "1/513/65529": [0],
+    "1/513/65531": [
+      0, 3, 4, 5, 6, 9, 17, 18, 21, 22, 23, 24, 25, 27, 28, 30, 65528, 65529,
+      65531, 65532, 65533
+    ],
+    "1/514/0": 0,
+    "1/514/1": 2,
+    "1/514/2": 0,
+    "1/514/3": 0,
+    "1/514/65532": 0,
+    "1/514/65533": 1,
+    "1/514/65528": [],
+    "1/514/65529": [],
+    "1/514/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "1/516/0": 0,
+    "1/516/1": 0,
+    "1/516/65532": 0,
+    "1/516/65533": 1,
+    "1/516/65528": [],
+    "1/516/65529": [],
+    "1/516/65531": [0, 1, 65528, 65529, 65531, 65532, 65533]
+  },
+  "attribute_subscriptions": [
+    [1, 513, 17],
+    [1, 6, 0],
+    [1, 513, 0],
+    [1, 513, 28],
+    [1, 513, 65532],
+    [1, 513, 18],
+    [1, 513, 30],
+    [1, 513, 27]
+  ]
+}
diff --git a/tests/components/matter/fixtures/nodes/window-covering_full.json b/tests/components/matter/fixtures/nodes/window-covering_full.json
index 3ffd68bd319..feb75409526 100644
--- a/tests/components/matter/fixtures/nodes/window-covering_full.json
+++ b/tests/components/matter/fixtures/nodes/window-covering_full.json
@@ -264,5 +264,6 @@
       65528, 65529, 65531, 65532, 65533, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12,
       13, 14, 15, 16, 17, 18, 19, 23, 26, 6
     ]
-  }
+  },
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/window-covering_lift.json b/tests/components/matter/fixtures/nodes/window-covering_lift.json
index cd200eb15f0..afc2a2f734f 100644
--- a/tests/components/matter/fixtures/nodes/window-covering_lift.json
+++ b/tests/components/matter/fixtures/nodes/window-covering_lift.json
@@ -245,5 +245,6 @@
     "1/258/65528": [],
     "1/258/65529": [0, 1, 2, 5],
     "1/258/65531": [65528, 65529, 65531, 65532, 65533, 0, 1, 5, 7, 10, 13, 23]
-  }
+  },
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/window-covering_pa-lift.json b/tests/components/matter/fixtures/nodes/window-covering_pa-lift.json
index 9214b9511be..8d3335bbd6c 100644
--- a/tests/components/matter/fixtures/nodes/window-covering_pa-lift.json
+++ b/tests/components/matter/fixtures/nodes/window-covering_pa-lift.json
@@ -349,5 +349,6 @@
       0, 1, 3, 5, 7, 8, 10, 11, 13, 14, 16, 17, 23, 65528, 65529, 65531, 65532,
       65533
     ]
-  }
+  },
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/window-covering_pa-tilt.json b/tests/components/matter/fixtures/nodes/window-covering_pa-tilt.json
index d432d7cf50a..44347dbd964 100644
--- a/tests/components/matter/fixtures/nodes/window-covering_pa-tilt.json
+++ b/tests/components/matter/fixtures/nodes/window-covering_pa-tilt.json
@@ -250,5 +250,6 @@
     "1/258/65531": [
       65528, 65529, 65531, 65532, 65533, 0, 7, 9, 10, 12, 13, 15, 23, 6
     ]
-  }
+  },
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/window-covering_tilt.json b/tests/components/matter/fixtures/nodes/window-covering_tilt.json
index 1fe0d99ac38..a33e0f24c3f 100644
--- a/tests/components/matter/fixtures/nodes/window-covering_tilt.json
+++ b/tests/components/matter/fixtures/nodes/window-covering_tilt.json
@@ -245,5 +245,6 @@
     "1/258/65528": [],
     "1/258/65529": [0, 1, 2, 8],
     "1/258/65531": [65528, 65529, 65531, 65532, 65533, 0, 7, 10, 13, 23, 6]
-  }
+  },
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/test_adapter.py b/tests/components/matter/test_adapter.py
index 9c37033dd4f..62ed847bf28 100644
--- a/tests/components/matter/test_adapter.py
+++ b/tests/components/matter/test_adapter.py
@@ -136,10 +136,10 @@ async def test_node_added_subscription(
     integration: MagicMock,
 ) -> None:
     """Test subscription to new devices work."""
-    assert matter_client.subscribe.call_count == 1
-    assert matter_client.subscribe.call_args[0][1] == EventType.NODE_ADDED
+    assert matter_client.subscribe_events.call_count == 4
+    assert matter_client.subscribe_events.call_args[0][1] == EventType.NODE_ADDED
 
-    node_added_callback = matter_client.subscribe.call_args[0][0]
+    node_added_callback = matter_client.subscribe_events.call_args[0][0]
     node_data = load_and_parse_node_fixture("onoff-light")
     node = MatterNode(
         dataclass_from_dict(
diff --git a/tests/components/matter/test_binary_sensor.py b/tests/components/matter/test_binary_sensor.py
index 743619ddde9..d7982e1d5ae 100644
--- a/tests/components/matter/test_binary_sensor.py
+++ b/tests/components/matter/test_binary_sensor.py
@@ -31,7 +31,7 @@ async def test_contact_sensor(
     contact_sensor_node: MatterNode,
 ) -> None:
     """Test contact sensor."""
-    state = hass.states.get("binary_sensor.mock_contact_sensor_contact")
+    state = hass.states.get("binary_sensor.mock_contact_sensor_door")
     assert state
     assert state.state == "off"
 
@@ -40,7 +40,7 @@ async def test_contact_sensor(
         hass, matter_client, data=(contact_sensor_node.node_id, "1/69/0", False)
     )
 
-    state = hass.states.get("binary_sensor.mock_contact_sensor_contact")
+    state = hass.states.get("binary_sensor.mock_contact_sensor_door")
     assert state
     assert state.state == "on"
 
diff --git a/tests/components/matter/test_climate.py b/tests/components/matter/test_climate.py
new file mode 100644
index 00000000000..ec8453b5c56
--- /dev/null
+++ b/tests/components/matter/test_climate.py
@@ -0,0 +1,399 @@
+"""Test Matter locks."""
+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 homeassistant.components.climate import (
+    HVAC_MODE_COOL,
+    HVAC_MODE_HEAT,
+    HVAC_MODE_HEAT_COOL,
+    HVACAction,
+    HVACMode,
+)
+from homeassistant.components.climate.const import (
+    HVAC_MODE_DRY,
+    HVAC_MODE_FAN_ONLY,
+    HVAC_MODE_OFF,
+)
+from homeassistant.core import HomeAssistant
+
+from .common import (
+    set_node_attribute,
+    setup_integration_with_node_fixture,
+    trigger_subscription_callback,
+)
+
+
+@pytest.fixture(name="thermostat")
+async def thermostat_fixture(
+    hass: HomeAssistant, matter_client: MagicMock
+) -> MatterNode:
+    """Fixture for a thermostat node."""
+    return await setup_integration_with_node_fixture(hass, "thermostat", matter_client)
+
+
+# This tests needs to be adjusted to remove lingering tasks
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+async def test_thermostat(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    thermostat: MatterNode,
+) -> None:
+    """Test thermostat."""
+    # test default temp range
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["min_temp"] == 7
+    assert state.attributes["max_temp"] == 35
+
+    # test set temperature when target temp is None
+    assert state.attributes["temperature"] is None
+    assert state.state == HVAC_MODE_COOL
+    with pytest.raises(
+        ValueError, match="Current target_temperature should not be None"
+    ):
+        await hass.services.async_call(
+            "climate",
+            "set_temperature",
+            {
+                "entity_id": "climate.longan_link_hvac",
+                "temperature": 22.5,
+            },
+            blocking=True,
+        )
+    with pytest.raises(ValueError, match="Temperature must be provided"):
+        await hass.services.async_call(
+            "climate",
+            "set_temperature",
+            {
+                "entity_id": "climate.longan_link_hvac",
+                "target_temp_low": 18,
+                "target_temp_high": 26,
+            },
+            blocking=True,
+        )
+
+    # change system mode to heat_cool
+    set_node_attribute(thermostat, 1, 513, 28, 1)
+    await trigger_subscription_callback(hass, matter_client)
+    with pytest.raises(
+        ValueError,
+        match="current target_temperature_low and target_temperature_high should not be None",
+    ):
+        state = hass.states.get("climate.longan_link_hvac")
+        assert state
+        assert state.state == HVAC_MODE_HEAT_COOL
+        await hass.services.async_call(
+            "climate",
+            "set_temperature",
+            {
+                "entity_id": "climate.longan_link_hvac",
+                "target_temp_low": 18,
+                "target_temp_high": 26,
+            },
+            blocking=True,
+        )
+
+    # initial state
+    set_node_attribute(thermostat, 1, 513, 3, 1600)
+    set_node_attribute(thermostat, 1, 513, 4, 3000)
+    set_node_attribute(thermostat, 1, 513, 5, 1600)
+    set_node_attribute(thermostat, 1, 513, 6, 3000)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["min_temp"] == 16
+    assert state.attributes["max_temp"] == 30
+    assert state.attributes["hvac_modes"] == [
+        HVACMode.OFF,
+        HVACMode.HEAT,
+        HVACMode.COOL,
+        HVACMode.HEAT_COOL,
+    ]
+
+    # test system mode update from device
+    set_node_attribute(thermostat, 1, 513, 28, 0)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.state == HVAC_MODE_OFF
+
+    set_node_attribute(thermostat, 1, 513, 28, 7)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.state == HVAC_MODE_FAN_ONLY
+
+    set_node_attribute(thermostat, 1, 513, 28, 8)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.state == HVAC_MODE_DRY
+
+    # test running state update from device
+    set_node_attribute(thermostat, 1, 513, 41, 1)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.HEATING
+
+    set_node_attribute(thermostat, 1, 513, 41, 8)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.HEATING
+
+    set_node_attribute(thermostat, 1, 513, 41, 2)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.COOLING
+
+    set_node_attribute(thermostat, 1, 513, 41, 16)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.COOLING
+
+    set_node_attribute(thermostat, 1, 513, 41, 4)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.FAN
+
+    set_node_attribute(thermostat, 1, 513, 41, 32)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.FAN
+
+    set_node_attribute(thermostat, 1, 513, 41, 64)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.FAN
+
+    set_node_attribute(thermostat, 1, 513, 41, 66)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.OFF
+
+    # change system mode to heat
+    set_node_attribute(thermostat, 1, 513, 28, 4)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.state == HVAC_MODE_HEAT
+
+    # change occupied heating setpoint to 20
+    set_node_attribute(thermostat, 1, 513, 18, 2000)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["temperature"] == 20
+
+    await hass.services.async_call(
+        "climate",
+        "set_temperature",
+        {
+            "entity_id": "climate.longan_link_hvac",
+            "temperature": 25,
+        },
+        blocking=True,
+    )
+
+    assert matter_client.send_device_command.call_count == 1
+    assert matter_client.send_device_command.call_args == call(
+        node_id=thermostat.node_id,
+        endpoint_id=1,
+        command=clusters.Thermostat.Commands.SetpointRaiseLower(
+            clusters.Thermostat.Enums.SetpointAdjustMode.kHeat,
+            50,
+        ),
+    )
+    matter_client.send_device_command.reset_mock()
+
+    # change system mode to cool
+    set_node_attribute(thermostat, 1, 513, 28, 3)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.state == HVAC_MODE_COOL
+
+    # change occupied cooling setpoint to 18
+    set_node_attribute(thermostat, 1, 513, 17, 1800)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["temperature"] == 18
+
+    await hass.services.async_call(
+        "climate",
+        "set_temperature",
+        {
+            "entity_id": "climate.longan_link_hvac",
+            "temperature": 16,
+        },
+        blocking=True,
+    )
+
+    assert matter_client.send_device_command.call_count == 1
+    assert matter_client.send_device_command.call_args == call(
+        node_id=thermostat.node_id,
+        endpoint_id=1,
+        command=clusters.Thermostat.Commands.SetpointRaiseLower(
+            clusters.Thermostat.Enums.SetpointAdjustMode.kCool, -20
+        ),
+    )
+    matter_client.send_device_command.reset_mock()
+
+    # change system mode to heat_cool
+    set_node_attribute(thermostat, 1, 513, 28, 1)
+    await trigger_subscription_callback(hass, matter_client)
+    with pytest.raises(
+        ValueError, match="temperature_low and temperature_high must be provided"
+    ):
+        await hass.services.async_call(
+            "climate",
+            "set_temperature",
+            {
+                "entity_id": "climate.longan_link_hvac",
+                "temperature": 18,
+            },
+            blocking=True,
+        )
+
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.state == HVAC_MODE_HEAT_COOL
+
+    # change occupied cooling setpoint to 18
+    set_node_attribute(thermostat, 1, 513, 17, 2500)
+    await trigger_subscription_callback(hass, matter_client)
+    # change occupied heating setpoint to 18
+    set_node_attribute(thermostat, 1, 513, 18, 1700)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["target_temp_low"] == 17
+    assert state.attributes["target_temp_high"] == 25
+
+    # change target_temp_low to 18
+    await hass.services.async_call(
+        "climate",
+        "set_temperature",
+        {
+            "entity_id": "climate.longan_link_hvac",
+            "target_temp_low": 18,
+            "target_temp_high": 25,
+        },
+        blocking=True,
+    )
+
+    assert matter_client.send_device_command.call_count == 1
+    assert matter_client.send_device_command.call_args == call(
+        node_id=thermostat.node_id,
+        endpoint_id=1,
+        command=clusters.Thermostat.Commands.SetpointRaiseLower(
+            clusters.Thermostat.Enums.SetpointAdjustMode.kHeat, 10
+        ),
+    )
+    matter_client.send_device_command.reset_mock()
+    set_node_attribute(thermostat, 1, 513, 18, 1800)
+    await trigger_subscription_callback(hass, matter_client)
+
+    # change target_temp_high to 26
+    await hass.services.async_call(
+        "climate",
+        "set_temperature",
+        {
+            "entity_id": "climate.longan_link_hvac",
+            "target_temp_low": 18,
+            "target_temp_high": 26,
+        },
+        blocking=True,
+    )
+
+    assert matter_client.send_device_command.call_count == 1
+    assert matter_client.send_device_command.call_args == call(
+        node_id=thermostat.node_id,
+        endpoint_id=1,
+        command=clusters.Thermostat.Commands.SetpointRaiseLower(
+            clusters.Thermostat.Enums.SetpointAdjustMode.kCool, 10
+        ),
+    )
+    matter_client.send_device_command.reset_mock()
+    set_node_attribute(thermostat, 1, 513, 17, 2600)
+    await trigger_subscription_callback(hass, matter_client)
+
+    await hass.services.async_call(
+        "climate",
+        "set_hvac_mode",
+        {
+            "entity_id": "climate.longan_link_hvac",
+            "hvac_mode": HVAC_MODE_HEAT,
+        },
+        blocking=True,
+    )
+
+    assert matter_client.write_attribute.call_count == 1
+    assert matter_client.write_attribute.call_args == call(
+        node_id=thermostat.node_id,
+        attribute_path=create_attribute_path_from_attribute(
+            endpoint_id=1,
+            attribute=clusters.Thermostat.Attributes.SystemMode,
+        ),
+        value=4,
+    )
+    matter_client.send_device_command.reset_mock()
+
+    with pytest.raises(ValueError, match="Unsupported hvac mode dry in Matter"):
+        await hass.services.async_call(
+            "climate",
+            "set_hvac_mode",
+            {
+                "entity_id": "climate.longan_link_hvac",
+                "hvac_mode": HVACMode.DRY,
+            },
+            blocking=True,
+        )
+
+    # change target_temp and hvac_mode in the same call
+    matter_client.send_device_command.reset_mock()
+    matter_client.write_attribute.reset_mock()
+    await hass.services.async_call(
+        "climate",
+        "set_temperature",
+        {
+            "entity_id": "climate.longan_link_hvac",
+            "temperature": 22,
+            "hvac_mode": HVACMode.COOL,
+        },
+        blocking=True,
+    )
+    assert matter_client.write_attribute.call_count == 1
+    assert matter_client.write_attribute.call_args == call(
+        node_id=thermostat.node_id,
+        attribute_path=create_attribute_path_from_attribute(
+            endpoint_id=1,
+            attribute=clusters.Thermostat.Attributes.SystemMode,
+        ),
+        value=3,
+    )
+    assert matter_client.send_device_command.call_count == 1
+    assert matter_client.send_device_command.call_args == call(
+        node_id=thermostat.node_id,
+        endpoint_id=1,
+        command=clusters.Thermostat.Commands.SetpointRaiseLower(
+            clusters.Thermostat.Enums.SetpointAdjustMode.kCool, -40
+        ),
+    )
diff --git a/tests/components/matter/test_door_lock.py b/tests/components/matter/test_door_lock.py
index 072658044d8..003bfa3cf39 100644
--- a/tests/components/matter/test_door_lock.py
+++ b/tests/components/matter/test_door_lock.py
@@ -11,7 +11,7 @@ from homeassistant.components.lock import (
     STATE_UNLOCKED,
     STATE_UNLOCKING,
 )
-from homeassistant.const import STATE_UNKNOWN
+from homeassistant.const import ATTR_CODE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 
 from .common import (
@@ -104,3 +104,46 @@ async def test_lock(
     state = hass.states.get("lock.mock_door_lock")
     assert state
     assert state.state == STATE_UNKNOWN
+
+
+# This tests needs to be adjusted to remove lingering tasks
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+async def test_lock_requires_pin(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    door_lock: MatterNode,
+) -> None:
+    """Test door lock with PINCode."""
+
+    code = "1234567"
+
+    # set RequirePINforRemoteOperation
+    set_node_attribute(door_lock, 1, 257, 51, True)
+    # set door state to unlocked
+    set_node_attribute(door_lock, 1, 257, 0, 2)
+
+    with pytest.raises(ValueError):
+        # Lock door using invalid code format
+        await trigger_subscription_callback(hass, matter_client)
+        await hass.services.async_call(
+            "lock",
+            "lock",
+            {"entity_id": "lock.mock_door_lock", ATTR_CODE: "1234"},
+            blocking=True,
+        )
+
+    # Lock door using valid code
+    await trigger_subscription_callback(hass, matter_client)
+    await hass.services.async_call(
+        "lock",
+        "lock",
+        {"entity_id": "lock.mock_door_lock", ATTR_CODE: code},
+        blocking=True,
+    )
+    assert matter_client.send_device_command.call_count == 1
+    assert matter_client.send_device_command.call_args == call(
+        node_id=door_lock.node_id,
+        endpoint_id=1,
+        command=clusters.DoorLock.Commands.LockDoor(code.encode()),
+        timed_request_timeout_ms=1000,
+    )
diff --git a/tests/components/matter/test_init.py b/tests/components/matter/test_init.py
index 58d0d0d445b..bbe77b76af5 100644
--- a/tests/components/matter/test_init.py
+++ b/tests/components/matter/test_init.py
@@ -168,7 +168,7 @@ async def test_listen_failure_config_entry_not_loaded(
         matter_client.connect.side_effect = MatterError("Boom")
         raise error
 
-    async def get_nodes() -> list[MagicMock]:
+    def get_nodes() -> list[MagicMock]:
         """Mock the client get_nodes method."""
         listen_block.set()
         return []
diff --git a/tests/components/mazda/test_button.py b/tests/components/mazda/test_button.py
index 535ddcc963b..ba80c10b38d 100644
--- a/tests/components/mazda/test_button.py
+++ b/tests/components/mazda/test_button.py
@@ -65,40 +65,6 @@ async def test_button_setup_electric_vehicle(hass: HomeAssistant) -> None:
 
     entity_registry = er.async_get(hass)
 
-    entry = entity_registry.async_get("button.my_mazda3_start_engine")
-    assert entry
-    assert entry.unique_id == "JM000000000000000_start_engine"
-    state = hass.states.get("button.my_mazda3_start_engine")
-    assert state
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "My Mazda3 Start engine"
-    assert state.attributes.get(ATTR_ICON) == "mdi:engine"
-
-    entry = entity_registry.async_get("button.my_mazda3_stop_engine")
-    assert entry
-    assert entry.unique_id == "JM000000000000000_stop_engine"
-    state = hass.states.get("button.my_mazda3_stop_engine")
-    assert state
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "My Mazda3 Stop engine"
-    assert state.attributes.get(ATTR_ICON) == "mdi:engine-off"
-
-    entry = entity_registry.async_get("button.my_mazda3_turn_on_hazard_lights")
-    assert entry
-    assert entry.unique_id == "JM000000000000000_turn_on_hazard_lights"
-    state = hass.states.get("button.my_mazda3_turn_on_hazard_lights")
-    assert state
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "My Mazda3 Turn on hazard lights"
-    assert state.attributes.get(ATTR_ICON) == "mdi:hazard-lights"
-
-    entry = entity_registry.async_get("button.my_mazda3_turn_off_hazard_lights")
-    assert entry
-    assert entry.unique_id == "JM000000000000000_turn_off_hazard_lights"
-    state = hass.states.get("button.my_mazda3_turn_off_hazard_lights")
-    assert state
-    assert (
-        state.attributes.get(ATTR_FRIENDLY_NAME) == "My Mazda3 Turn off hazard lights"
-    )
-    assert state.attributes.get(ATTR_ICON) == "mdi:hazard-lights"
-
     entry = entity_registry.async_get("button.my_mazda3_refresh_status")
     assert entry
     assert entry.unique_id == "JM000000000000000_refresh_vehicle_status"
@@ -109,20 +75,45 @@ async def test_button_setup_electric_vehicle(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.parametrize(
-    ("entity_id_suffix", "api_method_name"),
+    ("electric_vehicle", "entity_id_suffix"),
     [
-        ("start_engine", "start_engine"),
-        ("stop_engine", "stop_engine"),
-        ("turn_on_hazard_lights", "turn_on_hazard_lights"),
-        ("turn_off_hazard_lights", "turn_off_hazard_lights"),
-        ("refresh_status", "refresh_vehicle_status"),
+        (True, "start_engine"),
+        (True, "stop_engine"),
+        (True, "turn_on_hazard_lights"),
+        (True, "turn_off_hazard_lights"),
+        (False, "refresh_status"),
+    ],
+)
+async def test_button_not_created(
+    hass: HomeAssistant, electric_vehicle, entity_id_suffix
+) -> None:
+    """Test that button entities are not created when they should not be."""
+    await init_integration(hass, electric_vehicle=electric_vehicle)
+
+    entity_registry = er.async_get(hass)
+
+    entity_id = f"button.my_mazda3_{entity_id_suffix}"
+    entry = entity_registry.async_get(entity_id)
+    assert entry is None
+    state = hass.states.get(entity_id)
+    assert state is None
+
+
+@pytest.mark.parametrize(
+    ("electric_vehicle", "entity_id_suffix", "api_method_name"),
+    [
+        (False, "start_engine", "start_engine"),
+        (False, "stop_engine", "stop_engine"),
+        (False, "turn_on_hazard_lights", "turn_on_hazard_lights"),
+        (False, "turn_off_hazard_lights", "turn_off_hazard_lights"),
+        (True, "refresh_status", "refresh_vehicle_status"),
     ],
 )
 async def test_button_press(
-    hass: HomeAssistant, entity_id_suffix, api_method_name
+    hass: HomeAssistant, electric_vehicle, entity_id_suffix, api_method_name
 ) -> None:
     """Test pressing the button entities."""
-    client_mock = await init_integration(hass, electric_vehicle=True)
+    client_mock = await init_integration(hass, electric_vehicle=electric_vehicle)
 
     await hass.services.async_call(
         BUTTON_DOMAIN,
diff --git a/tests/components/media_player/test_device_condition.py b/tests/components/media_player/test_device_condition.py
index d70a9a90893..b89993dec65 100644
--- a/tests/components/media_player/test_device_condition.py
+++ b/tests/components/media_player/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Media player device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -20,7 +21,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -49,7 +49,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -58,7 +58,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in [
@@ -73,7 +73,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -99,7 +99,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -113,7 +113,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in [
@@ -128,12 +128,16 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("media_player.entity", STATE_ON)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -147,7 +151,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "media_player.entity",
+                            "entity_id": entry.id,
                             "type": "is_on",
                         }
                     ],
@@ -165,7 +169,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "media_player.entity",
+                            "entity_id": entry.id,
                             "type": "is_off",
                         }
                     ],
@@ -183,7 +187,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "media_player.entity",
+                            "entity_id": entry.id,
                             "type": "is_idle",
                         }
                     ],
@@ -201,7 +205,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "media_player.entity",
+                            "entity_id": entry.id,
                             "type": "is_paused",
                         }
                     ],
@@ -219,7 +223,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "media_player.entity",
+                            "entity_id": entry.id,
                             "type": "is_playing",
                         }
                     ],
@@ -237,7 +241,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "media_player.entity",
+                            "entity_id": entry.id,
                             "type": "is_buffering",
                         }
                     ],
@@ -261,7 +265,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on - event - test_event1"
 
-    hass.states.async_set("media_player.entity", STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -272,7 +276,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_off - event - test_event2"
 
-    hass.states.async_set("media_player.entity", STATE_IDLE)
+    hass.states.async_set(entry.entity_id, STATE_IDLE)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -283,7 +287,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 3
     assert calls[2].data["some"] == "is_idle - event - test_event3"
 
-    hass.states.async_set("media_player.entity", STATE_PAUSED)
+    hass.states.async_set(entry.entity_id, STATE_PAUSED)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -294,7 +298,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 4
     assert calls[3].data["some"] == "is_paused - event - test_event4"
 
-    hass.states.async_set("media_player.entity", STATE_PLAYING)
+    hass.states.async_set(entry.entity_id, STATE_PLAYING)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -305,7 +309,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 5
     assert calls[4].data["some"] == "is_playing - event - test_event5"
 
-    hass.states.async_set("media_player.entity", STATE_BUFFERING)
+    hass.states.async_set(entry.entity_id, STATE_BUFFERING)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -315,3 +319,43 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     await hass.async_block_till_done()
     assert len(calls) == 6
     assert calls[5].data["some"] == "is_buffering - event - test_event6"
+
+
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.id,
+                            "type": "is_on",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_on - {{ trigger.platform }} - {{ trigger.event.event_type }}"
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_on - event - test_event1"
diff --git a/tests/components/media_player/test_device_trigger.py b/tests/components/media_player/test_device_trigger.py
index d8d91c3495b..42608eacb09 100644
--- a/tests/components/media_player/test_device_trigger.py
+++ b/tests/components/media_player/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -23,7 +24,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
@@ -54,7 +54,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
 
@@ -73,7 +73,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in trigger_types
@@ -81,7 +81,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -107,7 +107,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -115,29 +115,30 @@ async def test_get_triggers_hidden_auxiliary(
         entity_category=entity_category,
         hidden_by=hidden_by,
     )
+    trigger_types = {
+        "buffering",
+        "changed_states",
+        "idle",
+        "paused",
+        "playing",
+        "turned_off",
+        "turned_on",
+    }
     expected_triggers = [
         {
             "platform": "device",
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
-        for trigger in [
-            "buffering",
-            "changed_states",
-            "idle",
-            "paused",
-            "playing",
-            "turned_off",
-            "turned_on",
-        ]
+        for trigger in trigger_types
     ]
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -171,9 +172,45 @@ async def test_get_trigger_capabilities(
         }
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a media player."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    assert len(triggers) == 7
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == {
+            "extra_fields": [
+                {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+            ]
+        }
+
+
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test triggers firing."""
-    hass.states.async_set("media_player.entity", STATE_OFF)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
 
     data_template = (
         "{label} - {{{{ trigger.platform}}}} - "
@@ -200,7 +237,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "media_player.entity",
+                        "entity_id": entry.id,
                         "type": trigger,
                     },
                     "action": {
@@ -214,64 +251,73 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Fake that the entity is turning on.
-    hass.states.async_set("media_player.entity", STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert {calls[0].data["some"], calls[1].data["some"]} == {
-        "turned_on - device - media_player.entity - off - on - None",
-        "changed_states - device - media_player.entity - off - on - None",
+        "turned_on - device - media_player.test_5678 - off - on - None",
+        "changed_states - device - media_player.test_5678 - off - on - None",
     }
 
     # Fake that the entity is turning off.
-    hass.states.async_set("media_player.entity", STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert {calls[2].data["some"], calls[3].data["some"]} == {
-        "turned_off - device - media_player.entity - on - off - None",
-        "changed_states - device - media_player.entity - on - off - None",
+        "turned_off - device - media_player.test_5678 - on - off - None",
+        "changed_states - device - media_player.test_5678 - on - off - None",
     }
 
     # Fake that the entity becomes idle.
-    hass.states.async_set("media_player.entity", STATE_IDLE)
+    hass.states.async_set(entry.entity_id, STATE_IDLE)
     await hass.async_block_till_done()
     assert len(calls) == 6
     assert {calls[4].data["some"], calls[5].data["some"]} == {
-        "idle - device - media_player.entity - off - idle - None",
-        "changed_states - device - media_player.entity - off - idle - None",
+        "idle - device - media_player.test_5678 - off - idle - None",
+        "changed_states - device - media_player.test_5678 - off - idle - None",
     }
 
     # Fake that the entity starts playing.
-    hass.states.async_set("media_player.entity", STATE_PLAYING)
+    hass.states.async_set(entry.entity_id, STATE_PLAYING)
     await hass.async_block_till_done()
     assert len(calls) == 8
     assert {calls[6].data["some"], calls[7].data["some"]} == {
-        "playing - device - media_player.entity - idle - playing - None",
-        "changed_states - device - media_player.entity - idle - playing - None",
+        "playing - device - media_player.test_5678 - idle - playing - None",
+        "changed_states - device - media_player.test_5678 - idle - playing - None",
     }
 
     # Fake that the entity is paused.
-    hass.states.async_set("media_player.entity", STATE_PAUSED)
+    hass.states.async_set(entry.entity_id, STATE_PAUSED)
     await hass.async_block_till_done()
     assert len(calls) == 10
     assert {calls[8].data["some"], calls[9].data["some"]} == {
-        "paused - device - media_player.entity - playing - paused - None",
-        "changed_states - device - media_player.entity - playing - paused - None",
+        "paused - device - media_player.test_5678 - playing - paused - None",
+        "changed_states - device - media_player.test_5678 - playing - paused - None",
     }
 
     # Fake that the entity is buffering.
-    hass.states.async_set("media_player.entity", STATE_BUFFERING)
+    hass.states.async_set(entry.entity_id, STATE_BUFFERING)
     await hass.async_block_till_done()
     assert len(calls) == 12
     assert {calls[10].data["some"], calls[11].data["some"]} == {
-        "buffering - device - media_player.entity - paused - buffering - None",
-        "changed_states - device - media_player.entity - paused - buffering - None",
+        "buffering - device - media_player.test_5678 - paused - buffering - None",
+        "changed_states - device - media_player.test_5678 - paused - buffering - None",
     }
 
 
-async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) -> None:
-    """Test for triggers firing with delay."""
-    entity_id = f"{DOMAIN}.entity"
-    hass.states.async_set(entity_id, STATE_OFF)
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
+
+    data_template = (
+        "{label} - {{{{ trigger.platform}}}} - "
+        "{{{{ trigger.entity_id}}}} - {{{{ trigger.from_state.state}}}} - "
+        "{{{{ trigger.to_state.state}}}} - {{{{ trigger.for }}}}"
+    )
 
     assert await async_setup_component(
         hass,
@@ -283,7 +329,49 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.entity_id,
+                        "type": "turned_on",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": data_template.format(label="turned_on")
+                        },
+                    },
+                }
+            ]
+        },
+    )
+
+    # Fake that the entity is turning on.
+    hass.states.async_set(entry.entity_id, STATE_ON)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == "turned_on - device - media_player.test_5678 - off - on - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
                         "type": "turned_on",
                         "for": {"seconds": 5},
                     },
@@ -307,10 +395,9 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == STATE_OFF
     assert len(calls) == 0
 
-    hass.states.async_set(entity_id, STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -318,5 +405,6 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     assert len(calls) == 1
     await hass.async_block_till_done()
     assert (
-        calls[0].data["some"] == f"turn_off device - {entity_id} - off - on - 0:00:05"
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - off - on - 0:00:05"
     )
diff --git a/tests/components/media_player/test_recorder.py b/tests/components/media_player/test_recorder.py
index 98922d7d0a4..a04c7e85119 100644
--- a/tests/components/media_player/test_recorder.py
+++ b/tests/components/media_player/test_recorder.py
@@ -2,6 +2,9 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import media_player
 from homeassistant.components.media_player import (
@@ -13,7 +16,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
-from homeassistant.const import ATTR_ENTITY_PICTURE, ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_ENTITY_PICTURE, ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -22,6 +25,16 @@ from tests.common import async_fire_time_changed
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def media_player_only() -> None:
+    """Enable only the media_player platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.MEDIA_PLAYER],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test media_player registered attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/moat/__init__.py b/tests/components/moat/__init__.py
index 358d338993f..e0af0229cba 100644
--- a/tests/components/moat/__init__.py
+++ b/tests/components/moat/__init__.py
@@ -19,7 +19,7 @@ MOAT_S2_SERVICE_INFO = BluetoothServiceInfo(
     service_data={
         "00005000-0000-1000-8000-00805f9b34fb": b"\xdfy\xe3\xa6\x12\xb3\xf5\x0b",
         "00001000-0000-1000-8000-00805f9b34fb": (
-            b"\xdfy\xe3\xa6\x12\xb3\x11S\xdbb\xfcbpq" b"\xf5\x0b\xff\xff"
+            b"\xdfy\xe3\xa6\x12\xb3\x11S\xdbb\xfcbpq\xf5\x0b\xff\xff"
         ),
     },
     service_uuids=[
diff --git a/tests/components/mobile_app/test_notify.py b/tests/components/mobile_app/test_notify.py
index 5ce010eee40..23e2530c70a 100644
--- a/tests/components/mobile_app/test_notify.py
+++ b/tests/components/mobile_app/test_notify.py
@@ -143,7 +143,7 @@ async def test_notify_works(
 ) -> None:
     """Test notify works."""
     assert hass.services.has_service("notify", "mobile_app_test") is True
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify", "mobile_app_test", {"message": "Hello world"}, blocking=True
     )
 
@@ -191,7 +191,7 @@ async def test_notify_ws_works(
     sub_result = await client.receive_json()
     assert sub_result["success"]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify", "mobile_app_test", {"message": "Hello world"}, blocking=True
     )
 
@@ -212,7 +212,7 @@ async def test_notify_ws_works(
     sub_result = await client.receive_json()
     assert sub_result["success"]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify", "mobile_app_test", {"message": "Hello world 2"}, blocking=True
     )
 
@@ -271,7 +271,7 @@ async def test_notify_ws_confirming_works(
     assert sub_result["success"]
 
     # Sent a message that will be delivered locally
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify", "mobile_app_test", {"message": "Hello world"}, blocking=True
     )
 
@@ -359,23 +359,24 @@ async def test_notify_ws_not_confirming(
     sub_result = await client.receive_json()
     assert sub_result["success"]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify", "mobile_app_test", {"message": "Hello world 1"}, blocking=True
     )
 
     with patch(
         "homeassistant.components.mobile_app.push_notification.PUSH_CONFIRM_TIMEOUT", 0
     ):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             "notify", "mobile_app_test", {"message": "Hello world 2"}, blocking=True
         )
         await hass.async_block_till_done()
+        await hass.async_block_till_done()
 
     # When we fail, all unconfirmed ones and failed one are sent via cloud
     assert len(aioclient_mock.mock_calls) == 2
 
     # All future ones also go via cloud
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify", "mobile_app_test", {"message": "Hello world 3"}, blocking=True
     )
 
@@ -389,7 +390,7 @@ async def test_local_push_only(
 ) -> None:
     """Test a local only push registration."""
     with pytest.raises(HomeAssistantError) as e_info:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             "notify",
             "mobile_app_websocket_push_name",
             {"message": "Not connected"},
@@ -411,7 +412,7 @@ async def test_local_push_only(
     sub_result = await client.receive_json()
     assert sub_result["success"]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify",
         "mobile_app_websocket_push_name",
         {"message": "Hello world 1"},
diff --git a/tests/components/mobile_app/test_webhook.py b/tests/components/mobile_app/test_webhook.py
index 02c9ace7cd4..ce1dc19319a 100644
--- a/tests/components/mobile_app/test_webhook.py
+++ b/tests/components/mobile_app/test_webhook.py
@@ -1026,15 +1026,19 @@ async def test_webhook_handle_conversation_process(
     """Test that we can converse."""
     webhook_client.server.app.router._frozen = False
 
-    resp = await webhook_client.post(
-        "/api/webhook/{}".format(create_registrations[1]["webhook_id"]),
-        json={
-            "type": "conversation_process",
-            "data": {
-                "text": "Turn the kitchen light off",
+    with patch(
+        "homeassistant.components.conversation.AgentManager.async_get_agent",
+        return_value=mock_agent,
+    ):
+        resp = await webhook_client.post(
+            "/api/webhook/{}".format(create_registrations[1]["webhook_id"]),
+            json={
+                "type": "conversation_process",
+                "data": {
+                    "text": "Turn the kitchen light off",
+                },
             },
-        },
-    )
+        )
 
     assert resp.status == HTTPStatus.OK
     json = await resp.json()
diff --git a/tests/components/modbus/test_init.py b/tests/components/modbus/test_init.py
index 7a069234045..2daf722bb05 100644
--- a/tests/components/modbus/test_init.py
+++ b/tests/components/modbus/test_init.py
@@ -705,7 +705,6 @@ async def test_pymodbus_connect_fail(
     ExceptionMessage = "test connect exception"
     mock_pymodbus.connect.side_effect = ModbusException(ExceptionMessage)
     assert await async_setup_component(hass, DOMAIN, config) is True
-    assert ExceptionMessage in caplog.text
 
 
 async def test_delay(
diff --git a/tests/components/moon/test_sensor.py b/tests/components/moon/test_sensor.py
index 164e5ddace5..922febed3bf 100644
--- a/tests/components/moon/test_sensor.py
+++ b/tests/components/moon/test_sensor.py
@@ -60,14 +60,14 @@ async def test_moon_day(
     assert state.attributes[ATTR_FRIENDLY_NAME] == "Moon Phase"
     assert state.attributes[ATTR_DEVICE_CLASS] == SensorDeviceClass.ENUM
     assert state.attributes[ATTR_OPTIONS] == [
-        STATE_FIRST_QUARTER,
-        STATE_FULL_MOON,
-        STATE_LAST_QUARTER,
         STATE_NEW_MOON,
-        STATE_WANING_CRESCENT,
-        STATE_WANING_GIBBOUS,
         STATE_WAXING_CRESCENT,
+        STATE_FIRST_QUARTER,
         STATE_WAXING_GIBBOUS,
+        STATE_FULL_MOON,
+        STATE_WANING_GIBBOUS,
+        STATE_LAST_QUARTER,
+        STATE_WANING_CRESCENT,
     ]
 
     entity_registry = er.async_get(hass)
diff --git a/tests/components/motioneye/test_camera.py b/tests/components/motioneye/test_camera.py
index 8cc64b8ff00..6972bee35d0 100644
--- a/tests/components/motioneye/test_camera.py
+++ b/tests/components/motioneye/test_camera.py
@@ -358,7 +358,7 @@ async def test_camera_option_stream_url_template(
         },
         options={
             CONF_STREAM_URL_TEMPLATE: (
-                f"http://127.0.0.1:{stream_server.port}/" "{{ name }}/{{ id }}"
+                f"http://127.0.0.1:{stream_server.port}/{{{{ name }}}}/{{{{ id }}}}"
             )
         },
     )
diff --git a/tests/components/mqtt/test_alarm_control_panel.py b/tests/components/mqtt/test_alarm_control_panel.py
index a30a15d5098..ee32b7131c4 100644
--- a/tests/components/mqtt/test_alarm_control_panel.py
+++ b/tests/components/mqtt/test_alarm_control_panel.py
@@ -64,7 +64,6 @@ from .test_common import (
     help_test_unload_config_entry_with_platform,
     help_test_update_with_json_attrs_bad_json,
     help_test_update_with_json_attrs_not_dict,
-    help_test_validate_platform_config,
 )
 
 from tests.common import async_fire_mqtt_message
@@ -131,7 +130,7 @@ def alarm_control_panel_platform_only():
 
 
 @pytest.mark.parametrize(
-    ("config", "valid"),
+    ("hass_config", "valid"),
     [
         (
             {
@@ -170,10 +169,14 @@ def alarm_control_panel_platform_only():
     ],
 )
 async def test_fail_setup_without_state_or_command_topic(
-    hass: HomeAssistant, config, valid
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator, valid
 ) -> None:
     """Test for failing setup with no state or command topic."""
-    assert help_test_validate_platform_config(hass, config) == valid
+    if valid:
+        await mqtt_mock_entry()
+        return
+    with pytest.raises(AssertionError):
+        await mqtt_mock_entry()
 
 
 @pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
diff --git a/tests/components/mqtt/test_binary_sensor.py b/tests/components/mqtt/test_binary_sensor.py
index c98de3628b8..921f46703c2 100644
--- a/tests/components/mqtt/test_binary_sensor.py
+++ b/tests/components/mqtt/test_binary_sensor.py
@@ -984,8 +984,8 @@ async def test_discovery_broken(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test handling of bad discovery message."""
-    data1 = '{ "name": "Beer",' '  "off_delay": -1 }'
-    data2 = '{ "name": "Milk",' '  "state_topic": "test_topic" }'
+    data1 = '{ "name": "Beer",  "off_delay": -1 }'
+    data2 = '{ "name": "Milk",  "state_topic": "test_topic" }'
     await help_test_discovery_broken(
         hass,
         mqtt_mock_entry,
diff --git a/tests/components/mqtt/test_climate.py b/tests/components/mqtt/test_climate.py
index 384f03a317c..4a6d1bf64d4 100644
--- a/tests/components/mqtt/test_climate.py
+++ b/tests/components/mqtt/test_climate.py
@@ -27,8 +27,11 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
-from homeassistant.components.mqtt.climate import MQTT_CLIMATE_ATTRIBUTES_BLOCKED
-from homeassistant.const import ATTR_TEMPERATURE, Platform
+from homeassistant.components.mqtt.climate import (
+    DEFAULT_INITIAL_TEMPERATURE,
+    MQTT_CLIMATE_ATTRIBUTES_BLOCKED,
+)
+from homeassistant.const import ATTR_TEMPERATURE, Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 
 from .test_common import (
@@ -352,9 +355,6 @@ async def test_set_operation_optimistic(
     assert state.state == "heat"
 
 
-# CONF_POWER_COMMAND_TOPIC, CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE are deprecated,
-# support for CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE was already removed or never added
-# support was deprecated with release 2023.2 and will be removed with release 2023.8
 @pytest.mark.parametrize(
     "hass_config",
     [
@@ -374,17 +374,134 @@ async def test_set_operation_with_power_command(
     await common.async_set_hvac_mode(hass, "cool", ENTITY_CLIMATE)
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.state == "cool"
-    mqtt_mock.async_publish.assert_has_calls(
-        [call("power-command", "ON", 0, False), call("mode-topic", "cool", 0, False)]
-    )
+    mqtt_mock.async_publish.assert_has_calls([call("mode-topic", "cool", 0, False)])
     mqtt_mock.async_publish.reset_mock()
 
     await common.async_set_hvac_mode(hass, "off", ENTITY_CLIMATE)
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.state == "off"
-    mqtt_mock.async_publish.assert_has_calls(
-        [call("power-command", "OFF", 0, False), call("mode-topic", "off", 0, False)]
-    )
+    mqtt_mock.async_publish.assert_has_calls([call("mode-topic", "off", 0, False)])
+    mqtt_mock.async_publish.reset_mock()
+
+    await common.async_turn_on(hass, ENTITY_CLIMATE)
+    # the hvac_mode is not updated optimistically as this is not supported
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+    mqtt_mock.async_publish.assert_has_calls([call("power-command", "ON", 0, False)])
+    mqtt_mock.async_publish.reset_mock()
+
+    await common.async_turn_off(hass, ENTITY_CLIMATE)
+    mqtt_mock.async_publish.assert_has_calls([call("power-command", "OFF", 0, False)])
+    mqtt_mock.async_publish.reset_mock()
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            climate.DOMAIN,
+            DEFAULT_CONFIG,
+            ({"power_command_topic": "power-command", "optimistic": True},),
+        )
+    ],
+)
+async def test_turn_on_and_off_optimistic_with_power_command(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting of turn on/off with power command enabled."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+    await common.async_set_hvac_mode(hass, "cool", ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "cool"
+    mqtt_mock.async_publish.assert_has_calls([call("mode-topic", "cool", 0, False)])
+    mqtt_mock.async_publish.reset_mock()
+    await common.async_set_hvac_mode(hass, "off", ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+
+    await common.async_turn_on(hass, ENTITY_CLIMATE)
+    # the hvac_mode is not updated optimistically as this is not supported
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+    mqtt_mock.async_publish.assert_has_calls([call("power-command", "ON", 0, False)])
+    mqtt_mock.async_publish.reset_mock()
+
+    await common.async_set_hvac_mode(hass, "cool", ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "cool"
+    await common.async_turn_off(hass, ENTITY_CLIMATE)
+    # the hvac_mode is updated optimistically
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+    mqtt_mock.async_publish.assert_has_calls([call("power-command", "OFF", 0, False)])
+    mqtt_mock.async_publish.reset_mock()
+
+
+@pytest.mark.parametrize(
+    ("hass_config", "climate_on", "climate_off"),
+    [
+        (
+            help_custom_config(
+                climate.DOMAIN, DEFAULT_CONFIG, ({"modes": ["heat", "cool"]},)
+            ),
+            "heat",
+            None,
+        ),
+        (
+            help_custom_config(
+                climate.DOMAIN, DEFAULT_CONFIG, ({"modes": ["off", "dry"]},)
+            ),
+            None,
+            "off",
+        ),
+        (
+            help_custom_config(
+                climate.DOMAIN, DEFAULT_CONFIG, ({"modes": ["off", "cool"]},)
+            ),
+            "cool",
+            "off",
+        ),
+    ],
+)
+async def test_turn_on_and_off_without_power_command(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    climate_on: str | None,
+    climate_off: str | None,
+) -> None:
+    """Test setting of turn on/off with power command enabled."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+
+    await common.async_turn_on(hass, ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert climate_on is None or state.state == climate_on
+    if climate_on:
+        mqtt_mock.async_publish.assert_has_calls(
+            [call("mode-topic", climate_on, 0, False)]
+        )
+    else:
+        mqtt_mock.async_publish.assert_has_calls([])
+
+    await common.async_set_hvac_mode(hass, "cool", ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "cool"
+    mqtt_mock.async_publish.reset_mock()
+
+    await common.async_turn_off(hass, ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert climate_off is None or state.state == climate_off
+    if climate_off:
+        assert state.state == "off"
+        mqtt_mock.async_publish.assert_has_calls([call("mode-topic", "off", 0, False)])
+    else:
+        assert state.state == "cool"
+        mqtt_mock.async_publish.assert_has_calls([])
     mqtt_mock.async_publish.reset_mock()
 
 
@@ -963,7 +1080,7 @@ async def test_handle_action_received(
     hvac_action = state.attributes.get(ATTR_HVAC_ACTION)
     assert hvac_action is None
     # Redefine actions according to https://developers.home-assistant.io/docs/core/entity/climate/#hvac-action
-    actions = ["off", "heating", "cooling", "drying", "idle", "fan"]
+    actions = ["off", "preheating", "heating", "cooling", "drying", "idle", "fan"]
     assert all(elem in actions for elem in HVACAction)
     for action in actions:
         async_fire_mqtt_message(hass, "action", action)
@@ -1330,6 +1447,9 @@ async def test_get_target_temperature_low_high_with_templates(
                     # By default, just unquote the JSON-strings
                     "value_template": "{{ value_json }}",
                     "action_template": "{{ value_json }}",
+                    "current_humidity_template": "{{ value_json }}",
+                    "current_temperature_template": "{{ value_json }}",
+                    "temperature_state_template": "{{ value_json }}",
                     # Rendering to a bool for aux heat
                     "aux_state_template": "{{ value == 'switchmeon' }}",
                     # Rendering preset_mode
@@ -1474,6 +1594,7 @@ async def test_get_with_templates(
                 climate.DOMAIN: {
                     "name": "test",
                     "mode_command_topic": "mode-topic",
+                    "power_command_topic": "power-topic",
                     "target_humidity_command_topic": "humidity-topic",
                     "temperature_command_topic": "temperature-topic",
                     "temperature_low_command_topic": "temperature-low-topic",
@@ -1493,6 +1614,7 @@ async def test_get_with_templates(
                     ],
                     # Create simple templates
                     "fan_mode_command_template": "fan_mode: {{ value }}",
+                    "power_command_template": "power: {{ value }}",
                     "preset_mode_command_template": "preset_mode: {{ value }}",
                     "mode_command_template": "mode: {{ value }}",
                     "swing_mode_command_template": "swing_mode: {{ value }}",
@@ -1534,13 +1656,38 @@ async def test_set_and_templates(
 
     # Mode
     await common.async_set_hvac_mode(hass, "cool", ENTITY_CLIMATE)
-    mqtt_mock.async_publish.assert_called_once_with(
-        "mode-topic", "mode: cool", 0, False
-    )
+    mqtt_mock.async_publish.assert_any_call("mode-topic", "mode: cool", 0, False)
+    assert mqtt_mock.async_publish.call_count == 1
     mqtt_mock.async_publish.reset_mock()
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.state == "cool"
 
+    await common.async_set_hvac_mode(hass, "off", ENTITY_CLIMATE)
+    mqtt_mock.async_publish.assert_any_call("mode-topic", "mode: off", 0, False)
+    assert mqtt_mock.async_publish.call_count == 1
+    mqtt_mock.async_publish.reset_mock()
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+
+    # Power
+    await common.async_turn_on(hass, ENTITY_CLIMATE)
+    mqtt_mock.async_publish.assert_any_call("power-topic", "power: ON", 0, False)
+    # Only power command is sent
+    # the mode is not updated when power_command_topic is set
+    assert mqtt_mock.async_publish.call_count == 1
+    mqtt_mock.async_publish.reset_mock()
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+
+    await common.async_turn_off(hass, ENTITY_CLIMATE)
+    mqtt_mock.async_publish.assert_any_call("power-topic", "power: OFF", 0, False)
+    # Only power command is sent
+    # the mode is not updated when power_command_topic is set
+    assert mqtt_mock.async_publish.call_count == 1
+    mqtt_mock.async_publish.reset_mock()
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+
     # Swing Mode
     await common.async_set_swing_mode(hass, "on", ENTITY_CLIMATE)
     mqtt_mock.async_publish.assert_called_once_with(
@@ -1690,12 +1837,97 @@ async def test_temperature_unit(
     """Test that setting temperature unit converts temperature values."""
     await mqtt_mock_entry()
 
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("temperature") == DEFAULT_INITIAL_TEMPERATURE
+    assert state.attributes.get("min_temp") == DEFAULT_MIN_TEMP
+    assert state.attributes.get("max_temp") == DEFAULT_MAX_TEMP
+
     async_fire_mqtt_message(hass, "current_temperature", "77")
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("current_temperature") == 25
 
 
+@pytest.mark.parametrize(
+    ("hass_config", "temperature_unit", "initial", "min", "max", "current"),
+    [
+        (
+            help_custom_config(
+                climate.DOMAIN,
+                DEFAULT_CONFIG,
+                (
+                    {
+                        "temperature_unit": "F",
+                        "current_temperature_topic": "current_temperature",
+                    },
+                ),
+            ),
+            UnitOfTemperature.CELSIUS,
+            DEFAULT_INITIAL_TEMPERATURE,
+            DEFAULT_MIN_TEMP,
+            DEFAULT_MAX_TEMP,
+            25,
+        ),
+        (
+            help_custom_config(
+                climate.DOMAIN,
+                DEFAULT_CONFIG,
+                (
+                    {
+                        "temperature_unit": "F",
+                        "current_temperature_topic": "current_temperature",
+                    },
+                ),
+            ),
+            UnitOfTemperature.KELVIN,
+            294,
+            280,
+            308,
+            298,
+        ),
+        (
+            help_custom_config(
+                climate.DOMAIN,
+                DEFAULT_CONFIG,
+                (
+                    {
+                        "temperature_unit": "F",
+                        "current_temperature_topic": "current_temperature",
+                    },
+                ),
+            ),
+            UnitOfTemperature.FAHRENHEIT,
+            70,
+            45,
+            95,
+            77,
+        ),
+    ],
+)
+async def test_alt_temperature_unit(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    temperature_unit: UnitOfTemperature,
+    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()
+
+        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")
+
+        state = hass.states.get(ENTITY_CLIMATE)
+        assert state.attributes.get("current_temperature") == current
+
+
 async def test_setting_attribute_via_mqtt_json_message(
     hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
 ) -> None:
@@ -2050,10 +2282,17 @@ async def test_precision_whole(
         (
             climate.SERVICE_TURN_ON,
             "power_command_topic",
-            None,
+            {},
             "ON",
             None,
         ),
+        (
+            climate.SERVICE_TURN_OFF,
+            "power_command_topic",
+            {},
+            "OFF",
+            None,
+        ),
         (
             climate.SERVICE_SET_HVAC_MODE,
             "mode_command_topic",
diff --git a/tests/components/mqtt/test_common.py b/tests/components/mqtt/test_common.py
index f9df3450c8d..cd1cc7280c6 100644
--- a/tests/components/mqtt/test_common.py
+++ b/tests/components/mqtt/test_common.py
@@ -9,17 +9,14 @@ from typing import Any
 from unittest.mock import ANY, MagicMock, patch
 
 import pytest
-import voluptuous as vol
 import yaml
 
 from homeassistant import config as module_hass_config
 from homeassistant.components import mqtt
 from homeassistant.components.mqtt import debug_info
-from homeassistant.components.mqtt.config_integration import PLATFORM_CONFIG_SCHEMA_BASE
 from homeassistant.components.mqtt.const import MQTT_DISCONNECTED
 from homeassistant.components.mqtt.mixins import MQTT_ATTRIBUTES_BLOCKED
 from homeassistant.components.mqtt.models import PublishPayloadType
-from homeassistant.config import async_log_exception
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import (
     ATTR_ASSUMED_STATE,
@@ -30,7 +27,6 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.generated.mqtt import MQTT
 from homeassistant.helpers import (
-    config_validation as cv,
     device_registry as dr,
     entity_registry as er,
 )
@@ -38,7 +34,7 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from tests.common import MockConfigEntry, async_fire_mqtt_message
-from tests.typing import MqttMockHAClient, MqttMockHAClientGenerator, MqttMockPahoClient
+from tests.typing import MqttMockHAClientGenerator, MqttMockPahoClient
 
 DEFAULT_CONFIG_DEVICE_INFO_ID = {
     "identifiers": ["helloworld"],
@@ -70,8 +66,6 @@ _MqttMessageType = list[tuple[str, str]]
 _AttributesType = list[tuple[str, Any]]
 _StateDataType = list[tuple[_MqttMessageType, str | None, _AttributesType | None]]
 
-MQTT_YAML_SCHEMA = vol.Schema({mqtt.DOMAIN: PLATFORM_CONFIG_SCHEMA_BASE})
-
 
 def help_all_subscribe_calls(mqtt_client_mock: MqttMockPahoClient) -> list[Any]:
     """Test of a call."""
@@ -82,53 +76,6 @@ def help_all_subscribe_calls(mqtt_client_mock: MqttMockPahoClient) -> list[Any]:
     return all_calls
 
 
-def help_test_validate_platform_config(
-    hass: HomeAssistant, config: ConfigType
-) -> ConfigType | None:
-    """Test the schema validation."""
-    try:
-        # validate the schema
-        MQTT_YAML_SCHEMA(config)
-        return True
-    except vol.Error as exc:
-        # log schema exceptions
-        async_log_exception(exc, mqtt.DOMAIN, config, hass)
-        return False
-
-
-async def help_setup_component(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator | None,
-    domain: str,
-    config: ConfigType,
-    use_discovery: bool = False,
-) -> MqttMockHAClient | None:
-    """Help to set up the MQTT component."""
-    # `async_setup_component` will call `async_setup` and
-    # after that it will also start the entry `async_start_entry`
-    # when `async_setup` removed mqtt_mock_entry_with_no_config should be awaited.
-
-    if use_discovery:
-        comp_config = cv.ensure_list(config[mqtt.DOMAIN][domain])
-        item = 0
-        assert mqtt_mock_entry is not None
-        mqtt_mock = await mqtt_mock_entry()
-        for comp in comp_config:
-            item += 1
-            topic = f"homeassistant/{domain}/item_{item}/config"
-            async_fire_mqtt_message(hass, topic, json.dumps(comp))
-        await hass.async_block_till_done()
-    else:
-        entry = MockConfigEntry(
-            domain=mqtt.DOMAIN, data={mqtt.CONF_BROKER: "test-broker"}
-        )
-        entry.add_to_hass(hass)
-        with patch("homeassistant.config.load_yaml_config_file", return_value=config):
-            await entry.async_setup(hass)
-        mqtt_mock = None
-    return mqtt_mock
-
-
 def help_custom_config(
     mqtt_entity_domain: str,
     mqtt_base_config: ConfigType,
@@ -189,7 +136,7 @@ async def help_test_availability_without_topic(
 
 async def help_test_default_availability_payload(
     hass: HomeAssistant,
-    mqtt_mock_entry_with_no_config: MqttMockHAClientGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
     domain: str,
     config: ConfigType,
     no_assumed_state: bool = False,
@@ -204,7 +151,8 @@ async def help_test_default_availability_payload(
     config = copy.deepcopy(config)
     config[mqtt.DOMAIN][domain]["availability_topic"] = "availability-topic"
 
-    await help_setup_component(hass, mqtt_mock_entry_with_no_config, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     state = hass.states.get(f"{domain}.test")
     assert state and state.state == STATE_UNAVAILABLE
@@ -252,7 +200,8 @@ async def help_test_default_availability_list_payload(
         {"topic": "availability-topic1"},
         {"topic": "availability-topic2"},
     ]
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     state = hass.states.get(f"{domain}.test")
     assert state and state.state == STATE_UNAVAILABLE
@@ -313,7 +262,8 @@ async def help_test_default_availability_list_payload_all(
         {"topic": "availability-topic1"},
         {"topic": "availability-topic2"},
     ]
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     state = hass.states.get(f"{domain}.test")
     assert state and state.state == STATE_UNAVAILABLE
@@ -375,7 +325,8 @@ async def help_test_default_availability_list_payload_any(
         {"topic": "availability-topic1"},
         {"topic": "availability-topic2"},
     ]
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     state = hass.states.get(f"{domain}.test")
     assert state and state.state == STATE_UNAVAILABLE
@@ -428,10 +379,14 @@ async def help_test_default_availability_list_single(
         {"topic": "availability-topic1"},
     ]
     config[mqtt.DOMAIN][domain]["availability_topic"] = "availability-topic"
-    help_test_validate_platform_config(hass, config)
+
+    entry = MockConfigEntry(domain=mqtt.DOMAIN, data={mqtt.CONF_BROKER: "test-broker"})
+    entry.add_to_hass(hass)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await entry.async_setup(hass)
 
     assert (
-        "Invalid config for [mqtt]: two or more values in the same group of exclusion 'availability'"
+        "two or more values in the same group of exclusion 'availability'"
         in caplog.text
     )
 
@@ -454,7 +409,8 @@ async def help_test_custom_availability_payload(
     config[mqtt.DOMAIN][domain]["availability_topic"] = "availability-topic"
     config[mqtt.DOMAIN][domain]["payload_available"] = "good"
     config[mqtt.DOMAIN][domain]["payload_not_available"] = "nogood"
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     state = hass.states.get(f"{domain}.test")
     assert state and state.state == STATE_UNAVAILABLE
@@ -574,7 +530,8 @@ async def help_test_setting_attribute_via_mqtt_json_message(
     # Add JSON attributes settings to config
     config = copy.deepcopy(config)
     config[mqtt.DOMAIN][domain]["json_attributes_topic"] = "attr-topic"
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     async_fire_mqtt_message(hass, "attr-topic", '{ "val": "100" }')
     state = hass.states.get(f"{domain}.test")
@@ -631,7 +588,8 @@ async def help_test_setting_attribute_with_template(
     config[mqtt.DOMAIN][domain][
         "json_attributes_template"
     ] = "{{ value_json['Timer1'] | tojson }}"
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     async_fire_mqtt_message(
         hass, "attr-topic", json.dumps({"Timer1": {"Arm": 0, "Time": "22:18"}})
@@ -657,7 +615,8 @@ async def help_test_update_with_json_attrs_not_dict(
     # Add JSON attributes settings to config
     config = copy.deepcopy(config)
     config[mqtt.DOMAIN][domain]["json_attributes_topic"] = "attr-topic"
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     async_fire_mqtt_message(hass, "attr-topic", '[ "list", "of", "things"]')
     state = hass.states.get(f"{domain}.test")
@@ -680,7 +639,8 @@ async def help_test_update_with_json_attrs_bad_json(
     # Add JSON attributes settings to config
     config = copy.deepcopy(config)
     config[mqtt.DOMAIN][domain]["json_attributes_topic"] = "attr-topic"
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     async_fire_mqtt_message(hass, "attr-topic", "This is not JSON")
 
@@ -1177,9 +1137,8 @@ async def help_test_entity_id_update_subscriptions(
     assert len(topics) > 0
     entity_registry = er.async_get(hass)
 
-    mqtt_mock = await help_setup_component(
-        hass, mqtt_mock_entry, domain, config, use_discovery=True
-    )
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        mqtt_mock = await mqtt_mock_entry()
     assert mqtt_mock is not None
 
     state = hass.states.get(f"{domain}.test")
diff --git a/tests/components/mqtt/test_device_trigger.py b/tests/components/mqtt/test_device_trigger.py
index 9954b0f9ba4..9f3b7565332 100644
--- a/tests/components/mqtt/test_device_trigger.py
+++ b/tests/components/mqtt/test_device_trigger.py
@@ -3,6 +3,7 @@ import json
 from unittest.mock import patch
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -17,7 +18,6 @@ from homeassistant.setup import async_setup_component
 from .test_common import help_test_unload_config_entry
 
 from tests.common import (
-    assert_lists_same,
     async_fire_mqtt_message,
     async_get_device_automations,
     async_mock_service,
@@ -79,7 +79,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_unknown_triggers(
@@ -126,7 +126,7 @@ async def test_get_unknown_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, [])
+    assert triggers == []
 
 
 async def test_get_non_existing_triggers(
@@ -149,7 +149,7 @@ async def test_get_non_existing_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, [])
+    assert triggers == []
 
 
 @pytest.mark.no_fail_on_log_exception
@@ -200,7 +200,7 @@ async def test_discover_bad_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_update_remove_triggers(
@@ -253,7 +253,7 @@ async def test_update_remove_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers1)
+    assert triggers == unordered(expected_triggers1)
 
     # Update trigger
     async_fire_mqtt_message(hass, "homeassistant/device_automation/bla/config", data2)
@@ -262,7 +262,7 @@ async def test_update_remove_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers2)
+    assert triggers == unordered(expected_triggers2)
 
     # Remove trigger
     async_fire_mqtt_message(hass, "homeassistant/device_automation/bla/config", "")
diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py
index 8d3c43744fc..f35af9fb037 100644
--- a/tests/components/mqtt/test_discovery.py
+++ b/tests/components/mqtt/test_discovery.py
@@ -1115,7 +1115,6 @@ async def test_discovery_expansion_2(
 
 
 @patch("homeassistant.components.mqtt.PLATFORMS", [Platform.SWITCH])
-@pytest.mark.no_fail_on_log_exception
 async def test_discovery_expansion_3(
     hass: HomeAssistant,
     mqtt_mock_entry: MqttMockHAClientGenerator,
@@ -1146,10 +1145,7 @@ async def test_discovery_expansion_3(
     assert hass.states.get("switch.DiscoveryExpansionTest1") is None
     # Make sure the malformed availability data does not trip up discovery by asserting
     # there are schema valdiation errors in the log
-    assert (
-        "voluptuous.error.MultipleInvalid: expected a dictionary @ data['availability'][0]"
-        in caplog.text
-    )
+    assert "expected a dictionary @ data['availability'][0]" in caplog.text
 
 
 async def test_discovery_expansion_without_encoding_and_value_template_1(
diff --git a/tests/components/mqtt/test_fan.py b/tests/components/mqtt/test_fan.py
index c274c18bec0..c4181a3f885 100644
--- a/tests/components/mqtt/test_fan.py
+++ b/tests/components/mqtt/test_fan.py
@@ -97,10 +97,7 @@ async def test_fail_setup_if_no_command_topic(
     """Test if command fails with command topic."""
     with pytest.raises(AssertionError):
         await mqtt_mock_entry()
-    assert (
-        "Invalid config for [mqtt]: required key not provided @ data['mqtt']['fan'][0]['command_topic']"
-        in caplog.text
-    )
+    assert "Invalid config for [mqtt]: required key not provided" in caplog.text
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/mqtt/test_humidifier.py b/tests/components/mqtt/test_humidifier.py
index 90b2e6d5ba6..1c386b28703 100644
--- a/tests/components/mqtt/test_humidifier.py
+++ b/tests/components/mqtt/test_humidifier.py
@@ -8,12 +8,15 @@ from voluptuous.error import MultipleInvalid
 
 from homeassistant.components import humidifier, mqtt
 from homeassistant.components.humidifier import (
+    ATTR_CURRENT_HUMIDITY,
     ATTR_HUMIDITY,
     ATTR_MODE,
     DOMAIN,
     SERVICE_SET_HUMIDITY,
     SERVICE_SET_MODE,
+    HumidifierAction,
 )
+from homeassistant.components.mqtt.const import CONF_CURRENT_HUMIDITY_TOPIC
 from homeassistant.components.mqtt.humidifier import (
     CONF_MODE_COMMAND_TOPIC,
     CONF_MODE_STATE_TOPIC,
@@ -139,10 +142,7 @@ async def test_fail_setup_if_no_command_topic(
     """Test if command fails with command topic."""
     with pytest.raises(AssertionError):
         await mqtt_mock_entry()
-    assert (
-        "Invalid config for [mqtt]: required key not provided @ data['mqtt']['humidifier'][0]['command_topic']. Got None"
-        in caplog.text
-    )
+    assert "Invalid config for [mqtt]: required key not provided" in caplog.text
 
 
 @pytest.mark.parametrize(
@@ -152,8 +152,10 @@ async def test_fail_setup_if_no_command_topic(
             mqtt.DOMAIN: {
                 humidifier.DOMAIN: {
                     "name": "test",
+                    "action_topic": "action-topic",
                     "state_topic": "state-topic",
                     "command_topic": "command-topic",
+                    "current_humidity_topic": "current-humidity-topic",
                     "payload_off": "StAtE_OfF",
                     "payload_on": "StAtE_On",
                     "target_humidity_state_topic": "humidity-state-topic",
@@ -186,14 +188,17 @@ async def test_controlling_state_via_topic(
     state = hass.states.get("humidifier.test")
     assert state.state == STATE_UNKNOWN
     assert not state.attributes.get(ATTR_ASSUMED_STATE)
+    assert not state.attributes.get(humidifier.ATTR_ACTION)
 
     async_fire_mqtt_message(hass, "state-topic", "StAtE_On")
     state = hass.states.get("humidifier.test")
     assert state.state == STATE_ON
+    assert not state.attributes.get(humidifier.ATTR_ACTION)
 
     async_fire_mqtt_message(hass, "state-topic", "StAtE_OfF")
     state = hass.states.get("humidifier.test")
     assert state.state == STATE_OFF
+    assert not state.attributes.get(humidifier.ATTR_ACTION)
 
     async_fire_mqtt_message(hass, "humidity-state-topic", "0")
     state = hass.states.get("humidifier.test")
@@ -223,6 +228,26 @@ async def test_controlling_state_via_topic(
     assert "not a valid mode" in caplog.text
     caplog.clear()
 
+    async_fire_mqtt_message(hass, "current-humidity-topic", "48")
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 48
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", "101")
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 48
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", "-1.6")
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 48
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", "43.6")
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 44
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", "invalid")
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 44
+
     async_fire_mqtt_message(hass, "mode-state-topic", "auto")
     state = hass.states.get("humidifier.test")
     assert state.attributes.get(humidifier.ATTR_MODE) == "auto"
@@ -250,6 +275,34 @@ async def test_controlling_state_via_topic(
     async_fire_mqtt_message(hass, "state-topic", "None")
     state = hass.states.get("humidifier.test")
     assert state.state == STATE_UNKNOWN
+    assert not state.attributes.get(humidifier.ATTR_ACTION)
+
+    # Turn un the humidifier
+    async_fire_mqtt_message(hass, "state-topic", "StAtE_On")
+    state = hass.states.get("humidifier.test")
+    assert state.state == STATE_ON
+    assert not state.attributes.get(humidifier.ATTR_ACTION)
+
+    async_fire_mqtt_message(hass, "action-topic", HumidifierAction.DRYING.value)
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.DRYING
+
+    async_fire_mqtt_message(hass, "action-topic", HumidifierAction.HUMIDIFYING.value)
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.HUMIDIFYING
+
+    async_fire_mqtt_message(hass, "action-topic", HumidifierAction.HUMIDIFYING.value)
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.HUMIDIFYING
+
+    async_fire_mqtt_message(hass, "action-topic", "invalid_action")
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.HUMIDIFYING
+
+    async_fire_mqtt_message(hass, "state-topic", "StAtE_OfF")
+    state = hass.states.get("humidifier.test")
+    assert state.state == STATE_OFF
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.OFF
 
 
 @pytest.mark.parametrize(
@@ -259,8 +312,10 @@ async def test_controlling_state_via_topic(
             mqtt.DOMAIN: {
                 humidifier.DOMAIN: {
                     "name": "test",
+                    "action_topic": "action-topic",
                     "state_topic": "state-topic",
                     "command_topic": "command-topic",
+                    "current_humidity_topic": "current-humidity-topic",
                     "target_humidity_state_topic": "humidity-state-topic",
                     "target_humidity_command_topic": "humidity-command-topic",
                     "mode_state_topic": "mode-state-topic",
@@ -270,6 +325,8 @@ async def test_controlling_state_via_topic(
                         "eco",
                         "baby",
                     ],
+                    "current_humidity_template": "{{ value_json.val }}",
+                    "action_template": "{{ value_json.val }}",
                     "state_value_template": "{{ value_json.val }}",
                     "target_humidity_state_template": "{{ value_json.val }}",
                     "mode_state_template": "{{ value_json.val }}",
@@ -315,6 +372,22 @@ async def test_controlling_state_via_topic_and_json_message(
     assert state.attributes.get(humidifier.ATTR_HUMIDITY) is None
     caplog.clear()
 
+    async_fire_mqtt_message(hass, "current-humidity-topic", '{"val": 1}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 1
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", '{"val": 100}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 100
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", '{"val": "None"}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) is None
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", '{"otherval": 100}')
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) is None
+    caplog.clear()
+
     async_fire_mqtt_message(hass, "mode-state-topic", '{"val": "low"}')
     assert "not a valid mode" in caplog.text
     caplog.clear()
@@ -343,6 +416,35 @@ async def test_controlling_state_via_topic_and_json_message(
     state = hass.states.get("humidifier.test")
     assert state.state == STATE_UNKNOWN
 
+    # Make sure the humidifier is ON
+    async_fire_mqtt_message(hass, "state-topic", '{"val":"ON"}')
+    state = hass.states.get("humidifier.test")
+    assert state.state == STATE_ON
+
+    async_fire_mqtt_message(hass, "action-topic", '{"val": "drying"}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.DRYING
+
+    async_fire_mqtt_message(hass, "action-topic", '{"val": "humidifying"}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.HUMIDIFYING
+
+    async_fire_mqtt_message(hass, "action-topic", '{"val": null}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.HUMIDIFYING
+
+    async_fire_mqtt_message(hass, "action-topic", '{"otherval": "idle"}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.HUMIDIFYING
+
+    async_fire_mqtt_message(hass, "action-topic", '{"val": "idle"}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.IDLE
+
+    async_fire_mqtt_message(hass, "action-topic", '{"val": "off"}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.OFF
+
 
 @pytest.mark.parametrize(
     "hass_config",
@@ -749,6 +851,7 @@ async def test_sending_mqtt_commands_and_explicit_optimistic(
         ("state_topic", "ON", None, "on"),
         (CONF_MODE_STATE_TOPIC, "auto", ATTR_MODE, "auto"),
         (CONF_TARGET_HUMIDITY_STATE_TOPIC, "45", ATTR_HUMIDITY, 45),
+        (CONF_CURRENT_HUMIDITY_TOPIC, "39", ATTR_CURRENT_HUMIDITY, 39),
     ],
 )
 async def test_encoding_subscribable_topics(
diff --git a/tests/components/mqtt/test_image.py b/tests/components/mqtt/test_image.py
new file mode 100644
index 00000000000..d5789880f73
--- /dev/null
+++ b/tests/components/mqtt/test_image.py
@@ -0,0 +1,812 @@
+"""The tests for mqtt image component."""
+from base64 import b64encode
+from contextlib import suppress
+from http import HTTPStatus
+import json
+import ssl
+from unittest.mock import MagicMock, patch
+
+import httpx
+import pytest
+import respx
+
+from homeassistant.components import image, mqtt
+from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN, Platform
+from homeassistant.core import HomeAssistant
+
+from .test_common import (
+    help_test_availability_when_connection_lost,
+    help_test_availability_without_topic,
+    help_test_custom_availability_payload,
+    help_test_default_availability_payload,
+    help_test_discovery_broken,
+    help_test_discovery_removal,
+    help_test_discovery_update,
+    help_test_discovery_update_attr,
+    help_test_discovery_update_unchanged,
+    help_test_entity_debug_info_message,
+    help_test_entity_device_info_remove,
+    help_test_entity_device_info_update,
+    help_test_entity_device_info_with_connection,
+    help_test_entity_device_info_with_identifier,
+    help_test_entity_id_update_discovery_update,
+    help_test_entity_id_update_subscriptions,
+    help_test_reloadable,
+    help_test_setting_attribute_via_mqtt_json_message,
+    help_test_setting_attribute_with_template,
+    help_test_unique_id,
+    help_test_unload_config_entry_with_platform,
+    help_test_update_with_json_attrs_bad_json,
+    help_test_update_with_json_attrs_not_dict,
+)
+
+from tests.common import async_fire_mqtt_message
+from tests.typing import (
+    ClientSessionGenerator,
+    MqttMockHAClientGenerator,
+    MqttMockPahoClient,
+)
+
+DEFAULT_CONFIG = {
+    mqtt.DOMAIN: {image.DOMAIN: {"name": "test", "image_topic": "test_topic"}}
+}
+
+
+@pytest.fixture(autouse=True)
+def image_platform_only():
+    """Only setup the image platform to speed up tests."""
+    with patch("homeassistant.components.mqtt.PLATFORMS", [Platform.IMAGE]):
+        yield
+
+
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [{mqtt.DOMAIN: {image.DOMAIN: {"image_topic": "test/image", "name": "Test"}}}],
+)
+async def test_run_image_setup(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test that it fetches the given payload."""
+    topic = "test/image"
+    await mqtt_mock_entry()
+
+    state = hass.states.get("image.test")
+    assert state.state == STATE_UNKNOWN
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+    async_fire_mqtt_message(hass, topic, b"grass")
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == b"grass"
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                image.DOMAIN: {
+                    "image_topic": "test/image",
+                    "name": "Test",
+                    "image_encoding": "b64",
+                    "content_type": "image/png",
+                }
+            }
+        }
+    ],
+)
+async def test_run_image_b64_encoded(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test that it fetches the given encoded payload."""
+    topic = "test/image"
+    await mqtt_mock_entry()
+
+    state = hass.states.get("image.test")
+    assert state.state == STATE_UNKNOWN
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+    # Fire incorrect encoded message (utf-8 encoded string)
+    async_fire_mqtt_message(hass, topic, "grass")
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.INTERNAL_SERVER_ERROR
+    assert "Error processing image data received at topic test/image" in caplog.text
+
+    # Fire correctly encoded message (b64 encoded payload)
+    async_fire_mqtt_message(hass, topic, b64encode(b"grass"))
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == b"grass"
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                "image": {
+                    "image_topic": "test/image",
+                    "name": "Test",
+                    "encoding": "utf-8",
+                    "image_encoding": "b64",
+                    "availability": {"topic": "test/image_availability"},
+                }
+            }
+        }
+    ],
+)
+async def test_image_b64_encoded_with_availability(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test availability works if b64 encoding is turned on."""
+    topic = "test/image"
+    topic_availability = "test/image_availability"
+    await mqtt_mock_entry()
+
+    state = hass.states.get("image.test")
+    assert state is not None
+    assert state.state == STATE_UNAVAILABLE
+
+    # Make sure we are available
+    async_fire_mqtt_message(hass, topic_availability, "online")
+
+    state = hass.states.get("image.test")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+    url = hass.states.get("image.test").attributes["entity_picture"]
+
+    async_fire_mqtt_message(hass, topic, b64encode(b"grass"))
+
+    client = await hass_client_no_auth()
+    resp = await client.get(url)
+    assert resp.status == HTTPStatus.OK
+    body = await resp.text()
+    assert body == "grass"
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                "image": {
+                    "url_topic": "test/image",
+                    "name": "Test",
+                }
+            }
+        }
+    ],
+)
+async def test_image_from_url(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test setup with URL."""
+    respx.get("http://localhost/test.png").respond(
+        status_code=HTTPStatus.OK, content_type="image/png", content=b"milk"
+    )
+    topic = "test/image"
+
+    await mqtt_mock_entry()
+
+    # Test first with invalid URL
+    async_fire_mqtt_message(hass, topic, b"/tmp/test.png")
+    await hass.async_block_till_done()
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+    assert "Invalid image URL" in caplog.text
+
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+    async_fire_mqtt_message(hass, topic, b"http://localhost/test.png")
+
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.text()
+    assert body == "milk"
+    assert respx.get("http://localhost/test.png").call_count == 1
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+    # Check the image is not refetched
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.text()
+    assert body == "milk"
+    assert respx.get("http://localhost/test.png").call_count == 1
+
+    # Check the image is refetched when receiving a new message on the URL topic
+    respx.get("http://localhost/test.png").respond(
+        status_code=HTTPStatus.OK, content_type="image/png", content=b"milk"
+    )
+    async_fire_mqtt_message(hass, topic, b"http://localhost/test.png")
+
+    await hass.async_block_till_done()
+
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.text()
+    assert body == "milk"
+    assert respx.get("http://localhost/test.png").call_count == 2
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                "image": {
+                    "url_topic": "test/image",
+                    "name": "Test",
+                    "url_template": "{{ value_json.val }}",
+                }
+            }
+        }
+    ],
+)
+async def test_image_from_url_with_template(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test setup with URL."""
+    respx.get("http://localhost/test.png").respond(
+        status_code=HTTPStatus.OK, content_type="image/png", content=b"milk"
+    )
+    topic = "test/image"
+
+    await mqtt_mock_entry()
+
+    state = hass.states.get("image.test")
+    assert state.state == STATE_UNKNOWN
+
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+    async_fire_mqtt_message(hass, topic, '{"val": "http://localhost/test.png"}')
+
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.text()
+    assert body == "milk"
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                "image": {
+                    "url_topic": "test/image",
+                    "name": "Test",
+                }
+            }
+        }
+    ],
+)
+@pytest.mark.parametrize(
+    ("content_type", "setup_ok"),
+    [
+        ("image/jpg", True),
+        ("image", True),
+        ("image/png", True),
+        ("text/javascript", False),
+    ],
+)
+async def test_image_from_url_content_type(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+    content_type: str,
+    setup_ok: bool,
+) -> None:
+    """Test setup with URL."""
+    respx.get("http://localhost/test.png").respond(
+        status_code=HTTPStatus.OK, content_type=content_type, content=b"milk"
+    )
+    topic = "test/image"
+
+    await mqtt_mock_entry()
+
+    # Test first with invalid URL
+    async_fire_mqtt_message(hass, topic, b"/tmp/test.png")
+    await hass.async_block_till_done()
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+    async_fire_mqtt_message(hass, topic, b"http://localhost/test.png")
+
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK if setup_ok else HTTPStatus.SERVICE_UNAVAILABLE
+    if setup_ok:
+        body = await resp.text()
+        assert body == "milk"
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00" if setup_ok else STATE_UNKNOWN
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                "image": {
+                    "url_topic": "test/image",
+                    "name": "Test",
+                    "encoding": "utf-8",
+                }
+            }
+        }
+    ],
+)
+@pytest.mark.parametrize(
+    "side_effect",
+    [
+        httpx.RequestError("server offline", request=MagicMock()),
+        httpx.TimeoutException,
+        ssl.SSLError,
+    ],
+)
+async def test_image_from_url_fails(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+    side_effect: Exception,
+) -> None:
+    """Test setup with minimum configuration."""
+    respx.get("http://localhost/test.png").mock(side_effect=side_effect)
+    topic = "test/image"
+
+    await mqtt_mock_entry()
+
+    state = hass.states.get("image.test")
+    assert state.state == STATE_UNKNOWN
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+    async_fire_mqtt_message(hass, topic, b"http://localhost/test.png")
+
+    await hass.async_block_till_done()
+
+    state = hass.states.get("image.test")
+
+    # The image failed to load, the the last image update is registered
+    # but _last_image was set to `None`
+    assert state.state == "2023-04-01T00:00:00+00:00"
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.INTERNAL_SERVER_ERROR
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    ("hass_config", "error_msg"),
+    [
+        (
+            {
+                mqtt.DOMAIN: {
+                    "image": {
+                        "url_topic": "test/image",
+                        "content_type": "image/jpg",
+                        "name": "Test",
+                        "encoding": "utf-8",
+                    }
+                }
+            },
+            "Option `content_type` can not be used together with `url_topic`",
+        ),
+        (
+            {
+                mqtt.DOMAIN: {
+                    "image": {
+                        "url_topic": "test/image",
+                        "image_topic": "test/image-data-topic",
+                        "name": "Test",
+                        "encoding": "utf-8",
+                    }
+                }
+            },
+            "two or more values in the same group of exclusion 'image_topic'",
+        ),
+        (
+            {
+                mqtt.DOMAIN: {
+                    "image": {
+                        "name": "Test",
+                        "encoding": "utf-8",
+                    }
+                }
+            },
+            "Invalid config for [mqtt]: Expected one of [`image_topic`, `url_topic`], got none",
+        ),
+    ],
+)
+async def test_image_config_fails(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+    error_msg: str,
+) -> None:
+    """Test setup with minimum configuration."""
+    with suppress(AssertionError):
+        await mqtt_mock_entry()
+    assert error_msg in caplog.text
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_availability_when_connection_lost(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability after MQTT disconnection."""
+    await help_test_availability_when_connection_lost(
+        hass, mqtt_mock_entry, image.DOMAIN
+    )
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_availability_without_topic(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability without defined availability topic."""
+    await help_test_availability_without_topic(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_default_availability_payload(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability by default payload with defined topic."""
+    await help_test_default_availability_payload(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_custom_availability_payload(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability by custom payload with defined topic."""
+    await help_test_custom_availability_payload(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_setting_attribute_via_mqtt_json_message(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the setting of attribute via MQTT with JSON payload."""
+    await help_test_setting_attribute_via_mqtt_json_message(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_setting_attribute_with_template(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the setting of attribute via MQTT with JSON payload."""
+    await help_test_setting_attribute_with_template(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_update_with_json_attrs_not_dict(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test attributes get extracted from a JSON result."""
+    await help_test_update_with_json_attrs_not_dict(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        image.DOMAIN,
+        DEFAULT_CONFIG,
+    )
+
+
+async def test_update_with_json_attrs_bad_json(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test attributes get extracted from a JSON result."""
+    await help_test_update_with_json_attrs_bad_json(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        image.DOMAIN,
+        DEFAULT_CONFIG,
+    )
+
+
+async def test_discovery_update_attr(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test update of discovered MQTTAttributes."""
+    await help_test_discovery_update_attr(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        image.DOMAIN,
+        DEFAULT_CONFIG,
+    )
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                image.DOMAIN: [
+                    {
+                        "name": "Test 1",
+                        "image_topic": "test-topic",
+                        "unique_id": "TOTALLY_UNIQUE",
+                    },
+                    {
+                        "name": "Test 2",
+                        "image_topic": "test-topic",
+                        "unique_id": "TOTALLY_UNIQUE",
+                    },
+                ]
+            }
+        }
+    ],
+)
+async def test_unique_id(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test unique id option only creates one image per unique_id."""
+    await help_test_unique_id(hass, mqtt_mock_entry, image.DOMAIN)
+
+
+async def test_discovery_removal_image(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test removal of discovered image."""
+    data = json.dumps(DEFAULT_CONFIG[mqtt.DOMAIN][image.DOMAIN])
+    await help_test_discovery_removal(hass, mqtt_mock_entry, caplog, image.DOMAIN, data)
+
+
+async def test_discovery_update_image(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test update of discovered image."""
+    config1 = {"name": "Beer", "image_topic": "test_topic"}
+    config2 = {"name": "Milk", "image_topic": "test_topic"}
+
+    await help_test_discovery_update(
+        hass, mqtt_mock_entry, caplog, image.DOMAIN, config1, config2
+    )
+
+
+async def test_discovery_update_unchanged_image(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test update of discovered image."""
+    data1 = '{ "name": "Beer", "image_topic": "test_topic"}'
+    with patch(
+        "homeassistant.components.mqtt.image.MqttImage.discovery_update"
+    ) as discovery_update:
+        await help_test_discovery_update_unchanged(
+            hass,
+            mqtt_mock_entry,
+            caplog,
+            image.DOMAIN,
+            data1,
+            discovery_update,
+        )
+
+
+@pytest.mark.no_fail_on_log_exception
+async def test_discovery_broken(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test handling of bad discovery message."""
+    data1 = '{ "name": "Beer" }'
+    data2 = '{ "name": "Milk", "image_topic": "test_topic"}'
+
+    await help_test_discovery_broken(
+        hass, mqtt_mock_entry, caplog, image.DOMAIN, data1, data2
+    )
+
+
+async def test_entity_device_info_with_connection(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT image device registry integration."""
+    await help_test_entity_device_info_with_connection(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_device_info_with_identifier(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT image device registry integration."""
+    await help_test_entity_device_info_with_identifier(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_device_info_update(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test device registry update."""
+    await help_test_entity_device_info_update(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_device_info_remove(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test device registry remove."""
+    await help_test_entity_device_info_remove(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_id_update_subscriptions(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    await help_test_entity_id_update_subscriptions(
+        hass,
+        mqtt_mock_entry,
+        image.DOMAIN,
+        DEFAULT_CONFIG,
+        ["test_topic"],
+    )
+
+
+async def test_entity_id_update_discovery_update(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT discovery update when entity_id is updated."""
+    await help_test_entity_id_update_discovery_update(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_debug_info_message(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT debug info."""
+    await help_test_entity_debug_info_message(
+        hass,
+        mqtt_mock_entry,
+        image.DOMAIN,
+        DEFAULT_CONFIG,
+        None,
+        state_topic="test_topic",
+        state_payload=b"ON",
+    )
+
+
+async def test_reloadable(
+    hass: HomeAssistant,
+    mqtt_client_mock: MqttMockPahoClient,
+) -> None:
+    """Test reloading the MQTT platform."""
+    domain = image.DOMAIN
+    config = DEFAULT_CONFIG
+    await help_test_reloadable(hass, mqtt_client_mock, domain, config)
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_setup_manual_entity_from_yaml(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setup manual configured MQTT entity."""
+    await mqtt_mock_entry()
+    platform = image.DOMAIN
+    assert hass.states.get(f"{platform}.test")
+
+
+async def test_unload_entry(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test unloading the config entry."""
+    domain = image.DOMAIN
+    config = DEFAULT_CONFIG
+    await help_test_unload_config_entry_with_platform(
+        hass, mqtt_mock_entry, domain, config
+    )
diff --git a/tests/components/mqtt/test_init.py b/tests/components/mqtt/test_init.py
index 1e3dbc6c323..eee1d006137 100644
--- a/tests/components/mqtt/test_init.py
+++ b/tests/components/mqtt/test_init.py
@@ -37,7 +37,7 @@ from homeassistant.helpers.typing import ConfigType
 from homeassistant.setup import async_setup_component
 from homeassistant.util.dt import utcnow
 
-from .test_common import help_all_subscribe_calls, help_test_validate_platform_config
+from .test_common import help_all_subscribe_calls
 
 from tests.common import (
     MockConfigEntry,
@@ -2066,50 +2066,52 @@ async def test_handle_message_callback(
     assert callbacks[0].payload == "test-payload"
 
 
-@patch("homeassistant.components.mqtt.PLATFORMS", [])
-async def test_setup_manual_mqtt_with_platform_key(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
-) -> None:
-    """Test set up a manual MQTT item with a platform key."""
-    config = {
-        mqtt.DOMAIN: {
-            "light": {
-                "platform": "mqtt",
-                "name": "test",
-                "command_topic": "test-topic",
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                "light": {
+                    "platform": "mqtt",
+                    "name": "test",
+                    "command_topic": "test-topic",
+                }
             }
         }
-    }
-    help_test_validate_platform_config(hass, config)
+    ],
+)
+@patch("homeassistant.components.mqtt.PLATFORMS", [])
+async def test_setup_manual_mqtt_with_platform_key(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test set up a manual MQTT item with a platform key."""
+    with pytest.raises(AssertionError):
+        await mqtt_mock_entry()
     assert (
         "Invalid config for [mqtt]: [platform] is an invalid option for [mqtt]"
         in caplog.text
     )
 
 
+@pytest.mark.parametrize("hass_config", [{mqtt.DOMAIN: {"light": {"name": "test"}}}])
+@pytest.mark.xfail(reason="Invalid config for [mqtt]: required key not provided")
 @patch("homeassistant.components.mqtt.PLATFORMS", [])
 async def test_setup_manual_mqtt_with_invalid_config(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test set up a manual MQTT item with an invalid config."""
-    config = {mqtt.DOMAIN: {"light": {"name": "test"}}}
-    help_test_validate_platform_config(hass, config)
+    with pytest.raises(AssertionError):
+        await mqtt_mock_entry()
     assert (
         "Invalid config for [mqtt]: required key not provided @ data['mqtt']['light'][0]['command_topic']."
         " Got None. (See ?, line ?)" in caplog.text
     )
 
 
-@patch("homeassistant.components.mqtt.PLATFORMS", [])
-async def test_setup_manual_mqtt_empty_platform(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
-) -> None:
-    """Test set up a manual MQTT platform without items."""
-    config: ConfigType = {mqtt.DOMAIN: {"light": []}}
-    help_test_validate_platform_config(hass, config)
-    assert "voluptuous.error.MultipleInvalid" not in caplog.text
-
-
 @patch("homeassistant.components.mqtt.PLATFORMS", [])
 @pytest.mark.parametrize(
     ("mqtt_config_entry_data", "protocol"),
diff --git a/tests/components/mqtt/test_legacy_vacuum.py b/tests/components/mqtt/test_legacy_vacuum.py
index bf10a692b7c..0297f4216c4 100644
--- a/tests/components/mqtt/test_legacy_vacuum.py
+++ b/tests/components/mqtt/test_legacy_vacuum.py
@@ -769,8 +769,8 @@ async def test_discovery_broken(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test handling of bad discovery message."""
-    data1 = '{ "name": "Beer",' '  "command_topic": "test_topic#" }'
-    data2 = '{ "name": "Milk",' '  "command_topic": "test_topic" }'
+    data1 = '{ "name": "Beer",  "command_topic": "test_topic#" }'
+    data2 = '{ "name": "Milk",  "command_topic": "test_topic" }'
     await help_test_discovery_broken(
         hass, mqtt_mock_entry, caplog, vacuum.DOMAIN, data1, data2
     )
diff --git a/tests/components/mqtt/test_light.py b/tests/components/mqtt/test_light.py
index 22330d65c2a..ee4f170e8e6 100644
--- a/tests/components/mqtt/test_light.py
+++ b/tests/components/mqtt/test_light.py
@@ -253,10 +253,7 @@ async def test_fail_setup_if_no_command_topic(
     """Test if command fails with command topic."""
     with pytest.raises(AssertionError):
         await mqtt_mock_entry()
-    assert (
-        "Invalid config for [mqtt]: required key not provided @ data['mqtt']['light'][0]['command_topic']. Got None."
-        in caplog.text
-    )
+    assert "Invalid config for [mqtt]: required key not provided" in caplog.text
 
 
 @pytest.mark.parametrize(
@@ -2419,9 +2416,7 @@ async def test_discovery_ignores_extra_keys(
     """Test discovery ignores extra keys that are not blocked."""
     await mqtt_mock_entry()
     # inserted `platform` key should be ignored
-    data = (
-        '{ "name": "Beer",' '  "platform": "mqtt",' '  "command_topic": "test_topic"}'
-    )
+    data = '{ "name": "Beer",  "platform": "mqtt",  "command_topic": "test_topic"}'
     async_fire_mqtt_message(hass, "homeassistant/light/bla/config", data)
     await hass.async_block_till_done()
     state = hass.states.get("light.beer")
diff --git a/tests/components/mqtt/test_light_json.py b/tests/components/mqtt/test_light_json.py
index 6c653045aa2..5a7bedd91e6 100644
--- a/tests/components/mqtt/test_light_json.py
+++ b/tests/components/mqtt/test_light_json.py
@@ -198,10 +198,7 @@ async def test_fail_setup_if_no_command_topic(
     """Test if setup fails with no command topic."""
     with pytest.raises(AssertionError):
         await mqtt_mock_entry()
-    assert (
-        "Invalid config for [mqtt]: required key not provided @ data['mqtt']['light'][0]['command_topic']. Got None."
-        in caplog.text
-    )
+    assert "Invalid config for [mqtt]: required key not provided" in caplog.text
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/mqtt/test_light_template.py b/tests/components/mqtt/test_light_template.py
index ba8414e252a..4727caca2cc 100644
--- a/tests/components/mqtt/test_light_template.py
+++ b/tests/components/mqtt/test_light_template.py
@@ -161,9 +161,9 @@ async def test_setup_fails(
                     "command_topic": "test_light_rgb/set",
                     "command_on_template": "on",
                     "command_off_template": "off",
-                    "red_template": '{{ value.split(",")[4].' 'split("-")[0] }}',
-                    "green_template": '{{ value.split(",")[4].' 'split("-")[1] }}',
-                    "blue_template": '{{ value.split(",")[4].' 'split("-")[2] }}',
+                    "red_template": '{{ value.split(",")[4].split("-")[0] }}',
+                    "green_template": '{{ value.split(",")[4].split("-")[1] }}',
+                    "blue_template": '{{ value.split(",")[4].split("-")[2] }}',
                 }
             }
         }
@@ -416,9 +416,9 @@ async def test_state_brightness_color_effect_temp_change_via_topic(
                     "optimistic": True,
                     "state_template": '{{ value.split(",")[0] }}',
                     "color_temp_template": '{{ value.split(",")[2] }}',
-                    "red_template": '{{ value.split(",")[3].' 'split("-")[0] }}',
-                    "green_template": '{{ value.split(",")[3].' 'split("-")[1] }}',
-                    "blue_template": '{{ value.split(",")[3].' 'split("-")[2] }}',
+                    "red_template": '{{ value.split(",")[3].split("-")[0] }}',
+                    "green_template": '{{ value.split(",")[3].split("-")[1] }}',
+                    "blue_template": '{{ value.split(",")[3].split("-")[2] }}',
                     "effect_template": '{{ value.split(",")[4] }}',
                     "qos": 2,
                 }
diff --git a/tests/components/mqtt/test_lock.py b/tests/components/mqtt/test_lock.py
index 3c878a85f9e..2b77a573bad 100644
--- a/tests/components/mqtt/test_lock.py
+++ b/tests/components/mqtt/test_lock.py
@@ -796,7 +796,7 @@ async def test_discovery_removal_lock(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test removal of discovered lock."""
-    data = '{ "name": "test",' '  "command_topic": "test_topic" }'
+    data = '{ "name": "test", "command_topic": "test_topic" }'
     await help_test_discovery_removal(hass, mqtt_mock_entry, caplog, lock.DOMAIN, data)
 
 
@@ -855,7 +855,7 @@ async def test_discovery_broken(
 ) -> None:
     """Test handling of bad discovery message."""
     data1 = '{ "name": "Beer" }'
-    data2 = '{ "name": "Milk",' '  "command_topic": "test_topic" }'
+    data2 = '{ "name": "Milk", "command_topic": "test_topic" }'
     await help_test_discovery_broken(
         hass, mqtt_mock_entry, caplog, lock.DOMAIN, data1, data2
     )
diff --git a/tests/components/mqtt/test_number.py b/tests/components/mqtt/test_number.py
index f12f5eca8b6..f882209139c 100644
--- a/tests/components/mqtt/test_number.py
+++ b/tests/components/mqtt/test_number.py
@@ -189,6 +189,14 @@ async def test_value_template(
     state = hass.states.get("number.test_number")
     assert state.state == "10"
 
+    # Assert an empty value from a template is ignored
+    async_fire_mqtt_message(hass, topic, '{"other_val":12}')
+
+    await hass.async_block_till_done()
+
+    state = hass.states.get("number.test_number")
+    assert state.state == "10"
+
     async_fire_mqtt_message(hass, topic, '{"val":20.5}')
 
     await hass.async_block_till_done()
diff --git a/tests/components/mqtt/test_scene.py b/tests/components/mqtt/test_scene.py
index 9c4b5b53be9..4da60d44bb7 100644
--- a/tests/components/mqtt/test_scene.py
+++ b/tests/components/mqtt/test_scene.py
@@ -180,7 +180,7 @@ async def test_discovery_removal_scene(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test removal of discovered scene."""
-    data = '{ "name": "test",' '  "command_topic": "test_topic" }'
+    data = '{ "name": "test",  "command_topic": "test_topic" }'
     await help_test_discovery_removal(hass, mqtt_mock_entry, caplog, scene.DOMAIN, data)
 
 
@@ -213,7 +213,7 @@ async def test_discovery_update_unchanged_scene(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test update of discovered scene."""
-    data1 = '{ "name": "Beer",' '  "command_topic": "test_topic" }'
+    data1 = '{ "name": "Beer",  "command_topic": "test_topic" }'
     with patch(
         "homeassistant.components.mqtt.scene.MqttScene.discovery_update"
     ) as discovery_update:
@@ -235,7 +235,7 @@ async def test_discovery_broken(
 ) -> None:
     """Test handling of bad discovery message."""
     data1 = '{ "name": "Beer" }'
-    data2 = '{ "name": "Milk",' '  "command_topic": "test_topic" }'
+    data2 = '{ "name": "Milk",  "command_topic": "test_topic" }'
     await help_test_discovery_broken(
         hass, mqtt_mock_entry, caplog, scene.DOMAIN, data1, data2
     )
diff --git a/tests/components/mqtt/test_sensor.py b/tests/components/mqtt/test_sensor.py
index 16697939f50..8f2aa754bac 100644
--- a/tests/components/mqtt/test_sensor.py
+++ b/tests/components/mqtt/test_sensor.py
@@ -692,10 +692,7 @@ async def test_default_availability_list_single(
 ) -> None:
     """Test availability list and availability_topic are mutually exclusive."""
     await help_test_default_availability_list_single(
-        hass,
-        caplog,
-        sensor.DOMAIN,
-        DEFAULT_CONFIG,
+        hass, caplog, sensor.DOMAIN, DEFAULT_CONFIG
     )
 
 
diff --git a/tests/components/mqtt/test_water_heater.py b/tests/components/mqtt/test_water_heater.py
new file mode 100644
index 00000000000..942a2ec87d4
--- /dev/null
+++ b/tests/components/mqtt/test_water_heater.py
@@ -0,0 +1,1109 @@
+"""The tests for the mqtt water heater component."""
+import copy
+import json
+from typing import Any
+from unittest.mock import call, patch
+
+import pytest
+import voluptuous as vol
+
+from homeassistant.components import mqtt, water_heater
+from homeassistant.components.mqtt.water_heater import (
+    MQTT_WATER_HEATER_ATTRIBUTES_BLOCKED,
+)
+from homeassistant.components.water_heater import (
+    ATTR_CURRENT_TEMPERATURE,
+    ATTR_OPERATION_MODE,
+    DEFAULT_MAX_TEMP,
+    DEFAULT_MIN_TEMP,
+    STATE_ECO,
+    STATE_ELECTRIC,
+    STATE_GAS,
+    STATE_HEAT_PUMP,
+    STATE_HIGH_DEMAND,
+    STATE_PERFORMANCE,
+    WaterHeaterEntityFeature,
+)
+from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, Platform, UnitOfTemperature
+from homeassistant.core import HomeAssistant
+from homeassistant.util.unit_conversion import TemperatureConverter
+
+from .test_common import (
+    help_custom_config,
+    help_test_availability_when_connection_lost,
+    help_test_availability_without_topic,
+    help_test_custom_availability_payload,
+    help_test_default_availability_payload,
+    help_test_discovery_broken,
+    help_test_discovery_removal,
+    help_test_discovery_update,
+    help_test_discovery_update_attr,
+    help_test_discovery_update_unchanged,
+    help_test_encoding_subscribable_topics,
+    help_test_entity_debug_info_message,
+    help_test_entity_device_info_remove,
+    help_test_entity_device_info_update,
+    help_test_entity_device_info_with_connection,
+    help_test_entity_device_info_with_identifier,
+    help_test_entity_id_update_discovery_update,
+    help_test_entity_id_update_subscriptions,
+    help_test_publishing_with_custom_encoding,
+    help_test_reloadable,
+    help_test_setting_attribute_via_mqtt_json_message,
+    help_test_setting_attribute_with_template,
+    help_test_setting_blocked_attribute_via_mqtt_json_message,
+    help_test_unique_id,
+    help_test_unload_config_entry_with_platform,
+    help_test_update_with_json_attrs_bad_json,
+    help_test_update_with_json_attrs_not_dict,
+)
+
+from tests.common import async_fire_mqtt_message
+from tests.components.water_heater import common
+from tests.typing import MqttMockHAClientGenerator, MqttMockPahoClient
+
+ENTITY_WATER_HEATER = "water_heater.test"
+
+
+_DEFAULT_MIN_TEMP_CELSIUS = round(
+    TemperatureConverter.convert(
+        DEFAULT_MIN_TEMP,
+        UnitOfTemperature.FAHRENHEIT,
+        UnitOfTemperature.CELSIUS,
+    ),
+    1,
+)
+_DEFAULT_MAX_TEMP_CELSIUS = round(
+    TemperatureConverter.convert(
+        DEFAULT_MAX_TEMP,
+        UnitOfTemperature.FAHRENHEIT,
+        UnitOfTemperature.CELSIUS,
+    ),
+    1,
+)
+
+
+DEFAULT_CONFIG = {
+    mqtt.DOMAIN: {
+        water_heater.DOMAIN: {
+            "name": "test",
+            "mode_command_topic": "mode-topic",
+            "temperature_command_topic": "temperature-topic",
+        }
+    }
+}
+
+
+@pytest.fixture(autouse=True)
+def water_heater_platform_only():
+    """Only setup the water heater platform to speed up tests."""
+    with patch("homeassistant.components.mqtt.PLATFORMS", [Platform.WATER_HEATER]):
+        yield
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_setup_params(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the initial parameters."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+
+    assert state.attributes.get("temperature") == _DEFAULT_MIN_TEMP_CELSIUS
+    assert state.state == "off"
+    # default water heater min/max temp in celsius
+    assert state.attributes.get("min_temp") == _DEFAULT_MIN_TEMP_CELSIUS
+    assert state.attributes.get("max_temp") == _DEFAULT_MAX_TEMP_CELSIUS
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_supported_features(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the supported_features."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    support = (
+        WaterHeaterEntityFeature.TARGET_TEMPERATURE
+        | WaterHeaterEntityFeature.OPERATION_MODE
+    )
+
+    assert state.attributes.get("supported_features") == support
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_get_operation_modes(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test that the operation list returns the correct modes."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert [
+        STATE_ECO,
+        STATE_ELECTRIC,
+        STATE_GAS,
+        STATE_HEAT_PUMP,
+        STATE_HIGH_DEMAND,
+        STATE_PERFORMANCE,
+        STATE_OFF,
+    ] == state.attributes.get("operation_list")
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_set_operation_mode_bad_attr_and_state(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test setting operation mode without required attribute."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "off"
+    with pytest.raises(vol.Invalid) as excinfo:
+        await common.async_set_operation_mode(hass, None, ENTITY_WATER_HEATER)
+    assert "string value is None for dictionary value @ data['operation_mode']" in str(
+        excinfo.value
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "off"
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_set_operation(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting of new operation mode."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "off"
+    await common.async_set_operation_mode(hass, "eco", ENTITY_WATER_HEATER)
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "eco"
+    mqtt_mock.async_publish.assert_called_once_with("mode-topic", "eco", 0, False)
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            water_heater.DOMAIN,
+            DEFAULT_CONFIG,
+            ({"mode_state_topic": "mode-state"},),
+        )
+    ],
+)
+async def test_set_operation_pessimistic(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting operation mode in pessimistic mode."""
+    await hass.async_block_till_done()
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "unknown"
+
+    await common.async_set_operation_mode(hass, "eco", ENTITY_WATER_HEATER)
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "unknown"
+
+    async_fire_mqtt_message(hass, "mode-state", "eco")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "eco"
+
+    async_fire_mqtt_message(hass, "mode-state", "bogus mode")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "eco"
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            water_heater.DOMAIN,
+            DEFAULT_CONFIG,
+            (
+                {
+                    "mode_state_topic": "mode-state",
+                    "optimistic": True,
+                },
+            ),
+        )
+    ],
+)
+async def test_set_operation_optimistic(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting operation mode in optimistic mode."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "off"
+
+    await common.async_set_operation_mode(hass, "electric", ENTITY_WATER_HEATER)
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "electric"
+
+    async_fire_mqtt_message(hass, "mode-state", "performance")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "performance"
+
+    async_fire_mqtt_message(hass, "mode-state", "bogus mode")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "performance"
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_set_target_temperature(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting the target temperature."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == _DEFAULT_MIN_TEMP_CELSIUS
+    await common.async_set_operation_mode(hass, "performance", ENTITY_WATER_HEATER)
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "performance"
+    mqtt_mock.async_publish.assert_called_once_with(
+        "mode-topic", "performance", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+    await common.async_set_temperature(
+        hass, temperature=50, entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 50
+    mqtt_mock.async_publish.assert_called_once_with(
+        "temperature-topic", "50.0", 0, False
+    )
+
+    # also test directly supplying the operation mode to set_temperature
+    mqtt_mock.async_publish.reset_mock()
+    await common.async_set_temperature(
+        hass, temperature=47, operation_mode="eco", entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "eco"
+    assert state.attributes.get("temperature") == 47
+    mqtt_mock.async_publish.assert_has_calls(
+        [
+            call("mode-topic", "eco", 0, False),
+            call("temperature-topic", "47.0", 0, False),
+        ]
+    )
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            water_heater.DOMAIN,
+            DEFAULT_CONFIG,
+            ({"temperature_state_topic": "temperature-state"},),
+        )
+    ],
+)
+async def test_set_target_temperature_pessimistic(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting the target temperature."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") is None
+    await common.async_set_operation_mode(hass, "performance", ENTITY_WATER_HEATER)
+    await common.async_set_temperature(
+        hass, temperature=60, entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") is None
+
+    async_fire_mqtt_message(hass, "temperature-state", "1701")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 1701
+
+    async_fire_mqtt_message(hass, "temperature-state", "not a number")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 1701
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            water_heater.DOMAIN,
+            DEFAULT_CONFIG,
+            ({"temperature_state_topic": "temperature-state", "optimistic": True},),
+        )
+    ],
+)
+async def test_set_target_temperature_optimistic(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting the target temperature optimistic."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == _DEFAULT_MIN_TEMP_CELSIUS
+    await common.async_set_operation_mode(hass, "performance", ENTITY_WATER_HEATER)
+    await common.async_set_temperature(
+        hass, temperature=55, entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 55
+
+    async_fire_mqtt_message(hass, "temperature-state", "49")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 49
+
+    async_fire_mqtt_message(hass, "temperature-state", "not a number")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 49
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            water_heater.DOMAIN,
+            DEFAULT_CONFIG,
+            ({"current_temperature_topic": "current_temperature"},),
+        )
+    ],
+)
+async def test_receive_mqtt_temperature(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test getting the current temperature via MQTT."""
+    await mqtt_mock_entry()
+
+    async_fire_mqtt_message(hass, "current_temperature", "53")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("current_temperature") == 53
+
+    async_fire_mqtt_message(hass, "current_temperature", "")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert (
+        "Invalid empty payload for attribute _attr_current_temperature, ignoring update"
+        in caplog.text
+    )
+    assert state.attributes.get("current_temperature") == 53
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_availability_when_connection_lost(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability after MQTT disconnection."""
+    await help_test_availability_when_connection_lost(
+        hass, mqtt_mock_entry, water_heater.DOMAIN
+    )
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_availability_without_topic(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability without defined availability topic."""
+    await help_test_availability_without_topic(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_default_availability_payload(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability by default payload with defined topic."""
+    await help_test_default_availability_payload(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_custom_availability_payload(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability by custom payload with defined topic."""
+    await help_test_custom_availability_payload(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                water_heater.DOMAIN: {
+                    "name": "test",
+                    "mode_command_topic": "mode-topic",
+                    "temperature_command_topic": "temperature-topic",
+                    # By default, just unquote the JSON-strings
+                    "value_template": "{{ value_json }}",
+                    "mode_state_template": "{{ value_json.attribute }}",
+                    "temperature_state_template": "{{ value_json }}",
+                    "current_temperature_template": "{{ value_json}}",
+                    "mode_state_topic": "mode-state",
+                    "temperature_state_topic": "temperature-state",
+                    "current_temperature_topic": "current-temperature",
+                }
+            }
+        }
+    ],
+)
+async def test_get_with_templates(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test getting various attributes with templates."""
+    await mqtt_mock_entry()
+
+    # Operation Mode
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    async_fire_mqtt_message(hass, "mode-state", '{"attribute": "eco"}')
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "eco"
+
+    # Temperature - with valid value
+    assert state.attributes.get("temperature") is None
+    async_fire_mqtt_message(hass, "temperature-state", '"1031"')
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 1031
+
+    # Temperature - with invalid value
+    async_fire_mqtt_message(hass, "temperature-state", '"-INVALID-"')
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    # make sure, the invalid value gets logged...
+    assert "Could not parse temperature_state_template from -INVALID-" in caplog.text
+    # ... but the actual value stays unchanged.
+    assert state.attributes.get("temperature") == 1031
+
+    # Temperature - with JSON null value
+    async_fire_mqtt_message(hass, "temperature-state", "null")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") is None
+
+    # Current temperature
+    async_fire_mqtt_message(hass, "current-temperature", '"74656"')
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("current_temperature") == 74656
+    # Test resetting the current temperature using a JSON null value
+    async_fire_mqtt_message(hass, "current-temperature", "null")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("current_temperature") is None
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                water_heater.DOMAIN: {
+                    "name": "test",
+                    "mode_command_topic": "mode-topic",
+                    "temperature_command_topic": "temperature-topic",
+                    # Create simple templates
+                    "mode_command_template": "mode: {{ value }}",
+                    "temperature_command_template": "temp: {{ value }}",
+                }
+            }
+        }
+    ],
+)
+async def test_set_and_templates(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test setting various attributes with templates."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    # Mode
+    await common.async_set_operation_mode(hass, "heat_pump", ENTITY_WATER_HEATER)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "mode-topic", "mode: heat_pump", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "heat_pump"
+
+    # Temperature
+    await common.async_set_temperature(
+        hass, temperature=107, entity_id=ENTITY_WATER_HEATER
+    )
+    mqtt_mock.async_publish.assert_called_once_with(
+        "temperature-topic", "temp: 107.0", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 107
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [help_custom_config(water_heater.DOMAIN, DEFAULT_CONFIG, ({"min_temp": 70},))],
+)
+async def test_min_temp_custom(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test a custom min temp."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    min_temp = state.attributes.get("min_temp")
+
+    assert isinstance(min_temp, float)
+    assert state.attributes.get("min_temp") == 70
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [help_custom_config(water_heater.DOMAIN, DEFAULT_CONFIG, ({"max_temp": 220},))],
+)
+async def test_max_temp_custom(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test a custom max temp."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    max_temp = state.attributes.get("max_temp")
+
+    assert isinstance(max_temp, float)
+    assert max_temp == 220
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            water_heater.DOMAIN,
+            DEFAULT_CONFIG,
+            (
+                {
+                    "temperature_unit": "F",
+                    "current_temperature_topic": "current_temperature",
+                },
+            ),
+        )
+    ],
+)
+async def test_temperature_unit(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test that setting temperature unit converts temperature values."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == _DEFAULT_MIN_TEMP_CELSIUS
+    assert state.attributes.get("min_temp") == _DEFAULT_MIN_TEMP_CELSIUS
+    assert state.attributes.get("max_temp") == _DEFAULT_MAX_TEMP_CELSIUS
+
+    async_fire_mqtt_message(hass, "current_temperature", "127")
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("current_temperature") == 52.8
+
+
+@pytest.mark.parametrize(
+    ("hass_config", "temperature_unit", "initial", "min_temp", "max_temp", "current"),
+    [
+        (
+            help_custom_config(
+                water_heater.DOMAIN,
+                DEFAULT_CONFIG,
+                (
+                    {
+                        "temperature_unit": "F",
+                        "current_temperature_topic": "current_temperature",
+                    },
+                ),
+            ),
+            UnitOfTemperature.CELSIUS,
+            _DEFAULT_MIN_TEMP_CELSIUS,
+            _DEFAULT_MIN_TEMP_CELSIUS,
+            _DEFAULT_MAX_TEMP_CELSIUS,
+            48.9,
+        ),
+        (
+            help_custom_config(
+                water_heater.DOMAIN,
+                DEFAULT_CONFIG,
+                (
+                    {
+                        "temperature_unit": "F",
+                        "current_temperature_topic": "current_temperature",
+                    },
+                ),
+            ),
+            UnitOfTemperature.KELVIN,
+            316,
+            316,
+            333,
+            322,
+        ),
+        (
+            help_custom_config(
+                water_heater.DOMAIN,
+                DEFAULT_CONFIG,
+                (
+                    {
+                        "temperature_unit": "F",
+                        "current_temperature_topic": "current_temperature",
+                    },
+                ),
+            ),
+            UnitOfTemperature.FAHRENHEIT,
+            DEFAULT_MIN_TEMP,
+            DEFAULT_MIN_TEMP,
+            DEFAULT_MAX_TEMP,
+            120,
+        ),
+    ],
+)
+async def test_alt_temperature_unit(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    temperature_unit: UnitOfTemperature,
+    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()
+
+        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")
+
+        state = hass.states.get(ENTITY_WATER_HEATER)
+        assert state.attributes.get("current_temperature") == current
+
+
+async def test_setting_attribute_via_mqtt_json_message(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the setting of attribute via MQTT with JSON payload."""
+    await help_test_setting_attribute_via_mqtt_json_message(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_setting_blocked_attribute_via_mqtt_json_message(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the setting of attribute via MQTT with JSON payload."""
+    await help_test_setting_blocked_attribute_via_mqtt_json_message(
+        hass,
+        mqtt_mock_entry,
+        water_heater.DOMAIN,
+        DEFAULT_CONFIG,
+        MQTT_WATER_HEATER_ATTRIBUTES_BLOCKED,
+    )
+
+
+async def test_setting_attribute_with_template(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the setting of attribute via MQTT with JSON payload."""
+    await help_test_setting_attribute_with_template(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_update_with_json_attrs_not_dict(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test attributes get extracted from a JSON result."""
+    await help_test_update_with_json_attrs_not_dict(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        water_heater.DOMAIN,
+        DEFAULT_CONFIG,
+    )
+
+
+async def test_update_with_json_attrs_bad_json(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test attributes get extracted from a JSON result."""
+    await help_test_update_with_json_attrs_bad_json(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        water_heater.DOMAIN,
+        DEFAULT_CONFIG,
+    )
+
+
+async def test_discovery_update_attr(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test update of discovered MQTTAttributes."""
+    await help_test_discovery_update_attr(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        water_heater.DOMAIN,
+        DEFAULT_CONFIG,
+    )
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                water_heater.DOMAIN: [
+                    {
+                        "name": "Test 1",
+                        "mode_state_topic": "test_topic1/state",
+                        "mode_command_topic": "test_topic1/command",
+                        "unique_id": "TOTALLY_UNIQUE",
+                    },
+                    {
+                        "name": "Test 2",
+                        "mode_state_topic": "test_topic2/state",
+                        "mode_command_topic": "test_topic2/command",
+                        "unique_id": "TOTALLY_UNIQUE",
+                    },
+                ]
+            }
+        }
+    ],
+)
+async def test_unique_id(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test unique id option only creates one water heater per unique_id."""
+    await help_test_unique_id(hass, mqtt_mock_entry, water_heater.DOMAIN)
+
+
+@pytest.mark.parametrize(
+    ("topic", "value", "attribute", "attribute_value"),
+    [
+        ("current_temperature_topic", "22.1", ATTR_CURRENT_TEMPERATURE, 22.1),
+        ("mode_state_topic", "eco", ATTR_OPERATION_MODE, None),
+        ("temperature_state_topic", "19.9", ATTR_TEMPERATURE, 19.9),
+    ],
+)
+async def test_encoding_subscribable_topics(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    topic: str,
+    value: str,
+    attribute: str | None,
+    attribute_value: Any,
+) -> None:
+    """Test handling of incoming encoded payload."""
+    config = copy.deepcopy(DEFAULT_CONFIG[mqtt.DOMAIN][water_heater.DOMAIN])
+    await help_test_encoding_subscribable_topics(
+        hass,
+        mqtt_mock_entry,
+        water_heater.DOMAIN,
+        config,
+        topic,
+        value,
+        attribute,
+        attribute_value,
+    )
+
+
+async def test_discovery_removal_water_heater(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test removal of discovered water heater."""
+    data = json.dumps(DEFAULT_CONFIG[mqtt.DOMAIN][water_heater.DOMAIN])
+    await help_test_discovery_removal(
+        hass, mqtt_mock_entry, caplog, water_heater.DOMAIN, data
+    )
+
+
+async def test_discovery_update_water_heater(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test update of discovered water heater."""
+    config1 = {"name": "Beer"}
+    config2 = {"name": "Milk"}
+    await help_test_discovery_update(
+        hass, mqtt_mock_entry, caplog, water_heater.DOMAIN, config1, config2
+    )
+
+
+async def test_discovery_update_unchanged_water_heater(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test update of discovered water heater."""
+    data1 = '{ "name": "Beer" }'
+    with patch(
+        "homeassistant.components.mqtt.water_heater.MqttWaterHeater.discovery_update"
+    ) as discovery_update:
+        await help_test_discovery_update_unchanged(
+            hass,
+            mqtt_mock_entry,
+            caplog,
+            water_heater.DOMAIN,
+            data1,
+            discovery_update,
+        )
+
+
+@pytest.mark.no_fail_on_log_exception
+async def test_discovery_broken(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test handling of bad discovery message."""
+    data1 = '{ "name": "Beer", "mode_command_topic": "test_topic#" }'
+    data2 = '{ "name": "Milk", "mode_command_topic": "test_topic" }'
+    await help_test_discovery_broken(
+        hass, mqtt_mock_entry, caplog, water_heater.DOMAIN, data1, data2
+    )
+
+
+async def test_entity_device_info_with_connection(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT water heater device registry integration."""
+    await help_test_entity_device_info_with_connection(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_device_info_with_identifier(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT water heater device registry integration."""
+    await help_test_entity_device_info_with_identifier(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_device_info_update(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test device registry update."""
+    await help_test_entity_device_info_update(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_device_info_remove(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test device registry remove."""
+    await help_test_entity_device_info_remove(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_id_update_subscriptions(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    config = {
+        mqtt.DOMAIN: {
+            water_heater.DOMAIN: {
+                "name": "test",
+                "mode_state_topic": "test-topic",
+                "availability_topic": "avty-topic",
+            }
+        }
+    }
+    await help_test_entity_id_update_subscriptions(
+        hass,
+        mqtt_mock_entry,
+        water_heater.DOMAIN,
+        config,
+        ["test-topic", "avty-topic"],
+    )
+
+
+async def test_entity_id_update_discovery_update(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT discovery update when entity_id is updated."""
+    await help_test_entity_id_update_discovery_update(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_debug_info_message(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT debug info."""
+    config = {
+        mqtt.DOMAIN: {
+            water_heater.DOMAIN: {
+                "name": "test",
+                "mode_command_topic": "command-topic",
+                "mode_state_topic": "test-topic",
+            }
+        }
+    }
+    await help_test_entity_debug_info_message(
+        hass,
+        mqtt_mock_entry,
+        water_heater.DOMAIN,
+        config,
+        water_heater.SERVICE_SET_OPERATION_MODE,
+        command_topic="command-topic",
+        command_payload="eco",
+        state_topic="test-topic",
+        service_parameters={"operation_mode": "eco"},
+    )
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_precision_default(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test that setting precision to tenths works as intended."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    await common.async_set_temperature(
+        hass, temperature=23.67, entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 23.7
+    mqtt_mock.async_publish.reset_mock()
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [help_custom_config(water_heater.DOMAIN, DEFAULT_CONFIG, ({"precision": 0.5},))],
+)
+async def test_precision_halves(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test that setting precision to halves works as intended."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    await common.async_set_temperature(
+        hass, temperature=23.67, entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 23.5
+    mqtt_mock.async_publish.reset_mock()
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [help_custom_config(water_heater.DOMAIN, DEFAULT_CONFIG, ({"precision": 1.0},))],
+)
+async def test_precision_whole(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test that setting precision to whole works as intended."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    await common.async_set_temperature(
+        hass, temperature=23.67, entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 24.0
+    mqtt_mock.async_publish.reset_mock()
+
+
+@pytest.mark.parametrize(
+    ("service", "topic", "parameters", "payload", "template"),
+    [
+        (
+            water_heater.SERVICE_SET_OPERATION_MODE,
+            "mode_command_topic",
+            {"operation_mode": "electric"},
+            "electric",
+            "mode_command_template",
+        ),
+        (
+            water_heater.SERVICE_SET_TEMPERATURE,
+            "temperature_command_topic",
+            {"temperature": "20.1"},
+            20.1,
+            "temperature_command_template",
+        ),
+    ],
+)
+async def test_publishing_with_custom_encoding(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+    service: str,
+    topic: str,
+    parameters: dict[str, Any],
+    payload: str,
+    template: str | None,
+) -> None:
+    """Test publishing MQTT payload with different encoding."""
+    domain = water_heater.DOMAIN
+    config = copy.deepcopy(DEFAULT_CONFIG)
+
+    await help_test_publishing_with_custom_encoding(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        domain,
+        config,
+        service,
+        topic,
+        parameters,
+        payload,
+        template,
+    )
+
+
+async def test_reloadable(
+    hass: HomeAssistant,
+    mqtt_client_mock: MqttMockPahoClient,
+) -> None:
+    """Test reloading the MQTT platform."""
+    domain = water_heater.DOMAIN
+    config = DEFAULT_CONFIG
+    await help_test_reloadable(hass, mqtt_client_mock, domain, config)
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_setup_manual_entity_from_yaml(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setup manual configured MQTT entity."""
+    await mqtt_mock_entry()
+    platform = water_heater.DOMAIN
+    assert hass.states.get(f"{platform}.test")
+
+
+async def test_unload_entry(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test unloading the config entry."""
+    domain = water_heater.DOMAIN
+    config = DEFAULT_CONFIG
+    await help_test_unload_config_entry_with_platform(
+        hass, mqtt_mock_entry, domain, config
+    )
diff --git a/tests/components/mqtt_eventstream/test_init.py b/tests/components/mqtt_eventstream/test_init.py
index a61ea692bf2..5eabb2202aa 100644
--- a/tests/components/mqtt_eventstream/test_init.py
+++ b/tests/components/mqtt_eventstream/test_init.py
@@ -49,7 +49,7 @@ async def test_setup_no_mqtt(
 async def test_setup_with_pub(hass: HomeAssistant, mqtt_mock: MqttMockHAClient) -> None:
     """Test the setup with subscription."""
     # Should start off with no listeners for all events
-    assert hass.bus.async_listeners().get("*") is None
+    assert not hass.bus.async_listeners().get("*")
 
     assert await add_eventstream(hass, pub_topic="bar")
     await hass.async_block_till_done()
diff --git a/tests/components/mystrom/__init__.py b/tests/components/mystrom/__init__.py
new file mode 100644
index 00000000000..f0cc6224191
--- /dev/null
+++ b/tests/components/mystrom/__init__.py
@@ -0,0 +1 @@
+"""Tests for the myStrom integration."""
diff --git a/tests/components/mystrom/conftest.py b/tests/components/mystrom/conftest.py
new file mode 100644
index 00000000000..04b8fc221ed
--- /dev/null
+++ b/tests/components/mystrom/conftest.py
@@ -0,0 +1,37 @@
+"""Provide common mystrom fixtures and mocks."""
+
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+from homeassistant.components.mystrom.const import DOMAIN
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+DEVICE_NAME = "myStrom Device"
+DEVICE_MAC = "6001940376EB"
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.mystrom.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture
+def config_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Create and add a config entry."""
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=DEVICE_MAC,
+        data={CONF_HOST: "1.1.1.1"},
+        title=DEVICE_NAME,
+    )
+    config_entry.add_to_hass(hass)
+    return config_entry
diff --git a/tests/components/mystrom/test_config_flow.py b/tests/components/mystrom/test_config_flow.py
new file mode 100644
index 00000000000..97823681b8e
--- /dev/null
+++ b/tests/components/mystrom/test_config_flow.py
@@ -0,0 +1,133 @@
+"""Test the myStrom config flow."""
+from unittest.mock import AsyncMock, patch
+
+from pymystrom.exceptions import MyStromConnectionError
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.mystrom.const import DOMAIN
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from .conftest import DEVICE_MAC
+
+from tests.common import MockConfigEntry
+
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
+
+
+async def test_form_combined(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> None:
+    """Test we get the form."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=AsyncMock(return_value={"type": 101, "mac": DEVICE_MAC}),
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "myStrom Device"
+    assert result2["data"] == {"host": "1.1.1.1"}
+
+
+async def test_form_duplicates(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, config_entry: MockConfigEntry
+) -> None:
+    """Test abort on duplicate."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    with patch(
+        "pymystrom.get_device_info",
+        return_value={"type": 101, "mac": DEVICE_MAC},
+    ) as mock_session:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.ABORT
+    assert result2["reason"] == "already_configured"
+
+    mock_session.assert_called_once()
+
+
+async def test_step_import(hass: HomeAssistant) -> None:
+    """Test the import step."""
+    conf = {
+        CONF_HOST: "1.1.1.1",
+    }
+    with patch("pymystrom.switch.MyStromSwitch.get_state"), patch(
+        "pymystrom.get_device_info",
+        return_value={"type": 101, "mac": DEVICE_MAC},
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=conf
+        )
+        await hass.async_block_till_done()
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["title"] == "myStrom Device"
+    assert result["data"] == {
+        CONF_HOST: "1.1.1.1",
+    }
+
+
+async def test_wong_answer_from_device(hass: HomeAssistant) -> None:
+    """Test handling of wrong answers from the device."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=MyStromConnectionError(),
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.FORM
+    assert result2["step_id"] == "user"
+    assert result2["errors"] == {"base": "cannot_connect"}
+
+    with patch(
+        "pymystrom.get_device_info",
+        return_value={"type": 101, "mac": DEVICE_MAC},
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+        await hass.async_block_till_done()
+    assert result2["type"] == FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "myStrom Device"
+    assert result2["data"] == {"host": "1.1.1.1"}
diff --git a/tests/components/mystrom/test_init.py b/tests/components/mystrom/test_init.py
new file mode 100644
index 00000000000..01b52d2cb94
--- /dev/null
+++ b/tests/components/mystrom/test_init.py
@@ -0,0 +1,132 @@
+"""Test the myStrom init."""
+from unittest.mock import AsyncMock, PropertyMock, patch
+
+from pymystrom.exceptions import MyStromConnectionError
+
+from homeassistant.components.mystrom.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+
+from .conftest import DEVICE_MAC
+
+from tests.common import MockConfigEntry
+
+
+async def init_integration(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    device_type: int,
+    bulb_type: str = "strip",
+) -> None:
+    """Inititialize integration for testing."""
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=AsyncMock(return_value={"type": device_type, "mac": DEVICE_MAC}),
+    ), patch("pymystrom.switch.MyStromSwitch.get_state", return_value={}), patch(
+        "pymystrom.bulb.MyStromBulb.get_state", return_value={}
+    ), patch(
+        "pymystrom.bulb.MyStromBulb.bulb_type", bulb_type
+    ), patch(
+        "pymystrom.switch.MyStromSwitch.mac",
+        new_callable=PropertyMock,
+        return_value=DEVICE_MAC,
+    ), patch(
+        "pymystrom.bulb.MyStromBulb.mac",
+        new_callable=PropertyMock,
+        return_value=DEVICE_MAC,
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert config_entry.state == ConfigEntryState.LOADED
+
+
+async def test_init_switch_and_unload(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
+    """Test the initialization of a myStrom switch."""
+    await init_integration(hass, config_entry, 101)
+    state = hass.states.get("switch.mystrom_device")
+    assert state is not None
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    await hass.config_entries.async_unload(config_entry.entry_id)
+    await hass.async_block_till_done()
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
+    assert not hass.data.get(DOMAIN)
+
+
+async def test_init_bulb(hass: HomeAssistant, config_entry: MockConfigEntry) -> None:
+    """Test the initialization of a myStrom bulb."""
+    await init_integration(hass, config_entry, 102)
+    state = hass.states.get("light.mystrom_device")
+    assert state is not None
+    assert config_entry.state is ConfigEntryState.LOADED
+
+
+async def test_init_of_unknown_bulb(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
+    """Test the initialization of a unknown myStrom bulb."""
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=AsyncMock(return_value={"type": 102, "mac": DEVICE_MAC}),
+    ), patch("pymystrom.bulb.MyStromBulb.get_state", return_value={}), patch(
+        "pymystrom.bulb.MyStromBulb.bulb_type", "new_type"
+    ), patch(
+        "pymystrom.bulb.MyStromBulb.mac",
+        new_callable=PropertyMock,
+        return_value=DEVICE_MAC,
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert config_entry.state == ConfigEntryState.SETUP_ERROR
+
+
+async def test_init_of_unknown_device(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
+    """Test the initialization of a unsupported myStrom device."""
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=AsyncMock(return_value={"type": 103, "mac": DEVICE_MAC}),
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert config_entry.state == ConfigEntryState.SETUP_ERROR
+
+
+async def test_init_cannot_connect_because_of_device_info(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
+    """Test error handling for failing get_device_info."""
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=MyStromConnectionError(),
+    ), patch("pymystrom.switch.MyStromSwitch.get_state", return_value={}), patch(
+        "pymystrom.bulb.MyStromBulb.get_state", return_value={}
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert config_entry.state == ConfigEntryState.SETUP_RETRY
+
+
+async def test_init_cannot_connect_because_of_get_state(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
+    """Test error handling for failing get_state."""
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=AsyncMock(return_value={"type": 101, "mac": DEVICE_MAC}),
+    ), patch(
+        "pymystrom.switch.MyStromSwitch.get_state", side_effect=MyStromConnectionError()
+    ), patch(
+        "pymystrom.bulb.MyStromBulb.get_state", side_effect=MyStromConnectionError()
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert config_entry.state == ConfigEntryState.SETUP_ERROR
diff --git a/tests/components/nest/test_device_trigger.py b/tests/components/nest/test_device_trigger.py
index ea888d32fd6..f659568c674 100644
--- a/tests/components/nest/test_device_trigger.py
+++ b/tests/components/nest/test_device_trigger.py
@@ -1,6 +1,7 @@
 """The tests for Nest device triggers."""
 from google_nest_sdm.event import EventMessage
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -17,7 +18,6 @@ from homeassistant.util.dt import utcnow
 from .common import DEVICE_ID, CreateDevice, FakeSubscriber, PlatformSetup
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -124,7 +124,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_multiple_devices(
diff --git a/tests/components/netatmo/test_device_trigger.py b/tests/components/netatmo/test_device_trigger.py
index 7d29ccb794a..c7cbaf4d131 100644
--- a/tests/components/netatmo/test_device_trigger.py
+++ b/tests/components/netatmo/test_device_trigger.py
@@ -1,5 +1,6 @@
 """The tests for Netatmo device triggers."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -18,7 +19,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_capture_events,
     async_get_device_automations,
     async_mock_service,
@@ -56,7 +56,7 @@ async def test_get_triggers(
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
         model=device_type,
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         platform, NETATMO_DOMAIN, "5678", device_id=device_entry.id
     )
     expected_triggers = []
@@ -70,7 +70,7 @@ async def test_get_triggers(
                         "type": event_type,
                         "subtype": subtype,
                         "device_id": device_entry.id,
-                        "entity_id": f"{platform}.{NETATMO_DOMAIN}_5678",
+                        "entity_id": entity_entry.id,
                         "metadata": {"secondary": False},
                     }
                 )
@@ -81,7 +81,7 @@ async def test_get_triggers(
                     "domain": NETATMO_DOMAIN,
                     "type": event_type,
                     "device_id": device_entry.id,
-                    "entity_id": f"{platform}.{NETATMO_DOMAIN}_5678",
+                    "entity_id": entity_entry.id,
                     "metadata": {"secondary": False},
                 }
             )
@@ -92,7 +92,7 @@ async def test_get_triggers(
         )
         if trigger["domain"] == NETATMO_DOMAIN
     ]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -130,7 +130,7 @@ async def test_if_fires_on_event(
         identifiers={(NETATMO_DOMAIN, mac_address)},
         model=camera_type,
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         platform, NETATMO_DOMAIN, "5678", device_id=device_entry.id
     )
     events = async_capture_events(hass, "netatmo_event")
@@ -145,7 +145,90 @@ async def test_if_fires_on_event(
                         "platform": "device",
                         "domain": NETATMO_DOMAIN,
                         "device_id": device_entry.id,
-                        "entity_id": f"{platform}.{NETATMO_DOMAIN}_5678",
+                        "entity_id": entity_entry.id,
+                        "type": event_type,
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "{{trigger.event.data.type}} - {{trigger.platform}} - {{trigger.event.data.device_id}}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    device = device_registry.async_get_device(set(), {connection})
+    assert device is not None
+
+    # Fake that the entity is turning on.
+    hass.bus.async_fire(
+        event_type=NETATMO_EVENT,
+        event_data={
+            "type": event_type,
+            ATTR_DEVICE_ID: device.id,
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(events) == 1
+    assert len(calls) == 1
+    assert calls[0].data["some"] == f"{event_type} - device - {device.id}"
+
+
+@pytest.mark.parametrize(
+    ("platform", "camera_type", "event_type"),
+    [("camera", "Smart Outdoor Camera", trigger) for trigger in OUTDOOR_CAMERA_TRIGGERS]
+    + [("camera", "Smart Indoor Camera", trigger) for trigger in INDOOR_CAMERA_TRIGGERS]
+    + [
+        ("climate", "Smart Valve", trigger)
+        for trigger in CLIMATE_TRIGGERS
+        if trigger not in SUBTYPES
+    ]
+    + [
+        ("climate", "Smart Thermostat", trigger)
+        for trigger in CLIMATE_TRIGGERS
+        if trigger not in SUBTYPES
+    ],
+)
+async def test_if_fires_on_event_legacy(
+    hass: HomeAssistant,
+    calls,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    platform,
+    camera_type,
+    event_type,
+) -> None:
+    """Test for event triggers firing."""
+    mac_address = "12:34:56:AB:CD:EF"
+    connection = (dr.CONNECTION_NETWORK_MAC, mac_address)
+    config_entry = MockConfigEntry(domain=NETATMO_DOMAIN, data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={connection},
+        identifiers={(NETATMO_DOMAIN, mac_address)},
+        model=camera_type,
+    )
+    entity_entry = entity_registry.async_get_or_create(
+        platform, NETATMO_DOMAIN, "5678", device_id=device_entry.id
+    )
+    events = async_capture_events(hass, "netatmo_event")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": NETATMO_DOMAIN,
+                        "device_id": device_entry.id,
+                        "entity_id": entity_entry.entity_id,
                         "type": event_type,
                     },
                     "action": {
@@ -212,7 +295,7 @@ async def test_if_fires_on_event_with_subtype(
         identifiers={(NETATMO_DOMAIN, mac_address)},
         model=camera_type,
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         platform, NETATMO_DOMAIN, "5678", device_id=device_entry.id
     )
     events = async_capture_events(hass, "netatmo_event")
@@ -227,7 +310,7 @@ async def test_if_fires_on_event_with_subtype(
                         "platform": "device",
                         "domain": NETATMO_DOMAIN,
                         "device_id": device_entry.id,
-                        "entity_id": f"{platform}.{NETATMO_DOMAIN}_5678",
+                        "entity_id": entity_entry.id,
                         "type": event_type,
                         "subtype": sub_type,
                     },
@@ -288,7 +371,7 @@ async def test_if_invalid_device(
         identifiers={(NETATMO_DOMAIN, mac_address)},
         model=device_type,
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         platform, NETATMO_DOMAIN, "5678", device_id=device_entry.id
     )
 
@@ -302,7 +385,7 @@ async def test_if_invalid_device(
                         "platform": "device",
                         "domain": NETATMO_DOMAIN,
                         "device_id": device_entry.id,
-                        "entity_id": f"{platform}.{NETATMO_DOMAIN}_5678",
+                        "entity_id": entity_entry.id,
                         "type": event_type,
                     },
                     "action": {
diff --git a/tests/components/network/test_init.py b/tests/components/network/test_init.py
index a54e649115b..880caecc138 100644
--- a/tests/components/network/test_init.py
+++ b/tests/components/network/test_init.py
@@ -712,3 +712,120 @@ async def test_async_get_source_ip_no_ip_loopback(
         await hass.async_block_till_done()
 
         assert await network.async_get_source_ip(hass) == "127.0.0.1"
+
+
+_ADAPTERS_WITH_MANUAL_CONFIG = [
+    {
+        "auto": True,
+        "index": 1,
+        "default": False,
+        "enabled": True,
+        "ipv4": [],
+        "ipv6": [
+            {
+                "address": "2001:db8::",
+                "network_prefix": 64,
+                "flowinfo": 1,
+                "scope_id": 1,
+            },
+            {
+                "address": "fe80::1234:5678:9abc:def0",
+                "network_prefix": 64,
+                "flowinfo": 1,
+                "scope_id": 1,
+            },
+        ],
+        "name": "eth0",
+    },
+    {
+        "auto": True,
+        "index": 2,
+        "default": False,
+        "enabled": True,
+        "ipv4": [{"address": "192.168.1.5", "network_prefix": 23}],
+        "ipv6": [],
+        "name": "eth1",
+    },
+    {
+        "auto": True,
+        "index": 3,
+        "default": False,
+        "enabled": True,
+        "ipv4": [{"address": "172.16.1.5", "network_prefix": 23}],
+        "ipv6": [
+            {
+                "address": "fe80::dead:beef:dead:beef",
+                "network_prefix": 64,
+                "flowinfo": 1,
+                "scope_id": 3,
+            }
+        ],
+        "name": "eth2",
+    },
+    {
+        "auto": False,
+        "index": 4,
+        "default": False,
+        "enabled": False,
+        "ipv4": [{"address": "169.254.3.2", "network_prefix": 16}],
+        "ipv6": [],
+        "name": "vtun0",
+    },
+]
+
+
+async def test_async_get_announce_addresses(hass: HomeAssistant) -> None:
+    """Test addresses for mDNS/etc announcement."""
+    first_ip = "172.16.1.5"
+    with patch(
+        "homeassistant.components.network.async_get_source_ip",
+        return_value=first_ip,
+    ), patch(
+        "homeassistant.components.network.async_get_adapters",
+        return_value=_ADAPTERS_WITH_MANUAL_CONFIG,
+    ):
+        actual = await network.async_get_announce_addresses(hass)
+    assert actual[0] == first_ip and actual == [
+        first_ip,
+        "2001:db8::",
+        "fe80::1234:5678:9abc:def0",
+        "192.168.1.5",
+        "fe80::dead:beef:dead:beef",
+    ]
+
+    first_ip = "192.168.1.5"
+    with patch(
+        "homeassistant.components.network.async_get_source_ip",
+        return_value=first_ip,
+    ), patch(
+        "homeassistant.components.network.async_get_adapters",
+        return_value=_ADAPTERS_WITH_MANUAL_CONFIG,
+    ):
+        actual = await network.async_get_announce_addresses(hass)
+
+    assert actual[0] == first_ip and actual == [
+        first_ip,
+        "2001:db8::",
+        "fe80::1234:5678:9abc:def0",
+        "172.16.1.5",
+        "fe80::dead:beef:dead:beef",
+    ]
+
+
+async def test_async_get_announce_addresses_no_source_ip(hass: HomeAssistant) -> None:
+    """Test addresses for mDNS/etc announcement without source ip."""
+    with patch(
+        "homeassistant.components.network.async_get_source_ip",
+        return_value=None,
+    ), patch(
+        "homeassistant.components.network.async_get_adapters",
+        return_value=_ADAPTERS_WITH_MANUAL_CONFIG,
+    ):
+        actual = await network.async_get_announce_addresses(hass)
+    assert actual == [
+        "2001:db8::",
+        "fe80::1234:5678:9abc:def0",
+        "192.168.1.5",
+        "172.16.1.5",
+        "fe80::dead:beef:dead:beef",
+    ]
diff --git a/tests/components/nextdns/test_switch.py b/tests/components/nextdns/test_switch.py
index ed0ea4e8620..33a3f804902 100644
--- a/tests/components/nextdns/test_switch.py
+++ b/tests/components/nextdns/test_switch.py
@@ -637,7 +637,7 @@ async def test_switch_on(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.nextdns.NextDns.set_setting", return_value=True
     ) as mock_switch_on:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             SWITCH_DOMAIN,
             SERVICE_TURN_ON,
             {ATTR_ENTITY_ID: "switch.fake_profile_block_page"},
@@ -663,7 +663,7 @@ async def test_switch_off(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.nextdns.NextDns.set_setting", return_value=True
     ) as mock_switch_on:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             SWITCH_DOMAIN,
             SERVICE_TURN_OFF,
             {ATTR_ENTITY_ID: "switch.fake_profile_web3"},
diff --git a/tests/components/nina/test_config_flow.py b/tests/components/nina/test_config_flow.py
index e09bdfc739b..194f0298dd5 100644
--- a/tests/components/nina/test_config_flow.py
+++ b/tests/components/nina/test_config_flow.py
@@ -10,7 +10,7 @@ from pynina import ApiError
 
 from homeassistant import data_entry_flow
 from homeassistant.components.nina.const import (
-    CONF_FILTER_CORONA,
+    CONF_HEADLINE_FILTER,
     CONF_MESSAGE_SLOTS,
     CONF_REGIONS,
     CONST_REGION_A_TO_D,
@@ -37,7 +37,7 @@ DUMMY_DATA: dict[str, Any] = {
     CONST_REGION_M_TO_Q: ["071380000000_0", "071380000000_1"],
     CONST_REGION_R_TO_U: ["072320000000_0", "072320000000_1"],
     CONST_REGION_V_TO_Z: ["081270000000_0", "081270000000_1"],
-    CONF_FILTER_CORONA: True,
+    CONF_HEADLINE_FILTER: ".*corona.*",
 }
 
 DUMMY_RESPONSE_REGIONS: dict[str, Any] = json.loads(
@@ -113,7 +113,7 @@ async def test_step_user_no_selection(hass: HomeAssistant) -> None:
         wraps=mocked_request_function,
     ):
         result: dict[str, Any] = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_USER}, data={}
+            DOMAIN, context={"source": SOURCE_USER}, data={CONF_HEADLINE_FILTER: ""}
         )
 
         assert result["type"] == data_entry_flow.FlowResultType.FORM
@@ -145,7 +145,7 @@ async def test_options_flow_init(hass: HomeAssistant) -> None:
         domain=DOMAIN,
         title="NINA",
         data={
-            CONF_FILTER_CORONA: deepcopy(DUMMY_DATA[CONF_FILTER_CORONA]),
+            CONF_HEADLINE_FILTER: deepcopy(DUMMY_DATA[CONF_HEADLINE_FILTER]),
             CONF_MESSAGE_SLOTS: deepcopy(DUMMY_DATA[CONF_MESSAGE_SLOTS]),
             CONST_REGION_A_TO_D: deepcopy(DUMMY_DATA[CONST_REGION_A_TO_D]),
             CONF_REGIONS: {"095760000000": "Aach"},
@@ -183,7 +183,7 @@ async def test_options_flow_init(hass: HomeAssistant) -> None:
         assert result["data"] is None
 
         assert dict(config_entry.data) == {
-            CONF_FILTER_CORONA: deepcopy(DUMMY_DATA[CONF_FILTER_CORONA]),
+            CONF_HEADLINE_FILTER: deepcopy(DUMMY_DATA[CONF_HEADLINE_FILTER]),
             CONF_MESSAGE_SLOTS: deepcopy(DUMMY_DATA[CONF_MESSAGE_SLOTS]),
             CONST_REGION_A_TO_D: ["072350000000_1"],
             CONST_REGION_E_TO_H: [],
@@ -229,6 +229,7 @@ async def test_options_flow_with_no_selection(hass: HomeAssistant) -> None:
                 CONST_REGION_M_TO_Q: [],
                 CONST_REGION_R_TO_U: [],
                 CONST_REGION_V_TO_Z: [],
+                CONF_HEADLINE_FILTER: "",
             },
         )
 
diff --git a/tests/components/nina/test_init.py b/tests/components/nina/test_init.py
index d75e35473ca..826b8e422ed 100644
--- a/tests/components/nina/test_init.py
+++ b/tests/components/nina/test_init.py
@@ -15,7 +15,7 @@ from tests.common import MockConfigEntry
 
 ENTRY_DATA: dict[str, Any] = {
     "slots": 5,
-    "corona_filter": True,
+    "headline_filter": ".*corona.*",
     "regions": {"083350000000": "Aach, Stadt"},
 }
 
@@ -37,6 +37,27 @@ async def init_integration(hass) -> MockConfigEntry:
         return entry
 
 
+async def test_config_migration(hass: HomeAssistant) -> None:
+    """Test the migration to a new configuration layout."""
+
+    old_entry_data: dict[str, Any] = {
+        "slots": 5,
+        "corona_filter": True,
+        "regions": {"083350000000": "Aach, Stadt"},
+    }
+
+    old_conf_entry: MockConfigEntry = MockConfigEntry(
+        domain=DOMAIN, title="NINA", data=old_entry_data
+    )
+
+    old_conf_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(old_conf_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert dict(old_conf_entry.data) == ENTRY_DATA
+
+
 async def test_config_entry_not_ready(hass: HomeAssistant) -> None:
     """Test the configuration entry."""
     entry: MockConfigEntry = await init_integration(hass)
diff --git a/tests/components/notify/test_persistent_notification.py b/tests/components/notify/test_persistent_notification.py
index 6f273ac3d9b..580b2bdb614 100644
--- a/tests/components/notify/test_persistent_notification.py
+++ b/tests/components/notify/test_persistent_notification.py
@@ -25,3 +25,42 @@ async def test_async_send_message(hass: HomeAssistant) -> None:
 
     assert notification["message"] == "Hello"
     assert notification["title"] == "Test notification"
+
+
+async def test_async_supports_notification_id(hass: HomeAssistant) -> None:
+    """Test that notify.persistent_notification supports notification_id."""
+    await async_setup_component(hass, pn.DOMAIN, {"core": {}})
+    await async_setup_component(hass, notify.DOMAIN, {})
+    await hass.async_block_till_done()
+
+    message = {
+        "message": "Hello",
+        "title": "Test notification",
+        "data": {"notification_id": "my_id"},
+    }
+    await hass.services.async_call(
+        notify.DOMAIN, notify.SERVICE_PERSISTENT_NOTIFICATION, message
+    )
+    await hass.async_block_till_done()
+
+    notifications = async_get_persistent_notifications(hass)
+    assert len(notifications) == 1
+
+    # Send second message with same ID
+
+    message = {
+        "message": "Goodbye",
+        "title": "Notification was updated",
+        "data": {"notification_id": "my_id"},
+    }
+    await hass.services.async_call(
+        notify.DOMAIN, notify.SERVICE_PERSISTENT_NOTIFICATION, message
+    )
+    await hass.async_block_till_done()
+
+    notifications = async_get_persistent_notifications(hass)
+    assert len(notifications) == 1
+
+    notification = notifications[list(notifications)[0]]
+    assert notification["message"] == "Goodbye"
+    assert notification["title"] == "Notification was updated"
diff --git a/tests/components/number/test_device_action.py b/tests/components/number/test_device_action.py
index 9cd8d3d4943..1e0cfd5b391 100644
--- a/tests/components/number/test_device_action.py
+++ b/tests/components/number/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Number device actions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -17,7 +18,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -40,7 +40,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     hass.states.async_set("number.test_5678", 0.5, {"min_value": 0.0, "max_value": 1.0})
@@ -49,14 +49,14 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": "set_value",
             "device_id": device_entry.id,
-            "entity_id": "number.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -82,7 +82,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -96,7 +96,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["set_value"]
@@ -104,7 +104,7 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_action_no_state(
@@ -119,7 +119,7 @@ async def test_get_action_no_state(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = [
@@ -127,19 +127,21 @@ async def test_get_action_no_state(
             "domain": DOMAIN,
             "type": "set_value",
             "device_id": device_entry.id,
-            "entity_id": "number.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for actions."""
-    hass.states.async_set("number.entity", 0.5, {"min_value": 0.0, "max_value": 1.0})
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, 0.5, {"min_value": 0.0, "max_value": 1.0})
 
     assert await async_setup_component(
         hass,
@@ -154,7 +156,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "number.entity",
+                        "entity_id": entry.id,
                         "type": "set_value",
                         "value": 0.3,
                     },
@@ -164,23 +166,96 @@ async def test_action(hass: HomeAssistant) -> None:
     )
 
     calls = async_mock_service(hass, DOMAIN, "set_value")
-
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event_set_value")
     await hass.async_block_till_done()
 
     assert len(calls) == 1
+    assert calls[0].domain == DOMAIN
+    assert calls[0].service == "set_value"
+    assert calls[0].data == {"entity_id": entry.entity_id, "value": 0.3}
 
 
-async def test_capabilities(hass: HomeAssistant) -> None:
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, 0.5, {"min_value": 0.0, "max_value": 1.0})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_set_value",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "set_value",
+                        "value": 0.3,
+                    },
+                },
+            ]
+        },
+    )
+
+    calls = async_mock_service(hass, DOMAIN, "set_value")
+    assert len(calls) == 0
+
+    hass.bus.async_fire("test_event_set_value")
+    await hass.async_block_till_done()
+
+    assert len(calls) == 1
+    assert calls[0].domain == DOMAIN
+    assert calls[0].service == "set_value"
+    assert calls[0].data == {"entity_id": entry.entity_id, "value": 0.3}
+
+
+async def test_capabilities(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
     """Test getting capabilities."""
+    entry = entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id="abcdefgh"
+    )
     capabilities = await device_action.async_get_action_capabilities(
         hass,
         {
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": "number.entity",
+            "entity_id": entry.id,
+            "type": "set_value",
+        },
+    )
+
+    assert capabilities and "extra_fields" in capabilities
+
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [{"name": "value", "required": True, "type": "float"}]
+
+
+async def test_capabilities_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test getting capabilities."""
+    entry = entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id="abcdefgh"
+    )
+    capabilities = await device_action.async_get_action_capabilities(
+        hass,
+        {
+            "domain": DOMAIN,
+            "device_id": "abcdefgh",
+            "entity_id": entry.entity_id,
             "type": "set_value",
         },
     )
diff --git a/tests/components/number/test_init.py b/tests/components/number/test_init.py
index 6cd9a53b6f4..d9cf27c12aa 100644
--- a/tests/components/number/test_init.py
+++ b/tests/components/number/test_init.py
@@ -1,4 +1,5 @@
 """The tests for the Number component."""
+from collections.abc import Generator
 from typing import Any
 from unittest.mock import MagicMock
 
@@ -14,6 +15,7 @@ from homeassistant.components.number import (
     NumberDeviceClass,
     NumberEntity,
     NumberEntityDescription,
+    NumberMode,
 )
 from homeassistant.components.number.const import (
     DEVICE_CLASS_UNITS as NUMBER_DEVICE_CLASS_UNITS,
@@ -22,6 +24,7 @@ from homeassistant.components.sensor import (
     DEVICE_CLASS_UNITS as SENSOR_DEVICE_CLASS_UNITS,
     SensorDeviceClass,
 )
+from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_UNIT_OF_MEASUREMENT,
@@ -30,15 +33,24 @@ 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.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
 
 from tests.common import (
+    MockConfigEntry,
+    MockModule,
+    MockPlatform,
     async_mock_restore_state_shutdown_restart,
+    mock_config_flow,
+    mock_integration,
+    mock_platform,
     mock_restore_cache_with_extra_data,
 )
 
+TEST_DOMAIN = "test"
+
 
 class MockDefaultNumberEntity(NumberEntity):
     """Mock NumberEntity device to use in tests.
@@ -240,60 +252,6 @@ async def test_attributes(hass: HomeAssistant) -> None:
     assert number_4.value is None
 
 
-async def test_deprecation_warnings(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
-) -> None:
-    """Test overriding the deprecated attributes is possible and warnings are logged."""
-    number = MockDefaultNumberEntityDeprecated()
-    number.hass = hass
-    assert number.max_value == 100.0
-    assert number.min_value == 0.0
-    assert number.step == 1.0
-    assert number.unit_of_measurement is None
-    assert number.value == 0.5
-
-    number_2 = MockNumberEntityDeprecated()
-    number_2.hass = hass
-    assert number_2.max_value == 0.5
-    assert number_2.min_value == -0.5
-    assert number_2.step == 0.1
-    assert number_2.unit_of_measurement == "cats"
-    assert number_2.value == 0.5
-
-    number_3 = MockNumberEntityAttrDeprecated()
-    number_3.hass = hass
-    assert number_3.max_value == 1000.0
-    assert number_3.min_value == -1000.0
-    assert number_3.step == 100.0
-    assert number_3.unit_of_measurement == "dogs"
-    assert number_3.value == 500.0
-
-    number_4 = MockNumberEntityDescrDeprecated()
-    number_4.hass = hass
-    assert number_4.max_value == 10.0
-    assert number_4.min_value == -10.0
-    assert number_4.step == 2.0
-    assert number_4.unit_of_measurement == "rabbits"
-    assert number_4.value == 0.5
-
-    assert (
-        "tests.components.number.test_init::MockNumberEntityDeprecated is overriding "
-        " deprecated methods on an instance of NumberEntity"
-    )
-    assert (
-        "Entity None (<class 'tests.components.number.test_init.MockNumberEntityAttrDeprecated'>) "
-        "is using deprecated NumberEntity features" in caplog.text
-    )
-    assert (
-        "Entity None (<class 'tests.components.number.test_init.MockNumberEntityDescrDeprecated'>) "
-        "is using deprecated NumberEntity features" in caplog.text
-    )
-    assert (
-        "tests.components.number.test_init is setting deprecated attributes on an "
-        "instance of NumberEntityDescription" in caplog.text
-    )
-
-
 async def test_sync_set_value(hass: HomeAssistant) -> None:
     """Test if async set_value calls sync set_value."""
     number = MockDefaultNumberEntity()
@@ -343,104 +301,6 @@ async def test_set_value(hass: HomeAssistant, enable_custom_integrations: None)
     assert state.state == "60.0"
 
 
-async def test_deprecated_attributes(
-    hass: HomeAssistant, enable_custom_integrations: None
-) -> None:
-    """Test entity using deprecated attributes."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init(empty=True)
-    platform.ENTITIES.append(platform.LegacyMockNumberEntity())
-    entity = platform.ENTITIES[0]
-    entity._attr_name = "Test"
-    entity._attr_max_value = 25
-    entity._attr_min_value = -25
-    entity._attr_step = 2.5
-    entity._attr_value = 51.0
-
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    state = hass.states.get("number.test")
-    assert state.state == "51.0"
-    assert state.attributes.get(ATTR_MAX) == 25.0
-    assert state.attributes.get(ATTR_MIN) == -25.0
-    assert state.attributes.get(ATTR_STEP) == 2.5
-
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_SET_VALUE,
-        {ATTR_VALUE: 0.0, ATTR_ENTITY_ID: "number.test"},
-        blocking=True,
-    )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("number.test")
-    assert state.state == "0.0"
-
-    # test ValueError trigger
-    with pytest.raises(ValueError):
-        await hass.services.async_call(
-            DOMAIN,
-            SERVICE_SET_VALUE,
-            {ATTR_VALUE: 110.0, ATTR_ENTITY_ID: "number.test"},
-            blocking=True,
-        )
-
-    await hass.async_block_till_done()
-    state = hass.states.get("number.test")
-    assert state.state == "0.0"
-
-
-async def test_deprecated_methods(
-    hass: HomeAssistant, enable_custom_integrations: None
-) -> None:
-    """Test entity using deprecated methods."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init(empty=True)
-    platform.ENTITIES.append(
-        platform.LegacyMockNumberEntity(
-            name="Test",
-            max_value=25.0,
-            min_value=-25.0,
-            step=2.5,
-            value=51.0,
-        )
-    )
-
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    state = hass.states.get("number.test")
-    assert state.state == "51.0"
-    assert state.attributes.get(ATTR_MAX) == 25.0
-    assert state.attributes.get(ATTR_MIN) == -25.0
-    assert state.attributes.get(ATTR_STEP) == 2.5
-
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_SET_VALUE,
-        {ATTR_VALUE: 0.0, ATTR_ENTITY_ID: "number.test"},
-        blocking=True,
-    )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("number.test")
-    assert state.state == "0.0"
-
-    # test ValueError trigger
-    with pytest.raises(ValueError):
-        await hass.services.async_call(
-            DOMAIN,
-            SERVICE_SET_VALUE,
-            {ATTR_VALUE: 110.0, ATTR_ENTITY_ID: "number.test"},
-            blocking=True,
-        )
-
-    await hass.async_block_till_done()
-    state = hass.states.get("number.test")
-    assert state.state == "0.0"
-
-
 @pytest.mark.parametrize(
     (
         "unit_system",
@@ -930,3 +790,120 @@ def test_device_classes_aligned() -> None:
             SENSOR_DEVICE_CLASS_UNITS[device_class]
             == NUMBER_DEVICE_CLASS_UNITS[device_class]
         )
+
+
+class MockFlow(ConfigFlow):
+    """Test flow."""
+
+
+@pytest.fixture(autouse=True)
+def config_flow_fixture(hass: HomeAssistant) -> Generator[None, None, None]:
+    """Mock config flow."""
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+
+    with mock_config_flow(TEST_DOMAIN, MockFlow):
+        yield
+
+
+async def test_name(hass: HomeAssistant) -> None:
+    """Test number name."""
+
+    async def async_setup_entry_init(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> bool:
+        """Set up test config entry."""
+        await hass.config_entries.async_forward_entry_setup(config_entry, DOMAIN)
+        return True
+
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+    mock_integration(
+        hass,
+        MockModule(
+            TEST_DOMAIN,
+            async_setup_entry=async_setup_entry_init,
+        ),
+    )
+
+    # Unnamed sensor without device class -> no name
+    entity1 = NumberEntity()
+    entity1.entity_id = "number.test1"
+
+    # Unnamed sensor with device class but has_entity_name False -> no name
+    entity2 = NumberEntity()
+    entity2.entity_id = "number.test2"
+    entity2._attr_device_class = NumberDeviceClass.TEMPERATURE
+
+    # Unnamed sensor with device class and has_entity_name True -> named
+    entity3 = NumberEntity()
+    entity3.entity_id = "number.test3"
+    entity3._attr_device_class = NumberDeviceClass.TEMPERATURE
+    entity3._attr_has_entity_name = True
+
+    # Unnamed sensor with device class and has_entity_name True -> named
+    entity4 = NumberEntity()
+    entity4.entity_id = "number.test4"
+    entity4.entity_description = NumberEntityDescription(
+        "test",
+        NumberDeviceClass.TEMPERATURE,
+        has_entity_name=True,
+    )
+
+    async def async_setup_entry_platform(
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        async_add_entities: AddEntitiesCallback,
+    ) -> None:
+        """Set up test number platform via config entry."""
+        async_add_entities([entity1, entity2, entity3, entity4])
+
+    mock_platform(
+        hass,
+        f"{TEST_DOMAIN}.{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()
+
+    state = hass.states.get(entity1.entity_id)
+    assert state
+    assert state.attributes == {
+        "max": 100.0,
+        "min": 0.0,
+        "mode": NumberMode.AUTO,
+        "step": 1.0,
+    }
+
+    state = hass.states.get(entity2.entity_id)
+    assert state
+    assert state.attributes == {
+        "device_class": "temperature",
+        "max": 100.0,
+        "min": 0.0,
+        "mode": NumberMode.AUTO,
+        "step": 1.0,
+    }
+
+    state = hass.states.get(entity3.entity_id)
+    assert state
+    assert state.attributes == {
+        "device_class": "temperature",
+        "friendly_name": "Temperature",
+        "max": 100.0,
+        "min": 0.0,
+        "mode": NumberMode.AUTO,
+        "step": 1.0,
+    }
+
+    state = hass.states.get(entity4.entity_id)
+    assert state
+    assert state.attributes == {
+        "device_class": "temperature",
+        "friendly_name": "Temperature",
+        "max": 100.0,
+        "min": 0.0,
+        "mode": NumberMode.AUTO,
+        "step": 1.0,
+    }
diff --git a/tests/components/number/test_recorder.py b/tests/components/number/test_recorder.py
index d996a67f93b..635354b1176 100644
--- a/tests/components/number/test_recorder.py
+++ b/tests/components/number/test_recorder.py
@@ -2,12 +2,15 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import number
 from homeassistant.components.number import ATTR_MAX, ATTR_MIN, ATTR_MODE, ATTR_STEP
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -16,6 +19,16 @@ from tests.common import async_fire_time_changed
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def number_only() -> None:
+    """Enable only the number platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.NUMBER],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test number registered attributes to be excluded."""
     assert await async_setup_component(hass, "homeassistant", {})
diff --git a/tests/components/nut/test_device_action.py b/tests/components/nut/test_device_action.py
index 0664b0de5c8..c15a2157343 100644
--- a/tests/components/nut/test_device_action.py
+++ b/tests/components/nut/test_device_action.py
@@ -3,6 +3,7 @@ from unittest.mock import MagicMock
 
 from pynut2.nut2 import PyNUTError
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation, device_automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -14,7 +15,7 @@ from homeassistant.setup import async_setup_component
 
 from .util import async_init_integration
 
-from tests.common import assert_lists_same, async_get_device_automations
+from tests.common import async_get_device_automations
 
 
 async def test_get_all_actions_for_specified_user(
@@ -47,7 +48,7 @@ async def test_get_all_actions_for_specified_user(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_no_actions_for_anonymous_user(
diff --git a/tests/components/onboarding/test_views.py b/tests/components/onboarding/test_views.py
index d609f118bdc..bbe50f9a810 100644
--- a/tests/components/onboarding/test_views.py
+++ b/tests/components/onboarding/test_views.py
@@ -453,6 +453,27 @@ async def test_onboarding_core_sets_up_met(
     assert len(hass.config_entries.async_entries("met")) == 1
 
 
+async def test_onboarding_core_sets_up_google_translate(
+    hass: HomeAssistant,
+    hass_storage: dict[str, Any],
+    hass_client: ClientSessionGenerator,
+    mock_default_integrations,
+) -> None:
+    """Test finishing the core step sets up google translate."""
+    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()
+    assert len(hass.config_entries.async_entries("google_translate")) == 1
+
+
 async def test_onboarding_core_sets_up_radio_browser(
     hass: HomeAssistant,
     hass_storage: dict[str, Any],
diff --git a/tests/components/onvif/test_diagnostics.py b/tests/components/onvif/test_diagnostics.py
index eb7d058a755..f87a5f0eff6 100644
--- a/tests/components/onvif/test_diagnostics.py
+++ b/tests/components/onvif/test_diagnostics.py
@@ -82,12 +82,12 @@ async def test_diagnostics(
         },
         "events": {
             "pullpoint_manager_state": {
-                "__type": "<enum " "'PullPointManagerState'>",
-                "repr": "<PullPointManagerState.PAUSED: " "2>",
+                "__type": "<enum 'PullPointManagerState'>",
+                "repr": "<PullPointManagerState.PAUSED: 2>",
             },
             "webhook_manager_state": {
                 "__type": "<enum 'WebHookManagerState'>",
-                "repr": "<WebHookManagerState.STARTED: " "1>",
+                "repr": "<WebHookManagerState.STARTED: 1>",
             },
         },
     }
diff --git a/tests/components/openai_conversation/test_init.py b/tests/components/openai_conversation/test_init.py
index 4016ac03c97..fe23bbac56c 100644
--- a/tests/components/openai_conversation/test_init.py
+++ b/tests/components/openai_conversation/test_init.py
@@ -13,6 +13,7 @@ from tests.common import MockConfigEntry
 
 async def test_default_prompt(
     hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
     mock_init_component,
     area_registry: ar.AreaRegistry,
     device_registry: dr.DeviceRegistry,
@@ -101,18 +102,24 @@ async def test_default_prompt(
             ]
         },
     ) as mock_create:
-        result = await conversation.async_converse(hass, "hello", None, Context())
+        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
     assert mock_create.mock_calls[0][2]["messages"] == snapshot
 
 
-async def test_error_handling(hass: HomeAssistant, mock_init_component) -> None:
+async def test_error_handling(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_init_component
+) -> None:
     """Test that the default prompt works."""
     with patch(
         "openai.ChatCompletion.acreate", side_effect=error.ServiceUnavailableError
     ):
-        result = await conversation.async_converse(hass, "hello", None, Context())
+        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
@@ -133,7 +140,9 @@ async def test_template_error(
     ), patch("openai.ChatCompletion.acreate"):
         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())
+        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
diff --git a/tests/components/openhome/__init__.py b/tests/components/openhome/__init__.py
new file mode 100644
index 00000000000..39c7a3a4dcb
--- /dev/null
+++ b/tests/components/openhome/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Linn / OpenHome integration."""
diff --git a/tests/components/openhome/test_config_flow.py b/tests/components/openhome/test_config_flow.py
new file mode 100644
index 00000000000..4cc5c58dda5
--- /dev/null
+++ b/tests/components/openhome/test_config_flow.py
@@ -0,0 +1,116 @@
+"""Tests for the Openhome config flow module."""
+
+from homeassistant import data_entry_flow
+from homeassistant.components import ssdp
+from homeassistant.components.openhome.const import DOMAIN
+from homeassistant.components.ssdp import ATTR_UPNP_FRIENDLY_NAME, ATTR_UPNP_UDN
+from homeassistant.config_entries import SOURCE_SSDP
+from homeassistant.const import CONF_HOST, CONF_NAME, CONF_SOURCE
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from tests.common import MockConfigEntry
+
+MOCK_UDN = "uuid:4c494e4e-1234-ab12-abcd-01234567819f"
+MOCK_FRIENDLY_NAME = "Test Client"
+MOCK_SSDP_LOCATION = "http://device:12345/description.xml"
+
+MOCK_DISCOVER = ssdp.SsdpServiceInfo(
+    ssdp_usn="usn",
+    ssdp_st="st",
+    ssdp_location=MOCK_SSDP_LOCATION,
+    upnp={ATTR_UPNP_FRIENDLY_NAME: MOCK_FRIENDLY_NAME, ATTR_UPNP_UDN: MOCK_UDN},
+)
+
+
+async def test_ssdp(hass: HomeAssistant) -> None:
+    """Test a ssdp import flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={CONF_SOURCE: SOURCE_SSDP},
+        data=MOCK_DISCOVER,
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "confirm"
+    assert result["description_placeholders"] == {CONF_NAME: MOCK_FRIENDLY_NAME}
+
+    result2 = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+    assert result2["title"] == MOCK_FRIENDLY_NAME
+    assert result2["data"] == {CONF_HOST: MOCK_SSDP_LOCATION}
+
+
+async def test_device_exists(hass: HomeAssistant) -> None:
+    """Test a ssdp import where device already exists."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_HOST: MOCK_SSDP_LOCATION},
+        title=MOCK_FRIENDLY_NAME,
+        unique_id=MOCK_UDN,
+    )
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={CONF_SOURCE: SOURCE_SSDP},
+        data=MOCK_DISCOVER,
+    )
+    assert result["type"] == data_entry_flow.FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+
+async def test_missing_udn(hass: HomeAssistant) -> None:
+    """Test a ssdp import where discovery is missing udn."""
+    broken_discovery = ssdp.SsdpServiceInfo(
+        ssdp_usn="usn",
+        ssdp_st="st",
+        ssdp_location=MOCK_SSDP_LOCATION,
+        upnp={
+            ATTR_UPNP_FRIENDLY_NAME: MOCK_FRIENDLY_NAME,
+        },
+    )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={CONF_SOURCE: SOURCE_SSDP},
+        data=broken_discovery,
+    )
+    assert result["type"] == data_entry_flow.FlowResultType.ABORT
+    assert result["reason"] == "incomplete_discovery"
+
+
+async def test_missing_ssdp_location(hass: HomeAssistant) -> None:
+    """Test a ssdp import where discovery is missing udn."""
+    broken_discovery = ssdp.SsdpServiceInfo(
+        ssdp_usn="usn",
+        ssdp_st="st",
+        ssdp_location="",
+        upnp={ATTR_UPNP_FRIENDLY_NAME: MOCK_FRIENDLY_NAME, ATTR_UPNP_UDN: MOCK_UDN},
+    )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={CONF_SOURCE: SOURCE_SSDP},
+        data=broken_discovery,
+    )
+    assert result["type"] == data_entry_flow.FlowResultType.ABORT
+    assert result["reason"] == "incomplete_discovery"
+
+
+async def test_host_updated(hass: HomeAssistant) -> None:
+    """Test a ssdp import flow where host changes."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_HOST: "old_host"},
+        title=MOCK_FRIENDLY_NAME,
+        unique_id=MOCK_UDN,
+    )
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={CONF_SOURCE: SOURCE_SSDP},
+        data=MOCK_DISCOVER,
+    )
+    assert result["type"] == data_entry_flow.FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+    assert entry.data[CONF_HOST] == MOCK_SSDP_LOCATION
diff --git a/tests/components/openhome/test_update.py b/tests/components/openhome/test_update.py
new file mode 100644
index 00000000000..d975cc29af4
--- /dev/null
+++ b/tests/components/openhome/test_update.py
@@ -0,0 +1,172 @@
+"""Tests for the Openhome update platform."""
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+
+from homeassistant.components.openhome.const import DOMAIN
+from homeassistant.components.update import (
+    ATTR_INSTALLED_VERSION,
+    ATTR_LATEST_VERSION,
+    ATTR_RELEASE_SUMMARY,
+    ATTR_RELEASE_URL,
+    DOMAIN as PLATFORM_DOMAIN,
+    SERVICE_INSTALL,
+    UpdateDeviceClass,
+)
+from homeassistant.const import (
+    ATTR_DEVICE_CLASS,
+    ATTR_ENTITY_ID,
+    CONF_HOST,
+    STATE_ON,
+    STATE_UNKNOWN,
+    Platform,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+
+from tests.common import MockConfigEntry
+
+LATEST_FIRMWARE_INSTALLED = {
+    "status": "on_latest",
+    "current_software": {"version": "4.100.502", "topic": "main", "channel": "release"},
+}
+
+FIRMWARE_UPDATE_AVAILABLE = {
+    "status": "update_available",
+    "current_software": {"version": "4.99.491", "topic": "main", "channel": "release"},
+    "update_info": {
+        "legal": {
+            "licenseurl": "http://products.linn.co.uk/VersionInfo/licenseV2.txt",
+            "privacyurl": "https://www.linn.co.uk/privacy",
+            "privacyuri": "https://products.linn.co.uk/VersionInfo/PrivacyV1.json",
+            "privacyversion": 1,
+        },
+        "releasenotesuri": "http://docs.linn.co.uk/wiki/index.php/ReleaseNotes",
+        "updates": [
+            {
+                "channel": "release",
+                "date": "07 Jun 2023 12:29:48",
+                "description": "Release build version 4.100.502 (07 Jun 2023 12:29:48)",
+                "exaktlink": "3",
+                "manifest": "https://cloud.linn.co.uk/update/components/836/4.100.502/manifest.json",
+                "topic": "main",
+                "variant": "836",
+                "version": "4.100.502",
+            }
+        ],
+        "exaktUpdates": [],
+    },
+}
+
+
+async def setup_integration(
+    hass: HomeAssistant,
+    software_status: dict,
+    update_firmware: AsyncMock,
+) -> None:
+    """Load an openhome platform with mocked device."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_HOST: "http://localhost"},
+    )
+    entry.add_to_hass(hass)
+
+    with patch("homeassistant.components.openhome.PLATFORMS", [Platform.UPDATE]), patch(
+        "homeassistant.components.openhome.Device", MagicMock()
+    ) as mock_device:
+        mock_device.return_value.init = AsyncMock()
+        mock_device.return_value.uuid = MagicMock(return_value="uuid")
+        mock_device.return_value.manufacturer = MagicMock(return_value="manufacturer")
+        mock_device.return_value.model_name = MagicMock(return_value="model_name")
+        mock_device.return_value.friendly_name = MagicMock(return_value="friendly_name")
+        mock_device.return_value.software_status = AsyncMock(
+            return_value=software_status
+        )
+        mock_device.return_value.update_firmware = update_firmware
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+
+async def test_not_supported(hass: HomeAssistant):
+    """Ensure update entity works if service not supported."""
+
+    update_firmware = AsyncMock()
+    await setup_integration(hass, None, update_firmware)
+
+    state = hass.states.get("update.friendly_name")
+
+    assert state
+    assert state.state == STATE_UNKNOWN
+    assert state.attributes[ATTR_DEVICE_CLASS] == UpdateDeviceClass.FIRMWARE
+    assert state.attributes[ATTR_INSTALLED_VERSION] is None
+    assert state.attributes[ATTR_LATEST_VERSION] is None
+    assert state.attributes[ATTR_RELEASE_URL] is None
+    assert state.attributes[ATTR_RELEASE_SUMMARY] is None
+    update_firmware.assert_not_called()
+
+
+async def test_on_latest_firmware(hass: HomeAssistant):
+    """Test device on latest firmware."""
+
+    update_firmware = AsyncMock()
+    await setup_integration(hass, LATEST_FIRMWARE_INSTALLED, update_firmware)
+
+    state = hass.states.get("update.friendly_name")
+
+    assert state
+    assert state.state == STATE_UNKNOWN
+    assert state.attributes[ATTR_DEVICE_CLASS] == UpdateDeviceClass.FIRMWARE
+    assert state.attributes[ATTR_INSTALLED_VERSION] == "4.100.502"
+    assert state.attributes[ATTR_LATEST_VERSION] is None
+    assert state.attributes[ATTR_RELEASE_URL] is None
+    assert state.attributes[ATTR_RELEASE_SUMMARY] is None
+    update_firmware.assert_not_called()
+
+
+async def test_update_available(hass: HomeAssistant):
+    """Test device has firmware update available."""
+
+    update_firmware = AsyncMock()
+    await setup_integration(hass, FIRMWARE_UPDATE_AVAILABLE, update_firmware)
+
+    state = hass.states.get("update.friendly_name")
+
+    assert state
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_DEVICE_CLASS] == UpdateDeviceClass.FIRMWARE
+    assert state.attributes[ATTR_INSTALLED_VERSION] == "4.99.491"
+    assert state.attributes[ATTR_LATEST_VERSION] == "4.100.502"
+    assert (
+        state.attributes[ATTR_RELEASE_URL]
+        == "http://docs.linn.co.uk/wiki/index.php/ReleaseNotes"
+    )
+    assert (
+        state.attributes[ATTR_RELEASE_SUMMARY]
+        == "Release build version 4.100.502 (07 Jun 2023 12:29:48)"
+    )
+
+    await hass.services.async_call(
+        PLATFORM_DOMAIN,
+        SERVICE_INSTALL,
+        {ATTR_ENTITY_ID: "update.friendly_name"},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    update_firmware.assert_called_once()
+
+
+async def test_firmware_update_not_required(hass: HomeAssistant):
+    """Ensure firmware install does nothing if up to date."""
+
+    update_firmware = AsyncMock()
+    await setup_integration(hass, LATEST_FIRMWARE_INSTALLED, update_firmware)
+
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            PLATFORM_DOMAIN,
+            SERVICE_INSTALL,
+            {ATTR_ENTITY_ID: "update.friendly_name"},
+            blocking=True,
+        )
+    update_firmware.assert_not_called()
diff --git a/tests/components/otbr/test_config_flow.py b/tests/components/otbr/test_config_flow.py
index cfb47a28bcf..b6cb0df78cd 100644
--- a/tests/components/otbr/test_config_flow.py
+++ b/tests/components/otbr/test_config_flow.py
@@ -25,6 +25,23 @@ HASSIO_DATA = hassio.HassioServiceInfo(
 )
 
 
+@pytest.fixture(name="addon_info")
+def addon_info_fixture():
+    """Mock Supervisor add-on info."""
+    with patch(
+        "homeassistant.components.otbr.config_flow.async_get_addon_info",
+    ) as addon_info:
+        addon_info.return_value = {
+            "available": True,
+            "hostname": None,
+            "options": {},
+            "state": None,
+            "update_available": False,
+            "version": None,
+        }
+        yield addon_info
+
+
 async def test_user_flow(
     hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
 ) -> None:
@@ -176,7 +193,7 @@ async def test_user_flow_connect_error(hass: HomeAssistant, error) -> None:
 
 
 async def test_hassio_discovery_flow(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, addon_info
 ) -> None:
     """Test the hassio discovery flow."""
     url = "http://core-silabs-multiprotocol:8081"
@@ -195,7 +212,7 @@ async def test_hassio_discovery_flow(
     }
 
     assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Open Thread Border Router"
+    assert result["title"] == "Silicon Labs Multiprotocol"
     assert result["data"] == expected_data
     assert result["options"] == {}
     assert len(mock_setup_entry.mock_calls) == 1
@@ -203,12 +220,101 @@ async def test_hassio_discovery_flow(
     config_entry = hass.config_entries.async_entries(otbr.DOMAIN)[0]
     assert config_entry.data == expected_data
     assert config_entry.options == {}
-    assert config_entry.title == "Open Thread Border Router"
+    assert config_entry.title == "Silicon Labs Multiprotocol"
+    assert config_entry.unique_id == HASSIO_DATA.uuid
+
+
+async def test_hassio_discovery_flow_yellow(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, addon_info
+) -> None:
+    """Test the hassio discovery flow."""
+    url = "http://core-silabs-multiprotocol:8081"
+    aioclient_mock.get(f"{url}/node/dataset/active", text="aa")
+
+    addon_info.return_value = {
+        "available": True,
+        "hostname": None,
+        "options": {"device": "/dev/TTYAMA1"},
+        "state": None,
+        "update_available": False,
+        "version": None,
+    }
+
+    with patch(
+        "homeassistant.components.otbr.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry, patch(
+        "homeassistant.components.otbr.config_flow.yellow_hardware.async_info"
+    ):
+        result = await hass.config_entries.flow.async_init(
+            otbr.DOMAIN, context={"source": "hassio"}, data=HASSIO_DATA
+        )
+
+    expected_data = {
+        "url": f"http://{HASSIO_DATA.config['host']}:{HASSIO_DATA.config['port']}",
+    }
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Home Assistant Yellow"
+    assert result["data"] == expected_data
+    assert result["options"] == {}
+    assert len(mock_setup_entry.mock_calls) == 1
+
+    config_entry = hass.config_entries.async_entries(otbr.DOMAIN)[0]
+    assert config_entry.data == expected_data
+    assert config_entry.options == {}
+    assert config_entry.title == "Home Assistant Yellow"
+    assert config_entry.unique_id == HASSIO_DATA.uuid
+
+
+async def test_hassio_discovery_flow_sky_connect(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, addon_info
+) -> None:
+    """Test the hassio discovery flow."""
+    url = "http://core-silabs-multiprotocol:8081"
+    aioclient_mock.get(f"{url}/node/dataset/active", text="aa")
+
+    addon_info.return_value = {
+        "available": True,
+        "hostname": None,
+        "options": {
+            "device": (
+                "/dev/serial/by-id/usb-Nabu_Casa_SkyConnect_v1.0_"
+                "9e2adbd75b8beb119fe564a0f320645d-if00-port0"
+            )
+        },
+        "state": None,
+        "update_available": False,
+        "version": None,
+    }
+
+    with patch(
+        "homeassistant.components.otbr.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        result = await hass.config_entries.flow.async_init(
+            otbr.DOMAIN, context={"source": "hassio"}, data=HASSIO_DATA
+        )
+
+    expected_data = {
+        "url": f"http://{HASSIO_DATA.config['host']}:{HASSIO_DATA.config['port']}",
+    }
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Home Assistant SkyConnect"
+    assert result["data"] == expected_data
+    assert result["options"] == {}
+    assert len(mock_setup_entry.mock_calls) == 1
+
+    config_entry = hass.config_entries.async_entries(otbr.DOMAIN)[0]
+    assert config_entry.data == expected_data
+    assert config_entry.options == {}
+    assert config_entry.title == "Home Assistant SkyConnect"
     assert config_entry.unique_id == HASSIO_DATA.uuid
 
 
 async def test_hassio_discovery_flow_router_not_setup(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, addon_info
 ) -> None:
     """Test the hassio discovery flow when the border router has no dataset.
 
@@ -247,7 +353,7 @@ async def test_hassio_discovery_flow_router_not_setup(
     }
 
     assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Open Thread Border Router"
+    assert result["title"] == "Silicon Labs Multiprotocol"
     assert result["data"] == expected_data
     assert result["options"] == {}
     assert len(mock_setup_entry.mock_calls) == 1
@@ -255,12 +361,12 @@ async def test_hassio_discovery_flow_router_not_setup(
     config_entry = hass.config_entries.async_entries(otbr.DOMAIN)[0]
     assert config_entry.data == expected_data
     assert config_entry.options == {}
-    assert config_entry.title == "Open Thread Border Router"
+    assert config_entry.title == "Silicon Labs Multiprotocol"
     assert config_entry.unique_id == HASSIO_DATA.uuid
 
 
 async def test_hassio_discovery_flow_router_not_setup_has_preferred(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, addon_info
 ) -> None:
     """Test the hassio discovery flow when the border router has no dataset.
 
@@ -296,7 +402,7 @@ async def test_hassio_discovery_flow_router_not_setup_has_preferred(
     }
 
     assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Open Thread Border Router"
+    assert result["title"] == "Silicon Labs Multiprotocol"
     assert result["data"] == expected_data
     assert result["options"] == {}
     assert len(mock_setup_entry.mock_calls) == 1
@@ -304,7 +410,7 @@ async def test_hassio_discovery_flow_router_not_setup_has_preferred(
     config_entry = hass.config_entries.async_entries(otbr.DOMAIN)[0]
     assert config_entry.data == expected_data
     assert config_entry.options == {}
-    assert config_entry.title == "Open Thread Border Router"
+    assert config_entry.title == "Silicon Labs Multiprotocol"
     assert config_entry.unique_id == HASSIO_DATA.uuid
 
 
@@ -312,6 +418,7 @@ async def test_hassio_discovery_flow_router_not_setup_has_preferred_2(
     hass: HomeAssistant,
     aioclient_mock: AiohttpClientMocker,
     multiprotocol_addon_manager_mock,
+    addon_info,
 ) -> None:
     """Test the hassio discovery flow when the border router has no dataset.
 
@@ -353,7 +460,7 @@ async def test_hassio_discovery_flow_router_not_setup_has_preferred_2(
     }
 
     assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Open Thread Border Router"
+    assert result["title"] == "Silicon Labs Multiprotocol"
     assert result["data"] == expected_data
     assert result["options"] == {}
     assert len(mock_setup_entry.mock_calls) == 1
@@ -361,7 +468,7 @@ async def test_hassio_discovery_flow_router_not_setup_has_preferred_2(
     config_entry = hass.config_entries.async_entries(otbr.DOMAIN)[0]
     assert config_entry.data == expected_data
     assert config_entry.options == {}
-    assert config_entry.title == "Open Thread Border Router"
+    assert config_entry.title == "Silicon Labs Multiprotocol"
     assert config_entry.unique_id == HASSIO_DATA.uuid
 
 
diff --git a/tests/components/persistent_notification/conftest.py b/tests/components/persistent_notification/conftest.py
new file mode 100644
index 00000000000..d665c0075b3
--- /dev/null
+++ b/tests/components/persistent_notification/conftest.py
@@ -0,0 +1,12 @@
+"""The tests for the persistent notification component."""
+
+import pytest
+
+import homeassistant.components.persistent_notification as pn
+from homeassistant.setup import async_setup_component
+
+
+@pytest.fixture(autouse=True)
+async def setup_integration(hass):
+    """Set up persistent notification integration."""
+    assert await async_setup_component(hass, pn.DOMAIN, {})
diff --git a/tests/components/persistent_notification/test_init.py b/tests/components/persistent_notification/test_init.py
index 4f0851dc477..921f4b12045 100644
--- a/tests/components/persistent_notification/test_init.py
+++ b/tests/components/persistent_notification/test_init.py
@@ -1,5 +1,5 @@
 """The tests for the persistent notification component."""
-import pytest
+
 
 import homeassistant.components.persistent_notification as pn
 from homeassistant.components.websocket_api.const import TYPE_RESULT
@@ -9,12 +9,6 @@ from homeassistant.setup import async_setup_component
 from tests.typing import WebSocketGenerator
 
 
-@pytest.fixture(autouse=True)
-async def setup_integration(hass):
-    """Set up persistent notification integration."""
-    assert await async_setup_component(hass, pn.DOMAIN, {})
-
-
 async def test_create(hass: HomeAssistant) -> None:
     """Test creating notification without title or notification id."""
     notifications = pn._async_get_or_create_notifications(hass)
@@ -60,11 +54,31 @@ async def test_dismiss_notification(hass: HomeAssistant) -> None:
     pn.async_create(hass, "test", notification_id="Beer 2")
 
     assert len(notifications) == 1
+    pn.async_dismiss(hass, notification_id="Does Not Exist")
+
+    assert len(notifications) == 1
+
     pn.async_dismiss(hass, notification_id="Beer 2")
 
     assert len(notifications) == 0
 
 
+async def test_dismiss_all_notifications(hass: HomeAssistant) -> None:
+    """Ensure removal of all notifications."""
+    notifications = pn._async_get_or_create_notifications(hass)
+    assert len(notifications) == 0
+
+    pn.async_create(hass, "test", notification_id="Beer 2")
+    pn.async_create(hass, "test", notification_id="Beer 3")
+    pn.async_create(hass, "test", notification_id="Beer 4")
+    pn.async_create(hass, "test", notification_id="Beer 5")
+
+    assert len(notifications) == 4
+    pn.async_dismiss_all(hass)
+
+    assert len(notifications) == 0
+
+
 async def test_ws_get_notifications(
     hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
@@ -175,3 +189,34 @@ async def test_manual_notification_id_round_trip(hass: HomeAssistant) -> None:
     )
 
     assert len(notifications) == 0
+
+
+async def test_manual_dismiss_all(hass: HomeAssistant) -> None:
+    """Test the dismiss all service."""
+    notifications = pn._async_get_or_create_notifications(hass)
+    assert len(notifications) == 0
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "create",
+        {"notification_id": "Beer 1", "message": "test"},
+        blocking=True,
+    )
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "create",
+        {"notification_id": "Beer 2", "message": "test 2"},
+        blocking=True,
+    )
+
+    assert len(notifications) == 2
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "dismiss_all",
+        None,
+        blocking=True,
+    )
+
+    assert len(notifications) == 0
diff --git a/tests/components/persistent_notification/test_trigger.py b/tests/components/persistent_notification/test_trigger.py
new file mode 100644
index 00000000000..3cf3655a3b6
--- /dev/null
+++ b/tests/components/persistent_notification/test_trigger.py
@@ -0,0 +1,101 @@
+"""The tests for the persistent notification component triggers."""
+from typing import Any
+
+import homeassistant.components.persistent_notification as pn
+from homeassistant.components.persistent_notification import trigger
+from homeassistant.core import Context, HomeAssistant, callback
+
+
+async def test_automation_with_pn_trigger(hass: HomeAssistant) -> None:
+    """Test automation with a persistent_notification trigger."""
+
+    result_any = []
+    result_dismissed = []
+    result_id = []
+
+    trigger_info = {"trigger_data": {}}
+
+    @callback
+    def trigger_callback_any(
+        run_variables: dict[str, Any], context: Context | None = None
+    ) -> None:
+        result_any.append(run_variables)
+
+    await trigger.async_attach_trigger(
+        hass,
+        {"platform": "persistent_notification"},
+        trigger_callback_any,
+        trigger_info,
+    )
+
+    @callback
+    def trigger_callback_dismissed(
+        run_variables: dict[str, Any], context: Context | None = None
+    ) -> None:
+        result_dismissed.append(run_variables)
+
+    await trigger.async_attach_trigger(
+        hass,
+        {"platform": "persistent_notification", "update_type": "removed"},
+        trigger_callback_dismissed,
+        trigger_info,
+    )
+
+    @callback
+    def trigger_callback_id(
+        run_variables: dict[str, Any], context: Context | None = None
+    ) -> None:
+        result_id.append(run_variables)
+
+    await trigger.async_attach_trigger(
+        hass,
+        {"platform": "persistent_notification", "notification_id": "42"},
+        trigger_callback_id,
+        trigger_info,
+    )
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "create",
+        {"notification_id": "test_notification", "message": "test"},
+        blocking=True,
+    )
+
+    result = result_any[0].get("trigger")
+    assert result["platform"] == "persistent_notification"
+    assert result["update_type"] == pn.UpdateType.ADDED
+    assert result["notification"]["notification_id"] == "test_notification"
+    assert result["notification"]["message"] == "test"
+
+    assert len(result_dismissed) == 0
+    assert len(result_id) == 0
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "dismiss",
+        {"notification_id": "test_notification"},
+        blocking=True,
+    )
+
+    result = result_any[1].get("trigger")
+    assert result["platform"] == "persistent_notification"
+    assert result["update_type"] == pn.UpdateType.REMOVED
+    assert result["notification"]["notification_id"] == "test_notification"
+    assert result["notification"]["message"] == "test"
+    assert result_any[1] == result_dismissed[0]
+
+    assert len(result_id) == 0
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "create",
+        {"notification_id": "42", "message": "Forty Two"},
+        blocking=True,
+    )
+
+    result = result_any[2].get("trigger")
+    assert result["platform"] == "persistent_notification"
+    assert result["update_type"] == pn.UpdateType.ADDED
+    assert result["notification"]["notification_id"] == "42"
+    assert result["notification"]["message"] == "Forty Two"
+    assert result_any[2] == result_id[0]
diff --git a/tests/components/philips_js/test_device_trigger.py b/tests/components/philips_js/test_device_trigger.py
index 339b30d6355..897bc5ebc70 100644
--- a/tests/components/philips_js/test_device_trigger.py
+++ b/tests/components/philips_js/test_device_trigger.py
@@ -1,5 +1,6 @@
 """The tests for Philips TV device triggers."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -8,7 +9,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -40,7 +40,7 @@ async def test_get_triggers(hass: HomeAssistant, mock_device) -> None:
         hass, DeviceAutomationType.TRIGGER, mock_device.id
     )
     triggers = [trigger for trigger in triggers if trigger["domain"] == DOMAIN]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_if_fires_on_turn_on_request(
diff --git a/tests/components/pilight/test_init.py b/tests/components/pilight/test_init.py
index 365cd942ab9..96f384f98b9 100644
--- a/tests/components/pilight/test_init.py
+++ b/tests/components/pilight/test_init.py
@@ -11,7 +11,11 @@ from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 
-from tests.common import assert_setup_component, async_fire_time_changed
+from tests.common import (
+    assert_setup_component,
+    async_capture_events,
+    async_fire_time_changed,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -222,9 +226,9 @@ async def test_start_stop(mock_pilight_error, hass: HomeAssistant) -> None:
 
 
 @patch("pilight.pilight.Client", PilightDaemonSim)
-@patch("homeassistant.core._LOGGER.debug")
-async def test_receive_code(mock_debug, hass: HomeAssistant) -> None:
+async def test_receive_code(hass: HomeAssistant) -> None:
     """Check if code receiving via pilight daemon works."""
+    events = async_capture_events(hass, pilight.EVENT)
     with assert_setup_component(4):
         assert await async_setup_component(hass, pilight.DOMAIN, {pilight.DOMAIN: {}})
 
@@ -239,18 +243,13 @@ async def test_receive_code(mock_debug, hass: HomeAssistant) -> None:
             },
             **PilightDaemonSim.test_message["message"],
         )
-        debug_log_call = mock_debug.call_args_list[-1]
-
-        # Check if all message parts are put on event bus
-        for key, value in expected_message.items():
-            assert str(key) in str(debug_log_call)
-            assert str(value) in str(debug_log_call)
+        assert events[0].data == expected_message
 
 
 @patch("pilight.pilight.Client", PilightDaemonSim)
-@patch("homeassistant.core._LOGGER.debug")
-async def test_whitelist_exact_match(mock_debug, hass: HomeAssistant) -> None:
+async def test_whitelist_exact_match(hass: HomeAssistant) -> None:
     """Check whitelist filter with matched data."""
+    events = async_capture_events(hass, pilight.EVENT)
     with assert_setup_component(4):
         whitelist = {
             "protocol": [PilightDaemonSim.test_message["protocol"]],
@@ -272,18 +271,14 @@ async def test_whitelist_exact_match(mock_debug, hass: HomeAssistant) -> None:
             },
             **PilightDaemonSim.test_message["message"],
         )
-        debug_log_call = mock_debug.call_args_list[-1]
-
         # Check if all message parts are put on event bus
-        for key, value in expected_message.items():
-            assert str(key) in str(debug_log_call)
-            assert str(value) in str(debug_log_call)
+        assert events[0].data == expected_message
 
 
 @patch("pilight.pilight.Client", PilightDaemonSim)
-@patch("homeassistant.core._LOGGER.debug")
-async def test_whitelist_partial_match(mock_debug, hass: HomeAssistant) -> None:
+async def test_whitelist_partial_match(hass: HomeAssistant) -> None:
     """Check whitelist filter with partially matched data, should work."""
+    events = async_capture_events(hass, pilight.EVENT)
     with assert_setup_component(4):
         whitelist = {
             "protocol": [PilightDaemonSim.test_message["protocol"]],
@@ -303,18 +298,15 @@ async def test_whitelist_partial_match(mock_debug, hass: HomeAssistant) -> None:
             },
             **PilightDaemonSim.test_message["message"],
         )
-        debug_log_call = mock_debug.call_args_list[-1]
-
         # Check if all message parts are put on event bus
-        for key, value in expected_message.items():
-            assert str(key) in str(debug_log_call)
-            assert str(value) in str(debug_log_call)
+        assert events[0].data == expected_message
 
 
 @patch("pilight.pilight.Client", PilightDaemonSim)
-@patch("homeassistant.core._LOGGER.debug")
-async def test_whitelist_or_match(mock_debug, hass: HomeAssistant) -> None:
+async def test_whitelist_or_match(hass: HomeAssistant) -> None:
     """Check whitelist filter with several subsection, should work."""
+    events = async_capture_events(hass, pilight.EVENT)
+
     with assert_setup_component(4):
         whitelist = {
             "protocol": [
@@ -337,18 +329,15 @@ async def test_whitelist_or_match(mock_debug, hass: HomeAssistant) -> None:
             },
             **PilightDaemonSim.test_message["message"],
         )
-        debug_log_call = mock_debug.call_args_list[-1]
-
         # Check if all message parts are put on event bus
-        for key, value in expected_message.items():
-            assert str(key) in str(debug_log_call)
-            assert str(value) in str(debug_log_call)
+        assert events[0].data == expected_message
 
 
 @patch("pilight.pilight.Client", PilightDaemonSim)
-@patch("homeassistant.core._LOGGER.debug")
-async def test_whitelist_no_match(mock_debug, hass: HomeAssistant) -> None:
+async def test_whitelist_no_match(hass: HomeAssistant) -> None:
     """Check whitelist filter with unmatched data, should not work."""
+    events = async_capture_events(hass, pilight.EVENT)
+
     with assert_setup_component(4):
         whitelist = {
             "protocol": ["wrong_protocol"],
@@ -360,9 +349,8 @@ async def test_whitelist_no_match(mock_debug, hass: HomeAssistant) -> None:
 
         await hass.async_start()
         await hass.async_block_till_done()
-        debug_log_call = mock_debug.call_args_list[-1]
 
-        assert "Event pilight_received" not in debug_log_call
+        assert len(events) == 0
 
 
 async def test_call_rate_delay_throttle_enabled(hass: HomeAssistant) -> None:
diff --git a/tests/components/ping/test_binary_sensor.py b/tests/components/ping/test_binary_sensor.py
index eae3d881fc0..3389534483f 100644
--- a/tests/components/ping/test_binary_sensor.py
+++ b/tests/components/ping/test_binary_sensor.py
@@ -12,13 +12,13 @@ from tests.common import get_fixture_path
 
 
 @pytest.fixture
-def mock_ping():
+def mock_ping() -> None:
     """Mock icmplib.ping."""
     with patch("homeassistant.components.ping.icmp_ping"):
         yield
 
 
-async def test_reload(hass: HomeAssistant, mock_ping) -> None:
+async def test_reload(hass: HomeAssistant, mock_ping: None) -> None:
     """Verify we can reload trend sensors."""
 
     await setup.async_setup_component(
diff --git a/tests/components/plex/test_button.py b/tests/components/plex/test_button.py
index 4ac79ed0b7e..e8e734143b3 100644
--- a/tests/components/plex/test_button.py
+++ b/tests/components/plex/test_button.py
@@ -26,7 +26,7 @@ async def test_scan_clients_button_schedule(
             dt_util.utcnow() + timedelta(seconds=DEBOUNCE_TIMEOUT),
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             BUTTON_DOMAIN,
             SERVICE_PRESS,
             {
diff --git a/tests/components/plex/test_media_search.py b/tests/components/plex/test_media_search.py
index 1a3e0279605..0cc94134f1c 100644
--- a/tests/components/plex/test_media_search.py
+++ b/tests/components/plex/test_media_search.py
@@ -30,7 +30,7 @@ async def test_media_lookups(
     requests_mock.post("/playqueues", text=playqueue_created)
     requests_mock.get("/player/playback/playMedia", status_code=200)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
@@ -43,7 +43,7 @@ async def test_media_lookups(
     with pytest.raises(MediaNotFound) as excinfo, patch(
         "plexapi.server.PlexServer.fetchItem", side_effect=NotFound
     ):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -58,7 +58,7 @@ async def test_media_lookups(
     # TV show searches
     with pytest.raises(MediaNotFound) as excinfo:
         payload = '{"library_name": "Not a Library", "show_name": "TV Show"}'
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -71,7 +71,7 @@ async def test_media_lookups(
     assert "Library 'Not a Library' not found in" in str(excinfo.value)
 
     with patch("plexapi.library.LibrarySection.search") as search:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -83,7 +83,7 @@ async def test_media_lookups(
         )
         search.assert_called_with(**{"show.title": "TV Show", "libtype": "show"})
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -97,7 +97,7 @@ async def test_media_lookups(
             **{"episode.title": "An Episode", "libtype": "episode"}
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -111,7 +111,7 @@ async def test_media_lookups(
             **{"show.title": "TV Show", "season.index": 1, "libtype": "season"}
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -130,7 +130,7 @@ async def test_media_lookups(
             }
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -142,7 +142,7 @@ async def test_media_lookups(
         )
         search.assert_called_with(**{"artist.title": "Artist", "libtype": "artist"})
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -154,7 +154,7 @@ async def test_media_lookups(
         )
         search.assert_called_with(**{"album.title": "Album", "libtype": "album"})
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -168,7 +168,7 @@ async def test_media_lookups(
             **{"artist.title": "Artist", "track.title": "Track 3", "libtype": "track"}
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -182,7 +182,7 @@ async def test_media_lookups(
             **{"artist.title": "Artist", "album.title": "Album", "libtype": "album"}
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -201,7 +201,7 @@ async def test_media_lookups(
             }
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -221,7 +221,7 @@ async def test_media_lookups(
         )
 
         # Movie searches
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -233,7 +233,7 @@ async def test_media_lookups(
         )
         search.assert_called_with(**{"movie.title": "Movie 1", "libtype": None})
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -247,7 +247,7 @@ async def test_media_lookups(
 
     with pytest.raises(MediaNotFound) as excinfo:
         payload = '{"title": "Movie 1"}'
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -262,7 +262,7 @@ async def test_media_lookups(
     with pytest.raises(MediaNotFound) as excinfo:
         payload = '{"library_name": "Movies", "title": "Not a Movie"}'
         with patch("plexapi.library.LibrarySection.search", side_effect=BadRequest):
-            assert await hass.services.async_call(
+            await hass.services.async_call(
                 MEDIA_PLAYER_DOMAIN,
                 SERVICE_PLAY_MEDIA,
                 {
@@ -275,7 +275,7 @@ async def test_media_lookups(
     assert "Problem in query" in str(excinfo.value)
 
     # Playlist searches
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
@@ -288,7 +288,7 @@ async def test_media_lookups(
 
     with pytest.raises(MediaNotFound) as excinfo:
         payload = '{"playlist_name": "Not a Playlist"}'
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -302,7 +302,7 @@ async def test_media_lookups(
 
     with pytest.raises(MediaNotFound) as excinfo:
         payload = "{}"
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
diff --git a/tests/components/plex/test_playback.py b/tests/components/plex/test_playback.py
index 58dd49a0542..c9dba4e4aca 100644
--- a/tests/components/plex/test_playback.py
+++ b/tests/components/plex/test_playback.py
@@ -67,7 +67,7 @@ async def test_media_player_playback(
     with patch(
         "plexapi.library.LibrarySection.search", return_value=None
     ), pytest.raises(HomeAssistantError) as excinfo:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -87,7 +87,7 @@ async def test_media_player_playback(
     # Test movie success
     movies = [movie1]
     with patch("plexapi.library.LibrarySection.search", return_value=movies):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -102,7 +102,7 @@ async def test_media_player_playback(
     # Test movie success with resume
     playmedia_mock.reset()
     with patch("plexapi.library.LibrarySection.search", return_value=movies):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -117,7 +117,7 @@ async def test_media_player_playback(
 
     # Test movie success with media browser URL
     playmedia_mock.reset()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         MP_DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
@@ -132,7 +132,7 @@ async def test_media_player_playback(
 
     # Test movie success with media browser URL and resuming
     playmedia_mock.reset()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         MP_DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
@@ -148,7 +148,7 @@ async def test_media_player_playback(
 
     # Test movie success with legacy media browser URL
     playmedia_mock.reset()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         MP_DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
@@ -164,7 +164,7 @@ async def test_media_player_playback(
     playmedia_mock.reset()
     movies = [movie1, movie2]
     with patch("plexapi.library.LibrarySection.search", return_value=movies):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -182,7 +182,7 @@ async def test_media_player_playback(
     with pytest.raises(HomeAssistantError) as excinfo:
         payload = '{"library_name": "Movies", "title": "Movie" }'
         with patch("plexapi.library.LibrarySection.search", return_value=movies):
-            assert await hass.services.async_call(
+            await hass.services.async_call(
                 MP_DOMAIN,
                 SERVICE_PLAY_MEDIA,
                 {
@@ -200,7 +200,7 @@ async def test_media_player_playback(
     with patch("plexapi.library.LibrarySection.search", return_value=movies), patch(
         "homeassistant.components.plex.server.PlexServer.create_playqueue"
     ) as mock_create_playqueue:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -216,7 +216,7 @@ async def test_media_player_playback(
     # Test radio station
     playmedia_mock.reset()
     radio_id = "/library/sections/3/stations/1"
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         MP_DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
diff --git a/tests/components/plex/test_services.py b/tests/components/plex/test_services.py
index 12a36057056..a74b3e91460 100644
--- a/tests/components/plex/test_services.py
+++ b/tests/components/plex/test_services.py
@@ -45,7 +45,7 @@ async def test_refresh_library(
 
     # Test with non-existent server
     with pytest.raises(HomeAssistantError):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_REFRESH_LIBRARY,
             {"server_name": "Not a Server", "library_name": "Movies"},
@@ -54,7 +54,7 @@ async def test_refresh_library(
     assert not refresh.called
 
     # Test with non-existent library
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_REFRESH_LIBRARY,
         {"library_name": "Not a Library"},
@@ -63,7 +63,7 @@ async def test_refresh_library(
     assert not refresh.called
 
     # Test with valid library
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_REFRESH_LIBRARY,
         {"library_name": "Movies"},
@@ -96,7 +96,7 @@ async def test_refresh_library(
 
     # Test multiple servers available but none specified
     with pytest.raises(HomeAssistantError) as excinfo:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_REFRESH_LIBRARY,
             {"library_name": "Movies"},
@@ -108,7 +108,7 @@ async def test_refresh_library(
 
 async def test_scan_clients(hass: HomeAssistant, mock_plex_server) -> None:
     """Test scan_for_clients service call."""
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SCAN_CLIENTS,
         blocking=True,
diff --git a/tests/components/profiler/test_init.py b/tests/components/profiler/test_init.py
index 6f61b45518b..7c2aeb2a29a 100644
--- a/tests/components/profiler/test_init.py
+++ b/tests/components/profiler/test_init.py
@@ -224,6 +224,8 @@ async def test_log_scheduled(
 
     assert hass.services.has_service(DOMAIN, SERVICE_LOG_EVENT_LOOP_SCHEDULED)
 
+    hass.loop.call_later(0.1, lambda: None)
+
     await hass.services.async_call(
         DOMAIN, SERVICE_LOG_EVENT_LOOP_SCHEDULED, {}, blocking=True
     )
diff --git a/tests/components/qnap/__init__.py b/tests/components/qnap/__init__.py
new file mode 100644
index 00000000000..46978f6cc8d
--- /dev/null
+++ b/tests/components/qnap/__init__.py
@@ -0,0 +1 @@
+"""Tests for the QNAP integration."""
diff --git a/tests/components/qnap/conftest.py b/tests/components/qnap/conftest.py
new file mode 100644
index 00000000000..7f26763d4d7
--- /dev/null
+++ b/tests/components/qnap/conftest.py
@@ -0,0 +1,33 @@
+"""Setup the QNAP tests."""
+from collections.abc import Generator
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+
+TEST_HOST = "1.2.3.4"
+TEST_USERNAME = "admin"
+TEST_PASSWORD = "password"
+TEST_NAS_NAME = "Test NAS name"
+TEST_SERIAL = "123456789"
+
+TEST_SYSTEM_STATS = {"system": {"serial_number": TEST_SERIAL, "name": TEST_NAS_NAME}}
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.qnap.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture
+def qnap_connect(mock_get_source_ip: None) -> Generator[MagicMock, None, None]:
+    """Mock qnap connection."""
+    with patch(
+        "homeassistant.components.qnap.config_flow.QNAPStats", autospec=True
+    ) as host_mock_class:
+        host_mock = host_mock_class.return_value
+        host_mock.get_system_stats.return_value = TEST_SYSTEM_STATS
+        yield host_mock
diff --git a/tests/components/qnap/test_config_flow.py b/tests/components/qnap/test_config_flow.py
new file mode 100644
index 00000000000..eb77109d62e
--- /dev/null
+++ b/tests/components/qnap/test_config_flow.py
@@ -0,0 +1,110 @@
+"""Test the QNAP config flow."""
+from unittest.mock import MagicMock
+
+import pytest
+from requests.exceptions import ConnectTimeout
+
+from homeassistant import config_entries, data_entry_flow
+from homeassistant.components.qnap import const
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_SSL,
+    CONF_USERNAME,
+    CONF_VERIFY_SSL,
+)
+from homeassistant.core import HomeAssistant
+
+from .conftest import TEST_HOST, TEST_PASSWORD, TEST_USERNAME
+
+STANDARD_CONFIG = {
+    CONF_USERNAME: TEST_USERNAME,
+    CONF_PASSWORD: TEST_PASSWORD,
+    CONF_HOST: TEST_HOST,
+}
+
+
+pytestmark = pytest.mark.usefixtures("mock_setup_entry", "qnap_connect")
+
+
+async def test_config_flow(hass: HomeAssistant, qnap_connect: MagicMock) -> None:
+    """Config flow manually initialized by the user."""
+    result = await hass.config_entries.flow.async_init(
+        const.DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    qnap_connect.get_system_stats.side_effect = ConnectTimeout("Test error")
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        STANDARD_CONFIG,
+    )
+
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "cannot_connect"}
+
+    qnap_connect.get_system_stats.side_effect = TypeError("Test error")
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        STANDARD_CONFIG,
+    )
+
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "invalid_auth"}
+
+    qnap_connect.get_system_stats.side_effect = Exception("Test error")
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        STANDARD_CONFIG,
+    )
+
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "unknown"}
+
+    qnap_connect.get_system_stats.side_effect = None
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        STANDARD_CONFIG,
+    )
+
+    assert result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Test NAS name"
+    assert result["data"] == {
+        CONF_HOST: "1.2.3.4",
+        CONF_USERNAME: "admin",
+        CONF_PASSWORD: "password",
+        CONF_SSL: const.DEFAULT_SSL,
+        CONF_VERIFY_SSL: const.DEFAULT_VERIFY_SSL,
+        CONF_PORT: const.DEFAULT_PORT,
+    }
+
+
+async def test_config_flow_import(hass: HomeAssistant) -> None:
+    """Test import of YAML config."""
+    data = STANDARD_CONFIG
+    data[CONF_SSL] = const.DEFAULT_SSL
+    data[CONF_VERIFY_SSL] = const.DEFAULT_VERIFY_SSL
+    data[CONF_PORT] = const.DEFAULT_PORT
+    result = await hass.config_entries.flow.async_init(
+        const.DOMAIN,
+        context={"source": config_entries.SOURCE_IMPORT},
+        data=data,
+    )
+
+    assert result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Test NAS name"
+    assert result["data"] == {
+        CONF_HOST: "1.2.3.4",
+        CONF_USERNAME: "admin",
+        CONF_PASSWORD: "password",
+        CONF_SSL: const.DEFAULT_SSL,
+        CONF_VERIFY_SSL: const.DEFAULT_VERIFY_SSL,
+        CONF_PORT: const.DEFAULT_PORT,
+    }
diff --git a/tests/components/recorder/test_init.py b/tests/components/recorder/test_init.py
index 84dbb9a2816..0bb315365b5 100644
--- a/tests/components/recorder/test_init.py
+++ b/tests/components/recorder/test_init.py
@@ -1426,7 +1426,7 @@ def test_service_disable_events_not_recording(
     """Test that events are not recorded when recorder is disabled using service."""
     hass = hass_recorder()
 
-    assert hass.services.call(
+    hass.services.call(
         DOMAIN,
         SERVICE_DISABLE,
         {},
@@ -1460,7 +1460,7 @@ def test_service_disable_events_not_recording(
         )
         assert len(db_events) == 0
 
-    assert hass.services.call(
+    hass.services.call(
         DOMAIN,
         SERVICE_ENABLE,
         {},
@@ -1510,7 +1510,7 @@ def test_service_disable_states_not_recording(
     """Test that state changes are not recorded when recorder is disabled using service."""
     hass = hass_recorder()
 
-    assert hass.services.call(
+    hass.services.call(
         DOMAIN,
         SERVICE_DISABLE,
         {},
@@ -1523,7 +1523,7 @@ def test_service_disable_states_not_recording(
     with session_scope(hass=hass, read_only=True) as session:
         assert len(list(session.query(States))) == 0
 
-    assert hass.services.call(
+    hass.services.call(
         DOMAIN,
         SERVICE_ENABLE,
         {},
@@ -1563,7 +1563,7 @@ def test_service_disable_run_information_recorded(tmp_path: Path) -> None:
         assert db_run_info[0].start is not None
         assert db_run_info[0].end is None
 
-    assert hass.services.call(
+    hass.services.call(
         DOMAIN,
         SERVICE_DISABLE,
         {},
diff --git a/tests/components/remote/test_device_action.py b/tests/components/remote/test_device_action.py
index d652f4d869d..97ff2fd58a0 100644
--- a/tests/components/remote/test_device_action.py
+++ b/tests/components/remote/test_device_action.py
@@ -1,10 +1,11 @@
 """The test for remote device automation."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.remote import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -12,7 +13,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -41,7 +41,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = [
@@ -49,7 +49,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in ["turn_off", "turn_on", "toggle"]
@@ -57,7 +57,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -83,7 +83,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -97,7 +97,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["turn_off", "turn_on", "toggle"]
@@ -105,20 +105,17 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_action(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off actions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -126,29 +123,29 @@ async def test_action(
         {
             automation.DOMAIN: [
                 {
-                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "trigger": {"platform": "event", "event_type": "test_off"},
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                 },
                 {
-                    "trigger": {"platform": "event", "event_type": "test_event2"},
+                    "trigger": {"platform": "event", "event_type": "test_on"},
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                 },
                 {
-                    "trigger": {"platform": "event", "event_type": "test_event3"},
+                    "trigger": {"platform": "event", "event_type": "test_toggle"},
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "toggle",
                     },
                 },
@@ -156,29 +153,58 @@ async def test_action(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-    assert len(calls) == 0
 
-    hass.bus.async_fire("test_event1")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
+    turn_on_calls = async_mock_service(hass, DOMAIN, "turn_on")
+    turn_off_calls = async_mock_service(hass, DOMAIN, "turn_off")
+    toggle_calls = async_mock_service(hass, DOMAIN, "toggle")
 
-    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_toggle")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
+    assert len(toggle_calls) == 1
+    assert toggle_calls[-1].data == {"entity_id": entry.entity_id}
 
-    hass.bus.async_fire("test_event2")
+    hass.bus.async_fire("test_off")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
+    assert len(turn_off_calls) == 1
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
 
-    hass.bus.async_fire("test_event2")
+    hass.bus.async_fire("test_on")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
+    assert len(turn_on_calls) == 1
+    assert turn_on_calls[-1].data == {"entity_id": entry.entity_id}
 
-    hass.bus.async_fire("test_event3")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
 
-    hass.bus.async_fire("test_event3")
+async def test_action_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_off"},
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "turn_off",
+                    },
+                },
+            ]
+        },
+    )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
+
+    turn_off_calls = async_mock_service(hass, DOMAIN, "turn_off")
+
+    hass.bus.async_fire("test_off")
+    await hass.async_block_till_done()
+    assert len(turn_off_calls) == 1
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/remote/test_device_condition.py b/tests/components/remote/test_device_condition.py
index a0899daf0af..b07747771d9 100644
--- a/tests/components/remote/test_device_condition.py
+++ b/tests/components/remote/test_device_condition.py
@@ -3,11 +3,12 @@ from datetime import timedelta
 
 from freezegun import freeze_time
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.remote import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import STATE_OFF, STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -16,7 +17,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
@@ -46,7 +46,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -55,7 +55,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in ["is_off", "is_on"]
@@ -63,7 +63,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -89,7 +89,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -103,7 +103,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_off", "is_on"]
@@ -111,7 +111,7 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_get_condition_capabilities(
@@ -144,17 +144,49 @@ async def test_get_condition_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a remote condition."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    conditions = await async_get_device_automations(
+        hass, DeviceAutomationType.CONDITION, device_entry.id
+    )
+    for condition in conditions:
+        condition["entity_id"] = entity_registry.async_get(
+            condition["entity_id"]
+        ).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.CONDITION, condition
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_state(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -168,7 +200,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_on",
                         }
                     ],
@@ -187,7 +219,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_off",
                         }
                     ],
@@ -203,7 +235,6 @@ async def test_if_state(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
@@ -212,7 +243,7 @@ async def test_if_state(
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on event - test_event1"
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
@@ -220,21 +251,68 @@ async def test_if_state(
     assert calls[1].data["some"] == "is_off event - test_event2"
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_on",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_on {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(("platform", "event.event_type"))
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_event2")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_on event - test_event1"
+
+
 async def test_if_fires_on_for_condition(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for firing if condition is on with delay."""
     point1 = dt_util.utcnow()
     point2 = point1 + timedelta(seconds=10)
     point3 = point2 + timedelta(seconds=10)
 
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     with freeze_time(point1) as freezer:
         assert await async_setup_component(
@@ -248,7 +326,7 @@ async def test_if_fires_on_for_condition(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_off",
                             "for": {"seconds": 5},
                         },
@@ -266,7 +344,6 @@ async def test_if_fires_on_for_condition(
             },
         )
         await hass.async_block_till_done()
-        assert hass.states.get(ent1.entity_id).state == STATE_ON
         assert len(calls) == 0
 
         hass.bus.async_fire("test_event1")
@@ -279,7 +356,7 @@ async def test_if_fires_on_for_condition(
         await hass.async_block_till_done()
         assert len(calls) == 0
 
-        hass.states.async_set(ent1.entity_id, STATE_OFF)
+        hass.states.async_set(entry.entity_id, STATE_OFF)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 0
diff --git a/tests/components/remote/test_device_trigger.py b/tests/components/remote/test_device_trigger.py
index fdd7b9e73ed..b5dcca3dc4c 100644
--- a/tests/components/remote/test_device_trigger.py
+++ b/tests/components/remote/test_device_trigger.py
@@ -2,11 +2,12 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.remote import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import STATE_OFF, STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -15,7 +16,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
@@ -46,7 +46,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -55,7 +55,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -63,7 +63,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -89,7 +89,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -103,7 +103,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -111,7 +111,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -144,17 +144,47 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a remote trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -166,7 +196,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_on",
                     },
                     "action": {
@@ -190,7 +220,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_off",
                     },
                     "action": {
@@ -214,7 +244,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "changed_states",
                     },
                     "action": {
@@ -236,38 +266,35 @@ async def test_if_fires_on_state_change(
             ]
         },
     )
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert {calls[0].data["some"], calls[1].data["some"]} == {
-        f"turn_off device - {ent1.entity_id} - on - off - None",
-        f"turn_on_or_off device - {ent1.entity_id} - on - off - None",
+        f"turn_off device - {entry.entity_id} - on - off - None",
+        f"turn_on_or_off device - {entry.entity_id} - on - off - None",
     }
 
-    hass.states.async_set(ent1.entity_id, STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert {calls[2].data["some"], calls[3].data["some"]} == {
-        f"turn_on device - {ent1.entity_id} - off - on - None",
-        f"turn_on_or_off device - {ent1.entity_id} - off - on - None",
+        f"turn_on device - {entry.entity_id} - off - on - None",
+        f"turn_on_or_off device - {entry.entity_id} - off - on - None",
     }
 
 
-async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
-    """Test for triggers firing with delay."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -279,7 +306,61 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.entity_id,
+                        "type": "turned_off",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "turn_off {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
                         "type": "turned_off",
                         "for": {"seconds": 5},
                     },
@@ -303,16 +384,16 @@ async def test_if_fires_on_state_change_with_for(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
     await hass.async_block_till_done()
     assert len(calls) == 1
     await hass.async_block_till_done()
-    assert calls[0].data["some"] == "turn_off device - {} - on - off - 0:00:05".format(
-        ent1.entity_id
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - 0:00:05"
     )
diff --git a/tests/components/renson/__init__.py b/tests/components/renson/__init__.py
new file mode 100644
index 00000000000..fa2bbe6b4a0
--- /dev/null
+++ b/tests/components/renson/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Renson integration."""
diff --git a/tests/components/renson/test_config_flow.py b/tests/components/renson/test_config_flow.py
new file mode 100644
index 00000000000..6b9f54cd454
--- /dev/null
+++ b/tests/components/renson/test_config_flow.py
@@ -0,0 +1,80 @@
+"""Test the Renson config flow."""
+from unittest.mock import patch
+
+from homeassistant import config_entries
+from homeassistant.components.renson.const import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import RESULT_TYPE_CREATE_ENTRY, RESULT_TYPE_FORM
+
+
+async def test_form(hass: HomeAssistant) -> None:
+    """Test we get the form."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == RESULT_TYPE_FORM
+    assert result["errors"] is None
+
+    with patch(
+        "homeassistant.components.renson.config_flow.renson",
+        return_value={"title": "Renson"},
+    ), patch(
+        "homeassistant.components.renson.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == RESULT_TYPE_CREATE_ENTRY
+    assert result2["title"] == "Renson"
+    assert result2["data"] == {
+        "host": "1.1.1.1",
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+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.renson.config_flow.renson.RensonVentilation.connect",
+        return_value=False,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+
+    assert result2["type"] == RESULT_TYPE_FORM
+    assert result2["errors"] == {"base": "cannot_connect"}
+
+
+async def test_form_unknown(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.renson.config_flow.renson.RensonVentilation.connect",
+        side_effect=ValueError,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+
+    assert result2["type"] == RESULT_TYPE_FORM
+    assert result2["errors"] == {"base": "unknown"}
diff --git a/tests/components/reolink/conftest.py b/tests/components/reolink/conftest.py
index d36aea905f7..1e6f9aa4902 100644
--- a/tests/components/reolink/conftest.py
+++ b/tests/components/reolink/conftest.py
@@ -59,7 +59,7 @@ def reolink_connect(mock_get_source_ip: None) -> Generator[MagicMock, None, None
         host_mock.user_level = "admin"
         host_mock.sw_version_update_required = False
         host_mock.timeout = 60
-        host_mock.renewtimer = 600
+        host_mock.renewtimer.return_value = 600
         yield host_mock
 
 
diff --git a/tests/components/reolink/test_init.py b/tests/components/reolink/test_init.py
index 8dd6db270fb..1e588d5e3a1 100644
--- a/tests/components/reolink/test_init.py
+++ b/tests/components/reolink/test_init.py
@@ -148,7 +148,11 @@ async def test_webhook_repair_issue(
     hass: HomeAssistant, config_entry: MockConfigEntry
 ) -> None:
     """Test repairs issue is raised when the webhook url is unreachable."""
-    with patch("homeassistant.components.reolink.host.FIRST_ONVIF_TIMEOUT", new=0):
+    with patch(
+        "homeassistant.components.reolink.host.FIRST_ONVIF_TIMEOUT", new=0
+    ), patch(
+        "homeassistant.components.reolink.host.ReolinkHost._async_long_polling",
+    ):
         assert await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
diff --git a/tests/components/rest/test_sensor.py b/tests/components/rest/test_sensor.py
index fd595ef07a6..a7674937ab8 100644
--- a/tests/components/rest/test_sensor.py
+++ b/tests/components/rest/test_sensor.py
@@ -899,7 +899,7 @@ async def test_update_with_xml_convert_bad_xml(
     state = hass.states.get("sensor.foo")
 
     assert state.state == STATE_UNKNOWN
-    assert "Erroneous XML" in caplog.text
+    assert "REST xml result could not be parsed" in caplog.text
     assert "Empty reply" in caplog.text
 
 
@@ -936,7 +936,7 @@ async def test_update_with_failed_get(
     state = hass.states.get("sensor.foo")
 
     assert state.state == STATE_UNKNOWN
-    assert "Erroneous XML" in caplog.text
+    assert "REST xml result could not be parsed" in caplog.text
     assert "Empty reply" in caplog.text
 
 
diff --git a/tests/components/rest/test_switch.py b/tests/components/rest/test_switch.py
index 5584fce5e3a..a6895183d4e 100644
--- a/tests/components/rest/test_switch.py
+++ b/tests/components/rest/test_switch.py
@@ -262,7 +262,7 @@ async def test_turn_on_success(hass: HomeAssistant) -> None:
 
     route = respx.post(RESOURCE) % HTTPStatus.OK
     respx.get(RESOURCE).mock(side_effect=httpx.RequestError)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: "switch.foo"},
@@ -282,7 +282,7 @@ async def test_turn_on_status_not_ok(hass: HomeAssistant) -> None:
     await _async_setup_test_switch(hass)
 
     route = respx.post(RESOURCE) % HTTPStatus.INTERNAL_SERVER_ERROR
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: "switch.foo"},
@@ -302,7 +302,7 @@ async def test_turn_on_timeout(hass: HomeAssistant) -> None:
     await _async_setup_test_switch(hass)
 
     respx.post(RESOURCE) % HTTPStatus.INTERNAL_SERVER_ERROR
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: "switch.foo"},
@@ -320,7 +320,7 @@ async def test_turn_off_success(hass: HomeAssistant) -> None:
 
     route = respx.post(RESOURCE) % HTTPStatus.OK
     respx.get(RESOURCE).mock(side_effect=httpx.RequestError)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: "switch.foo"},
@@ -341,7 +341,7 @@ async def test_turn_off_status_not_ok(hass: HomeAssistant) -> None:
     await _async_setup_test_switch(hass)
 
     route = respx.post(RESOURCE) % HTTPStatus.INTERNAL_SERVER_ERROR
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: "switch.foo"},
@@ -362,7 +362,7 @@ async def test_turn_off_timeout(hass: HomeAssistant) -> None:
     await _async_setup_test_switch(hass)
 
     respx.post(RESOURCE).mock(side_effect=asyncio.TimeoutError())
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: "switch.foo"},
diff --git a/tests/components/rflink/test_light.py b/tests/components/rflink/test_light.py
index ddbe4783323..27dca72fd96 100644
--- a/tests/components/rflink/test_light.py
+++ b/tests/components/rflink/test_light.py
@@ -4,6 +4,8 @@ Test setup of RFLink lights component/platform. State tracking and
 control of RFLink switch devices.
 
 """
+import asyncio
+
 from homeassistant.components.light import ATTR_BRIGHTNESS
 from homeassistant.components.rflink import EVENT_BUTTON_PRESSED
 from homeassistant.const import (
@@ -283,7 +285,8 @@ async def test_signal_repetitions_cancelling(hass: HomeAssistant, monkeypatch) -
     await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: f"{DOMAIN}.test"}
     )
-
+    # Get background service time to start running
+    await asyncio.sleep(0)
     await hass.services.async_call(
         DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: f"{DOMAIN}.test"}, blocking=True
     )
diff --git a/tests/components/rfxtrx/test_device_action.py b/tests/components/rfxtrx/test_device_action.py
index c4613d67282..d53ef6a7a02 100644
--- a/tests/components/rfxtrx/test_device_action.py
+++ b/tests/components/rfxtrx/test_device_action.py
@@ -3,8 +3,9 @@ from __future__ import annotations
 
 from typing import Any, NamedTuple
 
-import RFXtrx
 import pytest
+from pytest_unordered import unordered
+import RFXtrx
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -17,7 +18,6 @@ from .conftest import create_rfx_test_cfg
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
 )
 
@@ -107,7 +107,7 @@ async def test_get_actions(
         for action_type in expected
     ]
 
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/rfxtrx/test_device_trigger.py b/tests/components/rfxtrx/test_device_trigger.py
index c33e6c94f64..02e9ec87630 100644
--- a/tests/components/rfxtrx/test_device_trigger.py
+++ b/tests/components/rfxtrx/test_device_trigger.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 from typing import Any, NamedTuple
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -16,7 +17,6 @@ from .conftest import create_rfx_test_cfg
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -113,7 +113,7 @@ async def test_get_triggers(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
     triggers = [value for value in triggers if value["domain"] == "rfxtrx"]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/ring/test_config_flow.py b/tests/components/ring/test_config_flow.py
index b8e06fc7fd3..3e0c354e8fa 100644
--- a/tests/components/ring/test_config_flow.py
+++ b/tests/components/ring/test_config_flow.py
@@ -22,8 +22,6 @@ async def test_form(hass: HomeAssistant) -> None:
             fetch_token=Mock(return_value={"access_token": "mock-token"})
         ),
     ), patch(
-        "homeassistant.components.ring.async_setup", return_value=True
-    ) as mock_setup, patch(
         "homeassistant.components.ring.async_setup_entry",
         return_value=True,
     ) as mock_setup_entry:
@@ -39,7 +37,6 @@ async def test_form(hass: HomeAssistant) -> None:
         "username": "hello@home-assistant.io",
         "token": {"access_token": "mock-token"},
     }
-    assert len(mock_setup.mock_calls) == 1
     assert len(mock_setup_entry.mock_calls) == 1
 
 
diff --git a/tests/components/ring/test_init.py b/tests/components/ring/test_init.py
index 68f50e3ee8f..7e3f5344f73 100644
--- a/tests/components/ring/test_init.py
+++ b/tests/components/ring/test_init.py
@@ -1,5 +1,4 @@
 """The tests for the Ring component."""
-from datetime import timedelta
 
 import requests_mock
 
@@ -9,12 +8,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import load_fixture
 
-ATTRIBUTION = "Data provided by Ring.com"
-
-VALID_CONFIG = {
-    "ring": {"username": "foo", "password": "bar", "scan_interval": timedelta(10)}
-}
-
 
 async def test_setup(hass: HomeAssistant, requests_mock: requests_mock.Mocker) -> None:
     """Test the setup."""
@@ -39,5 +32,3 @@ async def test_setup(hass: HomeAssistant, requests_mock: requests_mock.Mocker) -
         "https://api.ring.com/clients_api/doorbots/987652/health",
         text=load_fixture("doorboot_health_attrs.json", "ring"),
     )
-
-    assert await ring.async_setup(hass, VALID_CONFIG)
diff --git a/tests/components/rituals_perfume_genie/common.py b/tests/components/rituals_perfume_genie/common.py
index 1f12d3e651e..f8bcc10ca59 100644
--- a/tests/components/rituals_perfume_genie/common.py
+++ b/tests/components/rituals_perfume_genie/common.py
@@ -7,7 +7,7 @@ from homeassistant.components.rituals_perfume_genie.const import ACCOUNT_HASH, D
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, load_json_object_fixture
 
 
 def mock_config_entry(unique_id: str, entry_id: str = "an_entry_id") -> MockConfigEntry:
@@ -58,6 +58,7 @@ def mock_diffuser(
     diffuser_mock.update_data = AsyncMock()
     diffuser_mock.version = version
     diffuser_mock.wifi_percentage = wifi_percentage
+    diffuser_mock.data = load_json_object_fixture("data.json", DOMAIN)
     return diffuser_mock
 
 
diff --git a/tests/components/rituals_perfume_genie/fixtures/data.json b/tests/components/rituals_perfume_genie/fixtures/data.json
new file mode 100644
index 00000000000..e583c87e3da
--- /dev/null
+++ b/tests/components/rituals_perfume_genie/fixtures/data.json
@@ -0,0 +1,121 @@
+{
+  "hub": {
+    "hublot": "LOT123",
+    "hash": "1234567890abcdefgghijklmnopqrstuvwxyz",
+    "status": 1,
+    "title": null,
+    "current_time": "2023-06-09T20:50",
+    "cached_time": "2023-06-09T20:48",
+    "ping_update": "25",
+    "attributes": {
+      "roomc": "4",
+      "speedc": "3",
+      "fanc": "1",
+      "roomnamec": "Living room",
+      "resetc": "",
+      "fspacenamec": "",
+      "fspacetypec": ""
+    },
+    "sensors": {
+      "wific": {
+        "id": 10,
+        "sensor_id": 1,
+        "title": "High",
+        "description": "",
+        "icon": "icon-signal.png",
+        "image": "",
+        "discover_image": "",
+        "discover_url": null,
+        "min_value": "-69.99",
+        "max_value": "-0.00",
+        "interval": "1",
+        "created_at": "2017-03-10 16:17:30",
+        "updated_at": "2020-06-17 16:57:53",
+        "default": 0
+      },
+      "fillc": {
+        "id": 38,
+        "sensor_id": 3,
+        "title": "90-100%",
+        "description": "",
+        "icon": "icon-fill.png",
+        "image": "",
+        "discover_image": "",
+        "discover_url": "",
+        "min_value": "0",
+        "max_value": "2000",
+        "interval": "",
+        "created_at": "2017-10-16 07:50:23",
+        "updated_at": "2021-02-17 13:42:16",
+        "default": 0
+      },
+      "rfidc": {
+        "id": 54,
+        "sensor_id": 4,
+        "title": "Private Collection Sweet Jasmine",
+        "description": "",
+        "icon": "icon-jasmine.png",
+        "image": "background-jasmine.png",
+        "discover_image": "discover-jasmine.png",
+        "discover_url": "sweet-jasmine-cartridge-1105402.html",
+        "min_value": "05377650",
+        "max_value": "05377650",
+        "interval": "",
+        "created_at": "2019-04-04 07:53:32",
+        "updated_at": "2021-01-26 14:17:03",
+        "default": 0
+      },
+      "versionc": "5.2-rc15",
+      "ipc": "1682963060",
+      "rpsc": {
+        "id": 48,
+        "sensor_id": 12,
+        "title": "Fan on",
+        "description": "",
+        "icon": "",
+        "image": "",
+        "discover_image": "",
+        "discover_url": null,
+        "min_value": "5",
+        "max_value": "10000",
+        "interval": "",
+        "created_at": "2018-01-23 12:05:45",
+        "updated_at": "2019-08-01 14:54:53",
+        "default": 0
+      },
+      "resetc": "External System",
+      "chipidc": "9820410",
+      "errorc": "",
+      "onlinec": {
+        "id": 31,
+        "sensor_id": 16,
+        "title": "Online",
+        "description": "",
+        "icon": "",
+        "image": "",
+        "discover_image": "",
+        "discover_url": null,
+        "min_value": "1",
+        "max_value": "1",
+        "interval": "",
+        "created_at": "2017-09-07 08:23:30",
+        "updated_at": "2017-09-07 08:23:30",
+        "default": 0
+      }
+    },
+    "settings": [
+      {
+        "schedule_id": 1835730,
+        "start": "07:30",
+        "end": "08:30",
+        "mon": 1,
+        "tue": 1,
+        "wed": 1,
+        "thu": 1,
+        "fri": 1,
+        "sat": 1,
+        "sun": 1
+      }
+    ]
+  }
+}
diff --git a/tests/components/rituals_perfume_genie/snapshots/test_diagnostics.ambr b/tests/components/rituals_perfume_genie/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000..4edc7622af7
--- /dev/null
+++ b/tests/components/rituals_perfume_genie/snapshots/test_diagnostics.ambr
@@ -0,0 +1,128 @@
+# serializer version: 1
+# name: test_diagnostics
+  dict({
+    'diffusers': list([
+      dict({
+        'hub': dict({
+          'attributes': dict({
+            'fanc': '1',
+            'fspacenamec': '',
+            'fspacetypec': '',
+            'resetc': '',
+            'roomc': '4',
+            'roomnamec': 'Living room',
+            'speedc': '3',
+          }),
+          'cached_time': '2023-06-09T20:48',
+          'current_time': '2023-06-09T20:50',
+          'hash': '**REDACTED**',
+          'hublot': '**REDACTED**',
+          'ping_update': '25',
+          'sensors': dict({
+            'chipidc': '9820410',
+            'errorc': '',
+            'fillc': dict({
+              'created_at': '2017-10-16 07:50:23',
+              'default': 0,
+              'description': '',
+              'discover_image': '',
+              'discover_url': '',
+              'icon': 'icon-fill.png',
+              'id': 38,
+              'image': '',
+              'interval': '',
+              'max_value': '2000',
+              'min_value': '0',
+              'sensor_id': 3,
+              'title': '90-100%',
+              'updated_at': '2021-02-17 13:42:16',
+            }),
+            'ipc': '1682963060',
+            'onlinec': dict({
+              'created_at': '2017-09-07 08:23:30',
+              'default': 0,
+              'description': '',
+              'discover_image': '',
+              'discover_url': None,
+              'icon': '',
+              'id': 31,
+              'image': '',
+              'interval': '',
+              'max_value': '1',
+              'min_value': '1',
+              'sensor_id': 16,
+              'title': 'Online',
+              'updated_at': '2017-09-07 08:23:30',
+            }),
+            'resetc': 'External System',
+            'rfidc': dict({
+              'created_at': '2019-04-04 07:53:32',
+              'default': 0,
+              'description': '',
+              'discover_image': 'discover-jasmine.png',
+              'discover_url': 'sweet-jasmine-cartridge-1105402.html',
+              'icon': 'icon-jasmine.png',
+              'id': 54,
+              'image': 'background-jasmine.png',
+              'interval': '',
+              'max_value': '05377650',
+              'min_value': '05377650',
+              'sensor_id': 4,
+              'title': 'Private Collection Sweet Jasmine',
+              'updated_at': '2021-01-26 14:17:03',
+            }),
+            'rpsc': dict({
+              'created_at': '2018-01-23 12:05:45',
+              'default': 0,
+              'description': '',
+              'discover_image': '',
+              'discover_url': None,
+              'icon': '',
+              'id': 48,
+              'image': '',
+              'interval': '',
+              'max_value': '10000',
+              'min_value': '5',
+              'sensor_id': 12,
+              'title': 'Fan on',
+              'updated_at': '2019-08-01 14:54:53',
+            }),
+            'versionc': '5.2-rc15',
+            'wific': dict({
+              'created_at': '2017-03-10 16:17:30',
+              'default': 0,
+              'description': '',
+              'discover_image': '',
+              'discover_url': None,
+              'icon': 'icon-signal.png',
+              'id': 10,
+              'image': '',
+              'interval': '1',
+              'max_value': '-0.00',
+              'min_value': '-69.99',
+              'sensor_id': 1,
+              'title': 'High',
+              'updated_at': '2020-06-17 16:57:53',
+            }),
+          }),
+          'settings': list([
+            dict({
+              'end': '08:30',
+              'fri': 1,
+              'mon': 1,
+              'sat': 1,
+              'schedule_id': 1835730,
+              'start': '07:30',
+              'sun': 1,
+              'thu': 1,
+              'tue': 1,
+              'wed': 1,
+            }),
+          ]),
+          'status': 1,
+          'title': None,
+        }),
+      }),
+    ]),
+  })
+# ---
diff --git a/tests/components/rituals_perfume_genie/test_diagnostics.py b/tests/components/rituals_perfume_genie/test_diagnostics.py
new file mode 100644
index 00000000000..a57f14f9afd
--- /dev/null
+++ b/tests/components/rituals_perfume_genie/test_diagnostics.py
@@ -0,0 +1,25 @@
+"""Tests for the diagnostics data provided by the Rituals Perfume Genie integration."""
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.core import HomeAssistant
+
+from .common import init_integration, mock_config_entry, mock_diffuser
+
+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."""
+    config_entry = mock_config_entry(unique_id="number_test")
+    diffuser = mock_diffuser(hublot="lot123", perfume_amount=2)
+    await init_integration(hass, config_entry, [diffuser])
+
+    assert (
+        await get_diagnostics_for_config_entry(hass, hass_client, config_entry)
+        == snapshot
+    )
diff --git a/tests/components/roborock/conftest.py b/tests/components/roborock/conftest.py
index d9c11bead74..eb281076825 100644
--- a/tests/components/roborock/conftest.py
+++ b/tests/components/roborock/conftest.py
@@ -20,11 +20,17 @@ from tests.common import MockConfigEntry
 @pytest.fixture(name="bypass_api_fixture")
 def bypass_api_fixture() -> None:
     """Skip calls to the API."""
-    with patch("homeassistant.components.roborock.RoborockMqttClient.connect"), patch(
-        "homeassistant.components.roborock.RoborockMqttClient.send_command"
+    with patch(
+        "homeassistant.components.roborock.RoborockMqttClient.async_connect"
+    ), patch(
+        "homeassistant.components.roborock.RoborockMqttClient._send_command"
     ), patch(
         "homeassistant.components.roborock.coordinator.RoborockLocalClient.get_prop",
         return_value=PROP,
+    ), patch(
+        "roborock.api.AttributeCache.async_value"
+    ), patch(
+        "roborock.api.AttributeCache.value"
     ):
         yield
 
diff --git a/tests/components/roborock/mock_data.py b/tests/components/roborock/mock_data.py
index 8155c10fdbd..6a2e1f4b5f1 100644
--- a/tests/components/roborock/mock_data.py
+++ b/tests/components/roborock/mock_data.py
@@ -1,8 +1,6 @@
 """Mock data for Roborock tests."""
 from __future__ import annotations
 
-import datetime
-
 from roborock.containers import (
     CleanRecord,
     CleanSummary,
@@ -322,8 +320,6 @@ DND_TIMER = DnDTimer.from_dict(
         "enabled": 1,
     }
 )
-DND_TIMER.start_time = datetime.datetime(year=2023, month=6, day=1, hour=22)
-DND_TIMER.end_time = datetime.datetime(year=2023, month=6, day=2, hour=7)
 
 STATUS = S7Status.from_dict(
     {
@@ -371,7 +367,12 @@ STATUS = S7Status.from_dict(
         "unsave_map_flag": 0,
     }
 )
-PROP = DeviceProp(STATUS, DND_TIMER, CLEAN_SUMMARY, CONSUMABLE, CLEAN_RECORD)
+PROP = DeviceProp(
+    status=STATUS,
+    clean_summary=CLEAN_SUMMARY,
+    consumable=CONSUMABLE,
+    last_clean_record=CLEAN_RECORD,
+)
 
 NETWORK_INFO = NetworkInfo(
     ip="123.232.12.1", ssid="wifi", mac="ac:cc:cc:cc:cc", bssid="bssid", rssi=90
diff --git a/tests/components/roborock/snapshots/test_diagnostics.ambr b/tests/components/roborock/snapshots/test_diagnostics.ambr
index 5cb9b109368..eb70e04110f 100644
--- a/tests/components/roborock/snapshots/test_diagnostics.ambr
+++ b/tests/components/roborock/snapshots/test_diagnostics.ambr
@@ -221,15 +221,6 @@
               'sideBrushWorkTime': 74382,
               'strainerWorkTimes': 65,
             }),
-            'dndTimer': dict({
-              'enabled': 1,
-              'endHour': 7,
-              'endMinute': 0,
-              'endTime': '2023-06-02T07:00:00',
-              'startHour': 22,
-              'startMinute': 0,
-              'startTime': '2023-06-01T22:00:00',
-            }),
             'lastCleanRecord': dict({
               'area': 20965000,
               'avoidCount': 19,
diff --git a/tests/components/roborock/test_select.py b/tests/components/roborock/test_select.py
index 3b0ba8183b3..bcea4e6246b 100644
--- a/tests/components/roborock/test_select.py
+++ b/tests/components/roborock/test_select.py
@@ -26,6 +26,8 @@ async def test_update_success(
     value: str,
 ) -> None:
     """Test allowed changing values for select entities."""
+    # 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.RoborockLocalClient.send_message"
     ) as mock_send_message:
diff --git a/tests/components/roborock/test_sensor.py b/tests/components/roborock/test_sensor.py
index 106508e6062..daa904d482a 100644
--- a/tests/components/roborock/test_sensor.py
+++ b/tests/components/roborock/test_sensor.py
@@ -14,7 +14,7 @@ from tests.common import MockConfigEntry
 
 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")) == 7
+    assert len(hass.states.async_all("sensor")) == 9
     assert hass.states.get("sensor.roborock_s7_maxv_main_brush_time_left").state == str(
         MAIN_BRUSH_REPLACE_TIME - 74382
     )
@@ -32,3 +32,7 @@ async def test_sensors(hass: HomeAssistant, setup_entry: MockConfigEntry) -> Non
         hass.states.get("sensor.roborock_s7_maxv_total_cleaning_time").state == "74382"
     )
     assert hass.states.get("sensor.roborock_s7_maxv_status").state == "charging"
+    assert (
+        hass.states.get("sensor.roborock_s7_maxv_total_cleaning_area").state == "1159.2"
+    )
+    assert hass.states.get("sensor.roborock_s7_maxv_cleaning_area").state == "21.0"
diff --git a/tests/components/roborock/test_switch.py b/tests/components/roborock/test_switch.py
index 276c2758da4..40ecdc267ed 100644
--- a/tests/components/roborock/test_switch.py
+++ b/tests/components/roborock/test_switch.py
@@ -2,11 +2,9 @@
 from unittest.mock import patch
 
 import pytest
-from roborock.exceptions import RoborockException
 
 from homeassistant.components.switch import SERVICE_TURN_OFF, SERVICE_TURN_ON
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
 
 from tests.common import MockConfigEntry
 
@@ -16,6 +14,7 @@ from tests.common import MockConfigEntry
     [
         ("switch.roborock_s7_maxv_child_lock"),
         ("switch.roborock_s7_maxv_status_indicator_light"),
+        ("switch.roborock_s7_maxv_do_not_disturb"),
     ],
 )
 async def test_update_success(
@@ -25,6 +24,8 @@ async def test_update_success(
     entity_id: str,
 ) -> None:
     """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.RoborockLocalClient.send_message"
     ) as mock_send_message:
@@ -47,22 +48,3 @@ async def test_update_success(
             target={"entity_id": entity_id},
         )
     assert mock_send_message.assert_called_once
-
-
-async def test_update_failure(
-    hass: HomeAssistant,
-    bypass_api_fixture,
-    setup_entry: MockConfigEntry,
-) -> None:
-    """Test that changing a value will raise a homeassistanterror when it fails."""
-    with patch(
-        "homeassistant.components.roborock.coordinator.RoborockLocalClient.send_message",
-        side_effect=RoborockException(),
-    ), pytest.raises(HomeAssistantError):
-        await hass.services.async_call(
-            "switch",
-            SERVICE_TURN_ON,
-            service_data=None,
-            blocking=True,
-            target={"entity_id": "switch.roborock_s7_maxv_child_lock"},
-        )
diff --git a/tests/components/samsungtv/test_init.py b/tests/components/samsungtv/test_init.py
index e15d84913be..7491f3b76b7 100644
--- a/tests/components/samsungtv/test_init.py
+++ b/tests/components/samsungtv/test_init.py
@@ -65,7 +65,7 @@ async def test_setup(hass: HomeAssistant) -> None:
     )
 
     # test host and port
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
 
diff --git a/tests/components/samsungtv/test_media_player.py b/tests/components/samsungtv/test_media_player.py
index 1be9982d6c4..3d3077a1c6a 100644
--- a/tests/components/samsungtv/test_media_player.py
+++ b/tests/components/samsungtv/test_media_player.py
@@ -524,7 +524,7 @@ async def test_connection_closed_during_update_can_recover(
 async def test_send_key(hass: HomeAssistant, remote: Mock) -> None:
     """Test for send key."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -540,7 +540,7 @@ async def test_send_key_broken_pipe(hass: HomeAssistant, remote: Mock) -> None:
     """Testing broken pipe Exception."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
     remote.control = Mock(side_effect=BrokenPipeError("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -555,7 +555,7 @@ async def test_send_key_connection_closed_retry_succeed(
     remote.control = Mock(
         side_effect=[exceptions.ConnectionClosed("Boom"), DEFAULT_MOCK, DEFAULT_MOCK]
     )
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -574,7 +574,7 @@ async def test_send_key_unhandled_response(hass: HomeAssistant, remote: Mock) ->
     """Testing unhandled response exception."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
     remote.control = Mock(side_effect=exceptions.UnhandledResponse("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -586,7 +586,7 @@ async def test_send_key_websocketexception(hass: HomeAssistant, remotews: Mock)
     """Testing unhandled response exception."""
     await setup_samsungtv_entry(hass, MOCK_CONFIGWS)
     remotews.send_commands = Mock(side_effect=WebSocketException("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -600,7 +600,7 @@ async def test_send_key_websocketexception_encrypted(
     """Testing unhandled response exception."""
     await setup_samsungtv_entry(hass, MOCK_ENTRYDATA_ENCRYPTED_WS)
     remoteencws.send_commands = Mock(side_effect=WebSocketException("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -612,7 +612,7 @@ async def test_send_key_os_error_ws(hass: HomeAssistant, remotews: Mock) -> None
     """Testing unhandled response exception."""
     await setup_samsungtv_entry(hass, MOCK_CONFIGWS)
     remotews.send_commands = Mock(side_effect=OSError("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -626,7 +626,7 @@ async def test_send_key_os_error_ws_encrypted(
     """Testing unhandled response exception."""
     await setup_samsungtv_entry(hass, MOCK_ENTRYDATA_ENCRYPTED_WS)
     remoteencws.send_commands = Mock(side_effect=OSError("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -637,7 +637,7 @@ async def test_send_key_os_error(hass: HomeAssistant, remote: Mock) -> None:
     """Testing broken pipe Exception."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
     remote.control = Mock(side_effect=OSError("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -656,12 +656,12 @@ async def test_name(hass: HomeAssistant) -> None:
 async def test_state(hass: HomeAssistant) -> None:
     """Test for state property."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
     assert state.state == STATE_ON
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -711,7 +711,7 @@ async def test_turn_off_websocket(
 
     remotews.send_commands.reset_mock()
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key called
@@ -723,11 +723,11 @@ async def test_turn_off_websocket(
 
     # commands not sent : power off in progress
     remotews.send_commands.reset_mock()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert "TV is powering off, not sending keys: ['KEY_VOLUP']" in caplog.text
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SELECT_SOURCE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_INPUT_SOURCE: "Deezer"},
@@ -750,7 +750,7 @@ async def test_turn_off_websocket_frame(
 
     remotews.send_commands.reset_mock()
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key called
@@ -778,7 +778,7 @@ async def test_turn_off_encrypted_websocket(
     remoteencws.send_commands.reset_mock()
 
     caplog.clear()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key called
@@ -793,7 +793,7 @@ async def test_turn_off_encrypted_websocket(
 
     # commands not sent : power off in progress
     remoteencws.send_commands.reset_mock()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert "TV is powering off, not sending keys: ['KEY_VOLUP']" in caplog.text
@@ -819,7 +819,7 @@ async def test_turn_off_encrypted_websocket_key_type(
     remoteencws.send_commands.reset_mock()
 
     caplog.clear()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key called
@@ -834,7 +834,7 @@ async def test_turn_off_encrypted_websocket_key_type(
 async def test_turn_off_legacy(hass: HomeAssistant, remote: Mock) -> None:
     """Test for turn_off."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key called
@@ -849,7 +849,7 @@ async def test_turn_off_os_error(
     caplog.set_level(logging.DEBUG)
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
     remote.close = Mock(side_effect=OSError("BOOM"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert "Could not establish connection" in caplog.text
@@ -863,7 +863,7 @@ async def test_turn_off_ws_os_error(
     caplog.set_level(logging.DEBUG)
     await setup_samsungtv_entry(hass, MOCK_CONFIGWS)
     remotews.close = Mock(side_effect=OSError("BOOM"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert "Error closing connection" in caplog.text
@@ -877,7 +877,7 @@ async def test_turn_off_encryptedws_os_error(
     caplog.set_level(logging.DEBUG)
     await setup_samsungtv_entry(hass, MOCK_ENTRYDATA_ENCRYPTED_WS)
     remoteencws.close = Mock(side_effect=OSError("BOOM"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert "Error closing connection" in caplog.text
@@ -886,7 +886,7 @@ async def test_turn_off_encryptedws_os_error(
 async def test_volume_up(hass: HomeAssistant, remote: Mock) -> None:
     """Test for volume_up."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -899,7 +899,7 @@ async def test_volume_up(hass: HomeAssistant, remote: Mock) -> None:
 async def test_volume_down(hass: HomeAssistant, remote: Mock) -> None:
     """Test for volume_down."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_DOWN, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -912,7 +912,7 @@ async def test_volume_down(hass: HomeAssistant, remote: Mock) -> None:
 async def test_mute_volume(hass: HomeAssistant, remote: Mock) -> None:
     """Test for mute_volume."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_VOLUME_MUTE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_MUTED: True},
@@ -928,7 +928,7 @@ async def test_mute_volume(hass: HomeAssistant, remote: Mock) -> None:
 async def test_media_play(hass: HomeAssistant, remote: Mock) -> None:
     """Test for media_play."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_MEDIA_PLAY, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -937,7 +937,7 @@ async def test_media_play(hass: HomeAssistant, remote: Mock) -> None:
     assert remote.close.call_count == 1
     assert remote.close.call_args_list == [call()]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -950,7 +950,7 @@ async def test_media_play(hass: HomeAssistant, remote: Mock) -> None:
 async def test_media_pause(hass: HomeAssistant, remote: Mock) -> None:
     """Test for media_pause."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_MEDIA_PAUSE, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -959,7 +959,7 @@ async def test_media_pause(hass: HomeAssistant, remote: Mock) -> None:
     assert remote.close.call_count == 1
     assert remote.close.call_args_list == [call()]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -972,7 +972,7 @@ async def test_media_pause(hass: HomeAssistant, remote: Mock) -> None:
 async def test_media_next_track(hass: HomeAssistant, remote: Mock) -> None:
     """Test for media_next_track."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_MEDIA_NEXT_TRACK, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -985,7 +985,7 @@ async def test_media_next_track(hass: HomeAssistant, remote: Mock) -> None:
 async def test_media_previous_track(hass: HomeAssistant, remote: Mock) -> None:
     """Test for media_previous_track."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_MEDIA_PREVIOUS_TRACK, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -1009,7 +1009,7 @@ async def test_turn_on_wol(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.samsungtv.media_player.send_magic_packet"
     ) as mock_send_magic_packet:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: ENTITY_ID}, True
         )
         await hass.async_block_till_done()
@@ -1031,7 +1031,7 @@ async def test_play_media(hass: HomeAssistant, remote: Mock) -> None:
     """Test for play_media."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
     with patch("homeassistant.components.samsungtv.bridge.asyncio.sleep") as sleep:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -1060,7 +1060,7 @@ async def test_play_media_invalid_type(hass: HomeAssistant) -> None:
         url = "https://example.com"
         await setup_samsungtv_entry(hass, MOCK_CONFIG)
         remote.reset_mock()
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -1082,7 +1082,7 @@ async def test_play_media_channel_as_string(hass: HomeAssistant) -> None:
         url = "https://example.com"
         await setup_samsungtv_entry(hass, MOCK_CONFIG)
         remote.reset_mock()
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -1103,7 +1103,7 @@ async def test_play_media_channel_as_non_positive(hass: HomeAssistant) -> None:
     with patch("homeassistant.components.samsungtv.bridge.Remote") as remote:
         await setup_samsungtv_entry(hass, MOCK_CONFIG)
         remote.reset_mock()
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -1122,7 +1122,7 @@ async def test_play_media_channel_as_non_positive(hass: HomeAssistant) -> None:
 async def test_select_source(hass: HomeAssistant, remote: Mock) -> None:
     """Test for select_source."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SELECT_SOURCE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_INPUT_SOURCE: "HDMI"},
@@ -1140,7 +1140,7 @@ async def test_select_source_invalid_source(hass: HomeAssistant) -> None:
     with patch("homeassistant.components.samsungtv.bridge.Remote") as remote:
         await setup_samsungtv_entry(hass, MOCK_CONFIG)
         remote.reset_mock()
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_SELECT_SOURCE,
             {ATTR_ENTITY_ID: ENTITY_ID, ATTR_INPUT_SOURCE: "INVALID"},
@@ -1158,7 +1158,7 @@ async def test_play_media_app(hass: HomeAssistant, remotews: Mock) -> None:
     await setup_samsungtv_entry(hass, MOCK_CONFIGWS)
     remotews.send_commands.reset_mock()
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
@@ -1182,7 +1182,7 @@ async def test_select_source_app(hass: HomeAssistant, remotews: Mock) -> None:
     await setup_samsungtv_entry(hass, MOCK_CONFIGWS)
     remotews.send_commands.reset_mock()
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SELECT_SOURCE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_INPUT_SOURCE: "Deezer"},
@@ -1207,7 +1207,7 @@ async def test_websocket_unsupported_remote_control(
 
     remotews.send_commands.reset_mock()
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     remotews.raise_mock_ws_event_callback(
@@ -1256,7 +1256,7 @@ async def test_volume_control_upnp(
     assert state.attributes[ATTR_MEDIA_VOLUME_MUTED] is False
 
     # Upnp action succeeds
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_VOLUME_SET,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_LEVEL: 0.5},
@@ -1270,7 +1270,7 @@ async def test_volume_control_upnp(
     dmr_device.async_set_volume_level.side_effect = UpnpActionResponseError(
         status=500, error_code=501, error_desc="Action Failed"
     )
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_VOLUME_SET,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_LEVEL: 0.6},
@@ -1289,7 +1289,7 @@ async def test_upnp_not_available(
     assert "Unable to create Upnp DMR device" in caplog.text
 
     # Upnp action fails
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_VOLUME_SET,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_LEVEL: 0.6},
@@ -1307,7 +1307,7 @@ async def test_upnp_missing_service(
     assert "Unable to create Upnp DMR device" in caplog.text
 
     # Upnp action fails
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_VOLUME_SET,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_LEVEL: 0.6},
diff --git a/tests/components/samsungtv/test_remote.py b/tests/components/samsungtv/test_remote.py
index d6c43060b85..88cf47bf148 100644
--- a/tests/components/samsungtv/test_remote.py
+++ b/tests/components/samsungtv/test_remote.py
@@ -46,7 +46,7 @@ async def test_main_services(
 
     remoteencws.send_commands.reset_mock()
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         REMOTE_DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: ENTITY_ID},
@@ -64,7 +64,7 @@ async def test_main_services(
 
     # commands not sent : power off in progress
     remoteencws.send_commands.reset_mock()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         REMOTE_DOMAIN,
         SERVICE_SEND_COMMAND,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_COMMAND: ["dash"]},
@@ -79,7 +79,7 @@ async def test_send_command_service(hass: HomeAssistant, remoteencws: Mock) -> N
     """Test the send command."""
     await setup_samsungtv_entry(hass, MOCK_ENTRYDATA_ENCRYPTED_WS)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         REMOTE_DOMAIN,
         SERVICE_SEND_COMMAND,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_COMMAND: ["dash"]},
diff --git a/tests/components/script/test_init.py b/tests/components/script/test_init.py
index dc88ae2f0f2..199c3e08942 100644
--- a/tests/components/script/test_init.py
+++ b/tests/components/script/test_init.py
@@ -1,6 +1,7 @@
 """The tests for the Script component."""
 import asyncio
 from datetime import timedelta
+from typing import Any
 from unittest.mock import Mock, patch
 
 import pytest
@@ -15,6 +16,7 @@ from homeassistant.const import (
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
     STATE_OFF,
+    STATE_UNAVAILABLE,
 )
 from homeassistant.core import (
     Context,
@@ -24,7 +26,7 @@ from homeassistant.core import (
     callback,
     split_entity_id,
 )
-from homeassistant.exceptions import ServiceNotFound
+from homeassistant.exceptions import HomeAssistantError, ServiceNotFound
 from homeassistant.helpers import entity_registry as er, template
 from homeassistant.helpers.event import async_track_state_change
 from homeassistant.helpers.script import (
@@ -157,14 +159,32 @@ invalid_configs = [
 ]
 
 
-@pytest.mark.parametrize("value", invalid_configs)
-async def test_setup_with_invalid_configs(hass: HomeAssistant, value) -> None:
+@pytest.mark.parametrize(
+    ("config", "nbr_script_entities"),
+    [
+        ({"test": {}}, 1),
+        # Invalid slug, entity can't be set up
+        ({"test hello world": {"sequence": [{"event": "bla"}]}}, 0),
+        (
+            {
+                "test": {
+                    "sequence": {
+                        "event": "test_event",
+                        "service": "homeassistant.turn_on",
+                    }
+                }
+            },
+            1,
+        ),
+    ],
+)
+async def test_setup_with_invalid_configs(
+    hass: HomeAssistant, config, nbr_script_entities
+) -> None:
     """Test setup with invalid configs."""
-    assert await async_setup_component(
-        hass, "script", {"script": value}
-    ), f"Script loaded with wrong config {value}"
+    assert await async_setup_component(hass, "script", {"script": config})
 
-    assert len(hass.states.async_entity_ids("script")) == 0
+    assert len(hass.states.async_entity_ids("script")) == nbr_script_entities
 
 
 @pytest.mark.parametrize(
@@ -176,6 +196,47 @@ async def test_setup_with_invalid_configs(hass: HomeAssistant, value) -> None:
             "has invalid object id",
             "invalid slug Bad Script",
         ),
+    ),
+)
+async def test_bad_config_validation_critical(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    object_id,
+    broken_config,
+    problem,
+    details,
+) -> None:
+    """Test bad script configuration which can be detected during validation."""
+    assert await async_setup_component(
+        hass,
+        script.DOMAIN,
+        {
+            script.DOMAIN: {
+                object_id: {"alias": "bad_script", **broken_config},
+                "good_script": {
+                    "alias": "good_script",
+                    "sequence": {
+                        "service": "test.automation",
+                        "entity_id": "hello.world",
+                    },
+                },
+            }
+        },
+    )
+
+    # Check we get the expected error message
+    assert (
+        f"Script with alias 'bad_script' {problem} and has been disabled: {details}"
+        in caplog.text
+    )
+
+    # Make sure one bad script does not prevent other scripts from setting up
+    assert hass.states.async_entity_ids("script") == ["script.good_script"]
+
+
+@pytest.mark.parametrize(
+    ("object_id", "broken_config", "problem", "details"),
+    (
         (
             "bad_script",
             {},
@@ -229,8 +290,13 @@ async def test_bad_config_validation(
         in caplog.text
     )
 
-    # Make sure one bad automation does not prevent other automations from setting up
-    assert hass.states.async_entity_ids("script") == ["script.good_script"]
+    # Make sure both scripts are setup
+    assert set(hass.states.async_entity_ids("script")) == {
+        "script.bad_script",
+        "script.good_script",
+    }
+    # The script failing validation should be unavailable
+    assert hass.states.get("script.bad_script").state == STATE_UNAVAILABLE
 
 
 @pytest.mark.parametrize("running", ["no", "same", "different"])
@@ -592,6 +658,46 @@ async def test_async_get_descriptions_script(hass: HomeAssistant) -> None:
     )
 
 
+async def test_extraction_functions_not_setup(hass: HomeAssistant) -> None:
+    """Test extraction functions when script is not setup."""
+    assert script.scripts_with_area(hass, "area-in-both") == []
+    assert script.areas_in_script(hass, "script.test") == []
+    assert script.scripts_with_blueprint(hass, "blabla.yaml") == []
+    assert script.blueprint_in_script(hass, "script.test") is None
+    assert script.scripts_with_device(hass, "device-in-both") == []
+    assert script.devices_in_script(hass, "script.test") == []
+    assert script.scripts_with_entity(hass, "light.in_both") == []
+    assert script.entities_in_script(hass, "script.test") == []
+
+
+async def test_extraction_functions_unknown_script(hass: HomeAssistant) -> None:
+    """Test extraction functions for an unknown script."""
+    assert await async_setup_component(hass, DOMAIN, {})
+    assert script.areas_in_script(hass, "script.unknown") == []
+    assert script.blueprint_in_script(hass, "script.unknown") is None
+    assert script.devices_in_script(hass, "script.unknown") == []
+    assert script.entities_in_script(hass, "script.unknown") == []
+
+
+async def test_extraction_functions_unavailable_script(hass: HomeAssistant) -> None:
+    """Test extraction functions for an unknown automation."""
+    entity_id = "script.test1"
+    assert await async_setup_component(
+        hass,
+        DOMAIN,
+        {DOMAIN: {"test1": {}}},
+    )
+    assert hass.states.get(entity_id).state == STATE_UNAVAILABLE
+    assert script.scripts_with_area(hass, "area-in-both") == []
+    assert script.areas_in_script(hass, entity_id) == []
+    assert script.scripts_with_blueprint(hass, "blabla.yaml") == []
+    assert script.blueprint_in_script(hass, entity_id) is None
+    assert script.scripts_with_device(hass, "device-in-both") == []
+    assert script.devices_in_script(hass, entity_id) == []
+    assert script.scripts_with_entity(hass, "light.in_both") == []
+    assert script.entities_in_script(hass, entity_id) == []
+
+
 async def test_extraction_functions(hass: HomeAssistant) -> None:
     """Test extraction functions."""
     assert await async_setup_component(
@@ -615,6 +721,10 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
                             "type": "turn_on",
                             "device_id": "device-in-both",
                         },
+                        {
+                            "service": "test.test",
+                            "target": {"area_id": "area-in-both"},
+                        },
                     ]
                 },
                 "test2": {
@@ -643,6 +753,28 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
                         },
                     ],
                 },
+                "test3": {
+                    "sequence": [
+                        {
+                            "service": "test.script",
+                            "data": {"entity_id": "light.in_both"},
+                        },
+                        {
+                            "condition": "state",
+                            "entity_id": "sensor.condition",
+                            "state": "100",
+                        },
+                        {"scene": "scene.hello"},
+                        {
+                            "service": "test.test",
+                            "target": {"area_id": "area-in-both"},
+                        },
+                        {
+                            "service": "test.test",
+                            "target": {"area_id": "area-in-last"},
+                        },
+                    ],
+                },
             }
         },
     )
@@ -650,6 +782,7 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
     assert set(script.scripts_with_entity(hass, "light.in_both")) == {
         "script.test1",
         "script.test2",
+        "script.test3",
     }
     assert set(script.entities_in_script(hass, "script.test1")) == {
         "light.in_both",
@@ -663,6 +796,15 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
         "device-in-both",
         "device-in-last",
     }
+    assert set(script.scripts_with_area(hass, "area-in-both")) == {
+        "script.test1",
+        "script.test3",
+    }
+    assert set(script.areas_in_script(hass, "script.test3")) == {
+        "area-in-both",
+        "area-in-last",
+    }
+    assert script.blueprint_in_script(hass, "script.test3") is None
 
 
 async def test_config_basic(hass: HomeAssistant) -> None:
@@ -1334,6 +1476,35 @@ async def test_script_service_changed_entity_id(hass: HomeAssistant) -> None:
     assert calls[1].data["entity_id"] == "script.custom_entity_id_2"
 
 
+async def test_blueprint_automation(hass: HomeAssistant, calls) -> None:
+    """Test blueprint script."""
+    assert await async_setup_component(
+        hass,
+        script.DOMAIN,
+        {
+            script.DOMAIN: {
+                "test_script": {
+                    "use_blueprint": {
+                        "path": "test_service.yaml",
+                        "input": {
+                            "service_to_call": "test.script",
+                        },
+                    }
+                }
+            }
+        },
+    )
+    await hass.services.async_call(
+        "script", "test_script", {"var_from_service": "hello"}, blocking=True
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert script.blueprint_in_script(hass, "script.test_script") == "test_service.yaml"
+    assert script.scripts_with_blueprint(hass, "test_service.yaml") == [
+        "script.test_script"
+    ]
+
+
 @pytest.mark.parametrize(
     ("blueprint_inputs", "problem", "details"),
     (
@@ -1416,3 +1587,72 @@ async def test_blueprint_script_fails_substitution(
         "{'service_to_call': 'test.automation'}: No substitution found for input blah"
         in caplog.text
     )
+
+
+@pytest.mark.parametrize("response", ({"value": 5}, '{"value": 5}'))
+async def test_responses(hass: HomeAssistant, response: Any) -> None:
+    """Test we can get responses."""
+    mock_restore_cache(hass, ())
+    assert await async_setup_component(
+        hass,
+        "script",
+        {
+            "script": {
+                "test": {
+                    "sequence": [
+                        {
+                            "variables": {"test_var": {"response": response}},
+                        },
+                        {
+                            "stop": "done",
+                            "response_variable": "test_var",
+                        },
+                    ]
+                }
+            }
+        },
+    )
+
+    assert await hass.services.async_call(
+        DOMAIN, "test", {"greeting": "world"}, blocking=True, return_response=True
+    ) == {"response": response}
+    # Validate we can also call it without return_response
+    assert (
+        await hass.services.async_call(
+            DOMAIN, "test", {"greeting": "world"}, blocking=True, return_response=False
+        )
+        is None
+    )
+
+
+async def test_responses_error(hass: HomeAssistant) -> None:
+    """Test response variable not set."""
+    mock_restore_cache(hass, ())
+    assert await async_setup_component(
+        hass,
+        "script",
+        {
+            "script": {
+                "test": {
+                    "sequence": [
+                        {
+                            "stop": "done",
+                            "response_variable": "test_var",
+                        },
+                    ]
+                }
+            }
+        },
+    )
+
+    with pytest.raises(HomeAssistantError):
+        assert await hass.services.async_call(
+            DOMAIN, "test", {"greeting": "world"}, blocking=True, return_response=True
+        )
+    # Validate we can also call it without return_response
+    assert (
+        await hass.services.async_call(
+            DOMAIN, "test", {"greeting": "world"}, blocking=True, return_response=False
+        )
+        is None
+    )
diff --git a/tests/components/select/test_device_action.py b/tests/components/select/test_device_action.py
index 168e47d5d68..ce5d48bb358 100644
--- a/tests/components/select/test_device_action.py
+++ b/tests/components/select/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Select device actions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 from homeassistant.components import automation
@@ -17,7 +18,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -35,7 +35,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = [
@@ -43,7 +43,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": "select.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in [
@@ -57,7 +57,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -83,7 +83,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -97,7 +97,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in [
@@ -111,12 +111,16 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize("action_type", ("select_first", "select_last"))
-async def test_action_select_first_last(hass: HomeAssistant, action_type: str) -> None:
+async def test_action_select_first_last(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, action_type: str
+) -> None:
     """Test for select_first and select_last actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -130,7 +134,7 @@ async def test_action_select_first_last(hass: HomeAssistant, action_type: str) -
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "select.entity",
+                        "entity_id": entry.id,
                         "type": action_type,
                     },
                 },
@@ -145,11 +149,16 @@ async def test_action_select_first_last(hass: HomeAssistant, action_type: str) -
     assert len(select_calls) == 1
     assert select_calls[0].domain == DOMAIN
     assert select_calls[0].service == action_type
-    assert select_calls[0].data == {"entity_id": "select.entity"}
+    assert select_calls[0].data == {"entity_id": entry.entity_id}
 
 
-async def test_action_select_option(hass: HomeAssistant) -> None:
-    """Test for select_option action."""
+@pytest.mark.parametrize("action_type", ("select_first", "select_last"))
+async def test_action_select_first_last_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, action_type: str
+) -> None:
+    """Test for select_first and select_last actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -163,7 +172,44 @@ async def test_action_select_option(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "select.entity",
+                        "entity_id": entry.entity_id,
+                        "type": action_type,
+                    },
+                },
+            ]
+        },
+    )
+
+    select_calls = async_mock_service(hass, DOMAIN, action_type)
+
+    hass.bus.async_fire("test_event")
+    await hass.async_block_till_done()
+    assert len(select_calls) == 1
+    assert select_calls[0].domain == DOMAIN
+    assert select_calls[0].service == action_type
+    assert select_calls[0].data == {"entity_id": entry.entity_id}
+
+
+async def test_action_select_option(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for select_option action."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.id,
                         "type": "select_option",
                         "option": "option1",
                     },
@@ -179,14 +225,16 @@ async def test_action_select_option(hass: HomeAssistant) -> None:
     assert len(select_calls) == 1
     assert select_calls[0].domain == DOMAIN
     assert select_calls[0].service == "select_option"
-    assert select_calls[0].data == {"entity_id": "select.entity", "option": "option1"}
+    assert select_calls[0].data == {"entity_id": entry.entity_id, "option": "option1"}
 
 
 @pytest.mark.parametrize("action_type", ["select_next", "select_previous"])
 async def test_action_select_next_previous(
-    hass: HomeAssistant, action_type: str
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, action_type: str
 ) -> None:
     """Test for select_next and select_previous actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -200,7 +248,7 @@ async def test_action_select_next_previous(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "select.entity",
+                        "entity_id": entry.id,
                         "type": action_type,
                         "cycle": False,
                     },
@@ -216,16 +264,20 @@ async def test_action_select_next_previous(
     assert len(select_calls) == 1
     assert select_calls[0].domain == DOMAIN
     assert select_calls[0].service == action_type
-    assert select_calls[0].data == {"entity_id": "select.entity", "cycle": False}
+    assert select_calls[0].data == {"entity_id": entry.entity_id, "cycle": False}
 
 
-async def test_get_action_capabilities(hass: HomeAssistant) -> None:
+async def test_get_action_capabilities(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
     """Test we get the expected capabilities from a select action."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     config = {
         "platform": "device",
         "domain": DOMAIN,
         "type": "select_option",
-        "entity_id": "select.test",
+        "entity_id": entry.id,
         "option": "option1",
     }
 
@@ -245,7 +297,9 @@ async def test_get_action_capabilities(hass: HomeAssistant) -> None:
     ]
 
     # Mock an entity
-    hass.states.async_set("select.test", "option1", {"options": ["option1", "option2"]})
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
 
     # Test if we get the right capabilities now
     capabilities = await async_get_action_capabilities(hass, config)
@@ -267,7 +321,7 @@ async def test_get_action_capabilities(hass: HomeAssistant) -> None:
         "platform": "device",
         "domain": DOMAIN,
         "type": "select_next",
-        "entity_id": "select.test",
+        "entity_id": entry.id,
     }
     capabilities = await async_get_action_capabilities(hass, config)
     assert capabilities
@@ -303,7 +357,107 @@ async def test_get_action_capabilities(hass: HomeAssistant) -> None:
         "platform": "device",
         "domain": DOMAIN,
         "type": "select_first",
-        "entity_id": "select.test",
+        "entity_id": entry.id,
+    }
+    capabilities = await async_get_action_capabilities(hass, config)
+    assert capabilities == {}
+
+    config["type"] = "select_last"
+    capabilities = await async_get_action_capabilities(hass, config)
+    assert capabilities == {}
+
+
+async def test_get_action_capabilities_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test we get the expected capabilities from a select action."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    config = {
+        "platform": "device",
+        "domain": DOMAIN,
+        "type": "select_option",
+        "entity_id": entry.entity_id,
+        "option": "option1",
+    }
+
+    # Test when entity doesn't exists
+    capabilities = await async_get_action_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "option",
+            "required": True,
+            "type": "select",
+            "options": [],
+        },
+    ]
+
+    # Mock an entity
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
+
+    # Test if we get the right capabilities now
+    capabilities = await async_get_action_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "option",
+            "required": True,
+            "type": "select",
+            "options": [("option1", "option1"), ("option2", "option2")],
+        },
+    ]
+
+    # Test next/previous actions
+    config = {
+        "platform": "device",
+        "domain": DOMAIN,
+        "type": "select_next",
+        "entity_id": entry.entity_id,
+    }
+    capabilities = await async_get_action_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "cycle",
+            "optional": True,
+            "type": "boolean",
+            "default": True,
+        },
+    ]
+
+    config["type"] = "select_previous"
+    capabilities = await async_get_action_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "cycle",
+            "optional": True,
+            "type": "boolean",
+            "default": True,
+        },
+    ]
+
+    # Test action types without extra fields
+    config = {
+        "platform": "device",
+        "domain": DOMAIN,
+        "type": "select_first",
+        "entity_id": entry.entity_id,
     }
     capabilities = await async_get_action_capabilities(hass, config)
     assert capabilities == {}
diff --git a/tests/components/select/test_device_condition.py b/tests/components/select/test_device_condition.py
index 738089e7f9b..18ebd428891 100644
--- a/tests/components/select/test_device_condition.py
+++ b/tests/components/select/test_device_condition.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 from homeassistant.components import automation
@@ -21,7 +22,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -45,7 +45,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -54,14 +54,14 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": "selected_option",
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
     ]
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -87,7 +87,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -101,7 +101,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["selected_option"]
@@ -109,13 +109,17 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_if_selected_option(
-    hass: HomeAssistant, calls: list[ServiceCall]
+    hass: HomeAssistant,
+    calls: list[ServiceCall],
+    entity_registry: er.EntityRegistry,
 ) -> None:
     """Test for selected_option conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -128,7 +132,7 @@ async def test_if_selected_option(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "select.entity",
+                            "entity_id": entry.id,
                             "type": "selected_option",
                             "option": "option1",
                         }
@@ -147,7 +151,7 @@ async def test_if_selected_option(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "select.entity",
+                            "entity_id": entry.id,
                             "type": "selected_option",
                             "option": "option2",
                         }
@@ -170,7 +174,7 @@ async def test_if_selected_option(
     assert len(calls) == 0
 
     hass.states.async_set(
-        "select.entity", "option1", {"options": ["option1", "option2"]}
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
     )
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
@@ -179,7 +183,7 @@ async def test_if_selected_option(
     assert calls[0].data["result"] == "option1 - event - test_event1"
 
     hass.states.async_set(
-        "select.entity", "option2", {"options": ["option1", "option2"]}
+        entry.entity_id, "option2", {"options": ["option1", "option2"]}
     )
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
@@ -188,13 +192,62 @@ async def test_if_selected_option(
     assert calls[1].data["result"] == "option2 - event - test_event2"
 
 
-async def test_get_condition_capabilities(hass: HomeAssistant) -> None:
+async def test_if_selected_option_legacy(
+    hass: HomeAssistant,
+    calls: list[ServiceCall],
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test for selected_option conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "selected_option",
+                            "option": "option1",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data": {
+                            "result": "option1 - {{ trigger.platform }} - {{ trigger.event.event_type }}"
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["result"] == "option1 - event - test_event1"
+
+
+async def test_get_condition_capabilities(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
     """Test we get the expected capabilities from a select condition."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     config = {
         "platform": "device",
         "domain": DOMAIN,
         "type": "selected_option",
-        "entity_id": "select.test",
+        "entity_id": entry.id,
         "option": "option1",
     }
 
@@ -219,7 +272,69 @@ async def test_get_condition_capabilities(hass: HomeAssistant) -> None:
     ]
 
     # Mock an entity
-    hass.states.async_set("select.test", "option1", {"options": ["option1", "option2"]})
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
+
+    # Test if we get the right capabilities now
+    capabilities = await async_get_condition_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "option",
+            "required": True,
+            "type": "select",
+            "options": [("option1", "option1"), ("option2", "option2")],
+        },
+        {
+            "name": "for",
+            "optional": True,
+            "type": "positive_time_period_dict",
+        },
+    ]
+
+
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test we get the expected capabilities from a select condition."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    config = {
+        "platform": "device",
+        "domain": DOMAIN,
+        "type": "selected_option",
+        "entity_id": entry.entity_id,
+        "option": "option1",
+    }
+
+    # Test when entity doesn't exists
+    capabilities = await async_get_condition_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "option",
+            "required": True,
+            "type": "select",
+            "options": [],
+        },
+        {
+            "name": "for",
+            "optional": True,
+            "type": "positive_time_period_dict",
+        },
+    ]
+
+    # Mock an entity
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
 
     # Test if we get the right capabilities now
     capabilities = await async_get_condition_capabilities(hass, config)
diff --git a/tests/components/select/test_device_trigger.py b/tests/components/select/test_device_trigger.py
index ed33884bff9..8a6ccd43abe 100644
--- a/tests/components/select/test_device_trigger.py
+++ b/tests/components/select/test_device_trigger.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 from homeassistant.components import automation
@@ -21,7 +22,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -45,7 +45,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -54,14 +54,14 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": "current_option_changed",
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
     ]
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -87,7 +87,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -101,7 +101,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["current_option_changed"]
@@ -109,13 +109,17 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "select.entity", "option1", {"options": ["option1", "option2", "option3"]}
+        entry.entity_id, "option1", {"options": ["option1", "option2", "option3"]}
     )
 
     assert await async_setup_component(
@@ -128,7 +132,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "select.entity",
+                        "entity_id": entry.id,
                         "type": "current_option_changed",
                         "to": "option2",
                     },
@@ -149,7 +153,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "select.entity",
+                        "entity_id": entry.id,
                         "type": "current_option_changed",
                         "from": "option2",
                     },
@@ -170,7 +174,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "select.entity",
+                        "entity_id": entry.id,
                         "type": "current_option_changed",
                         "from": "option3",
                         "to": "option1",
@@ -192,37 +196,94 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Test triggering device trigger with a to state
-    hass.states.async_set("select.entity", "option2")
+    hass.states.async_set(entry.entity_id, "option2")
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data[
-        "some"
-    ] == "to - device - {} - option1 - option2 - None - 0".format("select.entity")
+    assert (
+        calls[0].data["some"]
+        == f"to - device - {entry.entity_id} - option1 - option2 - None - 0"
+    )
 
     # Test triggering device trigger with a from state
-    hass.states.async_set("select.entity", "option3")
+    hass.states.async_set(entry.entity_id, "option3")
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data[
-        "some"
-    ] == "from - device - {} - option2 - option3 - None - 0".format("select.entity")
+    assert (
+        calls[1].data["some"]
+        == f"from - device - {entry.entity_id} - option2 - option3 - None - 0"
+    )
 
     # Test triggering device trigger with both a from and to state
-    hass.states.async_set("select.entity", "option1")
+    hass.states.async_set(entry.entity_id, "option1")
     await hass.async_block_till_done()
     assert len(calls) == 3
-    assert calls[2].data[
-        "some"
-    ] == "from-to - device - {} - option3 - option1 - None - 0".format("select.entity")
+    assert (
+        calls[2].data["some"]
+        == f"from-to - device - {entry.entity_id} - option3 - option1 - None - 0"
+    )
 
 
-async def test_get_trigger_capabilities(hass: HomeAssistant) -> None:
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2", "option3"]}
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "current_option_changed",
+                        "to": "option2",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data": {
+                            "some": (
+                                "to - {{ trigger.platform}} - "
+                                "{{ trigger.entity_id}} - {{ trigger.from_state.state}} - "
+                                "{{ trigger.to_state.state}} - {{ trigger.for }} - "
+                                "{{ trigger.id}}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    # Test triggering device trigger with a to state
+    hass.states.async_set(entry.entity_id, "option2")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"to - device - {entry.entity_id} - option1 - option2 - None - 0"
+    )
+
+
+async def test_get_trigger_capabilities(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
     """Test we get the expected capabilities from a select trigger."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     config = {
         "platform": "device",
         "domain": DOMAIN,
         "type": "current_option_changed",
-        "entity_id": "select.test",
+        "entity_id": entry.id,
         "to": "option1",
     }
 
@@ -253,7 +314,120 @@ async def test_get_trigger_capabilities(hass: HomeAssistant) -> None:
     ]
 
     # Mock an entity
-    hass.states.async_set("select.test", "option1", {"options": ["option1", "option2"]})
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
+
+    # Test if we get the right capabilities now
+    capabilities = await async_get_trigger_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "from",
+            "optional": True,
+            "type": "select",
+            "options": [("option1", "option1"), ("option2", "option2")],
+        },
+        {
+            "name": "to",
+            "optional": True,
+            "type": "select",
+            "options": [("option1", "option1"), ("option2", "option2")],
+        },
+        {
+            "name": "for",
+            "optional": True,
+            "type": "positive_time_period_dict",
+        },
+    ]
+
+
+async def test_get_trigger_capabilities_unknown(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test we get the expected capabilities from a select trigger."""
+    config = {
+        "platform": "device",
+        "domain": DOMAIN,
+        "type": "current_option_changed",
+        "entity_id": "12345",
+        "to": "option1",
+    }
+
+    # Test when entity doesn't exists
+    capabilities = await async_get_trigger_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "from",
+            "optional": True,
+            "type": "select",
+            "options": [],
+        },
+        {
+            "name": "to",
+            "optional": True,
+            "type": "select",
+            "options": [],
+        },
+        {
+            "name": "for",
+            "optional": True,
+            "type": "positive_time_period_dict",
+        },
+    ]
+
+
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test we get the expected capabilities from a select trigger."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    config = {
+        "platform": "device",
+        "domain": DOMAIN,
+        "type": "current_option_changed",
+        "entity_id": entry.entity_id,
+        "to": "option1",
+    }
+
+    # Test when entity doesn't exists
+    capabilities = await async_get_trigger_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "from",
+            "optional": True,
+            "type": "select",
+            "options": [],
+        },
+        {
+            "name": "to",
+            "optional": True,
+            "type": "select",
+            "options": [],
+        },
+        {
+            "name": "for",
+            "optional": True,
+            "type": "positive_time_period_dict",
+        },
+    ]
+
+    # Mock an entity
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
 
     # Test if we get the right capabilities now
     capabilities = await async_get_trigger_capabilities(hass, config)
diff --git a/tests/components/select/test_recorder.py b/tests/components/select/test_recorder.py
index 903d24d39bb..53911578d53 100644
--- a/tests/components/select/test_recorder.py
+++ b/tests/components/select/test_recorder.py
@@ -2,12 +2,15 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import select
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
 from homeassistant.components.select import ATTR_OPTIONS
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -16,6 +19,16 @@ from tests.common import async_fire_time_changed
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def select_only() -> None:
+    """Enable only the select platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.SELECT],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test select registered attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/senseme/__init__.py b/tests/components/senseme/__init__.py
deleted file mode 100644
index 43d586328bb..00000000000
--- a/tests/components/senseme/__init__.py
+++ /dev/null
@@ -1,142 +0,0 @@
-"""Tests for the SenseME integration."""
-
-from contextlib import contextmanager
-from unittest.mock import AsyncMock, MagicMock, patch
-
-from aiosenseme import SensemeDevice, SensemeDiscovery
-
-from homeassistant.components.senseme import config_flow
-
-MOCK_NAME = "Haiku Fan"
-MOCK_UUID = "77a6b7b3-925d-4695-a415-76d76dca4444"
-MOCK_ADDRESS = "127.0.0.1"
-MOCK_MAC = "20:F8:5E:92:5A:75"
-
-
-def _mock_device():
-    device = MagicMock(auto_spec=SensemeDevice)
-    device.async_update = AsyncMock()
-    device.model = "Haiku Fan"
-    device.fan_speed_max = 7
-    device.mac = "aa:bb:cc:dd:ee:ff"
-    device.fan_dir = "REV"
-    device.has_light = True
-    device.is_light = False
-    device.light_brightness = 50
-    device.room_name = "Main"
-    device.room_type = "Main"
-    device.fw_version = "1"
-    device.fan_autocomfort = "COOLING"
-    device.fan_smartmode = "OFF"
-    device.fan_whoosh_mode = "on"
-    device.name = MOCK_NAME
-    device.uuid = MOCK_UUID
-    device.address = MOCK_ADDRESS
-    device.get_device_info = {
-        "name": MOCK_NAME,
-        "uuid": MOCK_UUID,
-        "mac": MOCK_ADDRESS,
-        "address": MOCK_ADDRESS,
-        "base_model": "FAN,HAIKU,HSERIES",
-        "has_light": False,
-        "has_sensor": True,
-        "is_fan": True,
-        "is_light": False,
-    }
-    return device
-
-
-device_alternate_ip = MagicMock(auto_spec=SensemeDevice)
-device_alternate_ip.async_update = AsyncMock()
-device_alternate_ip.model = "Haiku Fan"
-device_alternate_ip.fan_speed_max = 7
-device_alternate_ip.mac = "aa:bb:cc:dd:ee:ff"
-device_alternate_ip.fan_dir = "REV"
-device_alternate_ip.room_name = "Main"
-device_alternate_ip.room_type = "Main"
-device_alternate_ip.fw_version = "1"
-device_alternate_ip.fan_autocomfort = "on"
-device_alternate_ip.fan_smartmode = "on"
-device_alternate_ip.fan_whoosh_mode = "on"
-device_alternate_ip.name = MOCK_NAME
-device_alternate_ip.uuid = MOCK_UUID
-device_alternate_ip.address = "127.0.0.8"
-device_alternate_ip.get_device_info = {
-    "name": MOCK_NAME,
-    "uuid": MOCK_UUID,
-    "mac": "20:F8:5E:92:5A:75",
-    "address": "127.0.0.8",
-    "base_model": "FAN,HAIKU,HSERIES",
-    "has_light": False,
-    "has_sensor": True,
-    "is_fan": True,
-    "is_light": False,
-}
-
-
-device2 = MagicMock(auto_spec=SensemeDevice)
-device2.async_update = AsyncMock()
-device2.model = "Haiku Fan"
-device2.fan_speed_max = 7
-device2.mac = "aa:bb:cc:dd:ee:ff"
-device2.fan_dir = "FWD"
-device2.room_name = "Main"
-device2.room_type = "Main"
-device2.fw_version = "1"
-device2.fan_autocomfort = "on"
-device2.fan_smartmode = "on"
-device2.fan_whoosh_mode = "on"
-device2.name = "Device 2"
-device2.uuid = "uuid2"
-device2.address = "127.0.0.2"
-device2.get_device_info = {
-    "name": "Device 2",
-    "uuid": "uuid2",
-    "mac": "20:F8:5E:92:5A:76",
-    "address": "127.0.0.2",
-    "base_model": "FAN,HAIKU,HSERIES",
-    "has_light": True,
-    "has_sensor": True,
-    "is_fan": True,
-    "is_light": False,
-}
-
-device_no_uuid = MagicMock(auto_spec=SensemeDevice)
-device_no_uuid.uuid = None
-
-
-MOCK_DEVICE = _mock_device()
-MOCK_DEVICE_ALTERNATE_IP = device_alternate_ip
-MOCK_DEVICE2 = device2
-MOCK_DEVICE_NO_UUID = device_no_uuid
-
-
-def _patch_discovery(device=None, no_device=None):
-    """Patch discovery."""
-    mock_senseme_discovery = MagicMock(auto_spec=SensemeDiscovery)
-    if not no_device:
-        mock_senseme_discovery.devices = [device or MOCK_DEVICE]
-
-    @contextmanager
-    def _patcher():
-        with patch.object(config_flow, "DISCOVER_TIMEOUT", 0), patch(
-            "homeassistant.components.senseme.discovery.SensemeDiscovery",
-            return_value=mock_senseme_discovery,
-        ):
-            yield
-
-    return _patcher()
-
-
-def _patch_device(device=None, no_device=False):
-    async def _device_mocker(*args, **kwargs):
-        if no_device:
-            return False, None
-        if device:
-            return True, device
-        return True, _mock_device()
-
-    return patch(
-        "homeassistant.components.senseme.async_get_device_by_device_info",
-        new=_device_mocker,
-    )
diff --git a/tests/components/senseme/test_config_flow.py b/tests/components/senseme/test_config_flow.py
deleted file mode 100644
index 63850dff3b5..00000000000
--- a/tests/components/senseme/test_config_flow.py
+++ /dev/null
@@ -1,361 +0,0 @@
-"""Test the SenseME config flow."""
-from unittest.mock import patch
-
-from homeassistant import config_entries
-from homeassistant.components import dhcp
-from homeassistant.components.senseme.const import DOMAIN
-from homeassistant.const import CONF_HOST, CONF_ID
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-
-from . import (
-    MOCK_ADDRESS,
-    MOCK_DEVICE,
-    MOCK_DEVICE2,
-    MOCK_DEVICE_ALTERNATE_IP,
-    MOCK_DEVICE_NO_UUID,
-    MOCK_MAC,
-    MOCK_UUID,
-    _patch_discovery,
-)
-
-from tests.common import MockConfigEntry
-
-DHCP_DISCOVERY = dhcp.DhcpServiceInfo(
-    hostname="any",
-    ip=MOCK_ADDRESS,
-    macaddress=MOCK_MAC,
-)
-
-
-async def test_form_user(hass: HomeAssistant) -> None:
-    """Test we get the form as a user."""
-
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_USER}
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert not result["errors"]
-
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "device": MOCK_UUID,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] == FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "Haiku Fan"
-    assert result2["data"] == {
-        "info": MOCK_DEVICE.get_device_info,
-    }
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_form_user_manual_entry(hass: HomeAssistant) -> None:
-    """Test we get the form as a user with a discovery but user chooses manual."""
-
-    with _patch_discovery():
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_USER}
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert not result["errors"]
-
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "device": None,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] == FlowResultType.FORM
-    assert result2["step_id"] == "manual"
-
-    with patch(
-        "homeassistant.components.senseme.config_flow.async_get_device_by_ip_address",
-        return_value=MOCK_DEVICE,
-    ), patch(
-        "homeassistant.components.senseme.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        result3 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_HOST: MOCK_ADDRESS,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result3["type"] == FlowResultType.CREATE_ENTRY
-    assert result3["title"] == "Haiku Fan"
-    assert result3["data"] == {
-        "info": MOCK_DEVICE.get_device_info,
-    }
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_form_user_no_discovery(hass: HomeAssistant) -> None:
-    """Test we get the form as a user with no discovery."""
-
-    with _patch_discovery(no_device=True), patch(
-        "homeassistant.components.senseme.config_flow.async_get_device_by_ip_address",
-        return_value=MOCK_DEVICE,
-    ), patch(
-        "homeassistant.components.senseme.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_USER}
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert not result["errors"]
-
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_HOST: "not a valid address",
-            },
-        )
-        await hass.async_block_till_done()
-
-        assert result2["type"] == FlowResultType.FORM
-        assert result2["step_id"] == "manual"
-        assert result2["errors"] == {CONF_HOST: "invalid_host"}
-
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
-            {
-                CONF_HOST: MOCK_ADDRESS,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result3["type"] == FlowResultType.CREATE_ENTRY
-    assert result3["title"] == "Haiku Fan"
-    assert result3["data"] == {
-        "info": MOCK_DEVICE.get_device_info,
-    }
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_form_user_manual_entry_cannot_connect(hass: HomeAssistant) -> None:
-    """Test we get the form as a user."""
-
-    with _patch_discovery():
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_USER}
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert not result["errors"]
-
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "device": None,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] == FlowResultType.FORM
-    assert result2["step_id"] == "manual"
-
-    with patch(
-        "homeassistant.components.senseme.config_flow.async_get_device_by_ip_address",
-        return_value=None,
-    ):
-        result3 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_HOST: MOCK_ADDRESS,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result3["type"] == FlowResultType.FORM
-    assert result3["step_id"] == "manual"
-    assert result3["errors"] == {CONF_HOST: "cannot_connect"}
-
-
-async def test_discovery(hass: HomeAssistant) -> None:
-    """Test we can setup a discovered device."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            "info": MOCK_DEVICE2.get_device_info,
-        },
-        unique_id=MOCK_DEVICE2.uuid,
-    )
-    entry.add_to_hass(hass)
-
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.async_get_device_by_device_info",
-        return_value=(True, MOCK_DEVICE2),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.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_ID: MOCK_UUID},
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert not result["errors"]
-
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "device": MOCK_UUID,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] == FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "Haiku Fan"
-    assert result2["data"] == {
-        "info": MOCK_DEVICE.get_device_info,
-    }
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_discovery_existing_device_no_ip_change(hass: HomeAssistant) -> None:
-    """Test we can setup a discovered device."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            "info": MOCK_DEVICE.get_device_info,
-        },
-        unique_id=MOCK_DEVICE.uuid,
-    )
-    entry.add_to_hass(hass)
-
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.async_get_device_by_device_info",
-        return_value=(True, MOCK_DEVICE),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-    with _patch_discovery():
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_INTEGRATION_DISCOVERY},
-            data={CONF_ID: MOCK_UUID},
-        )
-        assert result["type"] == FlowResultType.ABORT
-        assert result["reason"] == "already_configured"
-
-
-async def test_discovery_existing_device_ip_change(hass: HomeAssistant) -> None:
-    """Test a config entry ips get updated from discovery."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            "info": MOCK_DEVICE.get_device_info,
-        },
-        unique_id=MOCK_DEVICE.uuid,
-    )
-    entry.add_to_hass(hass)
-
-    with _patch_discovery(device=MOCK_DEVICE_ALTERNATE_IP), patch(
-        "homeassistant.components.senseme.async_get_device_by_device_info",
-        return_value=(True, MOCK_DEVICE),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_INTEGRATION_DISCOVERY},
-            data={CONF_ID: MOCK_UUID},
-        )
-        await hass.async_block_till_done()
-
-    assert result["type"] == FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-    assert entry.data["info"]["address"] == "127.0.0.8"
-
-
-async def test_dhcp_discovery_existing_config_entry(hass: HomeAssistant) -> None:
-    """Test dhcp discovery is aborted if there is an existing config entry."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            "info": MOCK_DEVICE2.get_device_info,
-        },
-        unique_id=MOCK_DEVICE2.uuid,
-    )
-    entry.add_to_hass(hass)
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_DHCP}, data=DHCP_DISCOVERY
-    )
-    assert result["type"] == FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-
-
-async def test_dhcp_discovery(hass: HomeAssistant) -> None:
-    """Test we can setup a dhcp discovered device."""
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.config_flow.async_get_device_by_ip_address",
-        return_value=MOCK_DEVICE,
-    ), patch(
-        "homeassistant.components.senseme.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_DHCP}, data=DHCP_DISCOVERY
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert not result["errors"]
-
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "device": MOCK_UUID,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] == FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "Haiku Fan"
-    assert result2["data"] == {
-        "info": MOCK_DEVICE.get_device_info,
-    }
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_dhcp_discovery_cannot_connect(hass: HomeAssistant) -> None:
-    """Test we abort if we cannot cannot to a dhcp discovered device."""
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.config_flow.async_get_device_by_ip_address",
-        return_value=None,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_DHCP}, data=DHCP_DISCOVERY
-        )
-        assert result["type"] == FlowResultType.ABORT
-        assert result["reason"] == "cannot_connect"
-
-
-async def test_dhcp_discovery_cannot_connect_no_uuid(hass: HomeAssistant) -> None:
-    """Test we abort if the discovered device has no uuid."""
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.config_flow.async_get_device_by_ip_address",
-        return_value=MOCK_DEVICE_NO_UUID,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_DHCP}, data=DHCP_DISCOVERY
-        )
-        assert result["type"] == FlowResultType.ABORT
-        assert result["reason"] == "cannot_connect"
diff --git a/tests/components/senseme/test_light.py b/tests/components/senseme/test_light.py
deleted file mode 100644
index d4a8eddc91c..00000000000
--- a/tests/components/senseme/test_light.py
+++ /dev/null
@@ -1,115 +0,0 @@
-"""Tests for senseme light platform."""
-from aiosenseme import SensemeDevice
-
-from homeassistant.components import senseme
-from homeassistant.components.light import (
-    ATTR_BRIGHTNESS,
-    ATTR_COLOR_MODE,
-    ATTR_COLOR_TEMP,
-    ATTR_SUPPORTED_COLOR_MODES,
-    DOMAIN as LIGHT_DOMAIN,
-    SERVICE_TURN_OFF,
-    SERVICE_TURN_ON,
-    ColorMode,
-)
-from homeassistant.components.senseme.const import DOMAIN
-from homeassistant.const import ATTR_ENTITY_ID, STATE_ON
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-from homeassistant.setup import async_setup_component
-
-from . import _mock_device, _patch_device, _patch_discovery
-
-from tests.common import MockConfigEntry
-
-
-async def _setup_mocked_entry(hass: HomeAssistant, device: SensemeDevice) -> None:
-    """Set up a mocked entry."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={"info": device.get_device_info},
-        unique_id=device.uuid,
-    )
-    entry.add_to_hass(hass)
-    with _patch_discovery(), _patch_device(device=device):
-        await async_setup_component(hass, senseme.DOMAIN, {senseme.DOMAIN: {}})
-        await hass.async_block_till_done()
-
-
-async def test_light_unique_id(hass: HomeAssistant) -> None:
-    """Test a light unique id."""
-    device = _mock_device()
-    await _setup_mocked_entry(hass, device)
-    entity_id = "light.haiku_fan"
-    entity_registry = er.async_get(hass)
-    assert entity_registry.async_get(entity_id).unique_id == f"{device.uuid}-LIGHT"
-    state = hass.states.get(entity_id)
-    assert state.state == STATE_ON
-
-
-async def test_fan_light(hass: HomeAssistant) -> None:
-    """Test a fan light."""
-    device = _mock_device()
-    await _setup_mocked_entry(hass, device)
-    entity_id = "light.haiku_fan"
-
-    state = hass.states.get(entity_id)
-    assert state.state == STATE_ON
-    attributes = state.attributes
-    assert attributes[ATTR_BRIGHTNESS] == 255
-    assert attributes[ATTR_COLOR_MODE] == ColorMode.BRIGHTNESS
-    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.BRIGHTNESS]
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: entity_id}, blocking=True
-    )
-    assert device.light_on is False
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: entity_id}, blocking=True
-    )
-    assert device.light_on is True
-
-
-async def test_fan_light_no_brightness(hass: HomeAssistant) -> None:
-    """Test a fan light without brightness."""
-    device = _mock_device()
-    device.brightness = None
-    await _setup_mocked_entry(hass, device)
-    entity_id = "light.haiku_fan"
-
-    state = hass.states.get(entity_id)
-    assert state.state == STATE_ON
-    attributes = state.attributes
-    assert attributes[ATTR_BRIGHTNESS] == 255
-    assert attributes[ATTR_COLOR_MODE] == ColorMode.BRIGHTNESS
-    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.BRIGHTNESS]
-
-
-async def test_standalone_light(hass: HomeAssistant) -> None:
-    """Test a standalone light."""
-    device = _mock_device()
-    device.is_light = True
-    device.light_color_temp_max = 6500
-    device.light_color_temp_min = 2700
-    device.light_color_temp = 4000
-    await _setup_mocked_entry(hass, device)
-    entity_id = "light.haiku_fan_light"
-
-    state = hass.states.get(entity_id)
-    assert state.state == STATE_ON
-    attributes = state.attributes
-    assert attributes[ATTR_BRIGHTNESS] == 255
-    assert attributes[ATTR_COLOR_MODE] == ColorMode.COLOR_TEMP
-    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.COLOR_TEMP]
-    assert attributes[ATTR_COLOR_TEMP] == 250
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: entity_id}, blocking=True
-    )
-    assert device.light_on is False
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: entity_id}, blocking=True
-    )
-    assert device.light_on is True
diff --git a/tests/components/sensor/test_device_condition.py b/tests/components/sensor/test_device_condition.py
index dcd7e16a514..301baf0fc49 100644
--- a/tests/components/sensor/test_device_condition.py
+++ b/tests/components/sensor/test_device_condition.py
@@ -1,5 +1,6 @@
 """The test for sensor device automation."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -21,7 +22,6 @@ from homeassistant.util.json import load_json
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
@@ -91,6 +91,7 @@ async def test_get_conditions(
     platform.init()
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
+    sensor_entries = {}
 
     config_entry = MockConfigEntry(domain="test", data={})
     config_entry.add_to_hass(hass)
@@ -99,7 +100,7 @@ async def test_get_conditions(
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
     for device_class in SensorDeviceClass:
-        entity_registry.async_get_or_create(
+        sensor_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             platform.ENTITIES[device_class].unique_id,
@@ -112,7 +113,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition["type"],
             "device_id": device_entry.id,
-            "entity_id": platform.ENTITIES[device_class].entity_id,
+            "entity_id": sensor_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in SensorDeviceClass
@@ -124,7 +125,7 @@ async def test_get_conditions(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
     assert len(conditions) == 27
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -150,7 +151,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -165,7 +166,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_value"]
@@ -173,7 +174,7 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_get_conditions_no_state(
@@ -188,16 +189,16 @@ async def test_get_conditions_no_state(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_ids = {}
+    sensor_entries = {}
     for device_class in SensorDeviceClass:
-        entity_ids[device_class] = entity_registry.async_get_or_create(
+        sensor_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             f"5678_{device_class}",
             device_id=device_entry.id,
             original_device_class=device_class,
             unit_of_measurement=UNITS_OF_MEASUREMENT.get(device_class),
-        ).entity_id
+        )
 
     await hass.async_block_till_done()
 
@@ -207,7 +208,7 @@ async def test_get_conditions_no_state(
             "domain": DOMAIN,
             "type": condition["type"],
             "device_id": device_entry.id,
-            "entity_id": entity_ids[device_class],
+            "entity_id": sensor_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in SensorDeviceClass
@@ -218,7 +219,7 @@ async def test_get_conditions_no_state(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -246,7 +247,7 @@ async def test_get_conditions_no_unit_or_stateclass(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -260,7 +261,7 @@ async def test_get_conditions_no_unit_or_stateclass(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in condition_types
@@ -268,7 +269,7 @@ async def test_get_conditions_no_unit_or_stateclass(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -340,8 +341,22 @@ async def test_get_condition_capabilities(
         assert capabilities == expected_capabilities
 
 
-async def test_get_condition_capabilities_none(
-    hass: HomeAssistant, enable_custom_integrations: None
+@pytest.mark.parametrize(
+    ("set_state", "device_class_reg", "device_class_state", "unit_reg", "unit_state"),
+    [
+        (False, SensorDeviceClass.BATTERY, None, PERCENTAGE, None),
+        (True, None, SensorDeviceClass.BATTERY, None, PERCENTAGE),
+    ],
+)
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    device_class_reg,
+    device_class_state,
+    unit_reg,
+    unit_state,
 ) -> None:
     """Test we get the expected capabilities from a sensor condition."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -349,6 +364,72 @@ async def test_get_condition_capabilities_none(
 
     config_entry = MockConfigEntry(domain="test", data={})
     config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_id = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["battery"].unique_id,
+        device_id=device_entry.id,
+        original_device_class=device_class_reg,
+        unit_of_measurement=unit_reg,
+    ).entity_id
+    if set_state:
+        hass.states.async_set(
+            entity_id,
+            None,
+            {"device_class": device_class_state, "unit_of_measurement": unit_state},
+        )
+
+    expected_capabilities = {
+        "extra_fields": [
+            {
+                "description": {"suffix": PERCENTAGE},
+                "name": "above",
+                "optional": True,
+                "type": "float",
+            },
+            {
+                "description": {"suffix": PERCENTAGE},
+                "name": "below",
+                "optional": True,
+                "type": "float",
+            },
+        ]
+    }
+    conditions = await async_get_device_automations(
+        hass, DeviceAutomationType.CONDITION, device_entry.id
+    )
+    assert len(conditions) == 1
+    for condition in conditions:
+        condition["entity_id"] = entity_registry.async_get(
+            condition["entity_id"]
+        ).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.CONDITION, condition
+        )
+        assert capabilities == expected_capabilities
+
+
+async def test_get_condition_capabilities_none(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test we get the expected capabilities from a sensor condition."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+
+    entry_none = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["none"].unique_id,
+    )
 
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
@@ -358,14 +439,14 @@ async def test_get_condition_capabilities_none(
             "condition": "device",
             "device_id": "8770c43885354d5fa27604db6817f63f",
             "domain": "sensor",
-            "entity_id": "sensor.beer",
+            "entity_id": "01234567890123456789012345678901",
             "type": "is_battery_level",
         },
         {
             "condition": "device",
             "device_id": "8770c43885354d5fa27604db6817f63f",
             "domain": "sensor",
-            "entity_id": platform.ENTITIES["none"].entity_id,
+            "entity_id": entry_none.id,
             "type": "is_battery_level",
         },
     ]
@@ -380,18 +461,13 @@ async def test_get_condition_capabilities_none(
 
 async def test_if_state_not_above_below(
     hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
     calls,
     caplog: pytest.LogCaptureFixture,
     enable_custom_integrations: None,
 ) -> None:
     """Test for bad value conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    sensor1 = platform.ENTITIES["battery"]
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -405,7 +481,7 @@ async def test_if_state_not_above_below(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_battery_level",
                         }
                     ],
@@ -418,16 +494,15 @@ async def test_if_state_not_above_below(
 
 
 async def test_if_state_above(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for value conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -441,7 +516,7 @@ async def test_if_state_above(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_battery_level",
                             "above": 10,
                         }
@@ -458,36 +533,34 @@ async def test_if_state_above(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 9)
+    hass.states.async_set(entry.entity_id, 9)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 11)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 1
     assert calls[0].data["some"] == "event - test_event1"
 
 
-async def test_if_state_below(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+async def test_if_state_above_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for value conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -501,7 +574,65 @@ async def test_if_state_below(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.entity_id,
+                            "type": "is_battery_level",
+                            "above": 10,
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "{{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(("platform", "event.event_type"))
+                        },
+                    },
+                }
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, 9)
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, 11)
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "event - test_event1"
+
+
+async def test_if_state_below(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for value conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.id,
                             "type": "is_battery_level",
                             "below": 10,
                         }
@@ -518,19 +649,18 @@ async def test_if_state_below(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 11)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 9)
+    hass.states.async_set(entry.entity_id, 9)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 1
@@ -538,16 +668,15 @@ async def test_if_state_below(
 
 
 async def test_if_state_between(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for value conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -561,7 +690,7 @@ async def test_if_state_between(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_battery_level",
                             "above": 10,
                             "below": 20,
@@ -579,30 +708,29 @@ async def test_if_state_between(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 9)
+    hass.states.async_set(entry.entity_id, 9)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 11)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 1
     assert calls[0].data["some"] == "event - test_event1"
 
-    hass.states.async_set(sensor1.entity_id, 21)
+    hass.states.async_set(entry.entity_id, 21)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 1
 
-    hass.states.async_set(sensor1.entity_id, 19)
+    hass.states.async_set(entry.entity_id, 19)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 2
diff --git a/tests/components/sensor/test_device_trigger.py b/tests/components/sensor/test_device_trigger.py
index 010c947e7ab..7045d71fb78 100644
--- a/tests/components/sensor/test_device_trigger.py
+++ b/tests/components/sensor/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -24,7 +25,6 @@ from homeassistant.util.json import load_json
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
@@ -93,6 +93,7 @@ async def test_get_triggers(
     platform.init()
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
+    sensor_entries: dict[SensorDeviceClass, er.RegistryEntry] = {}
 
     config_entry = MockConfigEntry(domain="test", data={})
     config_entry.add_to_hass(hass)
@@ -101,7 +102,7 @@ async def test_get_triggers(
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
     for device_class in SensorDeviceClass:
-        entity_registry.async_get_or_create(
+        sensor_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             platform.ENTITIES[device_class].unique_id,
@@ -114,7 +115,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger["type"],
             "device_id": device_entry.id,
-            "entity_id": platform.ENTITIES[device_class].entity_id,
+            "entity_id": sensor_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in SensorDeviceClass
@@ -126,7 +127,7 @@ async def test_get_triggers(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
     assert len(triggers) == 27
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -152,7 +153,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -167,7 +168,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["value"]
@@ -175,7 +176,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -203,7 +204,7 @@ async def test_get_triggers_no_unit_or_stateclass(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -217,7 +218,7 @@ async def test_get_triggers_no_unit_or_stateclass(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in trigger_types
@@ -225,7 +226,7 @@ async def test_get_triggers_no_unit_or_stateclass(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -298,8 +299,22 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
-async def test_get_trigger_capabilities_none(
-    hass: HomeAssistant, enable_custom_integrations: None
+@pytest.mark.parametrize(
+    ("set_state", "device_class_reg", "device_class_state", "unit_reg", "unit_state"),
+    [
+        (False, SensorDeviceClass.BATTERY, None, PERCENTAGE, None),
+        (True, None, SensorDeviceClass.BATTERY, None, PERCENTAGE),
+    ],
+)
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    device_class_reg,
+    device_class_state,
+    unit_reg,
+    unit_state,
 ) -> None:
     """Test we get the expected capabilities from a sensor trigger."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -307,6 +322,71 @@ async def test_get_trigger_capabilities_none(
 
     config_entry = MockConfigEntry(domain="test", data={})
     config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_id = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["battery"].unique_id,
+        device_id=device_entry.id,
+        original_device_class=device_class_reg,
+        unit_of_measurement=unit_reg,
+    ).entity_id
+    if set_state:
+        hass.states.async_set(
+            entity_id,
+            None,
+            {"device_class": device_class_state, "unit_of_measurement": unit_state},
+        )
+
+    expected_capabilities = {
+        "extra_fields": [
+            {
+                "description": {"suffix": PERCENTAGE},
+                "name": "above",
+                "optional": True,
+                "type": "float",
+            },
+            {
+                "description": {"suffix": PERCENTAGE},
+                "name": "below",
+                "optional": True,
+                "type": "float",
+            },
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"},
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    assert len(triggers) == 1
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
+
+
+async def test_get_trigger_capabilities_none(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test we get the expected capabilities from a sensor trigger."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+
+    entry_none = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["none"].unique_id,
+    )
 
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
@@ -316,14 +396,14 @@ async def test_get_trigger_capabilities_none(
             "platform": "device",
             "device_id": "8770c43885354d5fa27604db6817f63f",
             "domain": "sensor",
-            "entity_id": "sensor.beer",
+            "entity_id": "01234567890123456789012345678901",
             "type": "is_battery_level",
         },
         {
             "platform": "device",
             "device_id": "8770c43885354d5fa27604db6817f63f",
             "domain": "sensor",
-            "entity_id": platform.ENTITIES["none"].entity_id,
+            "entity_id": entry_none.id,
             "type": "is_battery_level",
         },
     ]
@@ -338,17 +418,13 @@ async def test_get_trigger_capabilities_none(
 
 async def test_if_fires_not_on_above_below(
     hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
     calls,
     caplog: pytest.LogCaptureFixture,
     enable_custom_integrations: None,
 ) -> None:
     """Test for value triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    sensor1 = platform.ENTITIES["battery"]
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -360,7 +436,7 @@ async def test_if_fires_not_on_above_below(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "battery_level",
                     },
                     "action": {"service": "test.automation"},
@@ -372,15 +448,15 @@ async def test_if_fires_not_on_above_below(
 
 
 async def test_if_fires_on_state_above(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for value triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -392,7 +468,7 @@ async def test_if_fires_on_state_above(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "battery_level",
                         "above": 10,
                     },
@@ -416,31 +492,30 @@ async def test_if_fires_on_state_above(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 9)
+    hass.states.async_set(entry.entity_id, 9)
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 11)
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data["some"] == "bat_low device - {} - 9 - 11 - None".format(
-        sensor1.entity_id
+    assert (
+        calls[0].data["some"] == f"bat_low device - {entry.entity_id} - 9 - 11 - None"
     )
 
 
 async def test_if_fires_on_state_below(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for value triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -452,7 +527,7 @@ async def test_if_fires_on_state_below(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "battery_level",
                         "below": 10,
                     },
@@ -476,31 +551,30 @@ async def test_if_fires_on_state_below(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 11)
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 9)
+    hass.states.async_set(entry.entity_id, 9)
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data["some"] == "bat_low device - {} - 11 - 9 - None".format(
-        sensor1.entity_id
+    assert (
+        calls[0].data["some"] == f"bat_low device - {entry.entity_id} - 11 - 9 - None"
     )
 
 
 async def test_if_fires_on_state_between(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for value triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -512,7 +586,7 @@ async def test_if_fires_on_state_between(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "battery_level",
                         "above": 10,
                         "below": 20,
@@ -537,43 +611,41 @@ async def test_if_fires_on_state_between(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 9)
+    hass.states.async_set(entry.entity_id, 9)
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 11)
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data["some"] == "bat_low device - {} - 9 - 11 - None".format(
-        sensor1.entity_id
+    assert (
+        calls[0].data["some"] == f"bat_low device - {entry.entity_id} - 9 - 11 - None"
     )
 
-    hass.states.async_set(sensor1.entity_id, 21)
+    hass.states.async_set(entry.entity_id, 21)
     await hass.async_block_till_done()
     assert len(calls) == 1
 
-    hass.states.async_set(sensor1.entity_id, 19)
+    hass.states.async_set(entry.entity_id, 19)
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data["some"] == "bat_low device - {} - 21 - 19 - None".format(
-        sensor1.entity_id
+    assert (
+        calls[1].data["some"] == f"bat_low device - {entry.entity_id} - 21 - 19 - None"
     )
 
 
-async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+async def test_if_fires_on_state_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
-    """Test for triggers firing with delay."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    """Test for value triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -585,7 +657,66 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.entity_id,
+                        "type": "battery_level",
+                        "above": 10,
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "bat_low {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                }
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, 9)
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, 11)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"] == f"bat_low device - {entry.entity_id} - 9 - 11 - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
                         "type": "battery_level",
                         "above": 10,
                         "for": {"seconds": 5},
@@ -610,11 +741,10 @@ async def test_if_fires_on_state_change_with_for(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 10)
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 10)
+    hass.states.async_set(entry.entity_id, 11)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -623,5 +753,5 @@ async def test_if_fires_on_state_change_with_for(
     await hass.async_block_till_done()
     assert (
         calls[0].data["some"]
-        == f"turn_off device - {sensor1.entity_id} - 10 - 11 - 0:00:05"
+        == f"turn_off device - {entry.entity_id} - 10 - 11 - 0:00:05"
     )
diff --git a/tests/components/sensor/test_init.py b/tests/components/sensor/test_init.py
index fb079b9ff55..d1da0a8166f 100644
--- a/tests/components/sensor/test_init.py
+++ b/tests/components/sensor/test_init.py
@@ -1,6 +1,7 @@
 """The test for sensor entity."""
 from __future__ import annotations
 
+from collections.abc import Generator
 from datetime import date, datetime, timezone
 from decimal import Decimal
 from typing import Any
@@ -11,10 +12,14 @@ from homeassistant.components.number import NumberDeviceClass
 from homeassistant.components.sensor import (
     DEVICE_CLASS_STATE_CLASSES,
     DEVICE_CLASS_UNITS,
+    DOMAIN as SENSOR_DOMAIN,
     SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
     SensorStateClass,
     async_update_suggested_units,
 )
+from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     PERCENTAGE,
@@ -30,16 +35,25 @@ 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.restore_state import STORAGE_KEY as RESTORE_STATE_KEY
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM
 
 from tests.common import (
+    MockConfigEntry,
+    MockModule,
+    MockPlatform,
     async_mock_restore_state_shutdown_restart,
+    mock_config_flow,
+    mock_integration,
+    mock_platform,
     mock_restore_cache_with_extra_data,
 )
 
+TEST_DOMAIN = "test"
+
 
 @pytest.mark.parametrize(
     ("unit_system", "native_unit", "state_unit", "native_value", "state_value"),
@@ -2260,3 +2274,91 @@ async def test_unit_conversion_update(
     state = hass.states.get(entity3.entity_id)
     assert state.state == suggested_state
     assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == suggested_unit
+
+
+class MockFlow(ConfigFlow):
+    """Test flow."""
+
+
+@pytest.fixture(autouse=True)
+def config_flow_fixture(hass: HomeAssistant) -> Generator[None, None, None]:
+    """Mock config flow."""
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+
+    with mock_config_flow(TEST_DOMAIN, MockFlow):
+        yield
+
+
+async def test_name(hass: HomeAssistant) -> None:
+    """Test sensor name."""
+
+    async def async_setup_entry_init(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> bool:
+        """Set up test config entry."""
+        await hass.config_entries.async_forward_entry_setup(config_entry, SENSOR_DOMAIN)
+        return True
+
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+    mock_integration(
+        hass,
+        MockModule(
+            TEST_DOMAIN,
+            async_setup_entry=async_setup_entry_init,
+        ),
+    )
+
+    # Unnamed sensor without device class -> no name
+    entity1 = SensorEntity()
+    entity1.entity_id = "sensor.test1"
+
+    # Unnamed sensor with device class but has_entity_name False -> no name
+    entity2 = SensorEntity()
+    entity2.entity_id = "sensor.test2"
+    entity2._attr_device_class = SensorDeviceClass.BATTERY
+
+    # Unnamed sensor with device class and has_entity_name True -> named
+    entity3 = SensorEntity()
+    entity3.entity_id = "sensor.test3"
+    entity3._attr_device_class = SensorDeviceClass.BATTERY
+    entity3._attr_has_entity_name = True
+
+    # Unnamed sensor with device class and has_entity_name True -> named
+    entity4 = SensorEntity()
+    entity4.entity_id = "sensor.test4"
+    entity4.entity_description = SensorEntityDescription(
+        "test",
+        SensorDeviceClass.BATTERY,
+        has_entity_name=True,
+    )
+
+    async def async_setup_entry_platform(
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        async_add_entities: AddEntitiesCallback,
+    ) -> None:
+        """Set up test stt platform via config entry."""
+        async_add_entities([entity1, entity2, entity3, entity4])
+
+    mock_platform(
+        hass,
+        f"{TEST_DOMAIN}.{SENSOR_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()
+
+    state = hass.states.get(entity1.entity_id)
+    assert state.attributes == {}
+
+    state = hass.states.get(entity2.entity_id)
+    assert state.attributes == {"device_class": "battery"}
+
+    state = hass.states.get(entity3.entity_id)
+    assert state.attributes == {"device_class": "battery", "friendly_name": "Battery"}
+
+    state = hass.states.get(entity4.entity_id)
+    assert state.attributes == {"device_class": "battery", "friendly_name": "Battery"}
diff --git a/tests/components/shelly/test_button.py b/tests/components/shelly/test_button.py
index fdb2cd60450..42fa83b32a1 100644
--- a/tests/components/shelly/test_button.py
+++ b/tests/components/shelly/test_button.py
@@ -1,9 +1,13 @@
 """Tests for Shelly button platform."""
 from __future__ import annotations
 
+import pytest
+
 from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
+from homeassistant.components.shelly.const import DOMAIN
 from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 
 from . import init_integration
 
@@ -38,3 +42,48 @@ async def test_rpc_button(hass: HomeAssistant, mock_rpc_device) -> None:
         blocking=True,
     )
     assert mock_rpc_device.trigger_reboot.call_count == 1
+
+
+@pytest.mark.parametrize(
+    ("gen", "old_unique_id", "new_unique_id", "migration"),
+    [
+        (2, "test_name_reboot", "123456789ABC_reboot", True),
+        (1, "test_name_reboot", "123456789ABC_reboot", True),
+        (2, "123456789ABC_reboot", "123456789ABC_reboot", False),
+    ],
+)
+async def test_migrate_unique_id(
+    hass: HomeAssistant,
+    mock_block_device,
+    mock_rpc_device,
+    caplog: pytest.LogCaptureFixture,
+    gen: int,
+    old_unique_id: str,
+    new_unique_id: str,
+    migration: bool,
+) -> None:
+    """Test migration of unique_id."""
+    entry = await init_integration(hass, gen, skip_setup=True)
+
+    entity_registry = er.async_get(hass)
+    entity: er.RegistryEntry = entity_registry.async_get_or_create(
+        suggested_object_id="test_name_reboot",
+        disabled_by=None,
+        domain=BUTTON_DOMAIN,
+        platform=DOMAIN,
+        unique_id=old_unique_id,
+        config_entry=entry,
+    )
+    assert entity.unique_id == old_unique_id
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    entity_entry = entity_registry.async_get("button.test_name_reboot")
+    assert entity_entry
+    assert entity_entry.unique_id == new_unique_id
+
+    assert (
+        bool("Migrating unique_id for button.test_name_reboot" in caplog.text)
+        == migration
+    )
diff --git a/tests/components/shelly/test_config_flow.py b/tests/components/shelly/test_config_flow.py
index 621885bef08..7a29d7b1a42 100644
--- a/tests/components/shelly/test_config_flow.py
+++ b/tests/components/shelly/test_config_flow.py
@@ -1117,3 +1117,35 @@ async def test_zeroconf_sleeping_device_not_triggers_refresh(
     await hass.async_block_till_done()
     assert len(mock_rpc_device.initialize.mock_calls) == 0
     assert "device did not update" not in caplog.text
+
+
+async def test_sleeping_device_gen2_with_new_firmware(
+    hass: HomeAssistant, mock_rpc_device, monkeypatch
+) -> None:
+    """Test sleeping device Gen2 with firmware 1.0.0 or later."""
+    monkeypatch.setitem(mock_rpc_device.status["sys"], "wakeup_period", 666)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == "form"
+    assert result["errors"] == {}
+
+    with patch(
+        "homeassistant.components.shelly.config_flow.get_info",
+        return_value={"mac": "test-mac", "gen": 2},
+    ), patch("homeassistant.components.shelly.async_setup", return_value=True), patch(
+        "homeassistant.components.shelly.async_setup_entry",
+        return_value=True,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {"host": "1.1.1.1"},
+        )
+        await hass.async_block_till_done()
+
+    assert result["data"] == {
+        "host": "1.1.1.1",
+        "model": "SNSW-002P16EU",
+        "sleep_period": 666,
+        "gen": 2,
+    }
diff --git a/tests/components/shelly/test_device_trigger.py b/tests/components/shelly/test_device_trigger.py
index 30a7cfe75d8..6e8c3bf8005 100644
--- a/tests/components/shelly/test_device_trigger.py
+++ b/tests/components/shelly/test_device_trigger.py
@@ -1,5 +1,6 @@
 """The tests for Shelly device triggers."""
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -26,7 +27,6 @@ from . import init_integration
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
 )
 
@@ -74,7 +74,7 @@ async def test_get_triggers_block_device(
         hass, DeviceAutomationType.TRIGGER, device.id
     )
     triggers = [value for value in triggers if value["domain"] == DOMAIN]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_rpc_device(hass: HomeAssistant, mock_rpc_device) -> None:
@@ -106,7 +106,7 @@ async def test_get_triggers_rpc_device(hass: HomeAssistant, mock_rpc_device) ->
         hass, DeviceAutomationType.TRIGGER, device.id
     )
     triggers = [value for value in triggers if value["domain"] == DOMAIN]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_button(hass: HomeAssistant, mock_block_device) -> None:
@@ -131,7 +131,7 @@ async def test_get_triggers_button(hass: HomeAssistant, mock_block_device) -> No
         hass, DeviceAutomationType.TRIGGER, device.id
     )
     triggers = [value for value in triggers if value["domain"] == DOMAIN]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_non_initialized_devices(
@@ -149,7 +149,7 @@ async def test_get_triggers_non_initialized_devices(
         hass, DeviceAutomationType.TRIGGER, device.id
     )
     triggers = [value for value in triggers if value["domain"] == DOMAIN]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_for_invalid_device_id(
diff --git a/tests/components/shelly/test_init.py b/tests/components/shelly/test_init.py
index 42ec4578016..be6e319c8ac 100644
--- a/tests/components/shelly/test_init.py
+++ b/tests/components/shelly/test_init.py
@@ -17,7 +17,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, format_mac
 from homeassistant.setup import async_setup_component
 
-from . import MOCK_MAC, init_integration
+from . import MOCK_MAC, init_integration, mutate_rpc_device_status
 
 from tests.common import MockConfigEntry
 
@@ -155,6 +155,22 @@ async def test_sleeping_rpc_device_online(
     assert entry.data["sleep_period"] == device_sleep
 
 
+async def test_sleeping_rpc_device_online_new_firmware(
+    hass: HomeAssistant,
+    mock_rpc_device,
+    monkeypatch,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test sleeping device Gen2 with firmware 1.0.0 or later."""
+    entry = await init_integration(hass, 2, sleep_period=None)
+    assert "will resume when device is online" in caplog.text
+
+    mutate_rpc_device_status(monkeypatch, mock_rpc_device, "sys", "wakeup_period", 1500)
+    mock_rpc_device.mock_update()
+    assert "online, resuming setup" in caplog.text
+    assert entry.data["sleep_period"] == 1500
+
+
 @pytest.mark.parametrize(
     ("gen", "entity_id"),
     [
diff --git a/tests/components/shelly/test_number.py b/tests/components/shelly/test_number.py
index 57a8e801b92..403d2f2993d 100644
--- a/tests/components/shelly/test_number.py
+++ b/tests/components/shelly/test_number.py
@@ -17,7 +17,7 @@ from homeassistant.exceptions import HomeAssistantError
 
 from . import init_integration, register_device, register_entity
 
-from tests.common import mock_restore_cache
+from tests.common import mock_restore_cache_with_extra_data
 
 DEVICE_BLOCK_ID = 4
 
@@ -62,7 +62,14 @@ async def test_block_restored_number(
         entry,
         capabilities,
     )
-    mock_restore_cache(hass, [State(entity_id, "40")])
+    extra_data = {
+        "native_max_value": 100,
+        "native_min_value": 0,
+        "native_step": 1,
+        "native_unit_of_measurement": "%",
+        "native_value": "40",
+    }
+    mock_restore_cache_with_extra_data(hass, ((State(entity_id, ""), extra_data),))
 
     monkeypatch.setattr(mock_block_device, "initialized", False)
     await hass.config_entries.async_setup(entry.entry_id)
diff --git a/tests/components/shelly/test_sensor.py b/tests/components/shelly/test_sensor.py
index 0b906d60079..d87460fb17d 100644
--- a/tests/components/shelly/test_sensor.py
+++ b/tests/components/shelly/test_sensor.py
@@ -20,7 +20,7 @@ from . import (
     register_entity,
 )
 
-from tests.common import mock_restore_cache
+from tests.common import mock_restore_cache_with_extra_data
 
 RELAY_BLOCK_ID = 0
 SENSOR_BLOCK_ID = 3
@@ -137,7 +137,9 @@ async def test_block_restored_sleeping_sensor(
     entity_id = register_entity(
         hass, SENSOR_DOMAIN, "test_name_temperature", "sensor_0-temp", entry
     )
-    mock_restore_cache(hass, [State(entity_id, "20.4")])
+    extra_data = {"native_value": "20.4", "native_unit_of_measurement": "°C"}
+
+    mock_restore_cache_with_extra_data(hass, ((State(entity_id, ""), extra_data),))
     monkeypatch.setattr(mock_block_device, "initialized", False)
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
@@ -216,7 +218,9 @@ async def test_block_not_matched_restored_sleeping_sensor(
     entity_id = register_entity(
         hass, SENSOR_DOMAIN, "test_name_temperature", "sensor_0-temp", entry
     )
-    mock_restore_cache(hass, [State(entity_id, "20.4")])
+    extra_data = {"native_value": "20.4", "native_unit_of_measurement": "°C"}
+
+    mock_restore_cache_with_extra_data(hass, ((State(entity_id, ""), extra_data),))
     monkeypatch.setattr(mock_block_device, "initialized", False)
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
@@ -357,8 +361,9 @@ async def test_rpc_restored_sleeping_sensor(
         "temperature:0-temperature_0",
         entry,
     )
+    extra_data = {"native_value": "21.0", "native_unit_of_measurement": "°C"}
 
-    mock_restore_cache(hass, [State(entity_id, "21.0")])
+    mock_restore_cache_with_extra_data(hass, ((State(entity_id, ""), extra_data),))
     monkeypatch.setattr(mock_rpc_device, "initialized", False)
 
     await hass.config_entries.async_setup(entry.entry_id)
diff --git a/tests/components/slack/test_config_flow.py b/tests/components/slack/test_config_flow.py
index 97c8e6ee743..e941e4ba47c 100644
--- a/tests/components/slack/test_config_flow.py
+++ b/tests/components/slack/test_config_flow.py
@@ -90,51 +90,3 @@ async def test_flow_user_unknown_error(hass: HomeAssistant) -> None:
     assert result["type"] == data_entry_flow.FlowResultType.FORM
     assert result["step_id"] == "user"
     assert result["errors"] == {"base": "unknown"}
-
-
-async def test_flow_import(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test an import flow."""
-    mock_connection(aioclient_mock)
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_IMPORT},
-        data=CONF_DATA,
-    )
-
-    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
-    assert result["title"] == TEAM_NAME
-    assert result["data"] == CONF_DATA
-
-
-async def test_flow_import_no_name(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test import flow with no name in config."""
-    mock_connection(aioclient_mock)
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_IMPORT},
-        data=CONF_INPUT,
-    )
-
-    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
-    assert result["title"] == TEAM_NAME
-    assert result["data"] == CONF_DATA
-
-
-async def test_flow_import_already_configured(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test an import flow already configured."""
-    create_entry(hass)
-    mock_connection(aioclient_mock)
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_IMPORT},
-        data=CONF_DATA,
-    )
-
-    assert result["type"] == data_entry_flow.FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
diff --git a/tests/components/smhi/test_weather.py b/tests/components/smhi/test_weather.py
index 57998b725f9..55b07530c39 100644
--- a/tests/components/smhi/test_weather.py
+++ b/tests/components/smhi/test_weather.py
@@ -6,14 +6,11 @@ from unittest.mock import patch
 import pytest
 from smhi.smhi_lib import APIURL_TEMPLATE, SmhiForecast, SmhiForecastException
 
-from homeassistant.components.smhi.const import (
-    ATTR_SMHI_CLOUDINESS,
-    ATTR_SMHI_THUNDER_PROBABILITY,
-    ATTR_SMHI_WIND_GUST_SPEED,
-)
+from homeassistant.components.smhi.const import ATTR_SMHI_THUNDER_PROBABILITY
 from homeassistant.components.smhi.weather import CONDITION_CLASSES, RETRY_TIMEOUT
 from homeassistant.components.weather import (
     ATTR_FORECAST,
+    ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
     ATTR_FORECAST_PRECIPITATION,
     ATTR_FORECAST_PRESSURE,
@@ -21,6 +18,7 @@ from homeassistant.components.weather import (
     ATTR_FORECAST_TEMP_LOW,
     ATTR_FORECAST_TIME,
     ATTR_FORECAST_WIND_BEARING,
+    ATTR_FORECAST_WIND_GUST_SPEED,
     ATTR_FORECAST_WIND_SPEED,
     ATTR_WEATHER_HUMIDITY,
     ATTR_WEATHER_PRESSURE,
@@ -31,6 +29,10 @@ from homeassistant.components.weather import (
     ATTR_WEATHER_WIND_SPEED_UNIT,
     DOMAIN as WEATHER_DOMAIN,
 )
+from homeassistant.components.weather.const import (
+    ATTR_WEATHER_CLOUD_COVERAGE,
+    ATTR_WEATHER_WIND_GUST_SPEED,
+)
 from homeassistant.const import ATTR_ATTRIBUTION, STATE_UNKNOWN, UnitOfSpeed
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -64,9 +66,9 @@ async def test_setup_hass(
 
     assert state
     assert state.state == "sunny"
-    assert state.attributes[ATTR_SMHI_CLOUDINESS] == 50
+    assert state.attributes[ATTR_WEATHER_CLOUD_COVERAGE] == 50
     assert state.attributes[ATTR_SMHI_THUNDER_PROBABILITY] == 33
-    assert state.attributes[ATTR_SMHI_WIND_GUST_SPEED] == 16.92
+    assert state.attributes[ATTR_WEATHER_WIND_GUST_SPEED] == 16.92
     assert state.attributes[ATTR_ATTRIBUTION].find("SMHI") >= 0
     assert state.attributes[ATTR_WEATHER_HUMIDITY] == 55
     assert state.attributes[ATTR_WEATHER_PRESSURE] == 1024
@@ -85,6 +87,8 @@ async def test_setup_hass(
     assert forecast[ATTR_FORECAST_PRESSURE] == 1026
     assert forecast[ATTR_FORECAST_WIND_BEARING] == 203
     assert forecast[ATTR_FORECAST_WIND_SPEED] == 6.12
+    assert forecast[ATTR_FORECAST_WIND_GUST_SPEED] == 18.36
+    assert forecast[ATTR_FORECAST_CLOUD_COVERAGE] == 100
 
 
 async def test_properties_no_data(hass: HomeAssistant) -> None:
@@ -112,9 +116,9 @@ async def test_properties_no_data(hass: HomeAssistant) -> None:
     assert ATTR_WEATHER_WIND_SPEED not in state.attributes
     assert ATTR_WEATHER_WIND_BEARING not in state.attributes
     assert ATTR_FORECAST not in state.attributes
-    assert ATTR_SMHI_CLOUDINESS not in state.attributes
+    assert ATTR_WEATHER_CLOUD_COVERAGE not in state.attributes
     assert ATTR_SMHI_THUNDER_PROBABILITY not in state.attributes
-    assert ATTR_SMHI_WIND_GUST_SPEED not in state.attributes
+    assert ATTR_WEATHER_WIND_GUST_SPEED not in state.attributes
 
 
 async def test_properties_unknown_symbol(hass: HomeAssistant) -> None:
@@ -337,7 +341,7 @@ async def test_custom_speed_unit(
 
     assert state
     assert state.name == "test"
-    assert state.attributes[ATTR_SMHI_WIND_GUST_SPEED] == 16.92
+    assert state.attributes[ATTR_WEATHER_WIND_GUST_SPEED] == 16.92
 
     entity_reg = er.async_get(hass)
     entity_reg.async_update_entity_options(
@@ -349,4 +353,4 @@ async def test_custom_speed_unit(
     await hass.async_block_till_done()
 
     state = hass.states.get(ENTITY_ID)
-    assert state.attributes[ATTR_SMHI_WIND_GUST_SPEED] == 4.7
+    assert state.attributes[ATTR_WEATHER_WIND_GUST_SPEED] == 4.7
diff --git a/tests/components/sonos/test_plex_playback.py b/tests/components/sonos/test_plex_playback.py
index a612359ac78..99269ca10ef 100644
--- a/tests/components/sonos/test_plex_playback.py
+++ b/tests/components/sonos/test_plex_playback.py
@@ -34,7 +34,7 @@ async def test_plex_play_media(hass: HomeAssistant, async_autosetup_sonos) -> No
         "homeassistant.components.sonos.media_player.SonosMediaPlayerEntity.set_shuffle"
     ) as mock_shuffle:
         # Test successful Plex service call
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -59,7 +59,7 @@ async def test_plex_play_media(hass: HomeAssistant, async_autosetup_sonos) -> No
             '"album_name": "Album", "shuffle": 1}'
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -107,7 +107,7 @@ async def test_plex_play_media(hass: HomeAssistant, async_autosetup_sonos) -> No
             "homeassistant.components.plex.services.get_plex_server",
             return_value=mock_plex_server,
         ):
-            assert await hass.services.async_call(
+            await hass.services.async_call(
                 MP_DOMAIN,
                 SERVICE_PLAY_MEDIA,
                 {
diff --git a/tests/components/steam_online/__init__.py b/tests/components/steam_online/__init__.py
index d41554e4d04..786c5d67782 100644
--- a/tests/components/steam_online/__init__.py
+++ b/tests/components/steam_online/__init__.py
@@ -1,5 +1,8 @@
 """Tests for Steam integration."""
+import random
+import string
 from unittest.mock import patch
+import urllib.parse
 
 import steam
 
@@ -11,8 +14,8 @@ from homeassistant.core import HomeAssistant
 from tests.common import MockConfigEntry
 
 API_KEY = "abc123"
-ACCOUNT_1 = "1234567890"
-ACCOUNT_2 = "1234567891"
+ACCOUNT_1 = "12345678901234567"
+ACCOUNT_2 = "12345678912345678"
 ACCOUNT_NAME_1 = "testaccount1"
 ACCOUNT_NAME_2 = "testaccount2"
 
@@ -30,6 +33,8 @@ CONF_OPTIONS_2 = {
     }
 }
 
+MAX_LENGTH_STEAM_IDS = 30
+
 
 def create_entry(hass: HomeAssistant) -> MockConfigEntry:
     """Add config entry in Home Assistant."""
@@ -62,16 +67,32 @@ class MockedInterface(dict):
 
     def GetFriendList(self, steamid: str) -> dict:
         """Get friend list."""
-        return {"friendslist": {"friends": [{"steamid": ACCOUNT_2}]}}
+        fake_friends = [{"steamid": ACCOUNT_2}]
+        for _i in range(0, 4):
+            fake_friends.append(
+                {"steamid": "".join(random.choices(string.digits, k=len(ACCOUNT_1)))}
+            )
+        return {"friendslist": {"friends": fake_friends}}
 
-    def GetPlayerSummaries(self, steamids: str) -> dict:
+    def GetPlayerSummaries(self, steamids: str | list[str]) -> dict:
         """Get player summaries."""
+        assert len(urllib.parse.quote(str(steamids))) <= MAX_LENGTH_STEAM_IDS
         return {
             "response": {
                 "players": {
                     "player": [
-                        {"steamid": ACCOUNT_1, "personaname": ACCOUNT_NAME_1},
-                        {"steamid": ACCOUNT_2, "personaname": ACCOUNT_NAME_2},
+                        {
+                            "steamid": ACCOUNT_1,
+                            "personaname": ACCOUNT_NAME_1,
+                            "personastate": 1,
+                            "avatarmedium": "",
+                        },
+                        {
+                            "steamid": ACCOUNT_2,
+                            "personaname": ACCOUNT_NAME_2,
+                            "personastate": 2,
+                            "avatarmedium": "",
+                        },
                     ]
                 }
             }
diff --git a/tests/components/steam_online/test_config_flow.py b/tests/components/steam_online/test_config_flow.py
index a9d81a16fba..a62adb18776 100644
--- a/tests/components/steam_online/test_config_flow.py
+++ b/tests/components/steam_online/test_config_flow.py
@@ -138,7 +138,10 @@ async def test_flow_reauth(hass: HomeAssistant) -> None:
 async def test_options_flow(hass: HomeAssistant) -> None:
     """Test updating options."""
     entry = create_entry(hass)
-    with patch_interface():
+    with patch_interface(), patch(
+        "homeassistant.components.steam_online.config_flow.MAX_IDS_TO_REQUEST",
+        return_value=2,
+    ):
         await hass.config_entries.async_setup(entry.entry_id)
         result = await hass.config_entries.options.async_init(entry.entry_id)
         await hass.async_block_till_done()
@@ -159,7 +162,10 @@ async def test_options_flow(hass: HomeAssistant) -> None:
 async def test_options_flow_deselect(hass: HomeAssistant) -> None:
     """Test deselecting user."""
     entry = create_entry(hass)
-    with patch_interface():
+    with patch_interface(), patch(
+        "homeassistant.components.steam_online.config_flow.MAX_IDS_TO_REQUEST",
+        return_value=2,
+    ):
         await hass.config_entries.async_setup(entry.entry_id)
         result = await hass.config_entries.options.async_init(entry.entry_id)
         await hass.async_block_till_done()
diff --git a/tests/components/switch/test_device_action.py b/tests/components/switch/test_device_action.py
index 623629e4b91..85799a49a34 100644
--- a/tests/components/switch/test_device_action.py
+++ b/tests/components/switch/test_device_action.py
@@ -1,10 +1,11 @@
 """The test for switch device automation."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.switch import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -12,7 +13,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -41,7 +41,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = []
@@ -50,7 +50,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in ["turn_off", "turn_on", "toggle"]
@@ -58,7 +58,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -84,7 +84,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -98,7 +98,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["turn_off", "turn_on", "toggle"]
@@ -106,20 +106,17 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_action(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off actions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -127,29 +124,29 @@ async def test_action(
         {
             automation.DOMAIN: [
                 {
-                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "trigger": {"platform": "event", "event_type": "test_off"},
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                 },
                 {
-                    "trigger": {"platform": "event", "event_type": "test_event2"},
+                    "trigger": {"platform": "event", "event_type": "test_on"},
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                 },
                 {
-                    "trigger": {"platform": "event", "event_type": "test_event3"},
+                    "trigger": {"platform": "event", "event_type": "test_toggle"},
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "toggle",
                     },
                 },
@@ -157,29 +154,58 @@ async def test_action(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-    assert len(calls) == 0
 
-    hass.bus.async_fire("test_event1")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
+    turn_on_calls = async_mock_service(hass, DOMAIN, "turn_on")
+    turn_off_calls = async_mock_service(hass, DOMAIN, "turn_off")
+    toggle_calls = async_mock_service(hass, DOMAIN, "toggle")
 
-    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_toggle")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
+    assert len(toggle_calls) == 1
+    assert toggle_calls[-1].data == {"entity_id": entry.entity_id}
 
-    hass.bus.async_fire("test_event2")
+    hass.bus.async_fire("test_off")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
+    assert len(turn_off_calls) == 1
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
 
-    hass.bus.async_fire("test_event2")
+    hass.bus.async_fire("test_on")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
+    assert len(turn_on_calls) == 1
+    assert turn_on_calls[-1].data == {"entity_id": entry.entity_id}
 
-    hass.bus.async_fire("test_event3")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
 
-    hass.bus.async_fire("test_event3")
+async def test_action_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_off"},
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
+                        "type": "turn_off",
+                    },
+                },
+            ]
+        },
+    )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
+
+    turn_off_calls = async_mock_service(hass, DOMAIN, "turn_off")
+
+    hass.bus.async_fire("test_off")
+    await hass.async_block_till_done()
+    assert len(turn_off_calls) == 1
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/switch/test_device_condition.py b/tests/components/switch/test_device_condition.py
index 22f5a562daf..c60954e335f 100644
--- a/tests/components/switch/test_device_condition.py
+++ b/tests/components/switch/test_device_condition.py
@@ -3,11 +3,12 @@ from datetime import timedelta
 
 from freezegun import freeze_time
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.switch import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import STATE_OFF, STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -16,7 +17,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
@@ -46,7 +46,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -55,7 +55,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in ["is_off", "is_on"]
@@ -63,7 +63,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -89,7 +89,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -103,7 +103,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_off", "is_on"]
@@ -111,7 +111,7 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_get_condition_capabilities(
@@ -144,17 +144,49 @@ async def test_get_condition_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a switch condition."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    conditions = await async_get_device_automations(
+        hass, DeviceAutomationType.CONDITION, device_entry.id
+    )
+    for condition in conditions:
+        condition["entity_id"] = entity_registry.async_get(
+            condition["entity_id"]
+        ).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.CONDITION, condition
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_state(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -168,7 +200,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_on",
                         }
                     ],
@@ -187,7 +219,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_off",
                         }
                     ],
@@ -203,7 +235,6 @@ async def test_if_state(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
@@ -212,7 +243,7 @@ async def test_if_state(
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on event - test_event1"
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
@@ -220,21 +251,67 @@ async def test_if_state(
     assert calls[1].data["some"] == "is_off event - test_event2"
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_on",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_on {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(("platform", "event.event_type"))
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_on event - test_event1"
+
+
 async def test_if_fires_on_for_condition(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for firing if condition is on with delay."""
     point1 = dt_util.utcnow()
     point2 = point1 + timedelta(seconds=10)
     point3 = point2 + timedelta(seconds=10)
 
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     with freeze_time(point1) as freezer:
         assert await async_setup_component(
@@ -248,7 +325,7 @@ async def test_if_fires_on_for_condition(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_off",
                             "for": {"seconds": 5},
                         },
@@ -266,7 +343,6 @@ async def test_if_fires_on_for_condition(
             },
         )
         await hass.async_block_till_done()
-        assert hass.states.get(ent1.entity_id).state == STATE_ON
         assert len(calls) == 0
 
         hass.bus.async_fire("test_event1")
@@ -279,7 +355,7 @@ async def test_if_fires_on_for_condition(
         await hass.async_block_till_done()
         assert len(calls) == 0
 
-        hass.states.async_set(ent1.entity_id, STATE_OFF)
+        hass.states.async_set(entry.entity_id, STATE_OFF)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 0
diff --git a/tests/components/switch/test_device_trigger.py b/tests/components/switch/test_device_trigger.py
index 58ffa7e7c18..32f8f65b114 100644
--- a/tests/components/switch/test_device_trigger.py
+++ b/tests/components/switch/test_device_trigger.py
@@ -2,11 +2,12 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.switch import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import STATE_OFF, STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -15,7 +16,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
@@ -46,7 +46,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -55,7 +55,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -63,7 +63,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -89,7 +89,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -103,7 +103,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -111,7 +111,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -144,17 +144,47 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a switch trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -166,7 +196,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_on",
                     },
                     "action": {
@@ -190,7 +220,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_off",
                     },
                     "action": {
@@ -214,7 +244,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "changed_states",
                     },
                     "action": {
@@ -237,37 +267,35 @@ async def test_if_fires_on_state_change(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert {calls[0].data["some"], calls[1].data["some"]} == {
-        f"turn_off device - {ent1.entity_id} - on - off - None",
-        f"turn_on_or_off device - {ent1.entity_id} - on - off - None",
+        f"turn_off device - {entry.entity_id} - on - off - None",
+        f"turn_on_or_off device - {entry.entity_id} - on - off - None",
     }
 
-    hass.states.async_set(ent1.entity_id, STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert {calls[2].data["some"], calls[3].data["some"]} == {
-        f"turn_on device - {ent1.entity_id} - off - on - None",
-        f"turn_on_or_off device - {ent1.entity_id} - off - on - None",
+        f"turn_on device - {entry.entity_id} - off - on - None",
+        f"turn_on_or_off device - {entry.entity_id} - off - on - None",
     }
 
 
-async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
-    """Test for triggers firing with delay."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -279,7 +307,62 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.entity_id,
+                        "type": "turned_off",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "turn_off {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
                         "type": "turned_off",
                         "for": {"seconds": 5},
                     },
@@ -303,16 +386,16 @@ async def test_if_fires_on_state_change_with_for(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
     await hass.async_block_till_done()
     assert len(calls) == 1
     await hass.async_block_till_done()
-    assert calls[0].data["some"] == "turn_off device - {} - on - off - 0:00:05".format(
-        ent1.entity_id
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - 0:00:05"
     )
diff --git a/tests/components/tasmota/test_device_trigger.py b/tests/components/tasmota/test_device_trigger.py
index fe3240790dd..880f4ed0e75 100644
--- a/tests/components/tasmota/test_device_trigger.py
+++ b/tests/components/tasmota/test_device_trigger.py
@@ -5,6 +5,7 @@ from unittest.mock import Mock, patch
 
 from hatasmota.switch import TasmotaSwitchTriggerConfig
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -18,7 +19,6 @@ from homeassistant.setup import async_setup_component
 from .test_common import DEFAULT_CONFIG, remove_device
 
 from tests.common import (
-    assert_lists_same,
     async_fire_mqtt_message,
     async_get_device_automations,
 )
@@ -74,7 +74,7 @@ async def test_get_triggers_btn(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_swc(
@@ -109,7 +109,7 @@ async def test_get_triggers_swc(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_unknown_triggers(
@@ -158,7 +158,7 @@ async def test_get_unknown_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, [])
+    assert triggers == []
 
 
 async def test_get_non_existing_triggers(
@@ -183,7 +183,7 @@ async def test_get_non_existing_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, [])
+    assert triggers == []
 
 
 @pytest.mark.no_fail_on_log_exception
@@ -215,7 +215,7 @@ async def test_discover_bad_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, [])
+    assert triggers == []
 
     # Trigger an exception when the entity is discovered
     class FakeTrigger(TasmotaSwitchTriggerConfig):
@@ -251,7 +251,7 @@ async def test_discover_bad_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, [])
+    assert triggers == []
 
     # Rediscover without exception
     async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
@@ -271,7 +271,7 @@ async def test_discover_bad_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_update_remove_triggers(
diff --git a/tests/components/template/test_image.py b/tests/components/template/test_image.py
new file mode 100644
index 00000000000..17b84e327b1
--- /dev/null
+++ b/tests/components/template/test_image.py
@@ -0,0 +1,507 @@
+"""The tests for the Template image platform."""
+from http import HTTPStatus
+from io import BytesIO
+from typing import Any
+
+import httpx
+from PIL import Image
+import pytest
+import respx
+
+from homeassistant import setup
+from homeassistant.components.input_text import (
+    ATTR_VALUE as INPUT_TEXT_ATTR_VALUE,
+    DOMAIN as INPUT_TEXT_DOMAIN,
+    SERVICE_SET_VALUE as INPUT_TEXT_SERVICE_SET_VALUE,
+)
+from homeassistant.const import (
+    ATTR_ENTITY_PICTURE,
+    CONF_ENTITY_ID,
+    STATE_UNKNOWN,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_registry import async_get
+from homeassistant.util import dt as dt_util
+
+from tests.common import assert_setup_component
+from tests.typing import ClientSessionGenerator
+
+_DEFAULT = object()
+_TEST_IMAGE = "image.template_image"
+_URL_INPUT_TEXT = "input_text.url"
+
+
+@pytest.fixture
+def imgbytes_jpg():
+    """Image in RAM for testing."""
+    buf = BytesIO()  # fake image in ram for testing.
+    Image.new("RGB", (1, 1)).save(buf, format="jpeg")
+    return bytes(buf.getbuffer())
+
+
+@pytest.fixture
+def imgbytes2_jpg():
+    """Image in RAM for testing."""
+    buf = BytesIO()  # fake image in ram for testing.
+    Image.new("RGB", (1, 1), 100).save(buf, format="jpeg")
+    return bytes(buf.getbuffer())
+
+
+async def _assert_state(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    expected_state: str,
+    expected_image: bytes | None,
+    entity_id: str = _TEST_IMAGE,
+    expected_content_type: str = "image/jpeg",
+    expected_entity_picture: Any = _DEFAULT,
+    expected_status: HTTPStatus = HTTPStatus.OK,
+):
+    """Verify image's state."""
+    state = hass.states.get(entity_id)
+    attributes = state.attributes
+    assert state.state == expected_state
+    if expected_entity_picture is _DEFAULT:
+        expected_entity_picture = (
+            f"/api/image_proxy/{entity_id}?token={attributes['access_token']}"
+        )
+
+    assert attributes.get(ATTR_ENTITY_PICTURE) == expected_entity_picture
+
+    client = await hass_client()
+
+    resp = await client.get(f"/api/image_proxy/{entity_id}")
+    assert resp.content_type == expected_content_type
+    assert resp.status == expected_status
+    body = await resp.read()
+    assert body == expected_image
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_platform_config(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, imgbytes_jpg
+) -> None:
+    """Test configuring under the platform key does not work."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+
+    with assert_setup_component(1, "image"):
+        assert await setup.async_setup_component(
+            hass,
+            "image",
+            {
+                "image": {
+                    "platform": "template",
+                    "url": "{{ 'http://example.com' }}",
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_all()) == 0
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_missing_optional_config(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, imgbytes_jpg
+) -> None:
+    """Test: missing optional template is ok."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+
+    with assert_setup_component(1, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "image": {
+                        "url": "{{ 'http://example.com' }}",
+                    }
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    expected_state = dt_util.utcnow().isoformat()
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    assert respx.get("http://example.com").call_count == 1
+
+    # Check the image is not refetched
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    assert respx.get("http://example.com").call_count == 1
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_multiple_configs(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    imgbytes_jpg,
+    imgbytes2_jpg,
+) -> None:
+    """Test: multiple image entities get created."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+    respx.get("http://example2.com").respond(
+        stream=imgbytes2_jpg, content_type="image/png"
+    )
+
+    with assert_setup_component(1, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "image": [
+                        {
+                            "url": "{{ 'http://example.com' }}",
+                        },
+                        {
+                            "url": "{{ 'http://example2.com' }}",
+                        },
+                    ]
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    expected_state = dt_util.utcnow().isoformat()
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    await _assert_state(
+        hass,
+        hass_client,
+        expected_state,
+        imgbytes2_jpg,
+        f"{_TEST_IMAGE}_2",
+        expected_content_type="image/png",
+    )
+
+
+async def test_missing_required_keys(hass: HomeAssistant) -> None:
+    """Test: missing required fields will fail."""
+    with assert_setup_component(0, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "image": {
+                        "name": "a name",
+                    }
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    assert hass.states.async_all("image") == []
+
+
+async def test_unique_id(hass: HomeAssistant) -> None:
+    """Test unique_id configuration."""
+    with assert_setup_component(1, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "unique_id": "b",
+                    "image": {
+                        "url": "http://example.com",
+                        "unique_id": "a",
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    ent_reg = async_get(hass)
+    entry = ent_reg.async_get(_TEST_IMAGE)
+    assert entry
+    assert entry.unique_id == "b-a"
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_custom_entity_picture(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, imgbytes_jpg
+) -> None:
+    """Test custom entity picture."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+
+    with assert_setup_component(1, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "image": {
+                        "url": "http://example.com",
+                        "picture": "http://example2.com",
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    expected_state = dt_util.utcnow().isoformat()
+    await _assert_state(
+        hass,
+        hass_client,
+        expected_state,
+        imgbytes_jpg,
+        expected_entity_picture="http://example2.com",
+    )
+
+
+@respx.mock
+async def test_template_error(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test handling template error."""
+    respx.get("http://example.com").side_effect = httpx.TimeoutException
+
+    with assert_setup_component(1, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "image": {
+                        "url": "{{ no_such_variable.url }}",
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    await _assert_state(
+        hass,
+        hass_client,
+        STATE_UNKNOWN,
+        b"500: Internal Server Error",
+        expected_status=HTTPStatus.INTERNAL_SERVER_ERROR,
+        expected_content_type="text/plain",
+    )
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_templates_with_entities(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    imgbytes_jpg,
+    imgbytes2_jpg,
+) -> None:
+    """Test templates with values from other entities."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+    respx.get("http://example2.com").respond(
+        stream=imgbytes2_jpg, content_type="image/png"
+    )
+
+    with assert_setup_component(1, "input_text"):
+        assert await setup.async_setup_component(
+            hass,
+            "input_text",
+            {
+                "input_text": {
+                    "url": {
+                        "initial": "http://example.com",
+                        "name": "url",
+                    },
+                }
+            },
+        )
+
+    with assert_setup_component(1, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "image": {
+                        "url": f"{{{{ states('{_URL_INPUT_TEXT}') }}}}",
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    expected_state = dt_util.utcnow().isoformat()
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    assert respx.get("http://example.com").call_count == 1
+
+    # Check the image is not refetched
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    assert respx.get("http://example.com").call_count == 1
+
+    await hass.services.async_call(
+        INPUT_TEXT_DOMAIN,
+        INPUT_TEXT_SERVICE_SET_VALUE,
+        {CONF_ENTITY_ID: _URL_INPUT_TEXT, INPUT_TEXT_ATTR_VALUE: "http://example2.com"},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+    await _assert_state(
+        hass,
+        hass_client,
+        expected_state,
+        imgbytes2_jpg,
+        expected_content_type="image/png",
+    )
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_trigger_image(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    imgbytes_jpg,
+    imgbytes2_jpg,
+) -> None:
+    """Test trigger based template image."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+    respx.get("http://example2.com").respond(
+        stream=imgbytes2_jpg, content_type="image/png"
+    )
+
+    assert await setup.async_setup_component(
+        hass,
+        "template",
+        {
+            "template": [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event"},
+                    "image": [
+                        {
+                            "url": "{{ trigger.event.data.url }}",
+                        },
+                    ],
+                },
+            ],
+        },
+    )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    # No image is loaded, expect error
+    await _assert_state(
+        hass,
+        hass_client,
+        "unknown",
+        b"500: Internal Server Error",
+        expected_status=HTTPStatus.INTERNAL_SERVER_ERROR,
+        expected_content_type="text/plain",
+    )
+
+    hass.bus.async_fire("test_event", {"url": "http://example.com"})
+    await hass.async_block_till_done()
+    expected_state = dt_util.utcnow().isoformat()
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    assert respx.get("http://example.com").call_count == 1
+
+    # Check the image is not refetched
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    assert respx.get("http://example.com").call_count == 1
+
+    hass.bus.async_fire("test_event", {"url": "http://example2.com"})
+    await hass.async_block_till_done()
+    await _assert_state(
+        hass,
+        hass_client,
+        expected_state,
+        imgbytes2_jpg,
+        expected_content_type="image/png",
+    )
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_trigger_image_custom_entity_picture(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, imgbytes_jpg
+) -> None:
+    """Test trigger based template image with custom entity picture."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+
+    assert await setup.async_setup_component(
+        hass,
+        "template",
+        {
+            "template": [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event"},
+                    "image": [
+                        {
+                            "url": "{{ trigger.event.data.url }}",
+                            "picture": "http://example2.com",
+                        },
+                    ],
+                },
+            ],
+        },
+    )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    # No image is loaded, expect error
+    await _assert_state(
+        hass,
+        hass_client,
+        "unknown",
+        b"500: Internal Server Error",
+        expected_status=HTTPStatus.INTERNAL_SERVER_ERROR,
+        expected_entity_picture="http://example2.com",
+        expected_content_type="text/plain",
+    )
+
+    hass.bus.async_fire("test_event", {"url": "http://example.com"})
+    await hass.async_block_till_done()
+    expected_state = dt_util.utcnow().isoformat()
+    await _assert_state(
+        hass,
+        hass_client,
+        expected_state,
+        imgbytes_jpg,
+        expected_entity_picture="http://example2.com",
+    )
diff --git a/tests/components/template/test_trigger.py b/tests/components/template/test_trigger.py
index c85c7a6d57b..84fdadfec0d 100644
--- a/tests/components/template/test_trigger.py
+++ b/tests/components/template/test_trigger.py
@@ -7,7 +7,12 @@ import pytest
 
 import homeassistant.components.automation as automation
 from homeassistant.components.template import trigger as template_trigger
-from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, SERVICE_TURN_OFF
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ENTITY_MATCH_ALL,
+    SERVICE_TURN_OFF,
+    STATE_UNAVAILABLE,
+)
 from homeassistant.core import Context, HomeAssistant, callback
 from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
@@ -389,7 +394,7 @@ async def test_if_action(hass: HomeAssistant, start_ha, calls) -> None:
     assert len(calls) == 1
 
 
-@pytest.mark.parametrize(("count", "domain"), [(0, automation.DOMAIN)])
+@pytest.mark.parametrize(("count", "domain"), [(1, automation.DOMAIN)])
 @pytest.mark.parametrize(
     "config",
     [
@@ -405,6 +410,7 @@ async def test_if_fires_on_change_with_bad_template(
     hass: HomeAssistant, start_ha, calls
 ) -> None:
     """Test for firing on change with bad template."""
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 @pytest.mark.parametrize(("count", "domain"), [(1, automation.DOMAIN)])
diff --git a/tests/components/template/test_weather.py b/tests/components/template/test_weather.py
index c987f7a2c30..38cf439987d 100644
--- a/tests/components/template/test_weather.py
+++ b/tests/components/template/test_weather.py
@@ -2,12 +2,16 @@
 import pytest
 
 from homeassistant.components.weather import (
+    ATTR_WEATHER_APPARENT_TEMPERATURE,
+    ATTR_WEATHER_CLOUD_COVERAGE,
+    ATTR_WEATHER_DEW_POINT,
     ATTR_WEATHER_HUMIDITY,
     ATTR_WEATHER_OZONE,
     ATTR_WEATHER_PRESSURE,
     ATTR_WEATHER_TEMPERATURE,
     ATTR_WEATHER_VISIBILITY,
     ATTR_WEATHER_WIND_BEARING,
+    ATTR_WEATHER_WIND_GUST_SPEED,
     ATTR_WEATHER_WIND_SPEED,
     DOMAIN,
 )
@@ -35,6 +39,10 @@ from homeassistant.core import HomeAssistant
                     "wind_bearing_template": "{{ states('sensor.windbearing') }}",
                     "ozone_template": "{{ states('sensor.ozone') }}",
                     "visibility_template": "{{ states('sensor.visibility') }}",
+                    "wind_gust_speed_template": "{{ states('sensor.wind_gust_speed') }}",
+                    "cloud_coverage_template": "{{ states('sensor.cloud_coverage') }}",
+                    "dew_point_template": "{{ states('sensor.dew_point') }}",
+                    "apparent_temperature_template": "{{ states('sensor.apparent_temperature') }}",
                 },
             ]
         },
@@ -55,6 +63,10 @@ async def test_template_state_text(hass: HomeAssistant, start_ha) -> None:
         ("sensor.windbearing", ATTR_WEATHER_WIND_BEARING, 180),
         ("sensor.ozone", ATTR_WEATHER_OZONE, 25),
         ("sensor.visibility", ATTR_WEATHER_VISIBILITY, 4.6),
+        ("sensor.wind_gust_speed", ATTR_WEATHER_WIND_GUST_SPEED, 30),
+        ("sensor.cloud_coverage", ATTR_WEATHER_CLOUD_COVERAGE, 75),
+        ("sensor.dew_point", ATTR_WEATHER_DEW_POINT, 2.2),
+        ("sensor.apparent_temperature", ATTR_WEATHER_APPARENT_TEMPERATURE, 25),
     ]:
         hass.states.async_set(attr, value)
         await hass.async_block_till_done()
diff --git a/tests/components/text/test_device_action.py b/tests/components/text/test_device_action.py
index 523a39c5640..88bf692b711 100644
--- a/tests/components/text/test_device_action.py
+++ b/tests/components/text/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Text device actions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -17,7 +18,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -40,7 +40,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     hass.states.async_set("text.test_5678", 0.5, {"min_value": 0.0, "max_value": 1.0})
@@ -49,14 +49,14 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": "set_value",
             "device_id": device_entry.id,
-            "entity_id": "text.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -82,7 +82,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -96,7 +96,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["set_value"]
@@ -104,7 +104,7 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_action_no_state(
@@ -119,7 +119,7 @@ async def test_get_action_no_state(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = [
@@ -127,19 +127,20 @@ async def test_get_action_no_state(
             "domain": DOMAIN,
             "type": "set_value",
             "device_id": device_entry.id,
-            "entity_id": "text.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for actions."""
-    hass.states.async_set("text.entity", 0.5, {"min_value": 0.0, "max_value": 1.0})
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+    hass.states.async_set(entry.entity_id, 0.5, {"min_value": 0.0, "max_value": 1.0})
 
     assert await async_setup_component(
         hass,
@@ -154,7 +155,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "text.entity",
+                        "entity_id": entry.id,
                         "type": "set_value",
                         "value": 0.3,
                     },
@@ -173,14 +174,78 @@ async def test_action(hass: HomeAssistant) -> None:
     assert len(calls) == 1
 
 
-async def test_capabilities(hass: HomeAssistant) -> None:
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+    hass.states.async_set(entry.entity_id, 0.5, {"min_value": 0.0, "max_value": 1.0})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_set_value",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "set_value",
+                        "value": 0.3,
+                    },
+                },
+            ]
+        },
+    )
+
+    calls = async_mock_service(hass, DOMAIN, "set_value")
+
+    assert len(calls) == 0
+
+    hass.bus.async_fire("test_event_set_value")
+    await hass.async_block_till_done()
+
+    assert len(calls) == 1
+
+
+async def test_capabilities(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
     """Test getting capabilities."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
     capabilities = await device_action.async_get_action_capabilities(
         hass,
         {
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": "text.entity",
+            "entity_id": entry.id,
+            "type": "set_value",
+        },
+    )
+
+    assert capabilities and "extra_fields" in capabilities
+
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [{"name": "value", "required": True, "type": "string"}]
+
+
+async def test_capabilities_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test getting capabilities."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+    capabilities = await device_action.async_get_action_capabilities(
+        hass,
+        {
+            "domain": DOMAIN,
+            "device_id": "abcdefgh",
+            "entity_id": entry.entity_id,
             "type": "set_value",
         },
     )
diff --git a/tests/components/text/test_recorder.py b/tests/components/text/test_recorder.py
index 54134ee501a..da9ec810da9 100644
--- a/tests/components/text/test_recorder.py
+++ b/tests/components/text/test_recorder.py
@@ -2,12 +2,15 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import text
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
 from homeassistant.components.text import ATTR_MAX, ATTR_MIN, ATTR_MODE, ATTR_PATTERN
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -16,6 +19,16 @@ from tests.common import async_fire_time_changed
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def text_only() -> None:
+    """Enable only the text platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.TEXT],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test siren registered attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/threshold/test_binary_sensor.py b/tests/components/threshold/test_binary_sensor.py
index 9e11195d878..e26781029c5 100644
--- a/tests/components/threshold/test_binary_sensor.py
+++ b/tests/components/threshold/test_binary_sensor.py
@@ -2,6 +2,7 @@
 
 import pytest
 
+from homeassistant.components.threshold.const import DOMAIN
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     STATE_UNAVAILABLE,
@@ -9,8 +10,11 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 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 tests.common import MockConfigEntry
+
 
 async def test_sensor_upper(hass: HomeAssistant) -> None:
     """Test if source is above threshold."""
@@ -585,3 +589,47 @@ async def test_sensor_no_lower_upper(
     await hass.async_block_till_done()
 
     assert "Lower or Upper thresholds not provided" in caplog.text
+
+
+async def test_device_id(hass: HomeAssistant) -> None:
+    """Test for source entity device for Threshold."""
+    device_registry = dr.async_get(hass)
+    entity_registry = er.async_get(hass)
+
+    source_config_entry = MockConfigEntry()
+    source_device_entry = device_registry.async_get_or_create(
+        config_entry_id=source_config_entry.entry_id,
+        identifiers={("sensor", "identifier_test")},
+        connections={("mac", "30:31:32:33:34:35")},
+    )
+    source_entity = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source",
+        config_entry=source_config_entry,
+        device_id=source_device_entry.id,
+    )
+    await hass.async_block_till_done()
+    assert entity_registry.async_get("sensor.test_source") is not None
+
+    utility_meter_config_entry = MockConfigEntry(
+        data={},
+        domain=DOMAIN,
+        options={
+            "entity_id": "sensor.test_source",
+            "hysteresis": 0.0,
+            "lower": -2.0,
+            "name": "Threshold",
+            "upper": None,
+        },
+        title="Threshold",
+    )
+
+    utility_meter_config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(utility_meter_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    utility_meter_entity = entity_registry.async_get("binary_sensor.threshold")
+    assert utility_meter_entity is not None
+    assert utility_meter_entity.device_id == source_entity.device_id
diff --git a/tests/components/timer/test_init.py b/tests/components/timer/test_init.py
index 76d92db3702..eabc5e04e0b 100644
--- a/tests/components/timer/test_init.py
+++ b/tests/components/timer/test_init.py
@@ -265,6 +265,7 @@ async def test_methods_and_events(hass: HomeAssistant) -> None:
             assert len(results) == expected_events
 
 
+@pytest.mark.freeze_time("2023-06-05 17:47:50")
 async def test_start_service(hass: HomeAssistant) -> None:
     """Test the start/stop service."""
     await async_setup_component(hass, DOMAIN, {DOMAIN: {"test1": {CONF_DURATION: 10}}})
@@ -880,6 +881,7 @@ async def test_restore_idle(hass: HomeAssistant) -> None:
     assert entity.extra_state_attributes[ATTR_RESTORE]
 
 
+@pytest.mark.freeze_time("2023-06-05 17:47:50")
 async def test_restore_paused(hass: HomeAssistant) -> None:
     """Test entity restore logic when timer is paused."""
     utc_now = utcnow()
@@ -917,6 +919,7 @@ async def test_restore_paused(hass: HomeAssistant) -> None:
     assert entity.extra_state_attributes[ATTR_RESTORE]
 
 
+@pytest.mark.freeze_time("2023-06-05 17:47:50")
 async def test_restore_active_resume(hass: HomeAssistant) -> None:
     """Test entity restore logic when timer is active and end time is after startup."""
     events = async_capture_events(hass, EVENT_TIMER_RESTARTED)
diff --git a/tests/components/tomato/test_device_tracker.py b/tests/components/tomato/test_device_tracker.py
index c23ee28ac7c..7c187c7b4bb 100644
--- a/tests/components/tomato/test_device_tracker.py
+++ b/tests/components/tomato/test_device_tracker.py
@@ -381,7 +381,7 @@ def test_bad_connection(hass: HomeAssistant, mock_exception_logger) -> None:
             "POST",
             "http://tomato-router:80/update.cgi",
             exc=requests.exceptions.ConnectionError,
-        ),
+        )
         tomato.get_scanner(hass, config)
     assert mock_exception_logger.call_count == 1
     assert mock_exception_logger.mock_calls[0] == mock.call(
@@ -409,7 +409,7 @@ def test_router_timeout(hass: HomeAssistant, mock_exception_logger) -> None:
             "POST",
             "http://tomato-router:80/update.cgi",
             exc=requests.exceptions.Timeout,
-        ),
+        )
         tomato.get_scanner(hass, config)
     assert mock_exception_logger.call_count == 1
     assert mock_exception_logger.mock_calls[0] == mock.call(
diff --git a/tests/components/trace/test_websocket_api.py b/tests/components/trace/test_websocket_api.py
index 5dbd78268e2..1041208fa61 100644
--- a/tests/components/trace/test_websocket_api.py
+++ b/tests/components/trace/test_websocket_api.py
@@ -6,6 +6,7 @@ from typing import Any
 from unittest.mock import patch
 
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.bootstrap import async_setup_component
 from homeassistant.components.trace.const import DEFAULT_STORED_TRACES
@@ -14,7 +15,7 @@ from homeassistant.core import Context, CoreState, HomeAssistant, callback
 from homeassistant.helpers.typing import UNDEFINED
 from homeassistant.util.uuid import random_uuid_hex
 
-from tests.common import assert_lists_same, load_fixture
+from tests.common import load_fixture
 from tests.typing import WebSocketGenerator
 
 
@@ -156,7 +157,6 @@ async def test_get_trace(
     }
 
     sun_action = {
-        "limit": 10,
         "params": {
             "domain": "test",
             "service": "automation",
@@ -1087,8 +1087,7 @@ async def test_breakpoints(
     await client.send_json({"id": next_id(), "type": "trace/debug/breakpoint/list"})
     response = await client.receive_json()
     assert response["success"]
-    assert_lists_same(
-        response["result"],
+    assert response["result"] == unordered(
         [
             {"node": f"{prefix}/1", "run_id": "*", "domain": domain, "item_id": "sun"},
             {"node": f"{prefix}/5", "run_id": "*", "domain": domain, "item_id": "sun"},
@@ -1594,7 +1593,6 @@ async def test_trace_blueprint_automation(
         },
     }
     sun_action = {
-        "limit": 10,
         "params": {
             "domain": "test",
             "service": "automation",
diff --git a/tests/components/transmission/test_init.py b/tests/components/transmission/test_init.py
index 89ad0dd2410..84bbf6be6ef 100644
--- a/tests/components/transmission/test_init.py
+++ b/tests/components/transmission/test_init.py
@@ -9,9 +9,12 @@ from transmission_rpc.error import (
     TransmissionError,
 )
 
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.components.transmission.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 
 from . import MOCK_CONFIG_DATA
 
@@ -91,3 +94,68 @@ async def test_unload_entry(hass: HomeAssistant) -> None:
 
     assert entry.state is ConfigEntryState.NOT_LOADED
     assert not hass.data[DOMAIN]
+
+
+@pytest.mark.parametrize(
+    ("domain", "old_unique_id", "new_unique_id"),
+    [
+        (SENSOR_DOMAIN, "0.0.0.0-Transmission Down Speed", "1234-download"),
+        (SENSOR_DOMAIN, "0.0.0.0-Transmission Up Speed", "1234-upload"),
+        (SENSOR_DOMAIN, "0.0.0.0-Transmission Status", "1234-status"),
+        (
+            SENSOR_DOMAIN,
+            "0.0.0.0-Transmission Active Torrents",
+            "1234-active_torrents",
+        ),
+        (
+            SENSOR_DOMAIN,
+            "0.0.0.0-Transmission Paused Torrents",
+            "1234-paused_torrents",
+        ),
+        (SENSOR_DOMAIN, "0.0.0.0-Transmission Total Torrents", "1234-total_torrents"),
+        (
+            SENSOR_DOMAIN,
+            "0.0.0.0-Transmission Completed Torrents",
+            "1234-completed_torrents",
+        ),
+        (
+            SENSOR_DOMAIN,
+            "0.0.0.0-Transmission Started Torrents",
+            "1234-started_torrents",
+        ),
+        # no change on correct sensor unique id
+        (SENSOR_DOMAIN, "1234-started_torrents", "1234-started_torrents"),
+        (SWITCH_DOMAIN, "0.0.0.0-Transmission Switch", "1234-on_off"),
+        (SWITCH_DOMAIN, "0.0.0.0-Transmission Turtle Mode", "1234-turtle_mode"),
+        # no change on correct switch unique id
+        (SWITCH_DOMAIN, "1234-turtle_mode", "1234-turtle_mode"),
+    ],
+)
+async def test_migrate_unique_id(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    domain: str,
+    old_unique_id: str,
+    new_unique_id: str,
+) -> None:
+    """Test unique id migration."""
+    entry = MockConfigEntry(domain=DOMAIN, data=MOCK_CONFIG_DATA, entry_id="1234")
+    entry.add_to_hass(hass)
+
+    entity: er.RegistryEntry = entity_registry.async_get_or_create(
+        suggested_object_id=f"my_{domain}",
+        disabled_by=None,
+        domain=domain,
+        platform=DOMAIN,
+        unique_id=old_unique_id,
+        config_entry=entry,
+    )
+    assert entity.unique_id == old_unique_id
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    migrated_entity = entity_registry.async_get(entity.entity_id)
+
+    assert migrated_entity
+    assert migrated_entity.unique_id == new_unique_id
diff --git a/tests/components/tts/common.py b/tests/components/tts/common.py
index 4e57b85ba4f..a9a95eae2f4 100644
--- a/tests/components/tts/common.py
+++ b/tests/components/tts/common.py
@@ -211,7 +211,7 @@ async def mock_config_entry_setup(
     async def async_unload_entry_init(
         hass: HomeAssistant, config_entry: ConfigEntry
     ) -> bool:
-        """Unload up test config entry."""
+        """Unload test config entry."""
         await hass.config_entries.async_forward_entry_unload(config_entry, TTS_DOMAIN)
         return True
 
diff --git a/tests/components/tts/test_init.py b/tests/components/tts/test_init.py
index 0d110f25b50..2656beba236 100644
--- a/tests/components/tts/test_init.py
+++ b/tests/components/tts/test_init.py
@@ -5,7 +5,6 @@ from typing import Any
 from unittest.mock import MagicMock, patch
 
 import pytest
-import voluptuous as vol
 
 from homeassistant.components import tts
 from homeassistant.components.media_player import (
@@ -17,14 +16,13 @@ from homeassistant.components.media_player import (
     MediaType,
 )
 from homeassistant.components.media_source import Unresolvable
-from homeassistant.components.tts.legacy import _valid_base_url
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, State
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.typing import UNDEFINED
 from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
-from homeassistant.util.network import normalize_url
 
 from .common import (
     DEFAULT_LANG,
@@ -68,7 +66,7 @@ async def test_default_entity_attributes() -> None:
     entity = DefaultEntity()
 
     assert entity.hass is None
-    assert entity.name is None
+    assert entity.name is UNDEFINED
     assert entity.default_language == DEFAULT_LANG
     assert entity.supported_languages == SUPPORT_LANGUAGES
     assert entity.supported_options is None
@@ -1314,44 +1312,6 @@ async def test_tags_with_wave() -> None:
     assert tagged_data != tts_data
 
 
-@pytest.mark.parametrize(
-    "value",
-    (
-        "http://example.local:8123",
-        "http://example.local",
-        "http://example.local:80",
-        "https://example.com",
-        "https://example.com:443",
-        "https://example.com:8123",
-    ),
-)
-def test_valid_base_url(value) -> None:
-    """Test we validate base urls."""
-    assert _valid_base_url(value) == normalize_url(value)
-    # Test we strip trailing `/`
-    assert _valid_base_url(value + "/") == normalize_url(value)
-
-
-@pytest.mark.parametrize(
-    "value",
-    (
-        "http://example.local:8123/sub-path",
-        "http://example.local/sub-path",
-        "https://example.com/sub-path",
-        "https://example.com:8123/sub-path",
-        "mailto:some@email",
-        "http:example.com",
-        "http:/example.com",
-        "http//example.com",
-        "example.com",
-    ),
-)
-def test_invalid_base_url(value) -> None:
-    """Test we catch bad base urls."""
-    with pytest.raises(vol.Invalid):
-        _valid_base_url(value)
-
-
 @pytest.mark.parametrize(
     ("setup", "result_engine"),
     [
diff --git a/tests/components/tts/test_legacy.py b/tests/components/tts/test_legacy.py
index 26b7c2397b4..5a8321e2ae4 100644
--- a/tests/components/tts/test_legacy.py
+++ b/tests/components/tts/test_legacy.py
@@ -4,11 +4,8 @@ from __future__ import annotations
 import pytest
 
 from homeassistant.components.media_player import (
-    ATTR_MEDIA_CONTENT_ID,
-    ATTR_MEDIA_CONTENT_TYPE,
     DOMAIN as DOMAIN_MP,
     SERVICE_PLAY_MEDIA,
-    MediaType,
 )
 from homeassistant.components.tts import ATTR_MESSAGE, DOMAIN, Provider
 from homeassistant.const import ATTR_ENTITY_ID
@@ -17,7 +14,7 @@ from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.setup import async_setup_component
 
-from .common import SUPPORT_LANGUAGES, MockProvider, MockTTS, get_media_source_url
+from .common import SUPPORT_LANGUAGES, MockProvider, MockTTS
 
 from tests.common import (
     MockModule,
@@ -140,34 +137,6 @@ async def test_platform_setup_with_error(
     assert "Error setting up platform: bad_tts" in caplog.text
 
 
-async def test_service_base_url_set(hass: HomeAssistant, mock_tts) -> None:
-    """Set up a TTS platform with ``base_url`` set and call service."""
-    calls = async_mock_service(hass, DOMAIN_MP, SERVICE_PLAY_MEDIA)
-
-    config = {DOMAIN: {"platform": "test", "base_url": "http://fnord"}}
-
-    with assert_setup_component(1, DOMAIN):
-        assert await async_setup_component(hass, DOMAIN, config)
-
-    await hass.services.async_call(
-        DOMAIN,
-        "test_say",
-        {
-            ATTR_ENTITY_ID: "media_player.something",
-            ATTR_MESSAGE: "There is someone at the door.",
-        },
-        blocking=True,
-    )
-    assert len(calls) == 1
-    assert calls[0].data[ATTR_MEDIA_CONTENT_TYPE] == MediaType.MUSIC
-    assert (
-        await get_media_source_url(hass, calls[0].data[ATTR_MEDIA_CONTENT_ID])
-        == "http://fnord"
-        "/api/tts_proxy/42f18378fd4393d18c8dd11d03fa9563c1e54491"
-        "_en-us_-_test.mp3"
-    )
-
-
 async def test_service_without_cache_config(
     hass: HomeAssistant, mock_tts_cache_dir, mock_tts
 ) -> None:
diff --git a/tests/components/tts/test_notify.py b/tests/components/tts/test_notify.py
index be528459a70..22ab151b864 100644
--- a/tests/components/tts/test_notify.py
+++ b/tests/components/tts/test_notify.py
@@ -1,7 +1,9 @@
 """The tests for the TTS component."""
+from unittest.mock import patch
+
 import pytest
 
-from homeassistant.components import media_player, notify, tts
+from homeassistant.components import notify, tts
 from homeassistant.components.media_player import (
     DOMAIN as DOMAIN_MP,
     SERVICE_PLAY_MEDIA,
@@ -24,6 +26,16 @@ async def internal_url_mock(hass: HomeAssistant) -> None:
     )
 
 
+@pytest.fixture(autouse=True)
+async def disable_platforms() -> None:
+    """Disable demo platforms."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [],
+    ):
+        yield
+
+
 async def test_setup_legacy_platform(hass: HomeAssistant) -> None:
     """Set up the tts notify platform ."""
     config = {
@@ -62,7 +74,6 @@ async def test_setup_legacy_service(hass: HomeAssistant) -> None:
 
     config = {
         tts.DOMAIN: {"platform": "demo"},
-        media_player.DOMAIN: {"platform": "demo"},
         notify.DOMAIN: {
             "platform": "tts",
             "name": "tts_test",
diff --git a/tests/components/universal/test_media_player.py b/tests/components/universal/test_media_player.py
index a6cf342eeb3..e31cab59358 100644
--- a/tests/components/universal/test_media_player.py
+++ b/tests/components/universal/test_media_player.py
@@ -1278,6 +1278,56 @@ async def test_master_state_with_template(hass: HomeAssistant) -> None:
     assert events[0].context == context
 
 
+async def test_invalid_active_child_template(hass: HomeAssistant) -> None:
+    """Test invalid active child template."""
+    hass.states.async_set("media_player.mock1", STATE_PLAYING)
+    hass.states.async_set("media_player.mock2", STATE_PAUSED)
+
+    await async_setup_component(
+        hass,
+        "media_player",
+        {
+            "media_player": {
+                "platform": "universal",
+                "name": "tv",
+                "children": ["media_player.mock1", "media_player.mock2"],
+                "active_child_template": "{{invalid.invalid}}!invalid",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    await hass.async_start()
+
+    await hass.async_block_till_done()
+    assert hass.states.get("media_player.tv").state == STATE_PLAYING
+
+
+async def test_active_child_template(hass: HomeAssistant) -> None:
+    """Test override active child with template."""
+    hass.states.async_set("media_player.mock1", STATE_PLAYING)
+    hass.states.async_set("media_player.mock2", STATE_PAUSED)
+
+    await async_setup_component(
+        hass,
+        "media_player",
+        {
+            "media_player": {
+                "platform": "universal",
+                "name": "tv",
+                "children": ["media_player.mock1", "media_player.mock2"],
+                "active_child_template": "{{ 'media_player.mock2' }}",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    await hass.async_start()
+
+    hass.states.async_set("media_player.mock2", STATE_ON)
+
+    await hass.async_block_till_done()
+    assert hass.states.get("media_player.tv").state == STATE_ON
+
+
 async def test_reload(hass: HomeAssistant) -> None:
     """Test reloading the media player from yaml."""
     hass.states.async_set("input_boolean.test", STATE_OFF)
diff --git a/tests/components/update/test_device_trigger.py b/tests/components/update/test_device_trigger.py
index bddcefa07c5..b2d06a642a8 100644
--- a/tests/components/update/test_device_trigger.py
+++ b/tests/components/update/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -14,7 +15,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
@@ -45,7 +45,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -54,7 +54,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -62,7 +62,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -88,7 +88,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -102,7 +102,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -110,7 +110,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -143,8 +143,42 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a update trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls: list[ServiceCall], enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls: list[ServiceCall],
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off triggers firing."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -153,6 +187,8 @@ async def test_if_fires_on_state_change(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
+    entry = entity_registry.async_get("update.update_available")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -163,7 +199,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "update.update_available",
+                        "entity_id": entry.id,
                         "type": "turned_on",
                     },
                     "action": {
@@ -232,16 +268,21 @@ async def test_if_fires_on_state_change(
     )
 
 
-async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls: list[ServiceCall], enable_custom_integrations: None
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls: list[ServiceCall],
+    enable_custom_integrations: None,
 ) -> None:
-    """Test for triggers firing with delay."""
+    """Test for turn_on and turn_off triggers firing."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
 
     platform.init()
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
+    entry = entity_registry.async_get("update.update_available")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -252,7 +293,69 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "update.update_available",
+                        "entity_id": entry.entity_id,
+                        "type": "turned_off",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "no_update {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("update.update_available")
+    assert state
+    assert state.state == STATE_ON
+    assert not calls
+
+    hass.states.async_set("update.update_available", STATE_OFF)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == "no_update device - update.update_available - on - off - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls: list[ServiceCall],
+    enable_custom_integrations: None,
+) -> None:
+    """Test for triggers firing with delay."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+
+    platform.init()
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    entry = entity_registry.async_get("update.update_available")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
                         "type": "turned_off",
                         "for": {"seconds": 5},
                     },
diff --git a/tests/components/update/test_init.py b/tests/components/update/test_init.py
index d0546b6a2ef..a7780f54f70 100644
--- a/tests/components/update/test_init.py
+++ b/tests/components/update/test_init.py
@@ -49,6 +49,7 @@ async def test_update(hass: HomeAssistant) -> None:
     """Test getting data from the mocked update entity."""
     update = MockUpdateEntity()
     update.hass = hass
+    update.platform = MockEntityPlatform(hass)
 
     update._attr_installed_version = "1.0.0"
     update._attr_latest_version = "1.0.1"
@@ -57,7 +58,10 @@ async def test_update(hass: HomeAssistant) -> None:
     update._attr_title = "Title"
 
     assert update.entity_category is EntityCategory.DIAGNOSTIC
-    assert update.entity_picture is None
+    assert (
+        update.entity_picture
+        == "https://brands.home-assistant.io/_/test_platform/icon.png"
+    )
     assert update.installed_version == "1.0.0"
     assert update.latest_version == "1.0.1"
     assert update.release_summary == "Summary"
@@ -76,13 +80,6 @@ async def test_update(hass: HomeAssistant) -> None:
         ATTR_TITLE: "Title",
     }
 
-    # Test with platform
-    update.platform = MockEntityPlatform(hass)
-    assert (
-        update.entity_picture
-        == "https://brands.home-assistant.io/_/test_platform/icon.png"
-    )
-
     # Test no update available
     update._attr_installed_version = "1.0.0"
     update._attr_latest_version = "1.0.0"
diff --git a/tests/components/usb/test_init.py b/tests/components/usb/test_init.py
index 0d4625fe7fb..e7c878b6f40 100644
--- a/tests/components/usb/test_init.py
+++ b/tests/components/usb/test_init.py
@@ -1021,3 +1021,45 @@ async def test_cancel_initial_scan_callback(
         hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
         await hass.async_block_till_done()
         assert len(mock_callback.mock_calls) == 0
+
+
+async def test_resolve_serial_by_id(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test the discovery data resolves to serial/by-id."""
+    new_usb = [{"domain": "test1", "vid": "3039", "pid": "3039"}]
+
+    mock_comports = [
+        MagicMock(
+            device=slae_sh_device.device,
+            vid=12345,
+            pid=12345,
+            serial_number=slae_sh_device.serial_number,
+            manufacturer=slae_sh_device.manufacturer,
+            description=slae_sh_device.description,
+        )
+    ]
+
+    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(
+        "homeassistant.components.usb.get_serial_by_id",
+        return_value="/dev/serial/by-id/bla",
+    ), 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()
+        hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
+        await hass.async_block_till_done()
+        ws_client = await hass_ws_client(hass)
+        await ws_client.send_json({"id": 1, "type": "usb/scan"})
+        response = await ws_client.receive_json()
+        assert response["success"]
+        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 mock_config_flow.mock_calls[0][2]["data"].device == "/dev/serial/by-id/bla"
diff --git a/tests/components/utility_meter/test_config_flow.py b/tests/components/utility_meter/test_config_flow.py
index 302d3879a04..88a77407c07 100644
--- a/tests/components/utility_meter/test_config_flow.py
+++ b/tests/components/utility_meter/test_config_flow.py
@@ -7,6 +7,7 @@ from homeassistant import config_entries
 from homeassistant.components.utility_meter.const import DOMAIN
 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 tests.common import MockConfigEntry
 
@@ -266,3 +267,173 @@ async def test_options(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
     state = hass.states.get("sensor.electricity_meter")
     assert state.attributes["source"] == input_sensor2_entity_id
+
+
+async def test_change_device_source(hass: HomeAssistant) -> None:
+    """Test remove the device registry configuration entry when the source entity changes."""
+
+    device_registry = dr.async_get(hass)
+    entity_registry = er.async_get(hass)
+
+    # Configure source entity 1 (with a linked device)
+    source_config_entry_1 = MockConfigEntry()
+    source_device_entry_1 = device_registry.async_get_or_create(
+        config_entry_id=source_config_entry_1.entry_id,
+        identifiers={("sensor", "identifier_test1")},
+        connections={("mac", "20:31:32:33:34:35")},
+    )
+    source_entity_1 = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source1",
+        config_entry=source_config_entry_1,
+        device_id=source_device_entry_1.id,
+    )
+
+    # Configure source entity 2 (with a linked device)
+    source_config_entry_2 = MockConfigEntry()
+    source_device_entry_2 = device_registry.async_get_or_create(
+        config_entry_id=source_config_entry_2.entry_id,
+        identifiers={("sensor", "identifier_test2")},
+        connections={("mac", "30:31:32:33:34:35")},
+    )
+    source_entity_2 = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source2",
+        config_entry=source_config_entry_2,
+        device_id=source_device_entry_2.id,
+    )
+
+    # Configure source entity 3 (without a device)
+    source_config_entry_3 = MockConfigEntry()
+    source_entity_3 = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source3",
+        config_entry=source_config_entry_3,
+    )
+
+    await hass.async_block_till_done()
+
+    input_sensor_entity_id_1 = "sensor.test_source1"
+    input_sensor_entity_id_2 = "sensor.test_source2"
+    input_sensor_entity_id_3 = "sensor.test_source3"
+
+    # Test the existence of configured source entities
+    assert entity_registry.async_get(input_sensor_entity_id_1) is not None
+    assert entity_registry.async_get(input_sensor_entity_id_2) is not None
+    assert entity_registry.async_get(input_sensor_entity_id_3) is not None
+
+    # Setup the config entry with source entity 1 (with a linked device)
+    current_entity_source = source_entity_1
+    utility_meter_config_entry = MockConfigEntry(
+        data={},
+        domain=DOMAIN,
+        options={
+            "cycle": "monthly",
+            "delta_values": False,
+            "name": "Energy",
+            "net_consumption": False,
+            "offset": 0,
+            "periodically_resetting": True,
+            "source": current_entity_source.entity_id,
+            "tariffs": [],
+        },
+        title="Energy",
+    )
+    utility_meter_config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(utility_meter_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    # Confirm that the configuration entry has been added to the source entity 1 (current) device registry
+    current_device = device_registry.async_get(
+        device_id=current_entity_source.device_id
+    )
+    assert utility_meter_config_entry.entry_id in current_device.config_entries
+
+    # Change configuration options to use source entity 2 (with a linked device) and reload the integration
+    previous_entity_source = source_entity_1
+    current_entity_source = source_entity_2
+
+    result = await hass.config_entries.options.async_init(
+        utility_meter_config_entry.entry_id
+    )
+    assert result["type"] == FlowResultType.FORM
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "periodically_resetting": True,
+            "source": current_entity_source.entity_id,
+        },
+    )
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    await hass.async_block_till_done()
+
+    # Confirm that the configuration entry has been removed from the source entity 1 (previous) device registry
+    previous_device = device_registry.async_get(
+        device_id=previous_entity_source.device_id
+    )
+    assert utility_meter_config_entry.entry_id not in previous_device.config_entries
+
+    # Confirm that the configuration entry has been added to the source entity 2 (current) device registry
+    current_device = device_registry.async_get(
+        device_id=current_entity_source.device_id
+    )
+    assert utility_meter_config_entry.entry_id in current_device.config_entries
+
+    # Change configuration options to use source entity 3 (without a device) and reload the integration
+    previous_entity_source = source_entity_2
+    current_entity_source = source_entity_3
+
+    result = await hass.config_entries.options.async_init(
+        utility_meter_config_entry.entry_id
+    )
+    assert result["type"] == FlowResultType.FORM
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "periodically_resetting": True,
+            "source": current_entity_source.entity_id,
+        },
+    )
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    await hass.async_block_till_done()
+
+    # Confirm that the configuration entry has been removed from the source entity 2 (previous) device registry
+    previous_device = device_registry.async_get(
+        device_id=previous_entity_source.device_id
+    )
+    assert utility_meter_config_entry.entry_id not in previous_device.config_entries
+
+    # Confirm that there is no device with the helper configuration entry
+    assert (
+        dr.async_entries_for_config_entry(
+            device_registry, utility_meter_config_entry.entry_id
+        )
+        == []
+    )
+
+    # Change configuration options to use source entity 2 (with a linked device) and reload the integration
+    previous_entity_source = source_entity_3
+    current_entity_source = source_entity_2
+
+    result = await hass.config_entries.options.async_init(
+        utility_meter_config_entry.entry_id
+    )
+    assert result["type"] == FlowResultType.FORM
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "periodically_resetting": True,
+            "source": current_entity_source.entity_id,
+        },
+    )
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    await hass.async_block_till_done()
+
+    # Confirm that the configuration entry has been added to the source entity 2 (current) device registry
+    current_device = device_registry.async_get(
+        device_id=current_entity_source.device_id
+    )
+    assert utility_meter_config_entry.entry_id in current_device.config_entries
diff --git a/tests/components/utility_meter/test_sensor.py b/tests/components/utility_meter/test_sensor.py
index 65892ae376a..5cb9e594cb2 100644
--- a/tests/components/utility_meter/test_sensor.py
+++ b/tests/components/utility_meter/test_sensor.py
@@ -41,7 +41,7 @@ from homeassistant.const import (
     UnitOfEnergy,
 )
 from homeassistant.core import CoreState, HomeAssistant, State
-from homeassistant.helpers import entity_registry as er
+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
 
@@ -1458,3 +1458,81 @@ def test_calculate_adjustment_invalid_new_state(
     new_state: State = State(entity_id="sensor.test", state="unknown")
     assert mock_sensor.calculate_adjustment(None, new_state) is None
     assert "Invalid state unknown" in caplog.text
+
+
+async def test_device_id(hass: HomeAssistant) -> None:
+    """Test for source entity device for Utility Meter."""
+    device_registry = dr.async_get(hass)
+    entity_registry = er.async_get(hass)
+
+    source_config_entry = MockConfigEntry()
+    source_device_entry = device_registry.async_get_or_create(
+        config_entry_id=source_config_entry.entry_id,
+        identifiers={("sensor", "identifier_test")},
+        connections={("mac", "30:31:32:33:34:35")},
+    )
+    source_entity = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source",
+        config_entry=source_config_entry,
+        device_id=source_device_entry.id,
+    )
+    await hass.async_block_till_done()
+    assert entity_registry.async_get("sensor.test_source") is not None
+
+    utility_meter_config_entry = MockConfigEntry(
+        data={},
+        domain=DOMAIN,
+        options={
+            "cycle": "monthly",
+            "delta_values": False,
+            "name": "Energy",
+            "net_consumption": False,
+            "offset": 0,
+            "periodically_resetting": True,
+            "source": "sensor.test_source",
+            "tariffs": ["peak", "offpeak"],
+        },
+        title="Energy",
+    )
+
+    utility_meter_config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(utility_meter_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    utility_meter_entity = entity_registry.async_get("sensor.energy_peak")
+    assert utility_meter_entity is not None
+    assert utility_meter_entity.device_id == source_entity.device_id
+
+    utility_meter_entity = entity_registry.async_get("sensor.energy_offpeak")
+    assert utility_meter_entity is not None
+    assert utility_meter_entity.device_id == source_entity.device_id
+
+    utility_meter_no_tariffs_config_entry = MockConfigEntry(
+        data={},
+        domain=DOMAIN,
+        options={
+            "cycle": "monthly",
+            "delta_values": False,
+            "name": "Energy",
+            "net_consumption": False,
+            "offset": 0,
+            "periodically_resetting": True,
+            "source": "sensor.test_source",
+            "tariffs": [],
+        },
+        title="Energy",
+    )
+
+    utility_meter_no_tariffs_config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(
+        utility_meter_no_tariffs_config_entry.entry_id
+    )
+    await hass.async_block_till_done()
+
+    utility_meter_no_tariffs_entity = entity_registry.async_get("sensor.energy")
+    assert utility_meter_no_tariffs_entity is not None
+    assert utility_meter_no_tariffs_entity.device_id == source_entity.device_id
diff --git a/tests/components/vacuum/test_device_action.py b/tests/components/vacuum/test_device_action.py
index 643d9ad0130..617b8d41609 100644
--- a/tests/components/vacuum/test_device_action.py
+++ b/tests/components/vacuum/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Vacuum device actions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -12,7 +13,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -35,16 +35,15 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
-    expected_actions = []
-    expected_actions += [
+    expected_actions = [
         {
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": "vacuum.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in ["clean", "dock"]
@@ -52,7 +51,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -78,7 +77,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -92,7 +91,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["clean", "dock"]
@@ -100,11 +99,13 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -115,7 +116,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "vacuum.entity",
+                        "entity_id": entry.id,
                         "type": "dock",
                     },
                 },
@@ -124,7 +125,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "vacuum.entity",
+                        "entity_id": entry.id,
                         "type": "clean",
                     },
                 },
@@ -144,3 +145,39 @@ async def test_action(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
     assert len(dock_calls) == 1
     assert len(clean_calls) == 1
+
+    assert dock_calls[-1].data == {"entity_id": entry.entity_id}
+    assert clean_calls[-1].data == {"entity_id": entry.entity_id}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event_dock"},
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "dock",
+                    },
+                },
+            ]
+        },
+    )
+
+    dock_calls = async_mock_service(hass, "vacuum", "return_to_base")
+
+    hass.bus.async_fire("test_event_dock")
+    await hass.async_block_till_done()
+    assert len(dock_calls) == 1
+
+    assert dock_calls[-1].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/vacuum/test_device_condition.py b/tests/components/vacuum/test_device_condition.py
index b1ed65d689f..694f4b64417 100644
--- a/tests/components/vacuum/test_device_condition.py
+++ b/tests/components/vacuum/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Vacuum device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -17,7 +18,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -46,7 +46,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -55,7 +55,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in ["is_cleaning", "is_docked"]
@@ -63,7 +63,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -89,7 +89,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -103,7 +103,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_cleaning", "is_docked"]
@@ -111,12 +111,16 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("vacuum.entity", STATE_DOCKED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_DOCKED)
 
     assert await async_setup_component(
         hass,
@@ -130,7 +134,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "vacuum.entity",
+                            "entity_id": entry.id,
                             "type": "is_cleaning",
                         }
                     ],
@@ -148,7 +152,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "vacuum.entity",
+                            "entity_id": entry.id,
                             "type": "is_docked",
                         }
                     ],
@@ -168,7 +172,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_docked - event - test_event2"
 
-    hass.states.async_set("vacuum.entity", STATE_CLEANING)
+    hass.states.async_set(entry.entity_id, STATE_CLEANING)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
@@ -176,9 +180,49 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert calls[1].data["some"] == "is_cleaning - event - test_event1"
 
     # Returning means it's still cleaning
-    hass.states.async_set("vacuum.entity", STATE_RETURNING)
+    hass.states.async_set(entry.entity_id, STATE_RETURNING)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
     assert len(calls) == 3
     assert calls[2].data["some"] == "is_cleaning - event - test_event1"
+
+
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_CLEANING)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_cleaning",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_cleaning - {{ trigger.platform }} - {{ trigger.event.event_type }}"
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_cleaning - event - test_event1"
diff --git a/tests/components/vacuum/test_device_trigger.py b/tests/components/vacuum/test_device_trigger.py
index 84519a80545..2f27d299d7e 100644
--- a/tests/components/vacuum/test_device_trigger.py
+++ b/tests/components/vacuum/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -15,7 +16,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
@@ -46,7 +46,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -55,7 +55,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["cleaning", "docked"]
@@ -63,7 +63,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -89,7 +89,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -103,7 +103,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["cleaning", "docked"]
@@ -111,7 +111,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -145,9 +145,45 @@ async def test_get_trigger_capabilities(
         }
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a vacuum device."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    assert len(triggers) == 2
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == {
+            "extra_fields": [
+                {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+            ]
+        }
+
+
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
-    hass.states.async_set("vacuum.entity", STATE_DOCKED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_DOCKED)
 
     assert await async_setup_component(
         hass,
@@ -159,7 +195,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "vacuum.entity",
+                        "entity_id": entry.id,
                         "type": "cleaning",
                     },
                     "action": {
@@ -178,7 +214,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "vacuum.entity",
+                        "entity_id": entry.id,
                         "type": "docked",
                     },
                     "action": {
@@ -197,26 +233,31 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Fake that the entity is cleaning
-    hass.states.async_set("vacuum.entity", STATE_CLEANING)
+    hass.states.async_set(entry.entity_id, STATE_CLEANING)
     await hass.async_block_till_done()
     assert len(calls) == 1
     assert (
-        calls[0].data["some"] == "cleaning - device - vacuum.entity - docked - cleaning"
+        calls[0].data["some"]
+        == f"cleaning - device - {entry.entity_id} - docked - cleaning"
     )
 
     # Fake that the entity is docked
-    hass.states.async_set("vacuum.entity", STATE_DOCKED)
+    hass.states.async_set(entry.entity_id, STATE_DOCKED)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert (
-        calls[1].data["some"] == "docked - device - vacuum.entity - cleaning - docked"
+        calls[1].data["some"]
+        == f"docked - device - {entry.entity_id} - cleaning - docked"
     )
 
 
-async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) -> None:
-    """Test for triggers firing with delay."""
-    entity_id = f"{DOMAIN}.entity"
-    hass.states.async_set(entity_id, STATE_DOCKED)
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_DOCKED)
 
     assert await async_setup_component(
         hass,
@@ -228,7 +269,53 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.entity_id,
+                        "type": "cleaning",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "cleaning - {{ trigger.platform}} - "
+                                "{{ trigger.entity_id}} - {{ trigger.from_state.state}} - "
+                                "{{ trigger.to_state.state}}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the entity is cleaning
+    hass.states.async_set(entry.entity_id, STATE_CLEANING)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"cleaning - device - {entry.entity_id} - docked - cleaning"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_DOCKED)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
                         "type": "cleaning",
                         "for": {"seconds": 5},
                     },
@@ -252,10 +339,9 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == STATE_DOCKED
     assert len(calls) == 0
 
-    hass.states.async_set(entity_id, STATE_CLEANING)
+    hass.states.async_set(entry.entity_id, STATE_CLEANING)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -264,5 +350,5 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     await hass.async_block_till_done()
     assert (
         calls[0].data["some"]
-        == f"turn_off device - {entity_id} - docked - cleaning - 0:00:05"
+        == f"turn_off device - {entry.entity_id} - docked - cleaning - 0:00:05"
     )
diff --git a/tests/components/verisure/test_config_flow.py b/tests/components/verisure/test_config_flow.py
index b1e67766df8..af102cced98 100644
--- a/tests/components/verisure/test_config_flow.py
+++ b/tests/components/verisure/test_config_flow.py
@@ -583,6 +583,15 @@ async def test_reauth_flow_errors(
                 CONF_LOCK_CODE_DIGITS: DEFAULT_LOCK_CODE_DIGITS,
             },
         ),
+        (
+            {
+                CONF_LOCK_CODE_DIGITS: 5,
+            },
+            {
+                CONF_LOCK_CODE_DIGITS: 5,
+                CONF_LOCK_DEFAULT_CODE: "",
+            },
+        ),
     ],
 )
 async def test_options_flow(
diff --git a/tests/components/vicare/conftest.py b/tests/components/vicare/conftest.py
index 1137abbc54e..5085ff6661d 100644
--- a/tests/components/vicare/conftest.py
+++ b/tests/components/vicare/conftest.py
@@ -4,8 +4,8 @@ from __future__ import annotations
 from collections.abc import AsyncGenerator, Generator
 from unittest.mock import AsyncMock, Mock, patch
 
-from PyViCare.PyViCareDeviceConfig import PyViCareDeviceConfig
 import pytest
+from PyViCare.PyViCareDeviceConfig import PyViCareDeviceConfig
 
 from homeassistant.components.vicare.const import DOMAIN
 from homeassistant.core import HomeAssistant
diff --git a/tests/components/vicare/test_config_flow.py b/tests/components/vicare/test_config_flow.py
index 72fb8d0d0b6..0774848ef11 100644
--- a/tests/components/vicare/test_config_flow.py
+++ b/tests/components/vicare/test_config_flow.py
@@ -1,8 +1,8 @@
 """Test the ViCare config flow."""
 from unittest.mock import AsyncMock, patch
 
-from PyViCare.PyViCareUtils import PyViCareInvalidCredentialsError
 import pytest
+from PyViCare.PyViCareUtils import PyViCareInvalidCredentialsError
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components import dhcp
diff --git a/tests/components/voip/test_select.py b/tests/components/voip/test_select.py
index 19c3202576a..7dd041a6866 100644
--- a/tests/components/voip/test_select.py
+++ b/tests/components/voip/test_select.py
@@ -17,3 +17,18 @@ async def test_pipeline_select(
     state = hass.states.get("select.192_168_1_210_assist_pipeline")
     assert state is not None
     assert state.state == "preferred"
+
+
+async def test_vad_sensitivity_select(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    voip_device: VoIPDevice,
+) -> None:
+    """Test VAD sensitivity select.
+
+    Functionality is tested in assist_pipeline/test_select.py.
+    This test is only to ensure it is set up.
+    """
+    state = hass.states.get("select.192_168_1_210_finished_speaking_detection")
+    assert state is not None
+    assert state.state == "default"
diff --git a/tests/components/voip/test_voip.py b/tests/components/voip/test_voip.py
index bd9a3587a9a..9b3f5d963dc 100644
--- a/tests/components/voip/test_voip.py
+++ b/tests/components/voip/test_voip.py
@@ -31,7 +31,9 @@ async def test_pipeline(
     # Used to test that audio queue is cleared before pipeline starts
     bad_chunk = bytes([1, 2, 3, 4])
 
-    async def async_pipeline_from_audio_stream(*args, **kwargs):
+    async def async_pipeline_from_audio_stream(*args, device_id, **kwargs):
+        assert device_id == voip_device.device_id
+
         stt_stream = kwargs["stt_stream"]
         event_callback = kwargs["event_callback"]
         async for _chunk in stt_stream:
@@ -93,6 +95,7 @@ async def test_pipeline(
             listening_tone_enabled=False,
             processing_tone_enabled=False,
             error_tone_enabled=False,
+            silence_seconds=assist_pipeline.vad.VadSensitivity.to_seconds("aggressive"),
         )
         rtp_protocol.transport = Mock()
 
@@ -111,7 +114,7 @@ async def test_pipeline(
         # "speech"
         rtp_protocol.on_chunk(bytes([255] * _ONE_SECOND * 2))
 
-        # silence
+        # silence (assumes aggressive VAD sensitivity)
         rtp_protocol.on_chunk(bytes(_ONE_SECOND))
 
         # Wait for mock pipeline to exhaust the audio stream
@@ -286,6 +289,7 @@ async def test_tts_timeout(
             listening_tone_enabled=True,
             processing_tone_enabled=True,
             error_tone_enabled=True,
+            silence_seconds=assist_pipeline.vad.VadSensitivity.to_seconds("relaxed"),
         )
         rtp_protocol._tone_bytes = tone_bytes
         rtp_protocol._processing_bytes = tone_bytes
@@ -311,8 +315,8 @@ async def test_tts_timeout(
         # "speech"
         rtp_protocol.on_chunk(bytes([255] * _ONE_SECOND * 2))
 
-        # silence
-        rtp_protocol.on_chunk(bytes(_ONE_SECOND))
+        # silence (assumes relaxed VAD sensitivity)
+        rtp_protocol.on_chunk(bytes(_ONE_SECOND * 4))
 
         # Wait for mock pipeline to exhaust the audio stream
         async with async_timeout.timeout(1):
diff --git a/tests/components/water_heater/test_device_action.py b/tests/components/water_heater/test_device_action.py
index b1e12dcab94..a8ca41905d6 100644
--- a/tests/components/water_heater/test_device_action.py
+++ b/tests/components/water_heater/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Water Heater device actions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -12,7 +13,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -35,16 +35,15 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
-    expected_actions = []
-    expected_actions += [
+    expected_actions = [
         {
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in ["turn_on", "turn_off"]
@@ -52,7 +51,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -78,7 +77,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -92,7 +91,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["turn_on", "turn_off"]
@@ -100,11 +99,13 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -118,7 +119,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "water_heater.entity",
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                 },
@@ -130,7 +131,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "water_heater.entity",
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                 },
@@ -150,3 +151,42 @@ async def test_action(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
     assert len(turn_off_calls) == 1
     assert len(turn_on_calls) == 1
+
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
+    assert turn_on_calls[-1].data == {"entity_id": entry.entity_id}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_turn_off",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "turn_off",
+                    },
+                },
+            ]
+        },
+    )
+
+    turn_off_calls = async_mock_service(hass, "water_heater", "turn_off")
+
+    hass.bus.async_fire("test_event_turn_off")
+    await hass.async_block_till_done()
+    assert len(turn_off_calls) == 1
+
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/waze_travel_time/conftest.py b/tests/components/waze_travel_time/conftest.py
index 4d964d9f08a..65c2616d1dc 100644
--- a/tests/components/waze_travel_time/conftest.py
+++ b/tests/components/waze_travel_time/conftest.py
@@ -1,8 +1,8 @@
 """Fixtures for Waze Travel Time tests."""
 from unittest.mock import patch
 
-from WazeRouteCalculator import WRCError
 import pytest
+from WazeRouteCalculator import WRCError
 
 
 @pytest.fixture(name="mock_wrc", autouse=True)
diff --git a/tests/components/waze_travel_time/test_sensor.py b/tests/components/waze_travel_time/test_sensor.py
index 5b23d8a369a..a3367a48d2a 100644
--- a/tests/components/waze_travel_time/test_sensor.py
+++ b/tests/components/waze_travel_time/test_sensor.py
@@ -1,6 +1,6 @@
 """Test Waze Travel Time sensors."""
-from WazeRouteCalculator import WRCError
 import pytest
+from WazeRouteCalculator import WRCError
 
 from homeassistant.components.waze_travel_time.const import (
     CONF_AVOID_FERRIES,
diff --git a/tests/components/weather/test_init.py b/tests/components/weather/test_init.py
index 76483491bf8..5ed6a02f24b 100644
--- a/tests/components/weather/test_init.py
+++ b/tests/components/weather/test_init.py
@@ -6,12 +6,17 @@ import pytest
 from homeassistant.components.weather import (
     ATTR_CONDITION_SUNNY,
     ATTR_FORECAST,
+    ATTR_FORECAST_APPARENT_TEMP,
+    ATTR_FORECAST_DEW_POINT,
+    ATTR_FORECAST_HUMIDITY,
     ATTR_FORECAST_PRECIPITATION,
     ATTR_FORECAST_PRESSURE,
     ATTR_FORECAST_TEMP,
     ATTR_FORECAST_TEMP_LOW,
     ATTR_FORECAST_WIND_BEARING,
+    ATTR_FORECAST_WIND_GUST_SPEED,
     ATTR_FORECAST_WIND_SPEED,
+    ATTR_WEATHER_APPARENT_TEMPERATURE,
     ATTR_WEATHER_OZONE,
     ATTR_WEATHER_PRECIPITATION_UNIT,
     ATTR_WEATHER_PRESSURE,
@@ -21,6 +26,7 @@ from homeassistant.components.weather import (
     ATTR_WEATHER_VISIBILITY,
     ATTR_WEATHER_VISIBILITY_UNIT,
     ATTR_WEATHER_WIND_BEARING,
+    ATTR_WEATHER_WIND_GUST_SPEED,
     ATTR_WEATHER_WIND_SPEED,
     ATTR_WEATHER_WIND_SPEED_UNIT,
     ROUNDING_PRECISION,
@@ -28,6 +34,11 @@ from homeassistant.components.weather import (
     WeatherEntity,
     round_temperature,
 )
+from homeassistant.components.weather.const import (
+    ATTR_WEATHER_CLOUD_COVERAGE,
+    ATTR_WEATHER_DEW_POINT,
+    ATTR_WEATHER_HUMIDITY,
+)
 from homeassistant.const import (
     ATTR_FRIENDLY_NAME,
     PRECISION_HALVES,
@@ -63,9 +74,12 @@ class MockWeatherEntity(WeatherEntity):
         self._attr_native_pressure = 10
         self._attr_native_pressure_unit = UnitOfPressure.HPA
         self._attr_native_temperature = 20
+        self._attr_native_apparent_temperature = 25
+        self._attr_native_dew_point = 2
         self._attr_native_temperature_unit = UnitOfTemperature.CELSIUS
         self._attr_native_visibility = 30
         self._attr_native_visibility_unit = UnitOfLength.KILOMETERS
+        self._attr_native_wind_gust_speed = 10
         self._attr_native_wind_speed = 3
         self._attr_native_wind_speed_unit = UnitOfSpeed.METERS_PER_SECOND
         self._attr_forecast = [
@@ -73,6 +87,7 @@ class MockWeatherEntity(WeatherEntity):
                 datetime=datetime(2022, 6, 20, 20, 00, 00),
                 native_precipitation=1,
                 native_temperature=20,
+                native_dew_point=2,
             )
         ]
 
@@ -85,6 +100,8 @@ class MockWeatherEntityPrecision(WeatherEntity):
         super().__init__()
         self._attr_condition = ATTR_CONDITION_SUNNY
         self._attr_native_temperature = 20.3
+        self._attr_native_apparent_temperature = 25.3
+        self._attr_native_dew_point = 2.3
         self._attr_native_temperature_unit = UnitOfTemperature.CELSIUS
         self._attr_precision = PRECISION_HALVES
 
@@ -153,21 +170,48 @@ async def test_temperature(
     """Test temperature."""
     hass.config.units = unit_system
     native_value = 38
+    apparent_native_value = 45
+    dew_point_native_value = 32
     state_value = TemperatureConverter.convert(native_value, native_unit, state_unit)
+    apparent_state_value = TemperatureConverter.convert(
+        apparent_native_value, native_unit, state_unit
+    )
 
+    state_value = TemperatureConverter.convert(native_value, native_unit, state_unit)
+    dew_point_state_value = TemperatureConverter.convert(
+        dew_point_native_value, native_unit, state_unit
+    )
     entity0 = await create_entity(
-        hass, native_temperature=native_value, native_temperature_unit=native_unit
+        hass,
+        native_temperature=native_value,
+        native_temperature_unit=native_unit,
+        native_apparent_temperature=apparent_native_value,
+        native_dew_point=dew_point_native_value,
     )
 
     state = hass.states.get(entity0.entity_id)
     forecast = state.attributes[ATTR_FORECAST][0]
 
     expected = state_value
+    apparent_expected = apparent_state_value
+    dew_point_expected = dew_point_state_value
     assert float(state.attributes[ATTR_WEATHER_TEMPERATURE]) == pytest.approx(
         expected, rel=0.1
     )
+    assert float(state.attributes[ATTR_WEATHER_APPARENT_TEMPERATURE]) == pytest.approx(
+        apparent_expected, rel=0.1
+    )
+    assert float(state.attributes[ATTR_WEATHER_DEW_POINT]) == pytest.approx(
+        dew_point_expected, rel=0.1
+    )
     assert state.attributes[ATTR_WEATHER_TEMPERATURE_UNIT] == state_unit
     assert float(forecast[ATTR_FORECAST_TEMP]) == pytest.approx(expected, rel=0.1)
+    assert float(forecast[ATTR_FORECAST_APPARENT_TEMP]) == pytest.approx(
+        apparent_expected, rel=0.1
+    )
+    assert float(forecast[ATTR_FORECAST_DEW_POINT]) == pytest.approx(
+        dew_point_expected, rel=0.1
+    )
     assert float(forecast[ATTR_FORECAST_TEMP_LOW]) == pytest.approx(expected, rel=0.1)
 
 
@@ -189,22 +233,44 @@ async def test_temperature_no_unit(
     """Test temperature when the entity does not declare a native unit."""
     hass.config.units = unit_system
     native_value = 38
+    dew_point_native_value = 32
+    apparent_temp_native_value = 45
     state_value = native_value
+    dew_point_state_value = dew_point_native_value
+    apparent_temp_state_value = apparent_temp_native_value
 
     entity0 = await create_entity(
-        hass, native_temperature=native_value, native_temperature_unit=native_unit
+        hass,
+        native_temperature=native_value,
+        native_temperature_unit=native_unit,
+        native_dew_point=dew_point_native_value,
+        native_apparent_temperature=apparent_temp_native_value,
     )
 
     state = hass.states.get(entity0.entity_id)
     forecast = state.attributes[ATTR_FORECAST][0]
 
     expected = state_value
+    dew_point_expected = dew_point_state_value
+    expected_apparent_temp = apparent_temp_state_value
     assert float(state.attributes[ATTR_WEATHER_TEMPERATURE]) == pytest.approx(
         expected, rel=0.1
     )
+    assert float(state.attributes[ATTR_WEATHER_DEW_POINT]) == pytest.approx(
+        dew_point_expected, rel=0.1
+    )
+    assert float(state.attributes[ATTR_WEATHER_APPARENT_TEMPERATURE]) == pytest.approx(
+        expected_apparent_temp, rel=0.1
+    )
     assert state.attributes[ATTR_WEATHER_TEMPERATURE_UNIT] == state_unit
     assert float(forecast[ATTR_FORECAST_TEMP]) == pytest.approx(expected, rel=0.1)
+    assert float(forecast[ATTR_FORECAST_DEW_POINT]) == pytest.approx(
+        dew_point_expected, rel=0.1
+    )
     assert float(forecast[ATTR_FORECAST_TEMP_LOW]) == pytest.approx(expected, rel=0.1)
+    assert float(forecast[ATTR_FORECAST_APPARENT_TEMP]) == pytest.approx(
+        expected_apparent_temp, rel=0.1
+    )
 
 
 @pytest.mark.parametrize("native_unit", (UnitOfPressure.INHG, UnitOfPressure.INHG))
@@ -310,6 +376,49 @@ async def test_wind_speed(
     )
 
 
+@pytest.mark.parametrize(
+    "native_unit",
+    (
+        UnitOfSpeed.MILES_PER_HOUR,
+        UnitOfSpeed.KILOMETERS_PER_HOUR,
+        UnitOfSpeed.METERS_PER_SECOND,
+    ),
+)
+@pytest.mark.parametrize(
+    ("state_unit", "unit_system"),
+    (
+        (UnitOfSpeed.KILOMETERS_PER_HOUR, METRIC_SYSTEM),
+        (UnitOfSpeed.MILES_PER_HOUR, US_CUSTOMARY_SYSTEM),
+    ),
+)
+async def test_wind_gust_speed(
+    hass: HomeAssistant,
+    enable_custom_integrations: None,
+    native_unit: str,
+    state_unit: str,
+    unit_system,
+) -> None:
+    """Test wind speed."""
+    hass.config.units = unit_system
+    native_value = 10
+    state_value = SpeedConverter.convert(native_value, native_unit, state_unit)
+
+    entity0 = await create_entity(
+        hass, native_wind_gust_speed=native_value, native_wind_speed_unit=native_unit
+    )
+
+    state = hass.states.get(entity0.entity_id)
+    forecast = state.attributes[ATTR_FORECAST][0]
+
+    expected = state_value
+    assert float(state.attributes[ATTR_WEATHER_WIND_GUST_SPEED]) == pytest.approx(
+        expected, rel=1e-2
+    )
+    assert float(forecast[ATTR_FORECAST_WIND_GUST_SPEED]) == pytest.approx(
+        expected, rel=1e-2
+    )
+
+
 @pytest.mark.parametrize("native_unit", (None,))
 @pytest.mark.parametrize(
     ("state_unit", "unit_system"),
@@ -474,21 +583,41 @@ async def test_precipitation_no_unit(
     )
 
 
-async def test_wind_bearing_and_ozone(
+async def test_wind_bearing_ozone_and_cloud_coverage(
     hass: HomeAssistant,
     enable_custom_integrations: None,
 ) -> None:
-    """Test wind bearing."""
+    """Test wind bearing, ozone and cloud coverage."""
     wind_bearing_value = 180
     ozone_value = 10
+    cloud_coverage = 75
 
     entity0 = await create_entity(
-        hass, wind_bearing=wind_bearing_value, ozone=ozone_value
+        hass,
+        wind_bearing=wind_bearing_value,
+        ozone=ozone_value,
+        cloud_coverage=cloud_coverage,
     )
 
     state = hass.states.get(entity0.entity_id)
     assert float(state.attributes[ATTR_WEATHER_WIND_BEARING]) == 180
     assert float(state.attributes[ATTR_WEATHER_OZONE]) == 10
+    assert float(state.attributes[ATTR_WEATHER_CLOUD_COVERAGE]) == 75
+
+
+async def test_humidity(
+    hass: HomeAssistant,
+    enable_custom_integrations: None,
+) -> None:
+    """Test humidity."""
+    humidity_value = 80.2
+
+    entity0 = await create_entity(hass, humidity=humidity_value)
+
+    state = hass.states.get(entity0.entity_id)
+    forecast = state.attributes[ATTR_FORECAST][0]
+    assert float(state.attributes[ATTR_WEATHER_HUMIDITY]) == 80
+    assert float(forecast[ATTR_FORECAST_HUMIDITY]) == 80
 
 
 async def test_none_forecast(
@@ -925,7 +1054,9 @@ async def test_precision_for_temperature(hass: HomeAssistant) -> None:
 
     assert weather.condition == ATTR_CONDITION_SUNNY
     assert weather.native_temperature == 20.3
+    assert weather.native_dew_point == 2.3
     assert weather._temperature_unit == UnitOfTemperature.CELSIUS
     assert weather.precision == PRECISION_HALVES
 
     assert weather.state_attributes[ATTR_WEATHER_TEMPERATURE] == 20.5
+    assert weather.state_attributes[ATTR_WEATHER_DEW_POINT] == 2.5
diff --git a/tests/components/webhook/test_trigger.py b/tests/components/webhook/test_trigger.py
index 327fc428cd0..392ab58a30f 100644
--- a/tests/components/webhook/test_trigger.py
+++ b/tests/components/webhook/test_trigger.py
@@ -137,7 +137,7 @@ async def test_webhook_allowed_methods_internet(
                     "platform": "webhook",
                     "webhook_id": "post_webhook",
                     "allowed_methods": "PUT",
-                    # Enable after 2023.4.0: "local_only": False,
+                    # Enable after 2023.11.0: "local_only": False,
                 },
                 "action": {
                     "event": "test_success",
diff --git a/tests/components/webostv/test_media_player.py b/tests/components/webostv/test_media_player.py
index b400951f61f..fec1bf7a04a 100644
--- a/tests/components/webostv/test_media_player.py
+++ b/tests/components/webostv/test_media_player.py
@@ -90,7 +90,7 @@ async def test_services_with_parameters(
     await setup_webostv(hass)
 
     data = {ATTR_ENTITY_ID: ENTITY_ID, **attr_data}
-    assert await hass.services.async_call(MP_DOMAIN, service, data, True)
+    await hass.services.async_call(MP_DOMAIN, service, data, True)
 
     getattr(client, client_call[0]).assert_called_once_with(client_call[1])
 
@@ -111,7 +111,7 @@ async def test_services(hass: HomeAssistant, client, service, client_call) -> No
     await setup_webostv(hass)
 
     data = {ATTR_ENTITY_ID: ENTITY_ID}
-    assert await hass.services.async_call(MP_DOMAIN, service, data, True)
+    await hass.services.async_call(MP_DOMAIN, service, data, True)
 
     getattr(client, client_call).assert_called_once()
 
@@ -123,17 +123,13 @@ async def test_media_play_pause(hass: HomeAssistant, client) -> None:
     data = {ATTR_ENTITY_ID: ENTITY_ID}
 
     # After init state is playing - check pause call
-    assert await hass.services.async_call(
-        MP_DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, data, True
-    )
+    await hass.services.async_call(MP_DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, data, True)
 
     client.pause.assert_called_once()
     client.play.assert_not_called()
 
     # After pause state is paused - check play call
-    assert await hass.services.async_call(
-        MP_DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, data, True
-    )
+    await hass.services.async_call(MP_DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, data, True)
 
     client.play.assert_called_once()
     client.pause.assert_called_once()
@@ -154,7 +150,7 @@ async def test_media_next_previous_track(
 
     # check channel up/down for live TV channels
     data = {ATTR_ENTITY_ID: ENTITY_ID}
-    assert await hass.services.async_call(MP_DOMAIN, service, data, True)
+    await hass.services.async_call(MP_DOMAIN, service, data, True)
 
     getattr(client, client_call[0]).assert_not_called()
     getattr(client, client_call[1]).assert_called_once()
@@ -162,7 +158,7 @@ async def test_media_next_previous_track(
     # check next/previous for not Live TV channels
     monkeypatch.setattr(client, "current_app_id", "in1")
     data = {ATTR_ENTITY_ID: ENTITY_ID}
-    assert await hass.services.async_call(MP_DOMAIN, service, data, True)
+    await hass.services.async_call(MP_DOMAIN, service, data, True)
 
     getattr(client, client_call[0]).assert_called_once()
     getattr(client, client_call[1]).assert_called_once()
@@ -179,7 +175,7 @@ async def test_select_source_with_empty_source_list(
         ATTR_ENTITY_ID: ENTITY_ID,
         ATTR_INPUT_SOURCE: "nonexistent",
     }
-    assert await hass.services.async_call(MP_DOMAIN, SERVICE_SELECT_SOURCE, data, True)
+    await hass.services.async_call(MP_DOMAIN, SERVICE_SELECT_SOURCE, data, True)
 
     client.launch_app.assert_not_called()
     client.set_input.assert_not_called()
@@ -195,7 +191,7 @@ async def test_select_app_source(hass: HomeAssistant, client) -> None:
         ATTR_ENTITY_ID: ENTITY_ID,
         ATTR_INPUT_SOURCE: "Live TV",
     }
-    assert await hass.services.async_call(MP_DOMAIN, SERVICE_SELECT_SOURCE, data, True)
+    await hass.services.async_call(MP_DOMAIN, SERVICE_SELECT_SOURCE, data, True)
 
     client.launch_app.assert_called_once_with(LIVE_TV_APP_ID)
     client.set_input.assert_not_called()
@@ -210,7 +206,7 @@ async def test_select_input_source(hass: HomeAssistant, client) -> None:
         ATTR_ENTITY_ID: ENTITY_ID,
         ATTR_INPUT_SOURCE: "Input01",
     }
-    assert await hass.services.async_call(MP_DOMAIN, SERVICE_SELECT_SOURCE, data, True)
+    await hass.services.async_call(MP_DOMAIN, SERVICE_SELECT_SOURCE, data, True)
 
     client.launch_app.assert_not_called()
     client.set_input.assert_called_once_with("in1")
@@ -224,8 +220,8 @@ async def test_button(hass: HomeAssistant, client) -> None:
         ATTR_ENTITY_ID: ENTITY_ID,
         ATTR_BUTTON: "test",
     }
-    assert await hass.services.async_call(DOMAIN, SERVICE_BUTTON, data, True)
-
+    await hass.services.async_call(DOMAIN, SERVICE_BUTTON, data, True)
+    await hass.async_block_till_done()
     client.button.assert_called_once()
     client.button.assert_called_with("test")
 
@@ -238,8 +234,8 @@ async def test_command(hass: HomeAssistant, client) -> None:
         ATTR_ENTITY_ID: ENTITY_ID,
         ATTR_COMMAND: "test",
     }
-    assert await hass.services.async_call(DOMAIN, SERVICE_COMMAND, data, True)
-
+    await hass.services.async_call(DOMAIN, SERVICE_COMMAND, data, True)
+    await hass.async_block_till_done()
     client.request.assert_called_with("test", payload=None)
 
 
@@ -252,8 +248,8 @@ async def test_command_with_optional_arg(hass: HomeAssistant, client) -> None:
         ATTR_COMMAND: "test",
         ATTR_PAYLOAD: {"target": "https://www.google.com"},
     }
-    assert await hass.services.async_call(DOMAIN, SERVICE_COMMAND, data, True)
-
+    await hass.services.async_call(DOMAIN, SERVICE_COMMAND, data, True)
+    await hass.async_block_till_done()
     client.request.assert_called_with(
         "test", payload={"target": "https://www.google.com"}
     )
@@ -267,10 +263,8 @@ async def test_select_sound_output(hass: HomeAssistant, client) -> None:
         ATTR_ENTITY_ID: ENTITY_ID,
         ATTR_SOUND_OUTPUT: "external_speaker",
     }
-    assert await hass.services.async_call(
-        DOMAIN, SERVICE_SELECT_SOUND_OUTPUT, data, True
-    )
-
+    await hass.services.async_call(DOMAIN, SERVICE_SELECT_SOUND_OUTPUT, data, True)
+    await hass.async_block_till_done()
     client.change_sound_output.assert_called_once_with("external_speaker")
 
 
@@ -359,9 +353,7 @@ async def test_service_entity_id_none(hass: HomeAssistant, client) -> None:
         ATTR_ENTITY_ID: ENTITY_MATCH_NONE,
         ATTR_SOUND_OUTPUT: "external_speaker",
     }
-    assert await hass.services.async_call(
-        DOMAIN, SERVICE_SELECT_SOUND_OUTPUT, data, True
-    )
+    await hass.services.async_call(DOMAIN, SERVICE_SELECT_SOUND_OUTPUT, data, True)
 
     client.change_sound_output.assert_not_called()
 
@@ -384,7 +376,7 @@ async def test_play_media(hass: HomeAssistant, client, media_id, ch_id) -> None:
         ATTR_MEDIA_CONTENT_TYPE: MediaType.CHANNEL,
         ATTR_MEDIA_CONTENT_ID: media_id,
     }
-    assert await hass.services.async_call(MP_DOMAIN, SERVICE_PLAY_MEDIA, data, True)
+    await hass.services.async_call(MP_DOMAIN, SERVICE_PLAY_MEDIA, data, True)
 
     client.set_channel.assert_called_once_with(ch_id)
 
@@ -493,7 +485,7 @@ async def test_control_error_handling(
 
     # Device on, raise HomeAssistantError
     with pytest.raises(HomeAssistantError) as exc:
-        assert await hass.services.async_call(MP_DOMAIN, SERVICE_MEDIA_PLAY, data, True)
+        await hass.services.async_call(MP_DOMAIN, SERVICE_MEDIA_PLAY, data, True)
 
     assert (
         str(exc.value)
@@ -505,7 +497,7 @@ async def test_control_error_handling(
     monkeypatch.setattr(client, "is_on", False)
     monkeypatch.setattr(client, "play", Mock(side_effect=asyncio.TimeoutError))
     await client.mock_state_update()
-    assert await hass.services.async_call(MP_DOMAIN, SERVICE_MEDIA_PLAY, data, True)
+    await hass.services.async_call(MP_DOMAIN, SERVICE_MEDIA_PLAY, data, True)
 
     assert client.play.call_count == 1
     assert (
diff --git a/tests/components/websocket_api/conftest.py b/tests/components/websocket_api/conftest.py
index 53569c3fa6a..69adf890584 100644
--- a/tests/components/websocket_api/conftest.py
+++ b/tests/components/websocket_api/conftest.py
@@ -3,11 +3,19 @@ import pytest
 
 from homeassistant.components.websocket_api.auth import TYPE_AUTH_REQUIRED
 from homeassistant.components.websocket_api.http import URL
+from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
+from tests.typing import (
+    MockHAClientWebSocket,
+    WebSocketGenerator,
+)
+
 
 @pytest.fixture
-async def websocket_client(hass, hass_ws_client):
+async def websocket_client(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> MockHAClientWebSocket:
     """Create a websocket client."""
     return await hass_ws_client(hass)
 
diff --git a/tests/components/websocket_api/test_auth.py b/tests/components/websocket_api/test_auth.py
index 070bd68d44a..51bff1af0d7 100644
--- a/tests/components/websocket_api/test_auth.py
+++ b/tests/components/websocket_api/test_auth.py
@@ -2,6 +2,7 @@
 from unittest.mock import patch
 
 import aiohttp
+from aiohttp import WSMsgType
 import pytest
 
 from homeassistant.auth.providers.legacy_api_password import (
@@ -223,3 +224,79 @@ async def test_auth_close_after_revoke(
     msg = await websocket_client.receive()
     assert msg.type == aiohttp.WSMsgType.CLOSE
     assert websocket_client.closed
+
+
+async def test_auth_sending_invalid_json_disconnects(
+    hass: HomeAssistant, hass_client_no_auth: ClientSessionGenerator
+) -> None:
+    """Test sending invalid json during auth."""
+    assert await async_setup_component(hass, "websocket_api", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+
+    async with client.ws_connect(URL) as ws:
+        auth_msg = await ws.receive_json()
+        assert auth_msg["type"] == TYPE_AUTH_REQUIRED
+
+        await ws.send_str("[--INVALID--JSON--]")
+
+        auth_msg = await ws.receive()
+        assert auth_msg.type == WSMsgType.close
+
+
+async def test_auth_sending_binary_disconnects(
+    hass: HomeAssistant, hass_client_no_auth: ClientSessionGenerator
+) -> None:
+    """Test sending bytes during auth."""
+    assert await async_setup_component(hass, "websocket_api", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+
+    async with client.ws_connect(URL) as ws:
+        auth_msg = await ws.receive_json()
+        assert auth_msg["type"] == TYPE_AUTH_REQUIRED
+
+        await ws.send_bytes(b"[INVALID]")
+
+        auth_msg = await ws.receive()
+        assert auth_msg.type == WSMsgType.close
+
+
+async def test_auth_close_disconnects(
+    hass: HomeAssistant, hass_client_no_auth: ClientSessionGenerator
+) -> None:
+    """Test closing during auth."""
+    assert await async_setup_component(hass, "websocket_api", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+
+    async with client.ws_connect(URL) as ws:
+        auth_msg = await ws.receive_json()
+        assert auth_msg["type"] == TYPE_AUTH_REQUIRED
+
+        await ws.close()
+
+        auth_msg = await ws.receive()
+        assert auth_msg.type == WSMsgType.CLOSED
+
+
+async def test_auth_sending_unknown_type_disconnects(
+    hass: HomeAssistant, hass_client_no_auth: ClientSessionGenerator
+) -> None:
+    """Test sending unknown type during auth."""
+    assert await async_setup_component(hass, "websocket_api", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+
+    async with client.ws_connect(URL) as ws:
+        auth_msg = await ws.receive_json()
+        assert auth_msg["type"] == TYPE_AUTH_REQUIRED
+
+        # pylint: disable-next=protected-access
+        await ws._writer._send_frame(b"1" * 130, 0x30)
+        auth_msg = await ws.receive()
+        assert auth_msg.type == WSMsgType.close
diff --git a/tests/components/websocket_api/test_commands.py b/tests/components/websocket_api/test_commands.py
index 9c2a05e96ca..ca04fef4f77 100644
--- a/tests/components/websocket_api/test_commands.py
+++ b/tests/components/websocket_api/test_commands.py
@@ -1,12 +1,14 @@
 """Tests for WebSocket API commands."""
 from copy import deepcopy
 import datetime
-from unittest.mock import ANY, patch
+from unittest.mock import ANY, AsyncMock, Mock, patch
 
 from async_timeout import timeout
 import pytest
 import voluptuous as vol
 
+from homeassistant import config_entries, loader
+from homeassistant.components.device_automation import toggle_entity
 from homeassistant.components.websocket_api import const
 from homeassistant.components.websocket_api.auth import (
     TYPE_AUTH,
@@ -17,14 +19,24 @@ from homeassistant.components.websocket_api.const import FEATURE_COALESCE_MESSAG
 from homeassistant.const import SIGNAL_BOOTSTRAP_INTEGRATIONS
 from homeassistant.core import Context, HomeAssistant, State, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity
+from homeassistant.helpers import device_registry as dr, entity
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.loader import async_get_integration
 from homeassistant.setup import DATA_SETUP_TIME, async_setup_component
 from homeassistant.util.json import json_loads
 
-from tests.common import MockEntity, MockEntityPlatform, MockUser, async_mock_service
-from tests.typing import ClientSessionGenerator, WebSocketGenerator
+from tests.common import (
+    MockConfigEntry,
+    MockEntity,
+    MockEntityPlatform,
+    MockUser,
+    async_mock_service,
+    mock_platform,
+)
+from tests.typing import (
+    ClientSessionGenerator,
+    WebSocketGenerator,
+)
 
 STATE_KEY_SHORT_NAMES = {
     "entity_id": "e",
@@ -37,6 +49,25 @@ STATE_KEY_SHORT_NAMES = {
 STATE_KEY_LONG_NAMES = {v: k for k, v in STATE_KEY_SHORT_NAMES.items()}
 
 
+@pytest.fixture
+def fake_integration(hass: HomeAssistant):
+    """Set up a mock integration with device automation support."""
+    DOMAIN = "fake_integration"
+
+    hass.config.components.add(DOMAIN)
+
+    mock_platform(
+        hass,
+        f"{DOMAIN}.device_action",
+        Mock(
+            ACTION_SCHEMA=toggle_entity.ACTION_SCHEMA.extend(
+                {vol.Required("domain"): DOMAIN}
+            ),
+            spec=["ACTION_SCHEMA"],
+        ),
+    )
+
+
 def _apply_entities_changes(state_dict: dict, change_dict: dict) -> None:
     """Apply a diff set to a dict.
 
@@ -1672,7 +1703,9 @@ async def test_test_condition(hass: HomeAssistant, websocket_client) -> None:
 
 async def test_execute_script(hass: HomeAssistant, websocket_client) -> None:
     """Test testing a condition."""
-    calls = async_mock_service(hass, "domain_test", "test_service")
+    calls = async_mock_service(
+        hass, "domain_test", "test_service", response={"hello": "world"}
+    )
 
     await websocket_client.send_json(
         {
@@ -1682,7 +1715,9 @@ async def test_execute_script(hass: HomeAssistant, websocket_client) -> None:
                 {
                     "service": "domain_test.test_service",
                     "data": {"hello": "world"},
-                }
+                    "response_variable": "service_result",
+                },
+                {"stop": "done", "response_variable": "service_result"},
             ],
         }
     )
@@ -1691,6 +1726,7 @@ async def test_execute_script(hass: HomeAssistant, websocket_client) -> None:
     assert msg_no_var["id"] == 5
     assert msg_no_var["type"] == const.TYPE_RESULT
     assert msg_no_var["success"]
+    assert msg_no_var["result"]["response"] == {"hello": "world"}
 
     await websocket_client.send_json(
         {
@@ -1727,6 +1763,91 @@ async def test_execute_script(hass: HomeAssistant, websocket_client) -> None:
     assert call.context.as_dict() == msg_var["result"]["context"]
 
 
+async def test_execute_script_complex_response(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test testing a condition."""
+    await async_setup_component(hass, "calendar", {"calendar": {"platform": "demo"}})
+    await hass.async_block_till_done()
+    ws_client = await hass_ws_client(hass)
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "execute_script",
+            "sequence": [
+                {
+                    "service": "calendar.list_events",
+                    "data": {"duration": {"hours": 24, "minutes": 0, "seconds": 0}},
+                    "target": {"entity_id": "calendar.calendar_1"},
+                    "response_variable": "service_result",
+                },
+                {"stop": "done", "response_variable": "service_result"},
+            ],
+        }
+    )
+
+    msg_no_var = await ws_client.receive_json()
+    assert msg_no_var["type"] == const.TYPE_RESULT
+    assert msg_no_var["success"]
+    assert msg_no_var["result"]["response"] == {
+        "events": [
+            {
+                "start": ANY,
+                "end": ANY,
+                "summary": "Future Event",
+                "description": "Future Description",
+                "location": "Future Location",
+            }
+        ]
+    }
+
+
+async def test_execute_script_with_dynamically_validated_action(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    device_registry: dr.DeviceRegistry,
+    fake_integration,
+) -> None:
+    """Test executing a script with an action which is dynamically validated."""
+
+    ws_client = await hass_ws_client(hass)
+
+    module_cache = hass.data.setdefault(loader.DATA_COMPONENTS, {})
+    module = module_cache["fake_integration.device_action"]
+    module.async_call_action_from_config = AsyncMock()
+    module.async_validate_action_config = AsyncMock(
+        side_effect=lambda hass, config: config
+    )
+
+    config_entry = MockConfigEntry(domain="fake_integration", data={})
+    config_entry.state = config_entries.ConfigEntryState.LOADED
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "execute_script",
+            "sequence": [
+                {
+                    "device_id": device_entry.id,
+                    "domain": "fake_integration",
+                },
+            ],
+        }
+    )
+
+    msg_no_var = await ws_client.receive_json()
+    assert msg_no_var["type"] == const.TYPE_RESULT
+    assert msg_no_var["success"]
+    assert msg_no_var["result"]["response"] is None
+
+    module.async_validate_action_config.assert_awaited_once()
+    module.async_call_action_from_config.assert_awaited_once()
+
+
 async def test_subscribe_unsubscribe_bootstrap_integrations(
     hass: HomeAssistant, websocket_client, hass_admin_user: MockUser
 ) -> None:
@@ -1773,11 +1894,17 @@ async def test_integration_setup_info(
     ("key", "config"),
     (
         ("trigger", {"platform": "event", "event_type": "hello"}),
+        ("trigger", [{"platform": "event", "event_type": "hello"}]),
         (
             "condition",
             {"condition": "state", "entity_id": "hello.world", "state": "paulus"},
         ),
+        (
+            "condition",
+            [{"condition": "state", "entity_id": "hello.world", "state": "paulus"}],
+        ),
         ("action", {"service": "domain_test.test_service"}),
+        ("action", [{"service": "domain_test.test_service"}]),
     ),
 )
 async def test_validate_config_works(websocket_client, key, config) -> None:
@@ -1808,7 +1935,8 @@ async def test_validate_config_works(websocket_client, key, config) -> None:
             },
             (
                 "Unexpected value for condition: 'non_existing'. Expected and, device,"
-                " not, numeric_state, or, state, sun, template, time, trigger, zone"
+                " not, numeric_state, or, state, sun, template, time, trigger, zone "
+                "@ data[0]"
             ),
         ),
         (
diff --git a/tests/components/websocket_api/test_http.py b/tests/components/websocket_api/test_http.py
index 02384aace89..b94df47213e 100644
--- a/tests/components/websocket_api/test_http.py
+++ b/tests/components/websocket_api/test_http.py
@@ -18,7 +18,10 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.util.dt import utcnow
 
 from tests.common import async_fire_time_changed
-from tests.typing import WebSocketGenerator
+from tests.typing import (
+    MockHAClientWebSocket,
+    WebSocketGenerator,
+)
 
 
 @pytest.fixture
@@ -36,15 +39,186 @@ def mock_low_peak():
 
 
 async def test_pending_msg_overflow(
-    hass: HomeAssistant, mock_low_queue, websocket_client
+    hass: HomeAssistant, mock_low_queue, websocket_client: MockHAClientWebSocket
 ) -> None:
-    """Test get_panels command."""
+    """Test pending messages overflows."""
     for idx in range(10):
         await websocket_client.send_json({"id": idx + 1, "type": "ping"})
     msg = await websocket_client.receive()
     assert msg.type == WSMsgType.close
 
 
+async def test_cleanup_on_cancellation(
+    hass: HomeAssistant, websocket_client: MockHAClientWebSocket
+) -> None:
+    """Test cleanup on cancellation."""
+
+    subscriptions = None
+
+    # Register a handler that registers a subscription
+    @callback
+    @websocket_command(
+        {
+            "type": "fake_subscription",
+        }
+    )
+    def fake_subscription(
+        hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
+    ) -> None:
+        nonlocal subscriptions
+        msg_id: int = msg["id"]
+        connection.subscriptions[msg_id] = callback(lambda: None)
+        connection.send_result(msg_id)
+        subscriptions = connection.subscriptions
+
+    async_register_command(hass, fake_subscription)
+
+    # Register a handler that raises on cancel
+    @callback
+    @websocket_command(
+        {
+            "type": "subscription_that_raises_on_cancel",
+        }
+    )
+    def subscription_that_raises_on_cancel(
+        hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
+    ) -> None:
+        nonlocal subscriptions
+        msg_id: int = msg["id"]
+
+        @callback
+        def _raise():
+            raise ValueError()
+
+        connection.subscriptions[msg_id] = _raise
+        connection.send_result(msg_id)
+        subscriptions = connection.subscriptions
+
+    async_register_command(hass, subscription_that_raises_on_cancel)
+
+    # Register a handler that cancels in handler
+    @callback
+    @websocket_command(
+        {
+            "type": "cancel_in_handler",
+        }
+    )
+    def cancel_in_handler(
+        hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
+    ) -> None:
+        raise asyncio.CancelledError()
+
+    async_register_command(hass, cancel_in_handler)
+
+    await websocket_client.send_json({"id": 1, "type": "ping"})
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 1
+    assert msg["type"] == "pong"
+    assert not subscriptions
+    await websocket_client.send_json({"id": 2, "type": "fake_subscription"})
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 2
+    assert msg["type"] == const.TYPE_RESULT
+    assert msg["success"]
+    assert len(subscriptions) == 2
+    await websocket_client.send_json(
+        {"id": 3, "type": "subscription_that_raises_on_cancel"}
+    )
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 3
+    assert msg["type"] == const.TYPE_RESULT
+    assert msg["success"]
+    assert len(subscriptions) == 3
+    await websocket_client.send_json({"id": 4, "type": "cancel_in_handler"})
+    await hass.async_block_till_done()
+    msg = await websocket_client.receive()
+    assert msg.type == WSMsgType.close
+    assert len(subscriptions) == 0
+
+
+async def test_delayed_response_handler(
+    hass: HomeAssistant,
+    websocket_client: MockHAClientWebSocket,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test a handler that responds after a connection has already been closed."""
+
+    subscriptions = None
+
+    # Register a handler that responds after it returns
+    @callback
+    @websocket_command(
+        {
+            "type": "late_responder",
+        }
+    )
+    def async_late_responder(
+        hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
+    ) -> None:
+        msg_id: int = msg["id"]
+        nonlocal subscriptions
+        subscriptions = connection.subscriptions
+        connection.subscriptions[msg_id] = lambda: None
+        connection.send_result(msg_id)
+
+        async def _async_late_send_message():
+            await asyncio.sleep(0.05)
+            connection.send_event(msg_id, {"event": "any"})
+
+        hass.async_create_task(_async_late_send_message())
+
+    async_register_command(hass, async_late_responder)
+
+    await websocket_client.send_json({"id": 1, "type": "ping"})
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 1
+    assert msg["type"] == "pong"
+    assert not subscriptions
+    await websocket_client.send_json({"id": 2, "type": "late_responder"})
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 2
+    assert msg["type"] == "result"
+    assert len(subscriptions) == 2
+    assert await websocket_client.close()
+    await hass.async_block_till_done()
+    assert len(subscriptions) == 0
+
+    assert "Tried to send message" in caplog.text
+    assert "on closed connection" in caplog.text
+
+
+async def test_ensure_disconnect_invalid_json(
+    hass: HomeAssistant,
+    websocket_client: MockHAClientWebSocket,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test we get disconnected when sending invalid JSON."""
+
+    await websocket_client.send_json({"id": 1, "type": "ping"})
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 1
+    assert msg["type"] == "pong"
+    await websocket_client.send_str("[--INVALID-JSON--]")
+    msg = await websocket_client.receive()
+    assert msg.type == WSMsgType.CLOSE
+
+
+async def test_ensure_disconnect_invalid_binary(
+    hass: HomeAssistant,
+    websocket_client: MockHAClientWebSocket,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test we get disconnected when sending invalid bytes."""
+
+    await websocket_client.send_json({"id": 1, "type": "ping"})
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 1
+    assert msg["type"] == "pong"
+    await websocket_client.send_bytes(b"")
+    msg = await websocket_client.receive()
+    assert msg.type == WSMsgType.CLOSE
+
+
 async def test_pending_msg_peak(
     hass: HomeAssistant,
     mock_low_peak,
@@ -208,6 +382,58 @@ async def test_prepare_fail(
     assert "Timeout preparing request" in caplog.text
 
 
+async def test_enable_coalesce(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test enabling coalesce."""
+    websocket_client = await hass_ws_client(hass)
+
+    await websocket_client.send_json(
+        {
+            "id": 1,
+            "type": "supported_features",
+            "features": {const.FEATURE_COALESCE_MESSAGES: 1},
+        }
+    )
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 1
+    assert msg["success"] is True
+    send_tasks: list[asyncio.Future] = []
+    ids: set[int] = set()
+    start_id = 2
+
+    for idx in range(10):
+        id_ = idx + start_id
+        ids.add(id_)
+        send_tasks.append(websocket_client.send_json({"id": id_, "type": "ping"}))
+
+    await asyncio.gather(*send_tasks)
+    returned_ids: set[int] = set()
+    for _ in range(10):
+        msg = await websocket_client.receive_json()
+        assert msg["type"] == "pong"
+        returned_ids.add(msg["id"])
+
+    assert ids == returned_ids
+
+    # Now close
+    send_tasks_with_close: list[asyncio.Future] = []
+    start_id = 12
+    for idx in range(10):
+        id_ = idx + start_id
+        send_tasks_with_close.append(
+            websocket_client.send_json({"id": id_, "type": "ping"})
+        )
+
+    send_tasks_with_close.append(websocket_client.close())
+    send_tasks_with_close.append(websocket_client.send_json({"id": 50, "type": "ping"}))
+
+    with pytest.raises(ConnectionResetError):
+        await asyncio.gather(*send_tasks_with_close)
+
+
 async def test_binary_message(
     hass: HomeAssistant, websocket_client, caplog: pytest.LogCaptureFixture
 ) -> None:
diff --git a/tests/components/wemo/conftest.py b/tests/components/wemo/conftest.py
index 6dc7b1e5d2c..5fe798004da 100644
--- a/tests/components/wemo/conftest.py
+++ b/tests/components/wemo/conftest.py
@@ -61,9 +61,9 @@ def create_pywemo_device(pywemo_registry, pywemo_model):
     device.host = MOCK_HOST
     device.port = MOCK_PORT
     device.name = MOCK_NAME
-    device.serialnumber = MOCK_SERIAL_NUMBER
+    device.serial_number = MOCK_SERIAL_NUMBER
     device.model_name = pywemo_model.replace("LongPress", "")
-    device.udn = f"uuid:{device.model_name}-1_0-{device.serialnumber}"
+    device.udn = f"uuid:{device.model_name}-1_0-{device.serial_number}"
     device.firmware_version = MOCK_FIRMWARE_VERSION
     device.get_state.return_value = 0  # Default to Off
     device.supports_long_press.return_value = cls.supports_long_press()
@@ -102,7 +102,7 @@ def pywemo_dli_device_fixture(pywemo_registry, pywemo_model):
     """Fixture for Digital Loggers emulated instances."""
     with create_pywemo_device(pywemo_registry, pywemo_model) as pywemo_dli_device:
         pywemo_dli_device.model_name = "DLI emulated Belkin Socket"
-        pywemo_dli_device.serialnumber = "1234567891"
+        pywemo_dli_device.serial_number = "1234567891"
         yield pywemo_dli_device
 
 
diff --git a/tests/components/wemo/test_config_flow.py b/tests/components/wemo/test_config_flow.py
index 0ffcb9d7f5e..71f3a378b74 100644
--- a/tests/components/wemo/test_config_flow.py
+++ b/tests/components/wemo/test_config_flow.py
@@ -1,11 +1,14 @@
 """Tests for Wemo config flow."""
 
+from dataclasses import asdict
+
 from homeassistant import data_entry_flow
 from homeassistant.components.wemo.const import DOMAIN
+from homeassistant.components.wemo.wemo_device import Options
 from homeassistant.config_entries import SOURCE_USER
 from homeassistant.core import HomeAssistant
 
-from tests.common import patch
+from tests.common import MockConfigEntry, patch
 
 
 async def test_not_discovered(hass: HomeAssistant) -> None:
@@ -20,3 +23,41 @@ async def test_not_discovered(hass: HomeAssistant) -> None:
         result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
     assert result["type"] == data_entry_flow.FlowResultType.ABORT
     assert result["reason"] == "no_devices_found"
+
+
+async def test_options(hass: HomeAssistant) -> None:
+    """Test updating options."""
+    options = Options(enable_subscription=False, enable_long_press=False)
+    entry = MockConfigEntry(domain=DOMAIN, title="Wemo")
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "init"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"], user_input=asdict(options)
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert Options(**result["data"]) == options
+
+
+async def test_invalid_options(hass: HomeAssistant) -> None:
+    """Test invalid option combinations."""
+    entry = MockConfigEntry(domain=DOMAIN, title="Wemo")
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "init"
+
+    # enable_subscription must be True if enable_long_press is True (default).
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"], user_input={"enable_subscription": False}
+    )
+    assert result["errors"] == {
+        "enable_subscription": "long_press_requires_subscription"
+    }
diff --git a/tests/components/wemo/test_device_trigger.py b/tests/components/wemo/test_device_trigger.py
index ad649fb3a24..fd5db46e6c6 100644
--- a/tests/components/wemo/test_device_trigger.py
+++ b/tests/components/wemo/test_device_trigger.py
@@ -1,5 +1,6 @@
 """Verify that WeMo device triggers work as expected."""
 import pytest
+from pytest_unordered import unordered
 from pywemo.subscribe import EVENT_TYPE_LONG_PRESS
 
 from homeassistant.components.automation import DOMAIN as AUTOMATION_DOMAIN
@@ -17,7 +18,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -71,7 +71,7 @@ async def test_get_triggers(hass: HomeAssistant, wemo_entity) -> None:
         {
             CONF_DEVICE_ID: wemo_entity.device_id,
             CONF_DOMAIN: Platform.SWITCH,
-            CONF_ENTITY_ID: wemo_entity.entity_id,
+            CONF_ENTITY_ID: wemo_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: "changed_states",
             "metadata": {"secondary": False},
@@ -79,7 +79,7 @@ async def test_get_triggers(hass: HomeAssistant, wemo_entity) -> None:
         {
             CONF_DEVICE_ID: wemo_entity.device_id,
             CONF_DOMAIN: Platform.SWITCH,
-            CONF_ENTITY_ID: wemo_entity.entity_id,
+            CONF_ENTITY_ID: wemo_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: "turned_off",
             "metadata": {"secondary": False},
@@ -87,7 +87,7 @@ async def test_get_triggers(hass: HomeAssistant, wemo_entity) -> None:
         {
             CONF_DEVICE_ID: wemo_entity.device_id,
             CONF_DOMAIN: Platform.SWITCH,
-            CONF_ENTITY_ID: wemo_entity.entity_id,
+            CONF_ENTITY_ID: wemo_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: "turned_on",
             "metadata": {"secondary": False},
@@ -96,7 +96,7 @@ async def test_get_triggers(hass: HomeAssistant, wemo_entity) -> None:
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, wemo_entity.device_id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_fires_on_long_press(hass: HomeAssistant) -> None:
diff --git a/tests/components/wemo/test_fan.py b/tests/components/wemo/test_fan.py
index 738b15f77c1..48ad5774b0a 100644
--- a/tests/components/wemo/test_fan.py
+++ b/tests/components/wemo/test_fan.py
@@ -106,7 +106,7 @@ async def test_fan_reset_filter_service(
     hass: HomeAssistant, pywemo_device, wemo_entity
 ) -> None:
     """Verify that SERVICE_RESET_FILTER_LIFE is registered and works."""
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         fan.SERVICE_RESET_FILTER_LIFE,
         {ATTR_ENTITY_ID: wemo_entity.entity_id},
@@ -130,7 +130,7 @@ async def test_fan_set_humidity_service(
     hass: HomeAssistant, pywemo_device, wemo_entity, test_input, expected
 ) -> None:
     """Verify that SERVICE_SET_HUMIDITY is registered and works."""
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         fan.SERVICE_SET_HUMIDITY,
         {
@@ -157,7 +157,7 @@ async def test_fan_set_percentage(
     hass: HomeAssistant, pywemo_device, wemo_entity, percentage, expected_fan_mode
 ) -> None:
     """Verify set_percentage works properly through the entire range of FanModes."""
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         FAN_DOMAIN,
         SERVICE_SET_PERCENTAGE,
         {ATTR_ENTITY_ID: [wemo_entity.entity_id], ATTR_PERCENTAGE: percentage},
@@ -170,7 +170,7 @@ async def test_fan_mode_high_initially(hass: HomeAssistant, pywemo_device) -> No
     """Verify the FanMode is set to High when turned on."""
     pywemo_device.fan_mode = FanMode.Off
     wemo_entity = await async_create_wemo_entity(hass, pywemo_device, "")
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         FAN_DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: [wemo_entity.entity_id]},
diff --git a/tests/components/wemo/test_init.py b/tests/components/wemo/test_init.py
index efdcb5424d1..0e9ba19af42 100644
--- a/tests/components/wemo/test_init.py
+++ b/tests/components/wemo/test_init.py
@@ -138,9 +138,9 @@ async def test_discovery(hass: HomeAssistant, pywemo_registry) -> None:
         device.host = f"{MOCK_HOST}_{counter}"
         device.port = MOCK_PORT + counter
         device.name = f"{MOCK_NAME}_{counter}"
-        device.serialnumber = f"{MOCK_SERIAL_NUMBER}_{counter}"
+        device.serial_number = f"{MOCK_SERIAL_NUMBER}_{counter}"
         device.model_name = "Motion"
-        device.udn = f"uuid:{device.model_name}-1_0-{device.serialnumber}"
+        device.udn = f"uuid:{device.model_name}-1_0-{device.serial_number}"
         device.firmware_version = MOCK_FIRMWARE_VERSION
         device.get_state.return_value = 0  # Default to Off
         device.supports_long_press.return_value = False
diff --git a/tests/components/wemo/test_light_bridge.py b/tests/components/wemo/test_light_bridge.py
index 62e68b2ea39..6f4180626b2 100644
--- a/tests/components/wemo/test_light_bridge.py
+++ b/tests/components/wemo/test_light_bridge.py
@@ -35,12 +35,12 @@ def pywemo_model():
 def pywemo_bridge_light_fixture(pywemo_device):
     """Fixture for Bridge.Light WeMoDevice instances."""
     light = create_autospec(pywemo.ouimeaux_device.bridge.Light, instance=True)
-    light.uniqueID = pywemo_device.serialnumber
+    light.uniqueID = pywemo_device.serial_number
     light.name = pywemo_device.name
     light.bridge = pywemo_device
     light.state = {"onoff": 0, "available": True}
     light.capabilities = ["onoff", "levelcontrol", "colortemperature"]
-    pywemo_device.Lights = {pywemo_device.serialnumber: light}
+    pywemo_device.Lights = {pywemo_device.serial_number: light}
     return light
 
 
diff --git a/tests/components/wemo/test_wemo_device.py b/tests/components/wemo/test_wemo_device.py
index 49c6664f7bb..b715dd4ba72 100644
--- a/tests/components/wemo/test_wemo_device.py
+++ b/tests/components/wemo/test_wemo_device.py
@@ -1,5 +1,6 @@
 """Tests for wemo_device.py."""
 import asyncio
+from dataclasses import asdict
 from datetime import timedelta
 from unittest.mock import call, patch
 
@@ -84,7 +85,7 @@ async def test_long_press_event(
         "name": device.wemo.name,
         "params": "testing_params",
         "type": EVENT_TYPE_LONG_PRESS,
-        "unique_id": device.wemo.serialnumber,
+        "unique_id": device.wemo.serial_number,
     }
 
 
@@ -188,6 +189,31 @@ async def test_dli_device_info(
     assert device_entries[0].identifiers == {(DOMAIN, "123456789")}
 
 
+async def test_options_enable_subscription_false(
+    hass, pywemo_registry, pywemo_device, wemo_entity
+):
+    """Test setting Options.enable_subscription = False."""
+    config_entry = hass.config_entries.async_get_entry(wemo_entity.config_entry_id)
+    assert hass.config_entries.async_update_entry(
+        config_entry,
+        options=asdict(
+            wemo_device.Options(enable_subscription=False, enable_long_press=False)
+        ),
+    )
+    await hass.async_block_till_done()
+    pywemo_registry.unregister.assert_called_once_with(pywemo_device)
+
+
+async def test_options_enable_long_press_false(hass, pywemo_device, wemo_entity):
+    """Test setting Options.enable_long_press = False."""
+    config_entry = hass.config_entries.async_get_entry(wemo_entity.config_entry_id)
+    assert hass.config_entries.async_update_entry(
+        config_entry, options=asdict(wemo_device.Options(enable_long_press=False))
+    )
+    await hass.async_block_till_done()
+    pywemo_device.remove_long_press_virtual_device.assert_called_once_with()
+
+
 class TestInsight:
     """Tests specific to the WeMo Insight device."""
 
diff --git a/tests/components/whirlpool/test_sensor.py b/tests/components/whirlpool/test_sensor.py
index 063ebd49c4c..be78b0e2df8 100644
--- a/tests/components/whirlpool/test_sensor.py
+++ b/tests/components/whirlpool/test_sensor.py
@@ -311,10 +311,11 @@ async def test_no_restore_state(
     await init_integration(hass)
     # restore from cache
     state = hass.states.get(entity_id)
-    state.state = "unknown"
+    assert state.state == "unknown"
 
+    mock_sensor1_api.get_machine_state.return_value = MachineState.RunningMainCycle
     state = await update_sensor_state(hass, entity_id, mock_sensor1_api)
-    state.state = datetime.now().isoformat()
+    assert state.state != "unknown"
 
 
 async def test_callback(
diff --git a/tests/components/xbox/test_config_flow.py b/tests/components/xbox/test_config_flow.py
index 2eb91f225bd..9738dc70148 100644
--- a/tests/components/xbox/test_config_flow.py
+++ b/tests/components/xbox/test_config_flow.py
@@ -3,6 +3,10 @@ from http import HTTPStatus
 from unittest.mock import patch
 
 from homeassistant import config_entries, data_entry_flow, setup
+from homeassistant.components.application_credentials import (
+    ClientCredential,
+    async_import_client_credential,
+)
 from homeassistant.components.xbox.const import DOMAIN, OAUTH2_AUTHORIZE, OAUTH2_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_entry_oauth2_flow
@@ -33,13 +37,9 @@ async def test_full_flow(
     current_request_with_host: None,
 ) -> None:
     """Check full flow."""
-    assert await setup.async_setup_component(
-        hass,
-        "xbox",
-        {
-            "xbox": {"client_id": CLIENT_ID, "client_secret": CLIENT_SECRET},
-            "http": {"base_url": "https://example.com"},
-        },
+    assert await setup.async_setup_component(hass, "application_credentials", {})
+    await async_import_client_credential(
+        hass, DOMAIN, ClientCredential(CLIENT_ID, CLIENT_SECRET), "imported-cred"
     )
 
     result = await hass.config_entries.flow.async_init(
diff --git a/tests/components/xiaomi_ble/test_binary_sensor.py b/tests/components/xiaomi_ble/test_binary_sensor.py
index 235be5c6cd8..424f6e22b26 100644
--- a/tests/components/xiaomi_ble/test_binary_sensor.py
+++ b/tests/components/xiaomi_ble/test_binary_sensor.py
@@ -247,7 +247,7 @@ async def test_smoke(hass: HomeAssistant) -> None:
         hass,
         make_advertisement(
             "54:EF:44:E3:9C:BC",
-            b"XY\x97\tf\xbc\x9c\xe3D\xefT\x01" b"\x08\x12\x05\x00\x00\x00q^\xbe\x90",
+            b"XY\x97\tf\xbc\x9c\xe3D\xefT\x01\x08\x12\x05\x00\x00\x00q^\xbe\x90",
         ),
     )
     await hass.async_block_till_done()
diff --git a/tests/components/xiaomi_miio/test_button.py b/tests/components/xiaomi_miio/test_button.py
new file mode 100644
index 00000000000..995c5ae034c
--- /dev/null
+++ b/tests/components/xiaomi_miio/test_button.py
@@ -0,0 +1,99 @@
+"""The tests for the xiaomi_miio button component."""
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from homeassistant.components.button import DOMAIN, SERVICE_PRESS
+from homeassistant.components.xiaomi_miio.const import (
+    CONF_DEVICE,
+    CONF_FLOW_TYPE,
+    CONF_MAC,
+    DOMAIN as XIAOMI_DOMAIN,
+    MODELS_VACUUM,
+)
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    CONF_HOST,
+    CONF_MODEL,
+    CONF_TOKEN,
+    Platform,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.util import dt as dt_util
+
+from . import TEST_MAC
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture(autouse=True)
+async def setup_test(hass: HomeAssistant):
+    """Initialize test xiaomi_miio for button entity."""
+
+    mock_vacuum = MagicMock()
+
+    with patch(
+        "homeassistant.components.xiaomi_miio.get_platforms",
+        return_value=[
+            Platform.BUTTON,
+        ],
+    ), patch("homeassistant.components.xiaomi_miio.RoborockVacuum") as mock_vacuum_cls:
+        mock_vacuum_cls.return_value = mock_vacuum
+        yield mock_vacuum
+
+
+async def test_vacuum_button_params(hass: HomeAssistant) -> None:
+    """Test the initial parameters of a vacuum button."""
+
+    entity_id = await setup_component(hass, "test_vacuum")
+
+    state = hass.states.get(f"{entity_id}_reset_main_brush")
+    assert state
+    assert state.state == "unknown"
+
+
+@pytest.mark.freeze_time("2023-06-28 00:00:00+00:00")
+async def test_vacuum_button_press(hass: HomeAssistant) -> None:
+    """Test pressing a vacuum button."""
+
+    entity_id = await setup_component(hass, "test_vacuum")
+
+    state = hass.states.get(f"{entity_id}_reset_side_brush")
+    assert state
+    assert state.state == "unknown"
+
+    pressed_at = dt_util.utcnow()
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_PRESS,
+        {ATTR_ENTITY_ID: entity_id + "_reset_side_brush"},
+        blocking=True,
+    )
+
+    state = hass.states.get(f"{entity_id}_reset_side_brush")
+    assert state
+    assert state.state == pressed_at.isoformat()
+
+
+async def setup_component(hass: HomeAssistant, entity_name: str) -> str:
+    """Set up vacuum component."""
+    entity_id = f"{DOMAIN}.{entity_name}"
+
+    config_entry = MockConfigEntry(
+        domain=XIAOMI_DOMAIN,
+        unique_id="123456",
+        title=entity_name,
+        data={
+            CONF_FLOW_TYPE: CONF_DEVICE,
+            CONF_HOST: "192.168.1.100",
+            CONF_TOKEN: "12345678901234567890123456789012",
+            CONF_MODEL: MODELS_VACUUM[0],
+            CONF_MAC: TEST_MAC,
+        },
+    )
+
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    return entity_id
diff --git a/tests/components/yolink/test_device_trigger.py b/tests/components/yolink/test_device_trigger.py
index f5679ca19c9..e0ef37c1b75 100644
--- a/tests/components/yolink/test_device_trigger.py
+++ b/tests/components/yolink/test_device_trigger.py
@@ -1,5 +1,6 @@
 """The tests for YoLink device triggers."""
 import pytest
+from pytest_unordered import unordered
 from yolink.const import ATTR_DEVICE_DIMMER, ATTR_DEVICE_SMART_REMOTER
 
 from homeassistant.components import automation
@@ -11,7 +12,6 @@ from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -96,7 +96,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_exception(
@@ -115,7 +115,7 @@ async def test_get_triggers_exception(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entity.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_if_fires_on_event(
diff --git a/tests/components/youtube/__init__.py b/tests/components/youtube/__init__.py
index 391ff4b3a22..15a43d7a62f 100644
--- a/tests/components/youtube/__init__.py
+++ b/tests/components/youtube/__init__.py
@@ -59,7 +59,13 @@ class MockSubscriptions:
         """Initialize mock subscriptions."""
         self._fixture = fixture
 
-    def list(self, part: str, mine: bool, maxResults: int | None = None) -> MockRequest:
+    def list(
+        self,
+        part: str,
+        mine: bool,
+        maxResults: int | None = None,
+        pageToken: str | None = None,
+    ) -> MockRequest:
         """Return a fixture."""
         return MockRequest(fixture=self._fixture)
 
diff --git a/tests/components/zeroconf/test_init.py b/tests/components/zeroconf/test_init.py
index fea6b27e208..5740abef789 100644
--- a/tests/components/zeroconf/test_init.py
+++ b/tests/components/zeroconf/test_init.py
@@ -1,5 +1,4 @@
 """Test Zeroconf component setup process."""
-from ipaddress import ip_address
 from typing import Any
 from unittest.mock import call, patch
 
@@ -13,11 +12,7 @@ from zeroconf import (
 from zeroconf.asyncio import AsyncServiceInfo
 
 from homeassistant.components import zeroconf
-from homeassistant.components.zeroconf import (
-    CONF_DEFAULT_INTERFACE,
-    CONF_IPV6,
-    _get_announced_addresses,
-)
+from homeassistant.components.zeroconf import CONF_DEFAULT_INTERFACE, CONF_IPV6
 from homeassistant.const import (
     EVENT_COMPONENT_LOADED,
     EVENT_HOMEASSISTANT_START,
@@ -910,13 +905,11 @@ async def test_info_from_service_non_utf8(hass: HomeAssistant) -> None:
     info = zeroconf.info_from_service(
         get_service_info_mock(service_type, f"test.{service_type}")
     )
-    raw_info = info.properties.pop("_raw", False)
-    assert raw_info
-    assert len(raw_info) == len(PROPERTIES) - 1
-    assert NON_ASCII_KEY not in raw_info
-    assert len(info.properties) <= len(raw_info)
-    assert "non-utf8-value" not in info.properties
-    assert raw_info["non-utf8-value"] is NON_UTF8_VALUE
+    assert NON_ASCII_KEY.decode("ascii", "replace") in info.properties
+    assert "non-utf8-value" in info.properties
+    assert info.properties["non-utf8-value"] == NON_UTF8_VALUE.decode(
+        "utf-8", "replace"
+    )
 
 
 async def test_info_from_service_with_addresses(hass: HomeAssistant) -> None:
@@ -1204,29 +1197,6 @@ async def test_async_detect_interfaces_setting_empty_route_freebsd(
     )
 
 
-async def test_get_announced_addresses(
-    hass: HomeAssistant, mock_async_zeroconf: None
-) -> None:
-    """Test addresses for mDNS announcement."""
-    expected = {
-        ip_address(ip).packed
-        for ip in [
-            "fe80::1234:5678:9abc:def0",
-            "2001:db8::",
-            "192.168.1.5",
-            "fe80::dead:beef:dead:beef",
-            "172.16.1.5",
-        ]
-    }
-    first_ip = ip_address("172.16.1.5").packed
-    actual = _get_announced_addresses(_ADAPTERS_WITH_MANUAL_CONFIG, first_ip)
-    assert actual[0] == first_ip and set(actual) == expected
-
-    first_ip = ip_address("192.168.1.5").packed
-    actual = _get_announced_addresses(_ADAPTERS_WITH_MANUAL_CONFIG, first_ip)
-    assert actual[0] == first_ip and set(actual) == expected
-
-
 _ADAPTER_WITH_DEFAULT_ENABLED_AND_IPV6 = [
     {
         "auto": True,
diff --git a/tests/components/zerproc/test_config_flow.py b/tests/components/zerproc/test_config_flow.py
index 43988836416..0a493929b67 100644
--- a/tests/components/zerproc/test_config_flow.py
+++ b/tests/components/zerproc/test_config_flow.py
@@ -21,8 +21,6 @@ async def test_flow_success(hass: HomeAssistant) -> None:
         "homeassistant.components.zerproc.config_flow.pyzerproc.discover",
         return_value=["Light1", "Light2"],
     ), patch(
-        "homeassistant.components.zerproc.async_setup", return_value=True
-    ) as mock_setup, patch(
         "homeassistant.components.zerproc.async_setup_entry",
         return_value=True,
     ) as mock_setup_entry:
@@ -36,7 +34,6 @@ async def test_flow_success(hass: HomeAssistant) -> None:
     assert result2["title"] == "Zerproc"
     assert result2["data"] == {}
 
-    assert len(mock_setup.mock_calls) == 1
     assert len(mock_setup_entry.mock_calls) == 1
 
 
@@ -53,8 +50,6 @@ async def test_flow_no_devices_found(hass: HomeAssistant) -> None:
         "homeassistant.components.zerproc.config_flow.pyzerproc.discover",
         return_value=[],
     ), patch(
-        "homeassistant.components.zerproc.async_setup", return_value=True
-    ) as mock_setup, patch(
         "homeassistant.components.zerproc.async_setup_entry",
         return_value=True,
     ) as mock_setup_entry:
@@ -66,7 +61,6 @@ async def test_flow_no_devices_found(hass: HomeAssistant) -> None:
     assert result2["type"] == "abort"
     assert result2["reason"] == "no_devices_found"
     await hass.async_block_till_done()
-    assert len(mock_setup.mock_calls) == 0
     assert len(mock_setup_entry.mock_calls) == 0
 
 
@@ -83,8 +77,6 @@ async def test_flow_exceptions_caught(hass: HomeAssistant) -> None:
         "homeassistant.components.zerproc.config_flow.pyzerproc.discover",
         side_effect=pyzerproc.ZerprocException("TEST"),
     ), patch(
-        "homeassistant.components.zerproc.async_setup", return_value=True
-    ) as mock_setup, patch(
         "homeassistant.components.zerproc.async_setup_entry",
         return_value=True,
     ) as mock_setup_entry:
@@ -96,5 +88,4 @@ async def test_flow_exceptions_caught(hass: HomeAssistant) -> None:
     assert result2["type"] == "abort"
     assert result2["reason"] == "no_devices_found"
     await hass.async_block_till_done()
-    assert len(mock_setup.mock_calls) == 0
     assert len(mock_setup_entry.mock_calls) == 0
diff --git a/tests/components/zha/common.py b/tests/components/zha/common.py
index d3f3bf9b654..79c319398f0 100644
--- a/tests/components/zha/common.py
+++ b/tests/components/zha/common.py
@@ -133,7 +133,7 @@ async def send_attributes_report(hass, cluster: zigpy.zcl.Cluster, attributes: d
     await hass.async_block_till_done()
 
 
-async def find_entity_id(domain, zha_device, hass, qualifier=None):
+def find_entity_id(domain, zha_device, hass, qualifier=None):
     """Find the entity id under the testing.
 
     This is used to get the entity id in order to get the state from the state
diff --git a/tests/components/zha/test_alarm_control_panel.py b/tests/components/zha/test_alarm_control_panel.py
index 319301cf7dc..49ad1b81e3b 100644
--- a/tests/components/zha/test_alarm_control_panel.py
+++ b/tests/components/zha/test_alarm_control_panel.py
@@ -65,7 +65,7 @@ async def test_alarm_control_panel(
 
     zha_device = await zha_device_joined_restored(zigpy_device)
     cluster = zigpy_device.endpoints.get(1).ias_ace
-    entity_id = await find_entity_id(Platform.ALARM_CONTROL_PANEL, zha_device, hass)
+    entity_id = find_entity_id(Platform.ALARM_CONTROL_PANEL, zha_device, hass)
     assert entity_id is not None
     assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
     await async_enable_traffic(hass, [zha_device], enabled=False)
diff --git a/tests/components/zha/test_binary_sensor.py b/tests/components/zha/test_binary_sensor.py
index 2a30e053376..1b4f5b56924 100644
--- a/tests/components/zha/test_binary_sensor.py
+++ b/tests/components/zha/test_binary_sensor.py
@@ -116,7 +116,7 @@ async def test_binary_sensor(
     """Test ZHA binary_sensor platform."""
     zigpy_device = zigpy_device_mock(device)
     zha_device = await zha_device_joined_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
+    entity_id = find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_OFF
@@ -192,7 +192,7 @@ async def test_binary_sensor_migration_not_migrated(
 
     zigpy_device = zigpy_device_mock(DEVICE_IAS)
     zha_device = await zha_device_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
+    entity_id = find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
 
     assert entity_id is not None
     assert hass.states.get(entity_id).state == restored_state
@@ -222,7 +222,7 @@ async def test_binary_sensor_migration_already_migrated(
     update_attribute_cache(cluster)
 
     zha_device = await zha_device_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
+    entity_id = find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
 
     assert entity_id is not None
     assert hass.states.get(entity_id).state == STATE_ON  # matches attribute cache
@@ -251,7 +251,7 @@ async def test_onoff_binary_sensor_restore_state(
 
     zigpy_device = zigpy_device_mock(DEVICE_ONOFF)
     zha_device = await zha_device_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
+    entity_id = find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
 
     assert entity_id is not None
     assert hass.states.get(entity_id).state == restored_state
diff --git a/tests/components/zha/test_button.py b/tests/components/zha/test_button.py
index e0a825cc874..2a2fbc92ace 100644
--- a/tests/components/zha/test_button.py
+++ b/tests/components/zha/test_button.py
@@ -10,6 +10,7 @@ from zhaquirks.const import (
     OUTPUT_CLUSTERS,
     PROFILE_ID,
 )
+from zhaquirks.tuya.ts0601_valve import ParksideTuyaValveManufCluster
 from zigpy.const import SIG_EP_PROFILE
 from zigpy.exceptions import ZigbeeException
 import zigpy.profiles.zha as zha
@@ -49,6 +50,7 @@ def button_platform_only():
             Platform.NUMBER,
             Platform.SELECT,
             Platform.SENSOR,
+            Platform.SWITCH,
         ),
     ):
         yield
@@ -107,13 +109,21 @@ async def tuya_water_valve(hass, zigpy_device_mock, zha_device_joined_restored):
     zigpy_device = zigpy_device_mock(
         {
             1: {
-                SIG_EP_INPUT: [general.Basic.cluster_id],
-                SIG_EP_OUTPUT: [],
-                SIG_EP_TYPE: zha.DeviceType.ON_OFF_SWITCH,
-            }
+                PROFILE_ID: zha.PROFILE_ID,
+                DEVICE_TYPE: zha.DeviceType.ON_OFF_SWITCH,
+                INPUT_CLUSTERS: [
+                    general.Basic.cluster_id,
+                    general.Identify.cluster_id,
+                    general.Groups.cluster_id,
+                    general.Scenes.cluster_id,
+                    general.OnOff.cluster_id,
+                    ParksideTuyaValveManufCluster.cluster_id,
+                ],
+                OUTPUT_CLUSTERS: [general.Time.cluster_id, general.Ota.cluster_id],
+            },
         },
         manufacturer="_TZE200_htnnfasr",
-        quirk=FrostLockQuirk,
+        model="TS0601",
     )
 
     zha_device = await zha_device_joined_restored(zigpy_device)
@@ -127,13 +137,13 @@ async def test_button(hass: HomeAssistant, contact_sensor) -> None:
     entity_registry = er.async_get(hass)
     zha_device, cluster = contact_sensor
     assert cluster is not None
-    entity_id = await find_entity_id(DOMAIN, zha_device, hass)
+    entity_id = find_entity_id(DOMAIN, zha_device, hass)
     assert entity_id is not None
 
     state = hass.states.get(entity_id)
     assert state
     assert state.state == STATE_UNKNOWN
-    assert state.attributes[ATTR_DEVICE_CLASS] == ButtonDeviceClass.UPDATE
+    assert state.attributes[ATTR_DEVICE_CLASS] == ButtonDeviceClass.IDENTIFY
 
     entry = entity_registry.async_get(entity_id)
     assert entry
@@ -158,7 +168,7 @@ async def test_button(hass: HomeAssistant, contact_sensor) -> None:
     state = hass.states.get(entity_id)
     assert state
     assert state.state == "2021-11-04T16:37:00+00:00"
-    assert state.attributes[ATTR_DEVICE_CLASS] == ButtonDeviceClass.UPDATE
+    assert state.attributes[ATTR_DEVICE_CLASS] == ButtonDeviceClass.IDENTIFY
 
 
 async def test_frost_unlock(hass: HomeAssistant, tuya_water_valve) -> None:
@@ -167,7 +177,7 @@ async def test_frost_unlock(hass: HomeAssistant, tuya_water_valve) -> None:
     entity_registry = er.async_get(hass)
     zha_device, cluster = tuya_water_valve
     assert cluster is not None
-    entity_id = await find_entity_id(DOMAIN, zha_device, hass)
+    entity_id = find_entity_id(DOMAIN, zha_device, hass, qualifier="frost_lock_reset")
     assert entity_id is not None
 
     state = hass.states.get(entity_id)
diff --git a/tests/components/zha/test_climate.py b/tests/components/zha/test_climate.py
index 79777dc0c7b..fd8bcaa1085 100644
--- a/tests/components/zha/test_climate.py
+++ b/tests/components/zha/test_climate.py
@@ -281,7 +281,7 @@ async def test_climate_local_temperature(hass: HomeAssistant, device_climate) ->
     """Test local temperature."""
 
     thrm_cluster = device_climate.device.endpoints[1].thermostat
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
 
     state = hass.states.get(entity_id)
     assert state.attributes[ATTR_CURRENT_TEMPERATURE] is None
@@ -297,8 +297,8 @@ async def test_climate_hvac_action_running_state(
     """Test hvac action via running state."""
 
     thrm_cluster = device_climate_sinope.device.endpoints[1].thermostat
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
-    sensor_entity_id = await find_entity_id(
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
+    sensor_entity_id = find_entity_id(
         Platform.SENSOR, device_climate_sinope, hass, "hvac"
     )
 
@@ -362,8 +362,8 @@ async def test_climate_hvac_action_running_state_zen(
     """Test Zen hvac action via running state."""
 
     thrm_cluster = device_climate_zen.device.endpoints[1].thermostat
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_zen, hass)
-    sensor_entity_id = await find_entity_id(Platform.SENSOR, device_climate_zen, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_zen, hass)
+    sensor_entity_id = find_entity_id(Platform.SENSOR, device_climate_zen, hass)
 
     state = hass.states.get(entity_id)
     assert ATTR_HVAC_ACTION not in state.attributes
@@ -449,7 +449,7 @@ async def test_climate_hvac_action_pi_demand(
     """Test hvac action based on pi_heating/cooling_demand attrs."""
 
     thrm_cluster = device_climate.device.endpoints[1].thermostat
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
 
     state = hass.states.get(entity_id)
     assert ATTR_HVAC_ACTION not in state.attributes
@@ -498,7 +498,7 @@ async def test_hvac_mode(
     """Test HVAC mode."""
 
     thrm_cluster = device_climate.device.endpoints[1].thermostat
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
 
     state = hass.states.get(entity_id)
     assert state.state == HVACMode.OFF
@@ -538,7 +538,7 @@ async def test_hvac_modes(
     device_climate = await device_climate_mock(
         CLIMATE, {"ctrl_sequence_of_oper": seq_of_op}
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     state = hass.states.get(entity_id)
     assert set(state.attributes[ATTR_HVAC_MODES]) == modes
 
@@ -569,7 +569,7 @@ async def test_target_temperature(
         manuf=MANUF_SINOPE,
         quirk=zhaquirks.sinope.thermostat.SinopeTechnologiesThermostat,
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     if preset:
         await hass.services.async_call(
             CLIMATE_DOMAIN,
@@ -605,7 +605,7 @@ async def test_target_temperature_high(
         manuf=MANUF_SINOPE,
         quirk=zhaquirks.sinope.thermostat.SinopeTechnologiesThermostat,
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     if preset:
         await hass.services.async_call(
             CLIMATE_DOMAIN,
@@ -641,7 +641,7 @@ async def test_target_temperature_low(
         manuf=MANUF_SINOPE,
         quirk=zhaquirks.sinope.thermostat.SinopeTechnologiesThermostat,
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     if preset:
         await hass.services.async_call(
             CLIMATE_DOMAIN,
@@ -671,7 +671,7 @@ async def test_set_hvac_mode(
     """Test setting hvac mode."""
 
     thrm_cluster = device_climate.device.endpoints[1].thermostat
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
 
     state = hass.states.get(entity_id)
     assert state.state == HVACMode.OFF
@@ -712,7 +712,7 @@ async def test_set_hvac_mode(
 async def test_preset_setting(hass: HomeAssistant, device_climate_sinope) -> None:
     """Test preset setting."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
     thrm_cluster = device_climate_sinope.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -792,7 +792,7 @@ async def test_preset_setting_invalid(
 ) -> None:
     """Test invalid preset setting."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
     thrm_cluster = device_climate_sinope.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -813,7 +813,7 @@ async def test_preset_setting_invalid(
 async def test_set_temperature_hvac_mode(hass: HomeAssistant, device_climate) -> None:
     """Test setting HVAC mode in temperature service call."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     thrm_cluster = device_climate.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -855,7 +855,7 @@ async def test_set_temperature_heat_cool(
         manuf=MANUF_SINOPE,
         quirk=zhaquirks.sinope.thermostat.SinopeTechnologiesThermostat,
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     thrm_cluster = device_climate.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -941,7 +941,7 @@ async def test_set_temperature_heat(hass: HomeAssistant, device_climate_mock) ->
         manuf=MANUF_SINOPE,
         quirk=zhaquirks.sinope.thermostat.SinopeTechnologiesThermostat,
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     thrm_cluster = device_climate.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1020,7 +1020,7 @@ async def test_set_temperature_cool(hass: HomeAssistant, device_climate_mock) ->
         manuf=MANUF_SINOPE,
         quirk=zhaquirks.sinope.thermostat.SinopeTechnologiesThermostat,
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     thrm_cluster = device_climate.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1105,7 +1105,7 @@ async def test_set_temperature_wrong_mode(
             },
             manuf=MANUF_SINOPE,
         )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     thrm_cluster = device_climate.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1128,7 +1128,7 @@ async def test_set_temperature_wrong_mode(
 async def test_occupancy_reset(hass: HomeAssistant, device_climate_sinope) -> None:
     """Test away preset reset."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
     thrm_cluster = device_climate_sinope.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1155,7 +1155,7 @@ async def test_occupancy_reset(hass: HomeAssistant, device_climate_sinope) -> No
 async def test_fan_mode(hass: HomeAssistant, device_climate_fan) -> None:
     """Test fan mode."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_fan, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_fan, hass)
     thrm_cluster = device_climate_fan.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1186,7 +1186,7 @@ async def test_set_fan_mode_not_supported(
 ) -> None:
     """Test fan setting unsupported mode."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_fan, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_fan, hass)
     fan_cluster = device_climate_fan.device.endpoints[1].fan
 
     await hass.services.async_call(
@@ -1201,7 +1201,7 @@ async def test_set_fan_mode_not_supported(
 async def test_set_fan_mode(hass: HomeAssistant, device_climate_fan) -> None:
     """Test fan mode setting."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_fan, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_fan, hass)
     fan_cluster = device_climate_fan.device.endpoints[1].fan
 
     state = hass.states.get(entity_id)
@@ -1230,7 +1230,7 @@ async def test_set_fan_mode(hass: HomeAssistant, device_climate_fan) -> None:
 async def test_set_moes_preset(hass: HomeAssistant, device_climate_moes) -> None:
     """Test setting preset for moes trv."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_moes, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_moes, hass)
     thrm_cluster = device_climate_moes.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1347,7 +1347,7 @@ async def test_set_moes_operation_mode(
 ) -> None:
     """Test setting preset for moes trv."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_moes, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_moes, hass)
     thrm_cluster = device_climate_moes.device.endpoints[1].thermostat
 
     await send_attributes_report(hass, thrm_cluster, {"operation_preset": 0})
@@ -1391,7 +1391,7 @@ async def test_set_zonnsmart_preset(
 ) -> None:
     """Test setting preset from homeassistant for zonnsmart trv."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_zonnsmart, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_zonnsmart, hass)
     thrm_cluster = device_climate_zonnsmart.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1460,7 +1460,7 @@ async def test_set_zonnsmart_operation_mode(
 ) -> None:
     """Test setting preset from trv for zonnsmart trv."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_zonnsmart, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_zonnsmart, hass)
     thrm_cluster = device_climate_zonnsmart.device.endpoints[1].thermostat
 
     await send_attributes_report(hass, thrm_cluster, {"operation_preset": 0})
diff --git a/tests/components/zha/test_config_flow.py b/tests/components/zha/test_config_flow.py
index 7c0d3eac2a9..17665994806 100644
--- a/tests/components/zha/test_config_flow.py
+++ b/tests/components/zha/test_config_flow.py
@@ -48,6 +48,19 @@ def disable_platform_only():
         yield
 
 
+@pytest.fixture(autouse=True)
+def mock_multipan_platform():
+    """Mock the multipan platform."""
+    with patch(
+        "homeassistant.components.zha.silabs_multiprotocol.async_get_channel",
+        return_value=None,
+    ), patch(
+        "homeassistant.components.zha.silabs_multiprotocol.async_using_multipan",
+        return_value=False,
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
 def reduce_reconnect_timeout():
     """Reduces reconnect timeout to speed up tests."""
@@ -61,6 +74,12 @@ def mock_app():
     mock_app = AsyncMock()
     mock_app.backups = create_autospec(BackupManager, instance=True)
     mock_app.backups.backups = []
+    mock_app.state.network_info.metadata = {
+        "ezsp": {
+            "can_burn_userdata_custom_eui64": True,
+            "can_rewrite_custom_eui64": False,
+        }
+    }
 
     with patch(
         "zigpy.application.ControllerApplication.new", AsyncMock(return_value=mock_app)
@@ -1504,6 +1523,7 @@ async def test_ezsp_restore_without_settings_change_ieee(
     mock_app.state.node_info = backup.node_info
     mock_app.state.network_info = copy.deepcopy(backup.network_info)
     mock_app.state.network_info.network_key.tx_counter += 10000
+    mock_app.state.network_info.metadata["ezsp"] = {}
 
     # Include the overwrite option, just in case someone uploads a backup with it
     backup.network_info.metadata["ezsp"] = {EZSP_OVERWRITE_EUI64: True}
diff --git a/tests/components/zha/test_cover.py b/tests/components/zha/test_cover.py
index b9d64dda317..d1003418487 100644
--- a/tests/components/zha/test_cover.py
+++ b/tests/components/zha/test_cover.py
@@ -1,6 +1,6 @@
 """Test ZHA cover."""
 import asyncio
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
 
 import pytest
 import zigpy.profiles.zha
@@ -36,7 +36,7 @@ from .common import (
 )
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_PROFILE, SIG_EP_TYPE
 
-from tests.common import async_capture_events, mock_coro, mock_restore_cache
+from tests.common import async_capture_events, mock_restore_cache
 
 
 @pytest.fixture(autouse=True)
@@ -132,7 +132,7 @@ async def test_cover(
     assert cluster.read_attributes.call_count == 1
     assert "current_position_lift_percentage" in cluster.read_attributes.call_args[0][0]
 
-    entity_id = await find_entity_id(Platform.COVER, zha_device, hass)
+    entity_id = find_entity_id(Platform.COVER, zha_device, hass)
     assert entity_id is not None
 
     await async_enable_traffic(hass, [zha_device], enabled=False)
@@ -152,9 +152,7 @@ async def test_cover(
     assert hass.states.get(entity_id).state == STATE_OPEN
 
     # close from UI
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([0x1, zcl_f.Status.SUCCESS])
-    ):
+    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
         )
@@ -165,9 +163,7 @@ async def test_cover(
         assert cluster.request.call_args[1]["expect_reply"] is True
 
     # open from UI
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([0x0, zcl_f.Status.SUCCESS])
-    ):
+    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
         )
@@ -178,9 +174,7 @@ async def test_cover(
         assert cluster.request.call_args[1]["expect_reply"] is True
 
     # set position UI
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([0x5, zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[0x5, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN,
             SERVICE_SET_COVER_POSITION,
@@ -195,9 +189,7 @@ async def test_cover(
         assert cluster.request.call_args[1]["expect_reply"] is True
 
     # stop from UI
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([0x2, zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[0x2, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN, SERVICE_STOP_COVER, {"entity_id": entity_id}, blocking=True
         )
@@ -223,7 +215,7 @@ async def test_shade(
 
     cluster_on_off = zigpy_shade_device.endpoints.get(1).on_off
     cluster_level = zigpy_shade_device.endpoints.get(1).level
-    entity_id = await find_entity_id(Platform.COVER, zha_device, hass)
+    entity_id = find_entity_id(Platform.COVER, zha_device, hass)
     assert entity_id is not None
 
     await async_enable_traffic(hass, [zha_device], enabled=False)
@@ -244,17 +236,19 @@ async def test_shade(
 
     # close from UI command fails
     with patch("zigpy.zcl.Cluster.request", side_effect=asyncio.TimeoutError):
-        await hass.services.async_call(
-            COVER_DOMAIN, SERVICE_CLOSE_COVER, {"entity_id": entity_id}, blocking=True
-        )
-        assert cluster_on_off.request.call_count == 1
+        with pytest.raises(asyncio.TimeoutError):
+            await hass.services.async_call(
+                COVER_DOMAIN,
+                SERVICE_CLOSE_COVER,
+                {"entity_id": entity_id},
+                blocking=True,
+            )
+        assert cluster_on_off.request.call_count == 3
         assert cluster_on_off.request.call_args[0][0] is False
         assert cluster_on_off.request.call_args[0][1] == 0x0000
         assert hass.states.get(entity_id).state == STATE_OPEN
 
-    with patch(
-        "zigpy.zcl.Cluster.request", AsyncMock(return_value=[0x1, zcl_f.Status.SUCCESS])
-    ):
+    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
         )
@@ -267,18 +261,20 @@ async def test_shade(
     assert ATTR_CURRENT_POSITION not in hass.states.get(entity_id).attributes
     await send_attributes_report(hass, cluster_level, {0: 0})
     with patch("zigpy.zcl.Cluster.request", side_effect=asyncio.TimeoutError):
-        await hass.services.async_call(
-            COVER_DOMAIN, SERVICE_OPEN_COVER, {"entity_id": entity_id}, blocking=True
-        )
-        assert cluster_on_off.request.call_count == 1
+        with pytest.raises(asyncio.TimeoutError):
+            await hass.services.async_call(
+                COVER_DOMAIN,
+                SERVICE_OPEN_COVER,
+                {"entity_id": entity_id},
+                blocking=True,
+            )
+        assert cluster_on_off.request.call_count == 3
         assert cluster_on_off.request.call_args[0][0] is False
         assert cluster_on_off.request.call_args[0][1] == 0x0001
         assert hass.states.get(entity_id).state == STATE_CLOSED
 
     # open from UI succeeds
-    with patch(
-        "zigpy.zcl.Cluster.request", AsyncMock(return_value=[0x0, zcl_f.Status.SUCCESS])
-    ):
+    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
         )
@@ -289,22 +285,21 @@ async def test_shade(
 
     # set position UI command fails
     with patch("zigpy.zcl.Cluster.request", side_effect=asyncio.TimeoutError):
-        await hass.services.async_call(
-            COVER_DOMAIN,
-            SERVICE_SET_COVER_POSITION,
-            {"entity_id": entity_id, "position": 47},
-            blocking=True,
-        )
-        assert cluster_level.request.call_count == 1
+        with pytest.raises(asyncio.TimeoutError):
+            await hass.services.async_call(
+                COVER_DOMAIN,
+                SERVICE_SET_COVER_POSITION,
+                {"entity_id": entity_id, "position": 47},
+                blocking=True,
+            )
+        assert cluster_level.request.call_count == 3
         assert cluster_level.request.call_args[0][0] is False
         assert cluster_level.request.call_args[0][1] == 0x0004
         assert int(cluster_level.request.call_args[0][3] * 100 / 255) == 47
         assert hass.states.get(entity_id).attributes[ATTR_CURRENT_POSITION] == 0
 
     # set position UI success
-    with patch(
-        "zigpy.zcl.Cluster.request", AsyncMock(return_value=[0x5, zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[0x5, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN,
             SERVICE_SET_COVER_POSITION,
@@ -331,13 +326,14 @@ async def test_shade(
 
     # test cover stop
     with patch("zigpy.zcl.Cluster.request", side_effect=asyncio.TimeoutError):
-        await hass.services.async_call(
-            COVER_DOMAIN,
-            SERVICE_STOP_COVER,
-            {"entity_id": entity_id},
-            blocking=True,
-        )
-        assert cluster_level.request.call_count == 1
+        with pytest.raises(asyncio.TimeoutError):
+            await hass.services.async_call(
+                COVER_DOMAIN,
+                SERVICE_STOP_COVER,
+                {"entity_id": entity_id},
+                blocking=True,
+            )
+        assert cluster_level.request.call_count == 3
         assert cluster_level.request.call_args[0][0] is False
         assert cluster_level.request.call_args[0][1] in (0x0003, 0x0007)
 
@@ -361,7 +357,7 @@ async def test_restore_state(
     hass.state = CoreState.starting
 
     zha_device = await zha_device_restored(zigpy_shade_device)
-    entity_id = await find_entity_id(Platform.COVER, zha_device, hass)
+    entity_id = find_entity_id(Platform.COVER, zha_device, hass)
     assert entity_id is not None
 
     # test that the cover was created and that it is unavailable
@@ -379,7 +375,7 @@ async def test_keen_vent(
 
     cluster_on_off = zigpy_keen_vent.endpoints.get(1).on_off
     cluster_level = zigpy_keen_vent.endpoints.get(1).level
-    entity_id = await find_entity_id(Platform.COVER, zha_device, hass)
+    entity_id = find_entity_id(Platform.COVER, zha_device, hass)
     assert entity_id is not None
 
     await async_enable_traffic(hass, [zha_device], enabled=False)
@@ -396,21 +392,25 @@ async def test_keen_vent(
 
     # open from UI command fails
     p1 = patch.object(cluster_on_off, "request", side_effect=asyncio.TimeoutError)
-    p2 = patch.object(cluster_level, "request", AsyncMock(return_value=[4, 0]))
+    p2 = patch.object(cluster_level, "request", return_value=[4, 0])
 
     with p1, p2:
-        await hass.services.async_call(
-            COVER_DOMAIN, SERVICE_OPEN_COVER, {"entity_id": entity_id}, blocking=True
-        )
-        assert cluster_on_off.request.call_count == 1
+        with pytest.raises(asyncio.TimeoutError):
+            await hass.services.async_call(
+                COVER_DOMAIN,
+                SERVICE_OPEN_COVER,
+                {"entity_id": entity_id},
+                blocking=True,
+            )
+        assert cluster_on_off.request.call_count == 3
         assert cluster_on_off.request.call_args[0][0] is False
         assert cluster_on_off.request.call_args[0][1] == 0x0001
         assert cluster_level.request.call_count == 1
         assert hass.states.get(entity_id).state == STATE_CLOSED
 
     # open from UI command success
-    p1 = patch.object(cluster_on_off, "request", AsyncMock(return_value=[1, 0]))
-    p2 = patch.object(cluster_level, "request", AsyncMock(return_value=[4, 0]))
+    p1 = patch.object(cluster_on_off, "request", return_value=[1, 0])
+    p2 = patch.object(cluster_level, "request", return_value=[4, 0])
 
     with p1, p2:
         await hass.services.async_call(
diff --git a/tests/components/zha/test_device_action.py b/tests/components/zha/test_device_action.py
index f1ab44f69eb..d938512981f 100644
--- a/tests/components/zha/test_device_action.py
+++ b/tests/components/zha/test_device_action.py
@@ -2,6 +2,7 @@
 from unittest.mock import call, patch
 
 import pytest
+from pytest_unordered import unordered
 from zhaquirks.inovelli.VZM31SN import InovelliVZM31SNv11
 import zigpy.profiles.zha
 import zigpy.zcl.clusters.general as general
@@ -13,13 +14,12 @@ from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.zha import DOMAIN
 from homeassistant.const import Platform
 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 .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_TYPE
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
     mock_coro,
@@ -114,6 +114,19 @@ async def test_get_actions(hass: HomeAssistant, device_ias) -> None:
 
     ha_device_registry = dr.async_get(hass)
     reg_device = ha_device_registry.async_get_device({(DOMAIN, ieee_address)})
+    ha_entity_registry = er.async_get(hass)
+    siren_level_select = ha_entity_registry.async_get(
+        "select.fakemanufacturer_fakemodel_default_siren_level"
+    )
+    siren_tone_select = ha_entity_registry.async_get(
+        "select.fakemanufacturer_fakemodel_default_siren_tone"
+    )
+    strobe_level_select = ha_entity_registry.async_get(
+        "select.fakemanufacturer_fakemodel_default_strobe_level"
+    )
+    strobe_select = ha_entity_registry.async_get(
+        "select.fakemanufacturer_fakemodel_default_strobe"
+    )
 
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, reg_device.id
@@ -145,15 +158,15 @@ async def test_get_actions(hass: HomeAssistant, device_ias) -> None:
                 "select_previous",
             ]
             for entity_id in [
-                "select.fakemanufacturer_fakemodel_default_siren_level",
-                "select.fakemanufacturer_fakemodel_default_siren_tone",
-                "select.fakemanufacturer_fakemodel_default_strobe_level",
-                "select.fakemanufacturer_fakemodel_default_strobe",
+                siren_level_select.id,
+                siren_tone_select.id,
+                strobe_level_select.id,
+                strobe_select.id,
             ]
         ]
     )
 
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_inovelli_actions(hass: HomeAssistant, device_inovelli) -> None:
@@ -164,6 +177,9 @@ async def test_get_inovelli_actions(hass: HomeAssistant, device_inovelli) -> Non
     inovelli_reg_device = ha_device_registry.async_get_device(
         {(DOMAIN, inovelli_ieee_address)}
     )
+    ha_entity_registry = er.async_get(hass)
+    inovelli_button = ha_entity_registry.async_get("button.inovelli_vzm31_sn_identify")
+    inovelli_light = ha_entity_registry.async_get("light.inovelli_vzm31_sn_light")
 
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, inovelli_reg_device.id
@@ -185,55 +201,55 @@ async def test_get_inovelli_actions(hass: HomeAssistant, device_inovelli) -> Non
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.BUTTON,
-            "entity_id": "button.inovelli_vzm31_sn_identify",
+            "entity_id": inovelli_button.id,
             "metadata": {"secondary": True},
             "type": "press",
         },
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.LIGHT,
-            "entity_id": "light.inovelli_vzm31_sn_light",
+            "entity_id": inovelli_light.id,
             "metadata": {"secondary": False},
             "type": "turn_off",
         },
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.LIGHT,
-            "entity_id": "light.inovelli_vzm31_sn_light",
+            "entity_id": inovelli_light.id,
             "metadata": {"secondary": False},
             "type": "turn_on",
         },
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.LIGHT,
-            "entity_id": "light.inovelli_vzm31_sn_light",
+            "entity_id": inovelli_light.id,
             "metadata": {"secondary": False},
             "type": "toggle",
         },
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.LIGHT,
-            "entity_id": "light.inovelli_vzm31_sn_light",
+            "entity_id": inovelli_light.id,
             "metadata": {"secondary": False},
             "type": "brightness_increase",
         },
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.LIGHT,
-            "entity_id": "light.inovelli_vzm31_sn_light",
+            "entity_id": inovelli_light.id,
             "metadata": {"secondary": False},
             "type": "brightness_decrease",
         },
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.LIGHT,
-            "entity_id": "light.inovelli_vzm31_sn_light",
+            "entity_id": inovelli_light.id,
             "metadata": {"secondary": False},
             "type": "flash",
         },
     ]
 
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_action(hass: HomeAssistant, device_ias, device_inovelli) -> None:
@@ -328,7 +344,6 @@ async def test_action(hass: HomeAssistant, device_ias, device_inovelli) -> None:
                 5,
                 expect_reply=False,
                 manufacturer=4151,
-                tries=1,
                 tsn=None,
             )
             in cluster.request.call_args_list
@@ -345,7 +360,6 @@ async def test_action(hass: HomeAssistant, device_ias, device_inovelli) -> None:
                 5,
                 expect_reply=False,
                 manufacturer=4151,
-                tries=1,
                 tsn=None,
             )
             in cluster.request.call_args_list
diff --git a/tests/components/zha/test_device_tracker.py b/tests/components/zha/test_device_tracker.py
index 70f76ae54f3..aa3c6b7d146 100644
--- a/tests/components/zha/test_device_tracker.py
+++ b/tests/components/zha/test_device_tracker.py
@@ -70,7 +70,7 @@ async def test_device_tracker(
 
     zha_device = await zha_device_joined_restored(zigpy_device_dt)
     cluster = zigpy_device_dt.endpoints.get(1).power
-    entity_id = await find_entity_id(Platform.DEVICE_TRACKER, zha_device, hass)
+    entity_id = find_entity_id(Platform.DEVICE_TRACKER, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_NOT_HOME
diff --git a/tests/components/zha/test_discover.py b/tests/components/zha/test_discover.py
index 236a3c4ad86..e0785601b4f 100644
--- a/tests/components/zha/test_discover.py
+++ b/tests/components/zha/test_discover.py
@@ -15,20 +15,12 @@ import zigpy.zcl.clusters.general
 import zigpy.zcl.clusters.security
 import zigpy.zcl.foundation as zcl_f
 
-import homeassistant.components.zha.binary_sensor
 import homeassistant.components.zha.core.cluster_handlers as cluster_handlers
 import homeassistant.components.zha.core.const as zha_const
 from homeassistant.components.zha.core.device import ZHADevice
 import homeassistant.components.zha.core.discovery as disc
 from homeassistant.components.zha.core.endpoint import Endpoint
 import homeassistant.components.zha.core.registries as zha_regs
-import homeassistant.components.zha.cover
-import homeassistant.components.zha.device_tracker
-import homeassistant.components.zha.fan
-import homeassistant.components.zha.light
-import homeassistant.components.zha.lock
-import homeassistant.components.zha.sensor
-import homeassistant.components.zha.switch
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.entity_registry as er
@@ -131,7 +123,6 @@ async def test_devices(
                     ),
                     expect_reply=True,
                     manufacturer=None,
-                    tries=1,
                     tsn=None,
                 )
             ]
@@ -493,35 +484,3 @@ async def test_group_probe_cleanup_called(
     await config_entry.async_unload(hass_disable_services)
     await hass_disable_services.async_block_till_done()
     disc.GROUP_PROBE.cleanup.assert_called()
-
-
-@patch(
-    "zigpy.zcl.clusters.general.Identify.request",
-    new=AsyncMock(return_value=[mock.sentinel.data, zcl_f.Status.SUCCESS]),
-)
-@patch(
-    "homeassistant.components.zha.entity.ZhaEntity.entity_registry_enabled_default",
-    new=Mock(return_value=True),
-)
-async def test_cluster_handler_with_empty_ep_attribute_cluster(
-    hass_disable_services,
-    zigpy_device_mock,
-    zha_device_joined_restored,
-) -> None:
-    """Test device discovery for cluster which does not have em_attribute."""
-    entity_registry = homeassistant.helpers.entity_registry.async_get(
-        hass_disable_services
-    )
-
-    zigpy_device = zigpy_device_mock(
-        {1: {SIG_EP_INPUT: [0x042E], SIG_EP_OUTPUT: [], SIG_EP_TYPE: 0x1234}},
-        "00:11:22:33:44:55:66:77",
-        "test manufacturer",
-        "test model",
-        patch_cluster=False,
-    )
-    zha_dev = await zha_device_joined_restored(zigpy_device)
-    ha_entity_id = entity_registry.async_get_entity_id(
-        "sensor", "zha", f"{zha_dev.ieee}-1-1070"
-    )
-    assert ha_entity_id is not None
diff --git a/tests/components/zha/test_fan.py b/tests/components/zha/test_fan.py
index 5ad8966c547..f93467ed3e1 100644
--- a/tests/components/zha/test_fan.py
+++ b/tests/components/zha/test_fan.py
@@ -167,7 +167,7 @@ async def test_fan(
 
     zha_device = await zha_device_joined_restored(zigpy_device)
     cluster = zigpy_device.endpoints.get(1).fan
-    entity_id = await find_entity_id(Platform.FAN, zha_device, hass)
+    entity_id = find_entity_id(Platform.FAN, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_OFF
@@ -475,7 +475,7 @@ async def test_fan_init(
     cluster.PLUGGED_ATTR_READS = plug_read
 
     zha_device = await zha_device_joined_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.FAN, zha_device, hass)
+    entity_id = find_entity_id(Platform.FAN, zha_device, hass)
     assert entity_id is not None
     assert hass.states.get(entity_id).state == expected_state
     assert hass.states.get(entity_id).attributes[ATTR_PERCENTAGE] == expected_percentage
@@ -493,7 +493,7 @@ async def test_fan_update_entity(
     cluster.PLUGGED_ATTR_READS = {"fan_mode": 0}
 
     zha_device = await zha_device_joined_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.FAN, zha_device, hass)
+    entity_id = find_entity_id(Platform.FAN, zha_device, hass)
     assert entity_id is not None
     assert hass.states.get(entity_id).state == STATE_OFF
     assert hass.states.get(entity_id).attributes[ATTR_PERCENTAGE] == 0
@@ -562,7 +562,7 @@ async def test_fan_ikea(
     """Test ZHA fan Ikea platform."""
     zha_device = await zha_device_joined_restored(zigpy_device_ikea)
     cluster = zigpy_device_ikea.endpoints.get(1).ikea_airpurifier
-    entity_id = await find_entity_id(Platform.FAN, zha_device, hass)
+    entity_id = find_entity_id(Platform.FAN, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_OFF
@@ -656,7 +656,7 @@ async def test_fan_ikea_init(
     cluster.PLUGGED_ATTR_READS = ikea_plug_read
 
     zha_device = await zha_device_joined_restored(zigpy_device_ikea)
-    entity_id = await find_entity_id(Platform.FAN, zha_device, hass)
+    entity_id = find_entity_id(Platform.FAN, zha_device, hass)
     assert entity_id is not None
     assert hass.states.get(entity_id).state == ikea_expected_state
     assert (
@@ -676,7 +676,7 @@ async def test_fan_ikea_update_entity(
     cluster.PLUGGED_ATTR_READS = {"fan_mode": 0}
 
     zha_device = await zha_device_joined_restored(zigpy_device_ikea)
-    entity_id = await find_entity_id(Platform.FAN, zha_device, hass)
+    entity_id = find_entity_id(Platform.FAN, zha_device, hass)
     assert entity_id is not None
     assert hass.states.get(entity_id).state == STATE_OFF
     assert hass.states.get(entity_id).attributes[ATTR_PERCENTAGE] == 0
diff --git a/tests/components/zha/test_light.py b/tests/components/zha/test_light.py
index c4751f7e7f6..3abfd0e4f9c 100644
--- a/tests/components/zha/test_light.py
+++ b/tests/components/zha/test_light.py
@@ -264,7 +264,7 @@ async def test_light_refresh(
     on_off_cluster = zigpy_device.endpoints[1].on_off
     on_off_cluster.PLUGGED_ATTR_READS = {"on_off": 0}
     zha_device = await zha_device_joined_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.LIGHT, zha_device, hass)
+    entity_id = find_entity_id(Platform.LIGHT, zha_device, hass)
 
     # allow traffic to flow through the gateway and device
     await async_enable_traffic(hass, [zha_device])
@@ -326,7 +326,7 @@ async def test_light(
     # create zigpy devices
     zigpy_device = zigpy_device_mock(device)
     zha_device = await zha_device_joined_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.LIGHT, zha_device, hass)
+    entity_id = find_entity_id(Platform.LIGHT, zha_device, hass)
 
     assert entity_id is not None
 
@@ -446,7 +446,7 @@ async def test_light_initialization(
 
     with patch_zha_config("light", config_override):
         zha_device = await zha_device_joined_restored(zigpy_device)
-        entity_id = await find_entity_id(Platform.LIGHT, zha_device, hass)
+        entity_id = find_entity_id(Platform.LIGHT, zha_device, hass)
 
     assert entity_id is not None
 
@@ -495,9 +495,9 @@ async def test_transitions(
         assert member.group == zha_group
         assert member.endpoint is not None
 
-    device_1_entity_id = await find_entity_id(Platform.LIGHT, device_light_1, hass)
-    device_2_entity_id = await find_entity_id(Platform.LIGHT, device_light_2, hass)
-    eWeLink_light_entity_id = await find_entity_id(Platform.LIGHT, eWeLink_light, hass)
+    device_1_entity_id = find_entity_id(Platform.LIGHT, device_light_1, hass)
+    device_2_entity_id = find_entity_id(Platform.LIGHT, device_light_2, hass)
+    eWeLink_light_entity_id = find_entity_id(Platform.LIGHT, eWeLink_light, hass)
     assert device_1_entity_id != device_2_entity_id
 
     group_entity_id = async_find_group_entity_id(hass, Platform.LIGHT, zha_group)
@@ -553,7 +553,6 @@ async def test_transitions(
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -589,7 +588,6 @@ async def test_transitions(
         transition_time=35,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_color.request.call_args == call(
@@ -600,7 +598,6 @@ async def test_transitions(
         transition_time=35,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -637,7 +634,6 @@ async def test_transitions(
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -674,7 +670,6 @@ async def test_transitions(
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_color.request.call_args == call(
@@ -685,7 +680,6 @@ async def test_transitions(
         transition_time=0,  # no transition when new_color_provided_while_off
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_level.request.call_args_list[1] == call(
@@ -696,7 +690,6 @@ async def test_transitions(
         transition_time=10,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -758,7 +751,6 @@ async def test_transitions(
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_color.request.call_args == call(
@@ -769,7 +761,6 @@ async def test_transitions(
         transition_time=0,  # no transition when new_color_provided_while_off
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_level.request.call_args_list[1] == call(
@@ -780,7 +771,6 @@ async def test_transitions(
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -838,7 +828,6 @@ async def test_transitions(
         dev1_cluster_on_off.commands_by_name["on"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -850,7 +839,6 @@ async def test_transitions(
         transition_time=0,  # no transition when new_color_provided_while_off
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -910,7 +898,6 @@ async def test_transitions(
         transition_time=1,  # transition time - sengled light uses default minimum
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -968,7 +955,6 @@ async def test_transitions(
         transition_time=1,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev2_cluster_color.request.call_args == call(
@@ -979,7 +965,6 @@ async def test_transitions(
         transition_time=1,  # sengled transition == 1 when new_color_provided_while_off
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev2_cluster_level.request.call_args_list[1] == call(
@@ -990,7 +975,6 @@ async def test_transitions(
         transition_time=10,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1055,7 +1039,6 @@ async def test_transitions(
         transition_time=10,  # sengled transition == 1 when new_color_provided_while_off
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert group_level_cluster_handler.request.call_args == call(
@@ -1066,7 +1049,6 @@ async def test_transitions(
         transition_time=10,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1121,7 +1103,6 @@ async def test_transitions(
         transition_time=20,  # transition time
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1151,7 +1132,6 @@ async def test_transitions(
         transition_time=1,  # transition time - sengled light uses default minimum
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1184,7 +1164,6 @@ async def test_transitions(
         eWeLink_cluster_on_off.commands_by_name["on"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_color.request.call_args == call(
@@ -1195,7 +1174,6 @@ async def test_transitions(
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1222,7 +1200,7 @@ async def test_transitions(
 async def test_on_with_off_color(hass: HomeAssistant, device_light_1) -> None:
     """Test turning on the light and sending color commands before on/level commands for supporting lights."""
 
-    device_1_entity_id = await find_entity_id(Platform.LIGHT, device_light_1, hass)
+    device_1_entity_id = find_entity_id(Platform.LIGHT, device_light_1, hass)
     dev1_cluster_on_off = device_light_1.device.endpoints[1].on_off
     dev1_cluster_level = device_light_1.device.endpoints[1].level
     dev1_cluster_color = device_light_1.device.endpoints[1].light_color
@@ -1261,7 +1239,6 @@ async def test_on_with_off_color(hass: HomeAssistant, device_light_1) -> None:
         dev1_cluster_on_off.commands_by_name["on"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_color.request.call_args == call(
@@ -1272,7 +1249,6 @@ async def test_on_with_off_color(hass: HomeAssistant, device_light_1) -> None:
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1319,7 +1295,6 @@ async def test_on_with_off_color(hass: HomeAssistant, device_light_1) -> None:
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_color.request.call_args == call(
@@ -1330,7 +1305,6 @@ async def test_on_with_off_color(hass: HomeAssistant, device_light_1) -> None:
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_level.request.call_args_list[1] == call(
@@ -1341,7 +1315,6 @@ async def test_on_with_off_color(hass: HomeAssistant, device_light_1) -> None:
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1388,7 +1361,6 @@ async def async_test_on_off_from_hass(hass, cluster, entity_id):
         cluster.commands_by_name["on"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1411,7 +1383,6 @@ async def async_test_off_from_hass(hass, cluster, entity_id):
         cluster.commands_by_name["off"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1439,7 +1410,6 @@ async def async_test_level_on_off_from_hass(
         on_off_cluster.commands_by_name["on"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     on_off_cluster.request.reset_mock()
@@ -1463,7 +1433,6 @@ async def async_test_level_on_off_from_hass(
         on_off_cluster.commands_by_name["on"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert level_cluster.request.call_args == call(
@@ -1474,7 +1443,6 @@ async def async_test_level_on_off_from_hass(
         transition_time=100,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     on_off_cluster.request.reset_mock()
@@ -1499,7 +1467,6 @@ async def async_test_level_on_off_from_hass(
         transition_time=int(expected_default_transition),
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     on_off_cluster.request.reset_mock()
@@ -1542,7 +1509,6 @@ async def async_test_flash_from_hass(hass, cluster, entity_id, flash):
         effect_variant=general.Identify.EffectVariant.Default,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1593,9 +1559,9 @@ async def test_zha_group_light_entity(
         assert member.group == zha_group
         assert member.endpoint is not None
 
-    device_1_entity_id = await find_entity_id(Platform.LIGHT, device_light_1, hass)
-    device_2_entity_id = await find_entity_id(Platform.LIGHT, device_light_2, hass)
-    device_3_entity_id = await find_entity_id(Platform.LIGHT, device_light_3, hass)
+    device_1_entity_id = find_entity_id(Platform.LIGHT, device_light_1, hass)
+    device_2_entity_id = find_entity_id(Platform.LIGHT, device_light_2, hass)
+    device_3_entity_id = find_entity_id(Platform.LIGHT, device_light_3, hass)
 
     assert (
         device_1_entity_id != device_2_entity_id
@@ -1833,8 +1799,8 @@ async def test_group_member_assume_state(
             assert member.group == zha_group
             assert member.endpoint is not None
 
-        device_1_entity_id = await find_entity_id(Platform.LIGHT, device_light_1, hass)
-        device_2_entity_id = await find_entity_id(Platform.LIGHT, device_light_2, hass)
+        device_1_entity_id = find_entity_id(Platform.LIGHT, device_light_1, hass)
+        device_2_entity_id = find_entity_id(Platform.LIGHT, device_light_2, hass)
 
         assert device_1_entity_id != device_2_entity_id
 
diff --git a/tests/components/zha/test_lock.py b/tests/components/zha/test_lock.py
index a3ce29bd630..2f1ecb6983d 100644
--- a/tests/components/zha/test_lock.py
+++ b/tests/components/zha/test_lock.py
@@ -19,8 +19,6 @@ from homeassistant.core import HomeAssistant
 from .common import async_enable_traffic, find_entity_id, send_attributes_report
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_TYPE
 
-from tests.common import mock_coro
-
 LOCK_DOOR = 0
 UNLOCK_DOOR = 1
 SET_PIN_CODE = 5
@@ -64,7 +62,7 @@ async def test_lock(hass: HomeAssistant, lock) -> None:
     """Test ZHA lock platform."""
 
     zha_device, cluster = lock
-    entity_id = await find_entity_id(Platform.LOCK, zha_device, hass)
+    entity_id = find_entity_id(Platform.LOCK, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_UNLOCKED
@@ -107,9 +105,7 @@ async def test_lock(hass: HomeAssistant, lock) -> None:
 
 async def async_lock(hass, cluster, entity_id):
     """Test lock functionality from hass."""
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[zcl_f.Status.SUCCESS]):
         # lock via UI
         await hass.services.async_call(
             LOCK_DOMAIN, "lock", {"entity_id": entity_id}, blocking=True
@@ -121,9 +117,7 @@ async def async_lock(hass, cluster, entity_id):
 
 async def async_unlock(hass, cluster, entity_id):
     """Test lock functionality from hass."""
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[zcl_f.Status.SUCCESS]):
         # lock via UI
         await hass.services.async_call(
             LOCK_DOMAIN, "unlock", {"entity_id": entity_id}, blocking=True
@@ -135,9 +129,7 @@ async def async_unlock(hass, cluster, entity_id):
 
 async def async_set_user_code(hass, cluster, entity_id):
     """Test set lock code functionality from hass."""
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[zcl_f.Status.SUCCESS]):
         # set lock code via service call
         await hass.services.async_call(
             "zha",
@@ -158,9 +150,7 @@ async def async_set_user_code(hass, cluster, entity_id):
 
 async def async_clear_user_code(hass, cluster, entity_id):
     """Test clear lock code functionality from hass."""
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[zcl_f.Status.SUCCESS]):
         # set lock code via service call
         await hass.services.async_call(
             "zha",
@@ -179,9 +169,7 @@ async def async_clear_user_code(hass, cluster, entity_id):
 
 async def async_enable_user_code(hass, cluster, entity_id):
     """Test enable lock code functionality from hass."""
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[zcl_f.Status.SUCCESS]):
         # set lock code via service call
         await hass.services.async_call(
             "zha",
@@ -201,9 +189,7 @@ async def async_enable_user_code(hass, cluster, entity_id):
 
 async def async_disable_user_code(hass, cluster, entity_id):
     """Test disable lock code functionality from hass."""
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[zcl_f.Status.SUCCESS]):
         # set lock code via service call
         await hass.services.async_call(
             "zha",
diff --git a/tests/components/zha/test_number.py b/tests/components/zha/test_number.py
index 584a7318383..60aa355af5f 100644
--- a/tests/components/zha/test_number.py
+++ b/tests/components/zha/test_number.py
@@ -114,7 +114,7 @@ async def test_number(
     assert "engineering_units" in attr_reads
     assert "application_type" in attr_reads
 
-    entity_id = await find_entity_id(Platform.NUMBER, zha_device, hass)
+    entity_id = find_entity_id(Platform.NUMBER, zha_device, hass)
     assert entity_id is not None
 
     await async_enable_traffic(hass, [zha_device], enabled=False)
@@ -211,7 +211,7 @@ async def test_level_control_number(
     }
     zha_device = await zha_device_joined(light)
 
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.NUMBER,
         zha_device,
         hass,
@@ -344,7 +344,7 @@ async def test_color_number(
     }
     zha_device = await zha_device_joined(light)
 
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.NUMBER,
         zha_device,
         hass,
diff --git a/tests/components/zha/test_select.py b/tests/components/zha/test_select.py
index fb1930e3f99..d2d1b79c92f 100644
--- a/tests/components/zha/test_select.py
+++ b/tests/components/zha/test_select.py
@@ -116,7 +116,6 @@ def core_rs(hass_storage):
                 }
             ],
         }
-        return
 
     return _storage
 
@@ -127,7 +126,7 @@ async def test_select(hass: HomeAssistant, siren) -> None:
     entity_registry = er.async_get(hass)
     zha_device, cluster = siren
     assert cluster is not None
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.SELECT,
         zha_device,
         hass,
@@ -194,7 +193,7 @@ async def test_select_restore_state(
     zha_device = await zha_device_restored(zigpy_device)
     cluster = zigpy_device.endpoints[1].ias_wd
     assert cluster is not None
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.SELECT,
         zha_device,
         hass,
@@ -219,7 +218,7 @@ async def test_on_off_select_new_join(
     }
     zha_device = await zha_device_joined(light)
     select_name = "start_up_behavior"
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.SELECT,
         zha_device,
         hass,
@@ -304,7 +303,7 @@ async def test_on_off_select_restored(
     )
 
     select_name = "start_up_behavior"
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.SELECT,
         zha_device,
         hass,
@@ -331,7 +330,7 @@ async def test_on_off_select_unsupported(
     on_off_cluster.add_unsupported_attribute("start_up_on_off")
     zha_device = await zha_device_joined_restored(light)
     select_name = general.OnOff.StartUpOnOff.__name__
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.SELECT,
         zha_device,
         hass,
@@ -400,7 +399,7 @@ async def test_on_off_select_attribute_report(
 
     zha_device = await zha_device_restored(zigpy_device_aqara_sensor)
     cluster = zigpy_device_aqara_sensor.endpoints.get(1).opple_cluster
-    entity_id = await find_entity_id(Platform.SELECT, zha_device, hass)
+    entity_id = find_entity_id(Platform.SELECT, zha_device, hass)
     assert entity_id is not None
 
     # allow traffic to flow through the gateway and device
diff --git a/tests/components/zha/test_sensor.py b/tests/components/zha/test_sensor.py
index 7d821ced4a0..b9d9511a6d1 100644
--- a/tests/components/zha/test_sensor.py
+++ b/tests/components/zha/test_sensor.py
@@ -569,7 +569,7 @@ async def test_temp_uom(
     )
     cluster = zigpy_device.endpoints[1].temperature
     zha_device = await zha_device_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.SENSOR, zha_device, hass)
+    entity_id = find_entity_id(Platform.SENSOR, zha_device, hass)
 
     if not restore:
         await async_enable_traffic(hass, [zha_device], enabled=False)
@@ -613,7 +613,7 @@ async def test_electrical_measurement_init(
     )
     cluster = zigpy_device.endpoints[1].in_clusters[cluster_id]
     zha_device = await zha_device_joined(zigpy_device)
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.SENSOR, zha_device, hass, qualifier="active_power"
     )
 
diff --git a/tests/components/zha/test_siren.py b/tests/components/zha/test_siren.py
index a6b3059f093..7346f1e5bcb 100644
--- a/tests/components/zha/test_siren.py
+++ b/tests/components/zha/test_siren.py
@@ -69,7 +69,7 @@ async def test_siren(hass: HomeAssistant, siren) -> None:
 
     zha_device, cluster = siren
     assert cluster is not None
-    entity_id = await find_entity_id(Platform.SIREN, zha_device, hass)
+    entity_id = find_entity_id(Platform.SIREN, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_OFF
diff --git a/tests/components/zha/test_switch.py b/tests/components/zha/test_switch.py
index 9f98acb9359..bee7ec409ca 100644
--- a/tests/components/zha/test_switch.py
+++ b/tests/components/zha/test_switch.py
@@ -34,8 +34,6 @@ from .common import (
 )
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_TYPE
 
-from tests.common import mock_coro
-
 ON = 1
 OFF = 0
 IEEE_GROUPABLE_DEVICE = "01:2d:6f:00:0a:90:69:e8"
@@ -138,7 +136,7 @@ async def test_switch(
 
     zha_device = await zha_device_joined_restored(zigpy_device)
     cluster = zigpy_device.endpoints.get(1).on_off
-    entity_id = await find_entity_id(Platform.SWITCH, zha_device, hass)
+    entity_id = find_entity_id(Platform.SWITCH, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_OFF
@@ -163,7 +161,7 @@ async def test_switch(
     # turn on from HA
     with patch(
         "zigpy.zcl.Cluster.request",
-        return_value=mock_coro([0x00, zcl_f.Status.SUCCESS]),
+        return_value=[0x00, zcl_f.Status.SUCCESS],
     ):
         # turn on via UI
         await hass.services.async_call(
@@ -176,14 +174,13 @@ async def test_switch(
             cluster.commands_by_name["on"].schema,
             expect_reply=True,
             manufacturer=None,
-            tries=1,
             tsn=None,
         )
 
     # turn off from HA
     with patch(
         "zigpy.zcl.Cluster.request",
-        return_value=mock_coro([0x01, zcl_f.Status.SUCCESS]),
+        return_value=[0x01, zcl_f.Status.SUCCESS],
     ):
         # turn off via UI
         await hass.services.async_call(
@@ -196,7 +193,6 @@ async def test_switch(
             cluster.commands_by_name["off"].schema,
             expect_reply=True,
             manufacturer=None,
-            tries=1,
             tsn=None,
         )
 
@@ -313,7 +309,7 @@ async def test_zha_group_switch_entity(
     # turn on from HA
     with patch(
         "zigpy.zcl.Cluster.request",
-        return_value=mock_coro([0x00, zcl_f.Status.SUCCESS]),
+        return_value=[0x00, zcl_f.Status.SUCCESS],
     ):
         # turn on via UI
         await hass.services.async_call(
@@ -326,7 +322,6 @@ async def test_zha_group_switch_entity(
             group_cluster_on_off.commands_by_name["on"].schema,
             expect_reply=True,
             manufacturer=None,
-            tries=1,
             tsn=None,
         )
     assert hass.states.get(entity_id).state == STATE_ON
@@ -334,7 +329,7 @@ async def test_zha_group_switch_entity(
     # turn off from HA
     with patch(
         "zigpy.zcl.Cluster.request",
-        return_value=mock_coro([0x01, zcl_f.Status.SUCCESS]),
+        return_value=[0x01, zcl_f.Status.SUCCESS],
     ):
         # turn off via UI
         await hass.services.async_call(
@@ -347,7 +342,6 @@ async def test_zha_group_switch_entity(
             group_cluster_on_off.commands_by_name["off"].schema,
             expect_reply=True,
             manufacturer=None,
-            tries=1,
             tsn=None,
         )
     assert hass.states.get(entity_id).state == STATE_OFF
@@ -386,7 +380,7 @@ async def test_switch_configurable(
 
     zha_device = await zha_device_joined_restored(zigpy_device_tuya)
     cluster = zigpy_device_tuya.endpoints.get(1).tuya_manufacturer
-    entity_id = await find_entity_id(Platform.SWITCH, zha_device, hass)
+    entity_id = find_entity_id(Platform.SWITCH, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_OFF
@@ -411,7 +405,7 @@ async def test_switch_configurable(
     # turn on from HA
     with patch(
         "zigpy.zcl.Cluster.write_attributes",
-        return_value=mock_coro([zcl_f.Status.SUCCESS, zcl_f.Status.SUCCESS]),
+        return_value=[zcl_f.Status.SUCCESS, zcl_f.Status.SUCCESS],
     ):
         # turn on via UI
         await hass.services.async_call(
@@ -425,7 +419,7 @@ async def test_switch_configurable(
     # turn off from HA
     with patch(
         "zigpy.zcl.Cluster.write_attributes",
-        return_value=mock_coro([zcl_f.Status.SUCCESS, zcl_f.Status.SUCCESS]),
+        return_value=[zcl_f.Status.SUCCESS, zcl_f.Status.SUCCESS],
     ):
         # turn off via UI
         await hass.services.async_call(
diff --git a/tests/components/zwave_js/conftest.py b/tests/components/zwave_js/conftest.py
index 1751bd0c0ca..68484111802 100644
--- a/tests/components/zwave_js/conftest.py
+++ b/tests/components/zwave_js/conftest.py
@@ -433,6 +433,12 @@ def leviton_zw4sf_state_fixture():
     return json.loads(load_fixture("zwave_js/leviton_zw4sf_state.json"))
 
 
+@pytest.fixture(name="fan_honeywell_39358_state", scope="session")
+def fan_honeywell_39358_state_fixture():
+    """Load the fan node state fixture data."""
+    return json.loads(load_fixture("zwave_js/fan_honeywell_39358_state.json"))
+
+
 @pytest.fixture(name="gdc_zw062_state", scope="session")
 def motorized_barrier_cover_state_fixture():
     """Load the motorized barrier cover node state fixture data."""
@@ -949,6 +955,14 @@ def leviton_zw4sf_fixture(client, leviton_zw4sf_state):
     return node
 
 
+@pytest.fixture(name="fan_honeywell_39358")
+def fan_honeywell_39358_fixture(client, fan_honeywell_39358_state):
+    """Mock a fan node."""
+    node = Node(client, copy.deepcopy(fan_honeywell_39358_state))
+    client.driver.controller.nodes[node.node_id] = node
+    return node
+
+
 @pytest.fixture(name="null_name_check")
 def null_name_check_fixture(client, null_name_check_state):
     """Mock a node with no name."""
diff --git a/tests/components/zwave_js/fixtures/fan_honeywell_39358_state.json b/tests/components/zwave_js/fixtures/fan_honeywell_39358_state.json
new file mode 100644
index 00000000000..063eae25b0f
--- /dev/null
+++ b/tests/components/zwave_js/fixtures/fan_honeywell_39358_state.json
@@ -0,0 +1,10511 @@
+{
+  "nodeId": 61,
+  "index": 0,
+  "installerIcon": 1024,
+  "userIcon": 1024,
+  "status": 4,
+  "ready": true,
+  "isListening": true,
+  "isRouting": true,
+  "isSecure": false,
+  "manufacturerId": 57,
+  "productId": 12593,
+  "productType": 18756,
+  "firmwareVersion": "5.24",
+  "zwavePlusVersion": 1,
+  "name": "honeywell_in_wall_smart_fan_control",
+  "deviceConfig": {
+    "filename": "/srv/zwavejs2mqtt/node_modules/@zwave-js/config/config/devices/0x0039/39358_39465_zw4002.json",
+    "isEmbedded": true,
+    "manufacturer": "Honeywell",
+    "manufacturerId": 57,
+    "label": "39358 / 39465 / ZW4002",
+    "description": "In-Wall Fan Speed Control, 500S",
+    "devices": [
+      {
+        "productType": 18756,
+        "productId": 12593
+      }
+    ],
+    "firmwareVersion": {
+      "min": "0.0",
+      "max": "255.255"
+    },
+    "preferred": false,
+    "associations": {},
+    "paramInformation": {
+      "_map": {}
+    },
+    "compat": {
+      "removeCCs": {},
+      "treatBasicSetAsEvent": true
+    },
+    "metadata": {
+      "inclusion": "1. Follow the instructions for your Z-Wave certified controller to include a device to the Z-Wave network.\n2. Once the controller is ready to include your device, press and release the top or bottom of the smart fan control switch (rocker) to include it in the network.\n3. Once your controller has confirmed the device has been included, refresh the Z-Wave network to optimize performance",
+      "exclusion": "1. Follow the instructions for your Z-Wave certified controller to exclude a device from the Z-Wave network. \n2. Once the controller is ready to Exclude your device, press and release the top or bottom of the wireless smart switch (rocker) to exclude it from the network",
+      "reset": "1. Quickly press ON (Top) button three (3) times then immediately press the OFF (Bottom) button three (3) times. The LED will flash ON/OFF 5 times when completed successfully.\nNote: This should only be used in the event your network\u2019s primary controller is missing or otherwise inoperable",
+      "manual": "https://products.z-wavealliance.org/ProductManual/File?folder=&filename=MarketCertificationFiles/2725/39358-HQSG-v1-para.pdf"
+    }
+  },
+  "label": "39358 / 39465 / ZW4002",
+  "interviewAttempts": 0,
+  "endpoints": [
+    {
+      "nodeId": 61,
+      "index": 0,
+      "installerIcon": 1024,
+      "userIcon": 1024,
+      "deviceClass": {
+        "basic": {
+          "key": 4,
+          "label": "Routing Slave"
+        },
+        "generic": {
+          "key": 17,
+          "label": "Multilevel Switch"
+        },
+        "specific": {
+          "key": 8,
+          "label": "Fan Switch"
+        },
+        "mandatorySupportedCCs": [32, 38, 133, 89, 114, 115, 134, 94],
+        "mandatoryControlledCCs": []
+      },
+      "commandClasses": [
+        {
+          "id": 32,
+          "name": "Basic",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 38,
+          "name": "Multilevel Switch",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 133,
+          "name": "Association",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 89,
+          "name": "Association Group Information",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 114,
+          "name": "Manufacturer Specific",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 115,
+          "name": "Powerlevel",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 134,
+          "name": "Version",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 94,
+          "name": "Z-Wave Plus Info",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 90,
+          "name": "Device Reset Locally",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 112,
+          "name": "Configuration",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 86,
+          "name": "CRC-16 Encapsulation",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 44,
+          "name": "Scene Actuator Configuration",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 43,
+          "name": "Scene Activation",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 122,
+          "name": "Firmware Update Meta Data",
+          "version": 2,
+          "isSecure": false
+        }
+      ]
+    }
+  ],
+  "values": [
+    {
+      "endpoint": 0,
+      "commandClass": 32,
+      "commandClassName": "Basic",
+      "property": "currentValue",
+      "propertyName": "currentValue",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Current value",
+        "min": 0,
+        "max": 99,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 32,
+      "commandClassName": "Basic",
+      "property": "targetValue",
+      "propertyName": "targetValue",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Target value",
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 32,
+      "commandClassName": "Basic",
+      "property": "event",
+      "propertyName": "event",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Event value",
+        "min": 0,
+        "max": 255,
+        "stateful": false,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 32,
+      "commandClassName": "Basic",
+      "property": "duration",
+      "propertyName": "duration",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": false,
+        "label": "Remaining duration",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 32,
+      "commandClassName": "Basic",
+      "property": "restorePrevious",
+      "propertyName": "restorePrevious",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Restore previous value",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "targetValue",
+      "propertyName": "targetValue",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Target value",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 99,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "currentValue",
+      "propertyName": "currentValue",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Current value",
+        "min": 0,
+        "max": 99,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "Up",
+      "propertyName": "Up",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "boolean",
+        "readable": true,
+        "writeable": true,
+        "label": "Perform a level change (Up)",
+        "ccSpecific": {
+          "switchType": 2
+        },
+        "valueChangeOptions": ["transitionDuration"],
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "Down",
+      "propertyName": "Down",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "boolean",
+        "readable": true,
+        "writeable": true,
+        "label": "Perform a level change (Down)",
+        "ccSpecific": {
+          "switchType": 2
+        },
+        "valueChangeOptions": ["transitionDuration"],
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "duration",
+      "propertyName": "duration",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": false,
+        "label": "Remaining duration",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "restorePrevious",
+      "propertyName": "restorePrevious",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Restore previous value",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 1,
+      "propertyName": "level",
+      "propertyKeyName": "1",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (1)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 1,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "1",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (1)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 2,
+      "propertyName": "level",
+      "propertyKeyName": "2",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (2)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 2,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "2",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (2)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 3,
+      "propertyName": "level",
+      "propertyKeyName": "3",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (3)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 3,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "3",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (3)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 4,
+      "propertyName": "level",
+      "propertyKeyName": "4",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (4)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 4,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "4",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (4)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 5,
+      "propertyName": "level",
+      "propertyKeyName": "5",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (5)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 5,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "5",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (5)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 6,
+      "propertyName": "level",
+      "propertyKeyName": "6",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (6)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 6,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "6",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (6)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 7,
+      "propertyName": "level",
+      "propertyKeyName": "7",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (7)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 7,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "7",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (7)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 8,
+      "propertyName": "level",
+      "propertyKeyName": "8",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (8)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 8,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "8",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (8)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 9,
+      "propertyName": "level",
+      "propertyKeyName": "9",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (9)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 9,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "9",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (9)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 10,
+      "propertyName": "level",
+      "propertyKeyName": "10",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (10)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 10,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "10",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (10)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 11,
+      "propertyName": "level",
+      "propertyKeyName": "11",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (11)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 11,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "11",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (11)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 12,
+      "propertyName": "level",
+      "propertyKeyName": "12",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (12)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 12,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "12",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (12)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 13,
+      "propertyName": "level",
+      "propertyKeyName": "13",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (13)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 13,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "13",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (13)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 14,
+      "propertyName": "level",
+      "propertyKeyName": "14",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (14)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 14,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "14",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (14)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 15,
+      "propertyName": "level",
+      "propertyKeyName": "15",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (15)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 15,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "15",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (15)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 16,
+      "propertyName": "level",
+      "propertyKeyName": "16",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (16)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 16,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "16",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (16)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 17,
+      "propertyName": "level",
+      "propertyKeyName": "17",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (17)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 17,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "17",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (17)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 18,
+      "propertyName": "level",
+      "propertyKeyName": "18",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (18)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 18,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "18",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (18)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 19,
+      "propertyName": "level",
+      "propertyKeyName": "19",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (19)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 19,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "19",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (19)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 20,
+      "propertyName": "level",
+      "propertyKeyName": "20",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (20)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 20,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "20",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (20)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 21,
+      "propertyName": "level",
+      "propertyKeyName": "21",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (21)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 21,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "21",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (21)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 22,
+      "propertyName": "level",
+      "propertyKeyName": "22",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (22)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 22,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "22",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (22)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 23,
+      "propertyName": "level",
+      "propertyKeyName": "23",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (23)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 23,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "23",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (23)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 24,
+      "propertyName": "level",
+      "propertyKeyName": "24",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (24)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 24,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "24",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (24)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 25,
+      "propertyName": "level",
+      "propertyKeyName": "25",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (25)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 25,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "25",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (25)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 26,
+      "propertyName": "level",
+      "propertyKeyName": "26",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (26)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 26,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "26",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (26)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 27,
+      "propertyName": "level",
+      "propertyKeyName": "27",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (27)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 27,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "27",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (27)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 28,
+      "propertyName": "level",
+      "propertyKeyName": "28",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (28)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 28,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "28",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (28)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 29,
+      "propertyName": "level",
+      "propertyKeyName": "29",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (29)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 29,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "29",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (29)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 30,
+      "propertyName": "level",
+      "propertyKeyName": "30",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (30)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 30,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "30",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (30)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 31,
+      "propertyName": "level",
+      "propertyKeyName": "31",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (31)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 31,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "31",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (31)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 32,
+      "propertyName": "level",
+      "propertyKeyName": "32",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (32)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 32,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "32",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (32)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 33,
+      "propertyName": "level",
+      "propertyKeyName": "33",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (33)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 33,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "33",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (33)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 34,
+      "propertyName": "level",
+      "propertyKeyName": "34",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (34)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 34,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "34",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (34)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 35,
+      "propertyName": "level",
+      "propertyKeyName": "35",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (35)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 35,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "35",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (35)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 36,
+      "propertyName": "level",
+      "propertyKeyName": "36",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (36)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 36,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "36",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (36)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 37,
+      "propertyName": "level",
+      "propertyKeyName": "37",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (37)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 37,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "37",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (37)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 38,
+      "propertyName": "level",
+      "propertyKeyName": "38",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (38)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 38,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "38",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (38)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 39,
+      "propertyName": "level",
+      "propertyKeyName": "39",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (39)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 39,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "39",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (39)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 40,
+      "propertyName": "level",
+      "propertyKeyName": "40",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (40)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 40,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "40",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (40)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 41,
+      "propertyName": "level",
+      "propertyKeyName": "41",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (41)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 41,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "41",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (41)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 42,
+      "propertyName": "level",
+      "propertyKeyName": "42",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (42)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 42,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "42",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (42)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 43,
+      "propertyName": "level",
+      "propertyKeyName": "43",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (43)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 43,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "43",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (43)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 44,
+      "propertyName": "level",
+      "propertyKeyName": "44",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (44)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 44,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "44",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (44)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 45,
+      "propertyName": "level",
+      "propertyKeyName": "45",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (45)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 45,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "45",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (45)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 46,
+      "propertyName": "level",
+      "propertyKeyName": "46",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (46)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 46,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "46",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (46)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 47,
+      "propertyName": "level",
+      "propertyKeyName": "47",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (47)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 47,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "47",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (47)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 48,
+      "propertyName": "level",
+      "propertyKeyName": "48",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (48)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 48,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "48",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (48)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 49,
+      "propertyName": "level",
+      "propertyKeyName": "49",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (49)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 49,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "49",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (49)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 50,
+      "propertyName": "level",
+      "propertyKeyName": "50",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (50)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 50,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "50",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (50)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 51,
+      "propertyName": "level",
+      "propertyKeyName": "51",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (51)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 51,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "51",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (51)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 52,
+      "propertyName": "level",
+      "propertyKeyName": "52",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (52)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 52,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "52",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (52)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 53,
+      "propertyName": "level",
+      "propertyKeyName": "53",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (53)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 53,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "53",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (53)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 54,
+      "propertyName": "level",
+      "propertyKeyName": "54",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (54)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 54,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "54",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (54)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 55,
+      "propertyName": "level",
+      "propertyKeyName": "55",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (55)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 55,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "55",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (55)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 56,
+      "propertyName": "level",
+      "propertyKeyName": "56",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (56)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 56,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "56",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (56)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 57,
+      "propertyName": "level",
+      "propertyKeyName": "57",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (57)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 57,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "57",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (57)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 58,
+      "propertyName": "level",
+      "propertyKeyName": "58",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (58)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 58,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "58",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (58)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 59,
+      "propertyName": "level",
+      "propertyKeyName": "59",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (59)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 59,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "59",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (59)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 60,
+      "propertyName": "level",
+      "propertyKeyName": "60",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (60)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 60,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "60",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (60)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 61,
+      "propertyName": "level",
+      "propertyKeyName": "61",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (61)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 61,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "61",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (61)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 62,
+      "propertyName": "level",
+      "propertyKeyName": "62",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (62)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 62,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "62",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (62)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 63,
+      "propertyName": "level",
+      "propertyKeyName": "63",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (63)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 63,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "63",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (63)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 64,
+      "propertyName": "level",
+      "propertyKeyName": "64",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (64)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 64,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "64",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (64)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 65,
+      "propertyName": "level",
+      "propertyKeyName": "65",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (65)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 65,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "65",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (65)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 66,
+      "propertyName": "level",
+      "propertyKeyName": "66",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (66)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 66,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "66",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (66)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 67,
+      "propertyName": "level",
+      "propertyKeyName": "67",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (67)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 67,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "67",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (67)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 68,
+      "propertyName": "level",
+      "propertyKeyName": "68",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (68)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 68,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "68",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (68)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 69,
+      "propertyName": "level",
+      "propertyKeyName": "69",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (69)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 69,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "69",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (69)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 70,
+      "propertyName": "level",
+      "propertyKeyName": "70",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (70)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 70,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "70",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (70)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 71,
+      "propertyName": "level",
+      "propertyKeyName": "71",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (71)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 71,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "71",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (71)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 72,
+      "propertyName": "level",
+      "propertyKeyName": "72",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (72)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 72,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "72",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (72)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 73,
+      "propertyName": "level",
+      "propertyKeyName": "73",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (73)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 73,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "73",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (73)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 74,
+      "propertyName": "level",
+      "propertyKeyName": "74",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (74)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 74,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "74",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (74)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 75,
+      "propertyName": "level",
+      "propertyKeyName": "75",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (75)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 75,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "75",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (75)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 76,
+      "propertyName": "level",
+      "propertyKeyName": "76",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (76)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 76,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "76",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (76)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 77,
+      "propertyName": "level",
+      "propertyKeyName": "77",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (77)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 77,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "77",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (77)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 78,
+      "propertyName": "level",
+      "propertyKeyName": "78",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (78)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 78,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "78",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (78)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 79,
+      "propertyName": "level",
+      "propertyKeyName": "79",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (79)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 79,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "79",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (79)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 80,
+      "propertyName": "level",
+      "propertyKeyName": "80",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (80)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 80,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "80",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (80)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 81,
+      "propertyName": "level",
+      "propertyKeyName": "81",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (81)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 81,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "81",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (81)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 82,
+      "propertyName": "level",
+      "propertyKeyName": "82",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (82)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 82,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "82",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (82)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 83,
+      "propertyName": "level",
+      "propertyKeyName": "83",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (83)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 83,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "83",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (83)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 84,
+      "propertyName": "level",
+      "propertyKeyName": "84",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (84)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 84,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "84",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (84)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 85,
+      "propertyName": "level",
+      "propertyKeyName": "85",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (85)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 85,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "85",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (85)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 86,
+      "propertyName": "level",
+      "propertyKeyName": "86",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (86)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 86,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "86",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (86)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 87,
+      "propertyName": "level",
+      "propertyKeyName": "87",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (87)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 87,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "87",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (87)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 88,
+      "propertyName": "level",
+      "propertyKeyName": "88",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (88)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 88,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "88",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (88)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 89,
+      "propertyName": "level",
+      "propertyKeyName": "89",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (89)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 89,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "89",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (89)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 90,
+      "propertyName": "level",
+      "propertyKeyName": "90",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (90)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 90,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "90",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (90)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 91,
+      "propertyName": "level",
+      "propertyKeyName": "91",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (91)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 91,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "91",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (91)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 92,
+      "propertyName": "level",
+      "propertyKeyName": "92",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (92)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 92,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "92",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (92)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 93,
+      "propertyName": "level",
+      "propertyKeyName": "93",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (93)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 93,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "93",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (93)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 94,
+      "propertyName": "level",
+      "propertyKeyName": "94",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (94)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 94,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "94",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (94)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 95,
+      "propertyName": "level",
+      "propertyKeyName": "95",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (95)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 95,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "95",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (95)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 96,
+      "propertyName": "level",
+      "propertyKeyName": "96",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (96)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 96,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "96",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (96)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 97,
+      "propertyName": "level",
+      "propertyKeyName": "97",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (97)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 97,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "97",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (97)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 98,
+      "propertyName": "level",
+      "propertyKeyName": "98",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (98)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 98,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "98",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (98)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 99,
+      "propertyName": "level",
+      "propertyKeyName": "99",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (99)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 99,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "99",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (99)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 100,
+      "propertyName": "level",
+      "propertyKeyName": "100",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (100)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 100,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "100",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (100)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 101,
+      "propertyName": "level",
+      "propertyKeyName": "101",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (101)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 101,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "101",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (101)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 102,
+      "propertyName": "level",
+      "propertyKeyName": "102",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (102)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 102,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "102",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (102)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 103,
+      "propertyName": "level",
+      "propertyKeyName": "103",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (103)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 103,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "103",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (103)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 104,
+      "propertyName": "level",
+      "propertyKeyName": "104",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (104)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 104,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "104",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (104)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 105,
+      "propertyName": "level",
+      "propertyKeyName": "105",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (105)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 105,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "105",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (105)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 106,
+      "propertyName": "level",
+      "propertyKeyName": "106",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (106)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 106,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "106",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (106)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 107,
+      "propertyName": "level",
+      "propertyKeyName": "107",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (107)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 107,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "107",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (107)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 108,
+      "propertyName": "level",
+      "propertyKeyName": "108",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (108)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 108,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "108",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (108)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 109,
+      "propertyName": "level",
+      "propertyKeyName": "109",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (109)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 109,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "109",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (109)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 110,
+      "propertyName": "level",
+      "propertyKeyName": "110",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (110)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 110,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "110",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (110)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 111,
+      "propertyName": "level",
+      "propertyKeyName": "111",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (111)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 111,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "111",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (111)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 112,
+      "propertyName": "level",
+      "propertyKeyName": "112",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (112)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 112,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "112",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (112)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 113,
+      "propertyName": "level",
+      "propertyKeyName": "113",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (113)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 113,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "113",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (113)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 114,
+      "propertyName": "level",
+      "propertyKeyName": "114",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (114)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 114,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "114",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (114)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 115,
+      "propertyName": "level",
+      "propertyKeyName": "115",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (115)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 115,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "115",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (115)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 116,
+      "propertyName": "level",
+      "propertyKeyName": "116",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (116)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 116,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "116",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (116)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 117,
+      "propertyName": "level",
+      "propertyKeyName": "117",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (117)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 117,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "117",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (117)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 118,
+      "propertyName": "level",
+      "propertyKeyName": "118",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (118)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 118,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "118",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (118)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 119,
+      "propertyName": "level",
+      "propertyKeyName": "119",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (119)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 119,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "119",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (119)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 120,
+      "propertyName": "level",
+      "propertyKeyName": "120",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (120)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 120,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "120",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (120)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 121,
+      "propertyName": "level",
+      "propertyKeyName": "121",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (121)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 121,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "121",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (121)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 122,
+      "propertyName": "level",
+      "propertyKeyName": "122",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (122)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 122,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "122",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (122)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 123,
+      "propertyName": "level",
+      "propertyKeyName": "123",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (123)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 123,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "123",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (123)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 124,
+      "propertyName": "level",
+      "propertyKeyName": "124",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (124)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 124,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "124",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (124)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 125,
+      "propertyName": "level",
+      "propertyKeyName": "125",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (125)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 125,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "125",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (125)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 126,
+      "propertyName": "level",
+      "propertyKeyName": "126",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (126)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 126,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "126",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (126)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 127,
+      "propertyName": "level",
+      "propertyKeyName": "127",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (127)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 127,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "127",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (127)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 128,
+      "propertyName": "level",
+      "propertyKeyName": "128",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (128)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 128,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "128",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (128)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 129,
+      "propertyName": "level",
+      "propertyKeyName": "129",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (129)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 129,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "129",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (129)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 130,
+      "propertyName": "level",
+      "propertyKeyName": "130",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (130)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 130,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "130",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (130)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 131,
+      "propertyName": "level",
+      "propertyKeyName": "131",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (131)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 131,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "131",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (131)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 132,
+      "propertyName": "level",
+      "propertyKeyName": "132",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (132)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 132,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "132",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (132)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 133,
+      "propertyName": "level",
+      "propertyKeyName": "133",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (133)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 133,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "133",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (133)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 134,
+      "propertyName": "level",
+      "propertyKeyName": "134",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (134)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 134,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "134",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (134)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 135,
+      "propertyName": "level",
+      "propertyKeyName": "135",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (135)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 135,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "135",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (135)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 136,
+      "propertyName": "level",
+      "propertyKeyName": "136",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (136)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 136,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "136",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (136)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 137,
+      "propertyName": "level",
+      "propertyKeyName": "137",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (137)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 137,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "137",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (137)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 138,
+      "propertyName": "level",
+      "propertyKeyName": "138",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (138)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 138,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "138",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (138)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 139,
+      "propertyName": "level",
+      "propertyKeyName": "139",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (139)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 139,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "139",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (139)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 140,
+      "propertyName": "level",
+      "propertyKeyName": "140",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (140)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 140,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "140",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (140)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 141,
+      "propertyName": "level",
+      "propertyKeyName": "141",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (141)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 141,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "141",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (141)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 142,
+      "propertyName": "level",
+      "propertyKeyName": "142",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (142)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 142,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "142",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (142)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 143,
+      "propertyName": "level",
+      "propertyKeyName": "143",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (143)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 143,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "143",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (143)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 144,
+      "propertyName": "level",
+      "propertyKeyName": "144",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (144)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 144,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "144",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (144)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 145,
+      "propertyName": "level",
+      "propertyKeyName": "145",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (145)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 145,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "145",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (145)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 146,
+      "propertyName": "level",
+      "propertyKeyName": "146",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (146)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 146,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "146",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (146)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 147,
+      "propertyName": "level",
+      "propertyKeyName": "147",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (147)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 147,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "147",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (147)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 148,
+      "propertyName": "level",
+      "propertyKeyName": "148",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (148)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 148,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "148",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (148)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 149,
+      "propertyName": "level",
+      "propertyKeyName": "149",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (149)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 149,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "149",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (149)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 150,
+      "propertyName": "level",
+      "propertyKeyName": "150",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (150)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 150,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "150",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (150)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 151,
+      "propertyName": "level",
+      "propertyKeyName": "151",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (151)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 151,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "151",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (151)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 152,
+      "propertyName": "level",
+      "propertyKeyName": "152",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (152)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 152,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "152",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (152)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 153,
+      "propertyName": "level",
+      "propertyKeyName": "153",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (153)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 153,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "153",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (153)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 154,
+      "propertyName": "level",
+      "propertyKeyName": "154",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (154)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 154,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "154",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (154)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 155,
+      "propertyName": "level",
+      "propertyKeyName": "155",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (155)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 155,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "155",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (155)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 156,
+      "propertyName": "level",
+      "propertyKeyName": "156",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (156)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 156,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "156",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (156)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 157,
+      "propertyName": "level",
+      "propertyKeyName": "157",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (157)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 157,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "157",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (157)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 158,
+      "propertyName": "level",
+      "propertyKeyName": "158",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (158)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 158,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "158",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (158)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 159,
+      "propertyName": "level",
+      "propertyKeyName": "159",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (159)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 159,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "159",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (159)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 160,
+      "propertyName": "level",
+      "propertyKeyName": "160",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (160)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 160,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "160",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (160)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 161,
+      "propertyName": "level",
+      "propertyKeyName": "161",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (161)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 161,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "161",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (161)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 162,
+      "propertyName": "level",
+      "propertyKeyName": "162",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (162)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 162,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "162",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (162)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 163,
+      "propertyName": "level",
+      "propertyKeyName": "163",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (163)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 163,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "163",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (163)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 164,
+      "propertyName": "level",
+      "propertyKeyName": "164",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (164)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 164,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "164",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (164)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 165,
+      "propertyName": "level",
+      "propertyKeyName": "165",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (165)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 165,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "165",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (165)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 166,
+      "propertyName": "level",
+      "propertyKeyName": "166",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (166)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 166,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "166",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (166)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 167,
+      "propertyName": "level",
+      "propertyKeyName": "167",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (167)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 167,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "167",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (167)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 168,
+      "propertyName": "level",
+      "propertyKeyName": "168",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (168)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 168,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "168",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (168)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 169,
+      "propertyName": "level",
+      "propertyKeyName": "169",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (169)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 169,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "169",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (169)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 170,
+      "propertyName": "level",
+      "propertyKeyName": "170",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (170)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 170,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "170",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (170)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 171,
+      "propertyName": "level",
+      "propertyKeyName": "171",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (171)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 171,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "171",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (171)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 172,
+      "propertyName": "level",
+      "propertyKeyName": "172",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (172)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 172,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "172",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (172)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 173,
+      "propertyName": "level",
+      "propertyKeyName": "173",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (173)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 173,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "173",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (173)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 174,
+      "propertyName": "level",
+      "propertyKeyName": "174",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (174)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 174,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "174",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (174)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 175,
+      "propertyName": "level",
+      "propertyKeyName": "175",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (175)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 175,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "175",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (175)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 176,
+      "propertyName": "level",
+      "propertyKeyName": "176",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (176)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 176,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "176",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (176)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 177,
+      "propertyName": "level",
+      "propertyKeyName": "177",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (177)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 177,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "177",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (177)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 178,
+      "propertyName": "level",
+      "propertyKeyName": "178",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (178)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 178,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "178",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (178)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 179,
+      "propertyName": "level",
+      "propertyKeyName": "179",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (179)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 179,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "179",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (179)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 180,
+      "propertyName": "level",
+      "propertyKeyName": "180",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (180)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 180,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "180",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (180)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 181,
+      "propertyName": "level",
+      "propertyKeyName": "181",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (181)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 181,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "181",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (181)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 182,
+      "propertyName": "level",
+      "propertyKeyName": "182",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (182)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 182,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "182",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (182)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 183,
+      "propertyName": "level",
+      "propertyKeyName": "183",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (183)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 183,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "183",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (183)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 184,
+      "propertyName": "level",
+      "propertyKeyName": "184",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (184)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 184,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "184",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (184)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 185,
+      "propertyName": "level",
+      "propertyKeyName": "185",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (185)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 185,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "185",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (185)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 186,
+      "propertyName": "level",
+      "propertyKeyName": "186",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (186)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 186,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "186",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (186)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 187,
+      "propertyName": "level",
+      "propertyKeyName": "187",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (187)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 187,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "187",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (187)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 188,
+      "propertyName": "level",
+      "propertyKeyName": "188",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (188)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 188,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "188",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (188)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 189,
+      "propertyName": "level",
+      "propertyKeyName": "189",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (189)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 189,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "189",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (189)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 190,
+      "propertyName": "level",
+      "propertyKeyName": "190",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (190)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 190,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "190",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (190)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 191,
+      "propertyName": "level",
+      "propertyKeyName": "191",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (191)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 191,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "191",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (191)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 192,
+      "propertyName": "level",
+      "propertyKeyName": "192",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (192)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 192,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "192",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (192)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 193,
+      "propertyName": "level",
+      "propertyKeyName": "193",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (193)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 193,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "193",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (193)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 194,
+      "propertyName": "level",
+      "propertyKeyName": "194",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (194)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 194,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "194",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (194)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 195,
+      "propertyName": "level",
+      "propertyKeyName": "195",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (195)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 195,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "195",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (195)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 196,
+      "propertyName": "level",
+      "propertyKeyName": "196",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (196)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 196,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "196",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (196)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 197,
+      "propertyName": "level",
+      "propertyKeyName": "197",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (197)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 197,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "197",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (197)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 198,
+      "propertyName": "level",
+      "propertyKeyName": "198",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (198)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 198,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "198",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (198)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 199,
+      "propertyName": "level",
+      "propertyKeyName": "199",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (199)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 199,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "199",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (199)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 200,
+      "propertyName": "level",
+      "propertyKeyName": "200",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (200)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 200,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "200",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (200)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 201,
+      "propertyName": "level",
+      "propertyKeyName": "201",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (201)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 201,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "201",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (201)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 202,
+      "propertyName": "level",
+      "propertyKeyName": "202",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (202)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 202,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "202",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (202)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 203,
+      "propertyName": "level",
+      "propertyKeyName": "203",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (203)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 203,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "203",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (203)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 204,
+      "propertyName": "level",
+      "propertyKeyName": "204",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (204)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 204,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "204",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (204)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 205,
+      "propertyName": "level",
+      "propertyKeyName": "205",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (205)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 205,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "205",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (205)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 206,
+      "propertyName": "level",
+      "propertyKeyName": "206",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (206)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 206,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "206",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (206)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 207,
+      "propertyName": "level",
+      "propertyKeyName": "207",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (207)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 207,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "207",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (207)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 208,
+      "propertyName": "level",
+      "propertyKeyName": "208",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (208)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 208,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "208",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (208)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 209,
+      "propertyName": "level",
+      "propertyKeyName": "209",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (209)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 209,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "209",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (209)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 210,
+      "propertyName": "level",
+      "propertyKeyName": "210",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (210)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 210,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "210",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (210)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 211,
+      "propertyName": "level",
+      "propertyKeyName": "211",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (211)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 211,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "211",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (211)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 212,
+      "propertyName": "level",
+      "propertyKeyName": "212",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (212)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 212,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "212",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (212)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 213,
+      "propertyName": "level",
+      "propertyKeyName": "213",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (213)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 213,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "213",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (213)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 214,
+      "propertyName": "level",
+      "propertyKeyName": "214",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (214)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 214,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "214",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (214)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 215,
+      "propertyName": "level",
+      "propertyKeyName": "215",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (215)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 215,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "215",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (215)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 216,
+      "propertyName": "level",
+      "propertyKeyName": "216",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (216)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 216,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "216",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (216)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 217,
+      "propertyName": "level",
+      "propertyKeyName": "217",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (217)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 217,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "217",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (217)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 218,
+      "propertyName": "level",
+      "propertyKeyName": "218",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (218)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 218,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "218",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (218)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 219,
+      "propertyName": "level",
+      "propertyKeyName": "219",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (219)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 219,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "219",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (219)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 220,
+      "propertyName": "level",
+      "propertyKeyName": "220",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (220)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 220,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "220",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (220)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 221,
+      "propertyName": "level",
+      "propertyKeyName": "221",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (221)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 221,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "221",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (221)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 222,
+      "propertyName": "level",
+      "propertyKeyName": "222",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (222)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 222,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "222",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (222)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 223,
+      "propertyName": "level",
+      "propertyKeyName": "223",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (223)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 223,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "223",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (223)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 224,
+      "propertyName": "level",
+      "propertyKeyName": "224",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (224)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 224,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "224",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (224)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 225,
+      "propertyName": "level",
+      "propertyKeyName": "225",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (225)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 225,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "225",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (225)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 226,
+      "propertyName": "level",
+      "propertyKeyName": "226",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (226)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 226,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "226",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (226)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 227,
+      "propertyName": "level",
+      "propertyKeyName": "227",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (227)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 227,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "227",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (227)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 228,
+      "propertyName": "level",
+      "propertyKeyName": "228",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (228)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 228,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "228",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (228)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 229,
+      "propertyName": "level",
+      "propertyKeyName": "229",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (229)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 229,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "229",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (229)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 230,
+      "propertyName": "level",
+      "propertyKeyName": "230",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (230)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 230,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "230",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (230)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 231,
+      "propertyName": "level",
+      "propertyKeyName": "231",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (231)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 231,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "231",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (231)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 232,
+      "propertyName": "level",
+      "propertyKeyName": "232",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (232)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 232,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "232",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (232)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 233,
+      "propertyName": "level",
+      "propertyKeyName": "233",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (233)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 233,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "233",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (233)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 234,
+      "propertyName": "level",
+      "propertyKeyName": "234",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (234)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 234,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "234",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (234)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 235,
+      "propertyName": "level",
+      "propertyKeyName": "235",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (235)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 235,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "235",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (235)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 236,
+      "propertyName": "level",
+      "propertyKeyName": "236",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (236)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 236,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "236",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (236)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 237,
+      "propertyName": "level",
+      "propertyKeyName": "237",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (237)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 237,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "237",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (237)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 238,
+      "propertyName": "level",
+      "propertyKeyName": "238",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (238)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 238,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "238",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (238)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 239,
+      "propertyName": "level",
+      "propertyKeyName": "239",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (239)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 239,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "239",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (239)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 240,
+      "propertyName": "level",
+      "propertyKeyName": "240",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (240)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 240,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "240",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (240)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 241,
+      "propertyName": "level",
+      "propertyKeyName": "241",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (241)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 241,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "241",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (241)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 242,
+      "propertyName": "level",
+      "propertyKeyName": "242",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (242)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 242,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "242",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (242)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 243,
+      "propertyName": "level",
+      "propertyKeyName": "243",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (243)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 243,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "243",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (243)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 244,
+      "propertyName": "level",
+      "propertyKeyName": "244",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (244)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 244,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "244",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (244)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 245,
+      "propertyName": "level",
+      "propertyKeyName": "245",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (245)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 245,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "245",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (245)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 246,
+      "propertyName": "level",
+      "propertyKeyName": "246",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (246)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 246,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "246",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (246)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 247,
+      "propertyName": "level",
+      "propertyKeyName": "247",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (247)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 247,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "247",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (247)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 248,
+      "propertyName": "level",
+      "propertyKeyName": "248",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (248)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 248,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "248",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (248)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 249,
+      "propertyName": "level",
+      "propertyKeyName": "249",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (249)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 249,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "249",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (249)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 250,
+      "propertyName": "level",
+      "propertyKeyName": "250",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (250)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 250,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "250",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (250)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 251,
+      "propertyName": "level",
+      "propertyKeyName": "251",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (251)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 251,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "251",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (251)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 252,
+      "propertyName": "level",
+      "propertyKeyName": "252",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (252)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 252,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "252",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (252)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 253,
+      "propertyName": "level",
+      "propertyKeyName": "253",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (253)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 253,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "253",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (253)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 254,
+      "propertyName": "level",
+      "propertyKeyName": "254",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (254)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 254,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "254",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (254)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 255,
+      "propertyName": "level",
+      "propertyKeyName": "255",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (255)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 255,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "255",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (255)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 4,
+      "propertyName": "Invert Switch",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Invert Switch",
+        "default": 0,
+        "min": 0,
+        "max": 1,
+        "states": {
+          "0": "Default",
+          "1": "Invert"
+        },
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "manufacturerId",
+      "propertyName": "manufacturerId",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Manufacturer ID",
+        "min": 0,
+        "max": 65535,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 57
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "productType",
+      "propertyName": "productType",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Product type",
+        "min": 0,
+        "max": 65535,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 18756
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "productId",
+      "propertyName": "productId",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Product ID",
+        "min": 0,
+        "max": 65535,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 12593
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "libraryType",
+      "propertyName": "libraryType",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Library type",
+        "states": {
+          "0": "Unknown",
+          "1": "Static Controller",
+          "2": "Controller",
+          "3": "Enhanced Slave",
+          "4": "Slave",
+          "5": "Installer",
+          "6": "Routing Slave",
+          "7": "Bridge Controller",
+          "8": "Device under Test",
+          "9": "N/A",
+          "10": "AV Remote",
+          "11": "AV Device"
+        },
+        "stateful": true,
+        "secret": false
+      },
+      "value": 3
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "protocolVersion",
+      "propertyName": "protocolVersion",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "4.54"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "firmwareVersions",
+      "propertyName": "firmwareVersions",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "string[]",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave chip firmware versions",
+        "stateful": true,
+        "secret": false
+      },
+      "value": ["5.24"]
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hardwareVersion",
+      "propertyName": "hardwareVersion",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave chip hardware version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 255
+    }
+  ],
+  "isFrequentListening": false,
+  "maxDataRate": 100000,
+  "supportedDataRates": [40000, 100000],
+  "protocolVersion": 3,
+  "supportsBeaming": true,
+  "supportsSecurity": false,
+  "nodeType": 1,
+  "zwavePlusNodeType": 0,
+  "zwavePlusRoleType": 5,
+  "deviceClass": {
+    "basic": {
+      "key": 4,
+      "label": "Routing Slave"
+    },
+    "generic": {
+      "key": 17,
+      "label": "Multilevel Switch"
+    },
+    "specific": {
+      "key": 8,
+      "label": "Fan Switch"
+    },
+    "mandatorySupportedCCs": [32, 38, 133, 89, 114, 115, 134, 94],
+    "mandatoryControlledCCs": []
+  },
+  "interviewStage": "Complete",
+  "deviceDatabaseUrl": "https://devices.zwave-js.io/?jumpTo=0x0039:0x4944:0x3131:5.24",
+  "statistics": {
+    "commandsTX": 40,
+    "commandsRX": 39,
+    "commandsDroppedRX": 0,
+    "commandsDroppedTX": 0,
+    "timeoutResponse": 0,
+    "rtt": 35.8
+  },
+  "highestSecurityClass": -1,
+  "isControllerNode": false,
+  "keepAwake": false
+}
diff --git a/tests/components/zwave_js/test_button.py b/tests/components/zwave_js/test_button.py
index e4c33e313c6..68a8e07ffe4 100644
--- a/tests/components/zwave_js/test_button.py
+++ b/tests/components/zwave_js/test_button.py
@@ -28,7 +28,7 @@ async def test_ping_entity(
         },
         blocking=True,
     )
-
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 1
     args = client.async_send_command.call_args_list[0][0][0]
     assert args["command"] == "node.ping"
@@ -47,7 +47,7 @@ async def test_ping_entity(
         },
         blocking=True,
     )
-
+    await hass.async_block_till_done()
     assert "There is no value to refresh for this entity" in caplog.text
 
     # Assert a node ping button entity is not created for the controller
diff --git a/tests/components/zwave_js/test_climate.py b/tests/components/zwave_js/test_climate.py
index 00006673785..d3f38aaa307 100644
--- a/tests/components/zwave_js/test_climate.py
+++ b/tests/components/zwave_js/test_climate.py
@@ -297,7 +297,7 @@ async def test_thermostat_v2(
         },
         blocking=True,
     )
-
+    await hass.async_block_till_done()
     assert "Error while refreshing value" in caplog.text
 
 
diff --git a/tests/components/zwave_js/test_device_trigger.py b/tests/components/zwave_js/test_device_trigger.py
index a8f5ff98fdf..8209564579c 100644
--- a/tests/components/zwave_js/test_device_trigger.py
+++ b/tests/components/zwave_js/test_device_trigger.py
@@ -2,6 +2,7 @@
 from unittest.mock import patch
 
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 from zwave_js_server.const import CommandClass
 from zwave_js_server.event import Event
@@ -25,7 +26,6 @@ from homeassistant.helpers.entity_registry import async_get as async_get_ent_reg
 from homeassistant.setup import async_setup_component
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -193,16 +193,15 @@ async def test_get_trigger_capabilities_notification_notification(
     )
     assert capabilities and "extra_fields" in capabilities
 
-    assert_lists_same(
-        voluptuous_serialize.convert(
-            capabilities["extra_fields"], custom_serializer=cv.custom_serializer
-        ),
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == unordered(
         [
             {"name": "type.", "optional": True, "type": "string"},
             {"name": "label", "optional": True, "type": "string"},
             {"name": "event", "optional": True, "type": "string"},
             {"name": "event_label", "optional": True, "type": "string"},
-        ],
+        ]
     )
 
 
@@ -323,14 +322,13 @@ async def test_get_trigger_capabilities_entry_control_notification(
     )
     assert capabilities and "extra_fields" in capabilities
 
-    assert_lists_same(
-        voluptuous_serialize.convert(
-            capabilities["extra_fields"], custom_serializer=cv.custom_serializer
-        ),
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == unordered(
         [
             {"name": "event_type", "optional": True, "type": "string"},
             {"name": "data_type", "optional": True, "type": "string"},
-        ],
+        ]
     )
 
 
diff --git a/tests/components/zwave_js/test_fan.py b/tests/components/zwave_js/test_fan.py
index e4ff285feb2..2b508700413 100644
--- a/tests/components/zwave_js/test_fan.py
+++ b/tests/components/zwave_js/test_fan.py
@@ -938,3 +938,72 @@ async def test_thermostat_fan_without_preset_modes(
 
     assert not state.attributes.get(ATTR_PRESET_MODE)
     assert not state.attributes.get(ATTR_PRESET_MODES)
+
+
+async def test_honeywell_39358_fan(
+    hass: HomeAssistant, client, fan_honeywell_39358, integration
+) -> None:
+    """Test a Honeywell 39358 fan with 3 fixed speeds."""
+    node = fan_honeywell_39358
+    node_id = 61
+    entity_id = "fan.honeywell_in_wall_smart_fan_control"
+
+    async def get_zwave_speed_from_percentage(percentage):
+        """Set the fan to a particular percentage and get the resulting Zwave speed."""
+        client.async_send_command.reset_mock()
+        await hass.services.async_call(
+            "fan",
+            "turn_on",
+            {"entity_id": entity_id, "percentage": percentage},
+            blocking=True,
+        )
+
+        assert len(client.async_send_command.call_args_list) == 1
+        args = client.async_send_command.call_args[0][0]
+        assert args["command"] == "node.set_value"
+        assert args["nodeId"] == node_id
+        return args["value"]
+
+    async def get_percentage_from_zwave_speed(zwave_speed):
+        """Set the underlying device speed and get the resulting percentage."""
+        event = Event(
+            type="value updated",
+            data={
+                "source": "node",
+                "event": "value updated",
+                "nodeId": node_id,
+                "args": {
+                    "commandClassName": "Multilevel Switch",
+                    "commandClass": 38,
+                    "endpoint": 0,
+                    "property": "currentValue",
+                    "newValue": zwave_speed,
+                    "prevValue": 0,
+                    "propertyName": "currentValue",
+                },
+            },
+        )
+        node.receive_event(event)
+        state = hass.states.get(entity_id)
+        return state.attributes[ATTR_PERCENTAGE]
+
+    # This device has the speeds:
+    # low = 1-32, med = 33-66, high = 67-99
+    percentages_to_zwave_speeds = [
+        [[0], [0]],
+        [range(1, 34), range(1, 33)],
+        [range(34, 68), range(33, 67)],
+        [range(68, 101), range(67, 100)],
+    ]
+
+    for percentages, zwave_speeds in percentages_to_zwave_speeds:
+        for percentage in percentages:
+            actual_zwave_speed = await get_zwave_speed_from_percentage(percentage)
+            assert actual_zwave_speed in zwave_speeds
+        for zwave_speed in zwave_speeds:
+            actual_percentage = await get_percentage_from_zwave_speed(zwave_speed)
+            assert actual_percentage in percentages
+
+    state = hass.states.get(entity_id)
+    assert state.attributes[ATTR_PERCENTAGE_STEP] == pytest.approx(33.3333, rel=1e-3)
+    assert state.attributes[ATTR_PRESET_MODES] == []
diff --git a/tests/components/zwave_js/test_sensor.py b/tests/components/zwave_js/test_sensor.py
index 766d5684af5..d809d52821c 100644
--- a/tests/components/zwave_js/test_sensor.py
+++ b/tests/components/zwave_js/test_sensor.py
@@ -368,7 +368,7 @@ async def test_node_status_sensor_not_ready(
         },
         blocking=True,
     )
-
+    await hass.async_block_till_done()
     assert "There is no value to refresh for this entity" in caplog.text
 
 
@@ -755,7 +755,7 @@ async def test_statistics_sensors(
                 {ATTR_ENTITY_ID: entity_id},
                 blocking=True,
             )
-
+    await hass.async_block_till_done()
     assert caplog.text.count("There is no value to refresh for this entity") == len(
         [
             *CONTROLLER_STATISTICS_SUFFIXES,
diff --git a/tests/components/zwave_js/test_services.py b/tests/components/zwave_js/test_services.py
index a92d34dd412..a8671edbe64 100644
--- a/tests/components/zwave_js/test_services.py
+++ b/tests/components/zwave_js/test_services.py
@@ -678,6 +678,7 @@ async def test_refresh_value(
         {ATTR_ENTITY_ID: CLIMATE_RADIO_THERMOSTAT_ENTITY},
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 1
     args = client.async_send_command.call_args[0][0]
     assert args["command"] == "node.poll_value"
@@ -701,6 +702,7 @@ async def test_refresh_value(
         },
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 8
 
     client.async_send_command.reset_mock()
@@ -716,6 +718,7 @@ async def test_refresh_value(
         },
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 8
 
     client.async_send_command.reset_mock()
@@ -733,6 +736,7 @@ async def test_refresh_value(
         },
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 8
 
     client.async_send_command.reset_mock()
@@ -1593,6 +1597,7 @@ async def test_invoke_cc_api(
         },
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 1
     args = client.async_send_command.call_args[0][0]
     assert args["command"] == "endpoint.invoke_cc_api"
@@ -1645,6 +1650,7 @@ async def test_invoke_cc_api(
         },
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 1
     args = client.async_send_command.call_args[0][0]
     assert args["command"] == "endpoint.invoke_cc_api"
diff --git a/tests/components/zwave_js/test_update.py b/tests/components/zwave_js/test_update.py
index 6a8cbdd724a..dcd71789e84 100644
--- a/tests/components/zwave_js/test_update.py
+++ b/tests/components/zwave_js/test_update.py
@@ -127,7 +127,7 @@ async def test_update_entity_states(
         },
         blocking=True,
     )
-
+    await hass.async_block_till_done()
     assert "There is no value to refresh for this entity" in caplog.text
 
     client.async_send_command.return_value = {"updates": []}
diff --git a/tests/helpers/test_config_validation.py b/tests/helpers/test_config_validation.py
index 58082838841..458774b748c 100644
--- a/tests/helpers/test_config_validation.py
+++ b/tests/helpers/test_config_validation.py
@@ -11,8 +11,13 @@ import pytest
 import voluptuous as vol
 
 import homeassistant
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv, selector, template
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
+from homeassistant.helpers import (
+    config_validation as cv,
+    issue_registry as ir,
+    selector,
+    template,
+)
 
 
 def test_boolean() -> None:
@@ -1345,9 +1350,9 @@ def test_key_value_schemas_with_default() -> None:
     schema({"mode": "{{ 1 + 1}}"})
 
 
-def test_script(caplog: pytest.LogCaptureFixture) -> None:
-    """Test script validation is user friendly."""
-    for data, msg in (
+@pytest.mark.parametrize(
+    ("config", "error"),
+    (
         ({"delay": "{{ invalid"}, "should be format 'HH:MM'"),
         ({"wait_template": "{{ invalid"}, "invalid template"),
         ({"condition": "invalid"}, "Unexpected value for condition: 'invalid'"),
@@ -1361,20 +1366,33 @@ def test_script(caplog: pytest.LogCaptureFixture) -> None:
             {"condition": "not", "conditions": "not a dynamic template"},
             "Expected a dictionary",
         ),
-        ({"event": None}, "string value is None for dictionary value @ data['event']"),
+        (
+            {"event": None},
+            r"string value is None for dictionary value @ data\['event'\]",
+        ),
         (
             {"device_id": None},
-            "string value is None for dictionary value @ data['device_id']",
+            r"string value is None for dictionary value @ data\['device_id'\]",
         ),
         (
             {"scene": "light.kitchen"},
             "Entity ID 'light.kitchen' does not belong to domain 'scene'",
         ),
-    ):
-        with pytest.raises(vol.Invalid) as excinfo:
-            cv.script_action(data)
-
-        assert msg in str(excinfo.value)
+        (
+            {
+                "alias": "stop step",
+                "stop": "In the name of love",
+                "error": True,
+                "response_variable": "response-value",
+            },
+            "not allowed to add a response to an error stop action",
+        ),
+    ),
+)
+def test_script(caplog: pytest.LogCaptureFixture, config: dict, error: str) -> None:
+    """Test script validation is user friendly."""
+    with pytest.raises(vol.Invalid, match=error):
+        cv.script_action(config)
 
 
 def test_whitespace() -> None:
@@ -1383,7 +1401,7 @@ def test_whitespace() -> None:
 
     for value in (
         None,
-        "" "T",
+        "T",
         "negative",
         "lock",
         "tr  ue",
@@ -1475,7 +1493,7 @@ def test_positive_time_period_template() -> None:
 
 
 def test_empty_schema(caplog: pytest.LogCaptureFixture) -> None:
-    """Test if the current module cannot be inspected."""
+    """Test empty_config_schema."""
     expected_message = (
         "The test_domain integration does not support any configuration parameters"
     )
@@ -1494,3 +1512,81 @@ def test_empty_schema_cant_find_module() -> None:
     """Test if the current module cannot be inspected."""
     with patch("inspect.getmodule", return_value=None):
         cv.empty_config_schema("test_domain")({"test_domain": {"foo": "bar"}})
+
+
+def test_config_entry_only_schema(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test config_entry_only_config_schema."""
+    expected_issue = "config_entry_only_test_domain"
+    expected_message = (
+        "The test_domain integration does not support YAML setup, please remove "
+        "it from your configuration"
+    )
+    issue_registry = ir.async_get(hass)
+
+    cv.config_entry_only_config_schema("test_domain")({})
+    assert expected_message not in caplog.text
+    assert not issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, expected_issue)
+
+    cv.config_entry_only_config_schema("test_domain")({"test_domain": {}})
+    assert expected_message in caplog.text
+    assert issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, expected_issue)
+    issue_registry.async_delete(HOMEASSISTANT_DOMAIN, expected_issue)
+
+    cv.config_entry_only_config_schema("test_domain")({"test_domain": {"foo": "bar"}})
+    assert expected_message in caplog.text
+    assert issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, expected_issue)
+
+
+def test_config_entry_only_schema_cant_find_module() -> None:
+    """Test if the current module cannot be inspected."""
+    with patch("inspect.getmodule", return_value=None):
+        cv.config_entry_only_config_schema("test_domain")(
+            {"test_domain": {"foo": "bar"}}
+        )
+
+
+def test_config_entry_only_schema_no_hass(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test if the the hass context var is not set in our context."""
+    with patch(
+        "homeassistant.helpers.config_validation.async_get_hass",
+        side_effect=LookupError,
+    ):
+        cv.config_entry_only_config_schema("test_domain")(
+            {"test_domain": {"foo": "bar"}}
+        )
+    expected_message = (
+        "The test_domain integration does not support YAML setup, please remove "
+        "it from your configuration"
+    )
+    assert expected_message in caplog.text
+    issue_registry = ir.async_get(hass)
+    assert not issue_registry.issues
+
+
+def test_platform_only_schema(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test config_entry_only_config_schema."""
+    expected_issue = "platform_only_test_domain"
+    expected_message = (
+        "The test_domain integration does not support YAML setup, please remove "
+        "it from your configuration"
+    )
+    issue_registry = ir.async_get(hass)
+
+    cv.platform_only_config_schema("test_domain")({})
+    assert expected_message not in caplog.text
+    assert not issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, expected_issue)
+
+    cv.platform_only_config_schema("test_domain")({"test_domain": {}})
+    assert expected_message in caplog.text
+    assert issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, expected_issue)
+    issue_registry.async_delete(HOMEASSISTANT_DOMAIN, expected_issue)
+
+    cv.platform_only_config_schema("test_domain")({"test_domain": {"foo": "bar"}})
+    assert expected_message in caplog.text
+    assert issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, expected_issue)
diff --git a/tests/helpers/test_debounce.py b/tests/helpers/test_debounce.py
index 4d36679d538..f31453cfe96 100644
--- a/tests/helpers/test_debounce.py
+++ b/tests/helpers/test_debounce.py
@@ -6,7 +6,7 @@ from unittest.mock import AsyncMock
 
 import pytest
 
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import debounce
 from homeassistant.util.dt import utcnow
 
@@ -69,6 +69,133 @@ async def test_immediate_works(hass: HomeAssistant) -> None:
     assert debouncer._job.target == debouncer.function
 
 
+async def test_immediate_works_with_passed_callback_function_raises(
+    hass: HomeAssistant,
+) -> None:
+    """Test immediate works with a callback function that raises."""
+    calls = []
+
+    @callback
+    def _append_and_raise() -> None:
+        calls.append(None)
+        raise RuntimeError("forced_raise")
+
+    debouncer = debounce.Debouncer(
+        hass,
+        _LOGGER,
+        cooldown=0.01,
+        immediate=True,
+        function=_append_and_raise,
+    )
+
+    # Call when nothing happening
+    with pytest.raises(RuntimeError, match="forced_raise"):
+        await debouncer.async_call()
+    assert len(calls) == 1
+    assert debouncer._timer_task is not None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+
+    # Call when cooldown active setting execute at end to True
+    await debouncer.async_call()
+    assert len(calls) == 1
+    assert debouncer._timer_task is not None
+    assert debouncer._execute_at_end_of_timer is True
+    assert debouncer._job.target == debouncer.function
+
+    # Canceling debounce in cooldown
+    debouncer.async_cancel()
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+
+    before_job = debouncer._job
+
+    # Call and let timer run out
+    with pytest.raises(RuntimeError, match="forced_raise"):
+        await debouncer.async_call()
+    assert len(calls) == 2
+    async_fire_time_changed(hass, utcnow() + timedelta(seconds=1))
+    await hass.async_block_till_done()
+    assert len(calls) == 2
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+    assert debouncer._job == before_job
+
+    # Test calling doesn't execute/cooldown if currently executing.
+    await debouncer._execute_lock.acquire()
+    await debouncer.async_call()
+    assert len(calls) == 2
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    debouncer._execute_lock.release()
+    assert debouncer._job.target == debouncer.function
+
+
+async def test_immediate_works_with_passed_coroutine_raises(
+    hass: HomeAssistant,
+) -> None:
+    """Test immediate works with a coroutine that raises."""
+    calls = []
+
+    async def _append_and_raise() -> None:
+        calls.append(None)
+        raise RuntimeError("forced_raise")
+
+    debouncer = debounce.Debouncer(
+        hass,
+        _LOGGER,
+        cooldown=0.01,
+        immediate=True,
+        function=_append_and_raise,
+    )
+
+    # Call when nothing happening
+    with pytest.raises(RuntimeError, match="forced_raise"):
+        await debouncer.async_call()
+    assert len(calls) == 1
+    assert debouncer._timer_task is not None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+
+    # Call when cooldown active setting execute at end to True
+    await debouncer.async_call()
+    assert len(calls) == 1
+    assert debouncer._timer_task is not None
+    assert debouncer._execute_at_end_of_timer is True
+    assert debouncer._job.target == debouncer.function
+
+    # Canceling debounce in cooldown
+    debouncer.async_cancel()
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+
+    before_job = debouncer._job
+
+    # Call and let timer run out
+    with pytest.raises(RuntimeError, match="forced_raise"):
+        await debouncer.async_call()
+    assert len(calls) == 2
+    async_fire_time_changed(hass, utcnow() + timedelta(seconds=1))
+    await hass.async_block_till_done()
+    assert len(calls) == 2
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+    assert debouncer._job == before_job
+
+    # Test calling doesn't execute/cooldown if currently executing.
+    await debouncer._execute_lock.acquire()
+    await debouncer.async_call()
+    assert len(calls) == 2
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    debouncer._execute_lock.release()
+    assert debouncer._job.target == debouncer.function
+
+
 async def test_not_immediate_works(hass: HomeAssistant) -> None:
     """Test immediate works."""
     calls = []
diff --git a/tests/helpers/test_entity.py b/tests/helpers/test_entity.py
index e556d9d5451..85a7932aef8 100644
--- a/tests/helpers/test_entity.py
+++ b/tests/helpers/test_entity.py
@@ -1,8 +1,10 @@
 """Test the entity helper."""
 import asyncio
+from collections.abc import Iterable
 import dataclasses
 from datetime import timedelta
 import threading
+from typing import Any
 from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
@@ -17,6 +19,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, HomeAssistant, 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.typing import UNDEFINED
 
 from tests.common import (
     MockConfigEntry,
@@ -578,12 +582,14 @@ async def test_async_remove_no_platform(hass: HomeAssistant) -> None:
 
 
 async def test_async_remove_runs_callbacks(hass: HomeAssistant) -> None:
-    """Test async_remove method when no platform set."""
+    """Test async_remove runs on_remove callback."""
     result = []
 
+    platform = MockEntityPlatform(hass, domain="test")
     ent = entity.Entity()
     ent.hass = hass
     ent.entity_id = "test.test"
+    await platform.async_add_entities([ent])
     ent.async_on_remove(lambda: result.append(1))
     await ent.async_remove()
     assert len(result) == 1
@@ -593,16 +599,23 @@ async def test_async_remove_ignores_in_flight_polling(hass: HomeAssistant) -> No
     """Test in flight polling is ignored after removing."""
     result = []
 
+    platform = MockEntityPlatform(hass, domain="test")
     ent = entity.Entity()
     ent.hass = hass
     ent.entity_id = "test.test"
     ent.async_on_remove(lambda: result.append(1))
-    ent.async_write_ha_state()
+    await platform.async_add_entities([ent])
     assert hass.states.get("test.test").state == STATE_UNKNOWN
+
+    # Remove the entity from the entity registry
     await ent.async_remove()
     assert len(result) == 1
     assert hass.states.get("test.test") is None
+
+    # Simulate an in-flight poll after the entity was removed
     ent.async_write_ha_state()
+    assert len(result) == 1
+    assert hass.states.get("test.test") is None
 
 
 async def test_set_context(hass: HomeAssistant) -> None:
@@ -798,18 +811,18 @@ async def test_setup_source(hass: HomeAssistant) -> None:
 
 async def test_removing_entity_unavailable(hass: HomeAssistant) -> None:
     """Test removing an entity that is still registered creates an unavailable state."""
-    entry = er.RegistryEntry(
+    er.RegistryEntry(
         entity_id="hello.world",
         unique_id="test-unique-id",
         platform="test-platform",
         disabled_by=None,
     )
 
+    platform = MockEntityPlatform(hass, domain="hello")
     ent = entity.Entity()
-    ent.hass = hass
     ent.entity_id = "hello.world"
-    ent.registry_entry = entry
-    ent.async_write_ha_state()
+    ent._attr_unique_id = "test-unique-id"
+    await platform.async_add_entities([ent])
 
     state = hass.states.get("hello.world")
     assert state is not None
@@ -939,39 +952,22 @@ async def test_entity_description_fallback() -> None:
         assert getattr(ent, field.name) == getattr(ent_with_description, field.name)
 
 
-@pytest.mark.parametrize(
-    ("has_entity_name", "entity_name", "expected_friendly_name"),
-    (
-        (False, "Entity Blu", "Entity Blu"),
-        (False, None, None),
-        (True, "Entity Blu", "Device Bla Entity Blu"),
-        (True, None, "Device Bla"),
-    ),
-)
-async def test_friendly_name(
+async def _test_friendly_name(
     hass: HomeAssistant,
-    has_entity_name: bool,
-    entity_name: str | None,
+    caplog: pytest.LogCaptureFixture,
+    ent: entity.Entity,
     expected_friendly_name: str | None,
+    warn_implicit_name: bool,
 ) -> None:
-    """Test entity_id is influenced by entity name."""
+    """Test friendly name."""
+
+    expected_warning = (
+        f"Entity {ent.entity_id} ({type(ent)}) is implicitly using device name"
+    )
 
     async def async_setup_entry(hass, config_entry, async_add_entities):
         """Mock setup entry method."""
-        async_add_entities(
-            [
-                MockEntity(
-                    unique_id="qwer",
-                    device_info={
-                        "identifiers": {("hue", "1234")},
-                        "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
-                        "name": "Device Bla",
-                    },
-                    has_entity_name=has_entity_name,
-                    name=entity_name,
-                ),
-            ]
-        )
+        async_add_entities([ent])
         return True
 
     platform = MockPlatform(async_setup_entry=async_setup_entry)
@@ -986,6 +982,319 @@ async def test_friendly_name(
     assert len(hass.states.async_entity_ids()) == 1
     state = hass.states.async_all()[0]
     assert state.attributes.get(ATTR_FRIENDLY_NAME) == expected_friendly_name
+    assert (expected_warning in caplog.text) is warn_implicit_name
+
+    await async_update_entity(hass, ent.entity_id)
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == expected_friendly_name
+
+
+@pytest.mark.parametrize(
+    ("has_entity_name", "entity_name", "expected_friendly_name", "warn_implicit_name"),
+    (
+        (False, "Entity Blu", "Entity Blu", False),
+        (False, None, None, False),
+        (True, "Entity Blu", "Device Bla Entity Blu", False),
+        (True, None, "Device Bla", False),
+    ),
+)
+async def test_friendly_name_attr(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    has_entity_name: bool,
+    entity_name: str | None,
+    expected_friendly_name: str | None,
+    warn_implicit_name: bool,
+) -> None:
+    """Test friendly name when the entity uses _attr_*."""
+
+    ent = MockEntity(
+        unique_id="qwer",
+        device_info={
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        },
+    )
+    ent._attr_has_entity_name = has_entity_name
+    ent._attr_name = entity_name
+    await _test_friendly_name(
+        hass,
+        caplog,
+        ent,
+        expected_friendly_name,
+        warn_implicit_name,
+    )
+
+
+@pytest.mark.parametrize(
+    ("has_entity_name", "entity_name", "expected_friendly_name", "warn_implicit_name"),
+    (
+        (False, "Entity Blu", "Entity Blu", False),
+        (False, None, None, False),
+        (False, UNDEFINED, None, False),
+        (True, "Entity Blu", "Device Bla Entity Blu", False),
+        (True, None, "Device Bla", False),
+        (True, UNDEFINED, "Device Bla", True),
+    ),
+)
+async def test_friendly_name_description(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    has_entity_name: bool,
+    entity_name: str | None,
+    expected_friendly_name: str | None,
+    warn_implicit_name: bool,
+) -> None:
+    """Test friendly name when the entity has an entity description."""
+
+    ent = MockEntity(
+        unique_id="qwer",
+        device_info={
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        },
+    )
+    ent.entity_description = entity.EntityDescription(
+        "test", has_entity_name=has_entity_name, name=entity_name
+    )
+    await _test_friendly_name(
+        hass,
+        caplog,
+        ent,
+        expected_friendly_name,
+        warn_implicit_name,
+    )
+
+
+@pytest.mark.parametrize(
+    ("has_entity_name", "entity_name", "expected_friendly_name", "warn_implicit_name"),
+    (
+        (False, "Entity Blu", "Entity Blu", False),
+        (False, None, None, False),
+        (False, UNDEFINED, None, False),
+        (True, "Entity Blu", "Device Bla Entity Blu", False),
+        (True, None, "Device Bla", False),
+        (True, UNDEFINED, "Device Bla English cls", False),
+    ),
+)
+async def test_friendly_name_description_device_class_name(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    has_entity_name: bool,
+    entity_name: str | None,
+    expected_friendly_name: str | None,
+    warn_implicit_name: bool,
+) -> None:
+    """Test friendly name when the entity has an entity description."""
+
+    translations = {
+        "en": {"component.test_domain.entity_component.test_class.name": "English cls"},
+    }
+
+    async def async_get_translations(
+        hass: HomeAssistant,
+        language: str,
+        category: str,
+        integrations: Iterable[str] | None = None,
+        config_flow: bool | None = None,
+    ) -> dict[str, Any]:
+        """Return all backend translations."""
+        return translations[language]
+
+    class DeviceClassNameMockEntity(MockEntity):
+        def _default_to_device_class_name(self) -> bool:
+            """Return True if an unnamed entity should be named by its device class."""
+            return True
+
+    ent = DeviceClassNameMockEntity(
+        unique_id="qwer",
+        device_info={
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        },
+    )
+    ent.entity_description = entity.EntityDescription(
+        "test",
+        device_class="test_class",
+        has_entity_name=has_entity_name,
+        name=entity_name,
+    )
+    with patch(
+        "homeassistant.helpers.entity_platform.translation.async_get_translations",
+        side_effect=async_get_translations,
+    ):
+        await _test_friendly_name(
+            hass,
+            caplog,
+            ent,
+            expected_friendly_name,
+            warn_implicit_name,
+        )
+
+
+@pytest.mark.parametrize(
+    ("has_entity_name", "entity_name", "expected_friendly_name", "warn_implicit_name"),
+    (
+        (False, "Entity Blu", "Entity Blu", False),
+        (False, None, None, False),
+        (False, UNDEFINED, None, False),
+        (True, "Entity Blu", "Device Bla Entity Blu", False),
+        (True, None, "Device Bla", False),
+        (True, UNDEFINED, "Device Bla", True),
+    ),
+)
+async def test_friendly_name_property(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    has_entity_name: bool,
+    entity_name: str | None,
+    expected_friendly_name: str | None,
+    warn_implicit_name: bool,
+) -> None:
+    """Test friendly name when the entity has overridden the name property."""
+
+    ent = MockEntity(
+        unique_id="qwer",
+        device_info={
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        },
+        has_entity_name=has_entity_name,
+        name=entity_name,
+    )
+    await _test_friendly_name(
+        hass,
+        caplog,
+        ent,
+        expected_friendly_name,
+        warn_implicit_name,
+    )
+
+
+@pytest.mark.parametrize(
+    ("has_entity_name", "entity_name", "expected_friendly_name", "warn_implicit_name"),
+    (
+        (False, "Entity Blu", "Entity Blu", False),
+        (False, None, None, False),
+        (False, UNDEFINED, None, False),
+        (True, "Entity Blu", "Device Bla Entity Blu", False),
+        (True, None, "Device Bla", False),
+        # Won't use the device class name because the entity overrides the name property
+        (True, UNDEFINED, "Device Bla None", False),
+    ),
+)
+async def test_friendly_name_property_device_class_name(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    has_entity_name: bool,
+    entity_name: str | None,
+    expected_friendly_name: str | None,
+    warn_implicit_name: bool,
+) -> None:
+    """Test friendly name when the entity has overridden the name property."""
+
+    translations = {
+        "en": {"component.test_domain.entity_component.test_class.name": "English cls"},
+    }
+
+    async def async_get_translations(
+        hass: HomeAssistant,
+        language: str,
+        category: str,
+        integrations: Iterable[str] | None = None,
+        config_flow: bool | None = None,
+    ) -> dict[str, Any]:
+        """Return all backend translations."""
+        return translations[language]
+
+    class DeviceClassNameMockEntity(MockEntity):
+        def _default_to_device_class_name(self) -> bool:
+            """Return True if an unnamed entity should be named by its device class."""
+            return True
+
+    ent = DeviceClassNameMockEntity(
+        unique_id="qwer",
+        device_class="test_class",
+        device_info={
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        },
+        has_entity_name=has_entity_name,
+        name=entity_name,
+    )
+    with patch(
+        "homeassistant.helpers.entity_platform.translation.async_get_translations",
+        side_effect=async_get_translations,
+    ):
+        await _test_friendly_name(
+            hass,
+            caplog,
+            ent,
+            expected_friendly_name,
+            warn_implicit_name,
+        )
+
+
+@pytest.mark.parametrize(
+    ("has_entity_name", "expected_friendly_name", "warn_implicit_name"),
+    (
+        (False, None, False),
+        (True, "Device Bla English cls", False),
+    ),
+)
+async def test_friendly_name_device_class_name(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    has_entity_name: bool,
+    expected_friendly_name: str | None,
+    warn_implicit_name: bool,
+) -> None:
+    """Test friendly name when the entity has not set the name in any way."""
+
+    translations = {
+        "en": {"component.test_domain.entity_component.test_class.name": "English cls"},
+    }
+
+    async def async_get_translations(
+        hass: HomeAssistant,
+        language: str,
+        category: str,
+        integrations: Iterable[str] | None = None,
+        config_flow: bool | None = None,
+    ) -> dict[str, Any]:
+        """Return all backend translations."""
+        return translations[language]
+
+    class DeviceClassNameMockEntity(MockEntity):
+        def _default_to_device_class_name(self) -> bool:
+            """Return True if an unnamed entity should be named by its device class."""
+            return True
+
+    ent = DeviceClassNameMockEntity(
+        unique_id="qwer",
+        device_class="test_class",
+        device_info={
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        },
+        has_entity_name=has_entity_name,
+    )
+    with patch(
+        "homeassistant.helpers.entity_platform.translation.async_get_translations",
+        side_effect=async_get_translations,
+    ):
+        await _test_friendly_name(
+            hass,
+            caplog,
+            ent,
+            expected_friendly_name,
+            warn_implicit_name,
+        )
 
 
 @pytest.mark.parametrize(
@@ -1019,7 +1328,7 @@ async def test_friendly_name_updated(
     expected_friendly_name2: str,
     expected_friendly_name3: str,
 ) -> None:
-    """Test entity_id is influenced by entity name."""
+    """Test friendly name is updated when device or entity registry updates."""
 
     async def async_setup_entry(hass, config_entry, async_add_entities):
         """Mock setup entry method."""
@@ -1112,19 +1421,48 @@ async def test_warn_using_async_update_ha_state(
     """Test we warn once when using async_update_ha_state without force_update."""
     ent = entity.Entity()
     ent.hass = hass
+    ent.platform = MockEntityPlatform(hass)
     ent.entity_id = "hello.world"
+    error_message = "is using self.async_update_ha_state()"
 
     # When forcing, it should not trigger the warning
     caplog.clear()
     await ent.async_update_ha_state(force_refresh=True)
-    assert "is using self.async_update_ha_state()" not in caplog.text
+    assert error_message not in caplog.text
 
     # When not forcing, it should trigger the warning
     caplog.clear()
     await ent.async_update_ha_state()
-    assert "is using self.async_update_ha_state()" in caplog.text
+    assert error_message in caplog.text
 
     # When not forcing, it should not trigger the warning again
     caplog.clear()
     await ent.async_update_ha_state()
-    assert "is using self.async_update_ha_state()" not in caplog.text
+    assert error_message not in caplog.text
+
+
+async def test_warn_no_platform(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test we warn am entity does not have a platform."""
+    ent = entity.Entity()
+    ent.hass = hass
+    ent.platform = MockEntityPlatform(hass)
+    ent.entity_id = "hello.world"
+    error_message = "does not have a platform"
+
+    # No warning if the entity has a platform
+    caplog.clear()
+    ent.async_write_ha_state()
+    assert error_message not in caplog.text
+
+    # Without a platform, it should trigger the warning
+    ent.platform = None
+    caplog.clear()
+    ent.async_write_ha_state()
+    assert error_message in caplog.text
+
+    # Without a platform, it should not trigger the warning again
+    caplog.clear()
+    ent.async_write_ha_state()
+    assert error_message not in caplog.text
diff --git a/tests/helpers/test_entity_component.py b/tests/helpers/test_entity_component.py
index 4c9847bb3d2..4119ccc6e85 100644
--- a/tests/helpers/test_entity_component.py
+++ b/tests/helpers/test_entity_component.py
@@ -14,8 +14,14 @@ from homeassistant.const import (
     ENTITY_MATCH_NONE,
     EVENT_HOMEASSISTANT_STOP,
 )
-from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.exceptions import PlatformNotReady
+from homeassistant.core import (
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+    callback,
+)
+from homeassistant.exceptions import HomeAssistantError, PlatformNotReady
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity_component import EntityComponent, async_update_entity
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -474,7 +480,7 @@ async def test_extract_all_use_match_all(
 
 
 async def test_register_entity_service(hass: HomeAssistant) -> None:
-    """Test not expanding a group."""
+    """Test registering an enttiy service and calling it."""
     entity = MockEntity(entity_id=f"{DOMAIN}.entity")
     calls = []
 
@@ -524,6 +530,70 @@ async def test_register_entity_service(hass: HomeAssistant) -> None:
     assert len(calls) == 2
 
 
+async def test_register_entity_service_response_data(hass: HomeAssistant) -> None:
+    """Test an enttiy service that does not support response data."""
+    entity = MockEntity(entity_id=f"{DOMAIN}.entity")
+
+    async def generate_response(
+        target: MockEntity, call: ServiceCall
+    ) -> ServiceResponse:
+        assert call.return_response
+        return {"response-key": "response-value"}
+
+    component = EntityComponent(_LOGGER, DOMAIN, hass)
+    await component.async_setup({})
+    await component.async_add_entities([entity])
+
+    component.async_register_entity_service(
+        "hello",
+        {"some": str},
+        generate_response,
+        supports_response=SupportsResponse.ONLY,
+    )
+
+    response_data = await hass.services.async_call(
+        DOMAIN,
+        "hello",
+        service_data={"entity_id": entity.entity_id, "some": "data"},
+        blocking=True,
+        return_response=True,
+    )
+    assert response_data == {"response-key": "response-value"}
+
+
+async def test_register_entity_service_response_data_multiple_matches(
+    hass: HomeAssistant,
+) -> None:
+    """Test asking for service response data but matching many entities."""
+    entity1 = MockEntity(entity_id=f"{DOMAIN}.entity1")
+    entity2 = MockEntity(entity_id=f"{DOMAIN}.entity2")
+
+    async def generate_response(
+        target: MockEntity, call: ServiceCall
+    ) -> ServiceResponse:
+        raise ValueError("Should not be invoked")
+
+    component = EntityComponent(_LOGGER, DOMAIN, hass)
+    await component.async_setup({})
+    await component.async_add_entities([entity1, entity2])
+
+    component.async_register_entity_service(
+        "hello",
+        {},
+        generate_response,
+        supports_response=SupportsResponse.ONLY,
+    )
+
+    with pytest.raises(HomeAssistantError, match="matched more than one entity"):
+        await hass.services.async_call(
+            DOMAIN,
+            "hello",
+            target={"entity_id": [entity1.entity_id, entity2.entity_id]},
+            blocking=True,
+            return_response=True,
+        )
+
+
 async def test_platforms_shutdown_on_stop(hass: HomeAssistant) -> None:
     """Test that we shutdown platforms on stop."""
     platform1_setup = Mock(side_effect=[PlatformNotReady, PlatformNotReady, None])
diff --git a/tests/helpers/test_entity_platform.py b/tests/helpers/test_entity_platform.py
index dd39f664f7a..46806510f40 100644
--- a/tests/helpers/test_entity_platform.py
+++ b/tests/helpers/test_entity_platform.py
@@ -1,5 +1,6 @@
 """Tests for the EntityPlatform helper."""
 import asyncio
+from collections.abc import Iterable
 from datetime import timedelta
 import logging
 from typing import Any
@@ -18,6 +19,7 @@ from homeassistant.helpers import (
 )
 from homeassistant.helpers.entity import (
     DeviceInfo,
+    Entity,
     EntityCategory,
     async_generate_entity_id,
 )
@@ -1669,3 +1671,159 @@ async def test_entity_name_influences_entity_id(
 
     assert len(hass.states.async_entity_ids()) == 1
     assert registry.async_get(expected_entity_id) is not None
+
+
+@pytest.mark.parametrize(
+    ("language", "has_entity_name", "expected_entity_id"),
+    (
+        ("en", False, "test_domain.test_qwer"),  # Set to <platform>_<unique_id>
+        ("en", True, "test_domain.device_bla_english_name"),
+        ("sv", True, "test_domain.device_bla_swedish_name"),
+        # Chinese uses english for entity_id
+        ("cn", True, "test_domain.device_bla_english_name"),
+    ),
+)
+async def test_translated_entity_name_influences_entity_id(
+    hass: HomeAssistant,
+    language: str,
+    has_entity_name: bool,
+    expected_entity_id: str,
+) -> None:
+    """Test entity_id is influenced by translated entity name."""
+
+    class TranslatedEntity(Entity):
+        _attr_unique_id = "qwer"
+        _attr_device_info = {
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        }
+
+        _attr_translation_key = "test"
+
+        def __init__(self, has_entity_name: bool) -> None:
+            """Initialize."""
+            self._attr_has_entity_name = has_entity_name
+
+    registry = er.async_get(hass)
+
+    translations = {
+        "en": {"component.test.entity.test_domain.test.name": "English name"},
+        "sv": {"component.test.entity.test_domain.test.name": "Swedish name"},
+        "cn": {"component.test.entity.test_domain.test.name": "Chinese name"},
+    }
+    hass.config.language = language
+
+    async def async_get_translations(
+        hass: HomeAssistant,
+        language: str,
+        category: str,
+        integrations: Iterable[str] | None = None,
+        config_flow: bool | None = None,
+    ) -> dict[str, Any]:
+        """Return all backend translations."""
+        return translations[language]
+
+    async def async_setup_entry(hass, config_entry, async_add_entities):
+        """Mock setup entry method."""
+        async_add_entities([TranslatedEntity(has_entity_name)])
+        return True
+
+    platform = MockPlatform(async_setup_entry=async_setup_entry)
+    config_entry = MockConfigEntry(entry_id="super-mock-id")
+    entity_platform = MockEntityPlatform(
+        hass, platform_name=config_entry.domain, platform=platform
+    )
+
+    with patch(
+        "homeassistant.helpers.entity_platform.translation.async_get_translations",
+        side_effect=async_get_translations,
+    ):
+        assert await entity_platform.async_setup_entry(config_entry)
+        await hass.async_block_till_done()
+
+    assert len(hass.states.async_entity_ids()) == 1
+    assert registry.async_get(expected_entity_id) is not None
+
+
+@pytest.mark.parametrize(
+    ("language", "has_entity_name", "device_class", "expected_entity_id"),
+    (
+        ("en", False, None, "test_domain.test_qwer"),  # Set to <platform>_<unique_id>
+        (
+            "en",
+            False,
+            "test_class",
+            "test_domain.test_qwer",
+        ),  # Set to <platform>_<unique_id>
+        ("en", True, "test_class", "test_domain.device_bla_english_cls"),
+        ("sv", True, "test_class", "test_domain.device_bla_swedish_cls"),
+        # Chinese uses english for entity_id
+        ("cn", True, "test_class", "test_domain.device_bla_english_cls"),
+    ),
+)
+async def test_translated_device_class_name_influences_entity_id(
+    hass: HomeAssistant,
+    language: str,
+    has_entity_name: bool,
+    device_class: str | None,
+    expected_entity_id: str,
+) -> None:
+    """Test entity_id is influenced by translated entity name."""
+
+    class TranslatedDeviceClassEntity(Entity):
+        _attr_unique_id = "qwer"
+        _attr_device_info = {
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        }
+
+        def __init__(self, device_class: str | None, has_entity_name: bool) -> None:
+            """Initialize."""
+            self._attr_device_class = device_class
+            self._attr_has_entity_name = has_entity_name
+
+        def _default_to_device_class_name(self) -> bool:
+            """Return True if an unnamed entity should be named by its device class."""
+            return self.device_class is not None
+
+    registry = er.async_get(hass)
+
+    translations = {
+        "en": {"component.test_domain.entity_component.test_class.name": "English cls"},
+        "sv": {"component.test_domain.entity_component.test_class.name": "Swedish cls"},
+        "cn": {"component.test_domain.entity_component.test_class.name": "Chinese cls"},
+    }
+    hass.config.language = language
+
+    async def async_get_translations(
+        hass: HomeAssistant,
+        language: str,
+        category: str,
+        integrations: Iterable[str] | None = None,
+        config_flow: bool | None = None,
+    ) -> dict[str, Any]:
+        """Return all backend translations."""
+        return translations[language]
+
+    async def async_setup_entry(hass, config_entry, async_add_entities):
+        """Mock setup entry method."""
+        async_add_entities([TranslatedDeviceClassEntity(device_class, has_entity_name)])
+        return True
+
+    platform = MockPlatform(async_setup_entry=async_setup_entry)
+    config_entry = MockConfigEntry(entry_id="super-mock-id")
+    entity_platform = MockEntityPlatform(
+        hass, platform_name=config_entry.domain, platform=platform
+    )
+
+    with patch(
+        "homeassistant.helpers.entity_platform.translation.async_get_translations",
+        side_effect=async_get_translations,
+    ):
+        assert await entity_platform.async_setup_entry(config_entry)
+        await hass.async_block_till_done()
+
+    assert len(hass.states.async_entity_ids()) == 1
+    assert registry.async_get(expected_entity_id) is not None
diff --git a/tests/helpers/test_entity_registry.py b/tests/helpers/test_entity_registry.py
index a0425065775..57622d330d9 100644
--- a/tests/helpers/test_entity_registry.py
+++ b/tests/helpers/test_entity_registry.py
@@ -1,7 +1,9 @@
 """Tests for the Entity Registry."""
+from datetime import timedelta
 from typing import Any
 from unittest.mock import patch
 
+import attr
 import pytest
 import voluptuous as vol
 
@@ -15,7 +17,7 @@ from homeassistant.core import CoreState, HomeAssistant, callback
 from homeassistant.exceptions import MaxLengthExceeded
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from tests.common import MockConfigEntry, flush_store
+from tests.common import MockConfigEntry, async_fire_time_changed, flush_store
 
 YAML__OPEN_PATH = "homeassistant.util.yaml.loader.open"
 
@@ -34,6 +36,16 @@ def update_events(hass):
     return events
 
 
+async def test_get(hass: HomeAssistant, entity_registry: er.EntityRegistry):
+    """Test we can get an item."""
+    entry = entity_registry.async_get_or_create("light", "hue", "1234")
+
+    assert entity_registry.async_get(entry.entity_id) is entry
+    assert entity_registry.async_get(entry.id) is entry
+    assert entity_registry.async_get("blah") is None
+    assert entity_registry.async_get("blah.blah") is None
+
+
 async def test_get_or_create_returns_same_entry(
     hass: HomeAssistant, entity_registry: er.EntityRegistry, update_events
 ) -> None:
@@ -266,8 +278,13 @@ async def test_loading_saving_data(
         orig_entry2.entity_id, "light", {"minimum_brightness": 20}
     )
     orig_entry2 = entity_registry.async_get(orig_entry2.entity_id)
+    orig_entry3 = entity_registry.async_get_or_create("light", "hue", "ABCD")
+    orig_entry4 = entity_registry.async_get_or_create("light", "hue", "EFGH")
+    entity_registry.async_remove(orig_entry3.entity_id)
+    entity_registry.async_remove(orig_entry4.entity_id)
 
     assert len(entity_registry.entities) == 2
+    assert len(entity_registry.deleted_entities) == 2
 
     # Now load written data in new registry
     registry2 = er.EntityRegistry(hass)
@@ -276,11 +293,16 @@ async def test_loading_saving_data(
 
     # Ensure same order
     assert list(entity_registry.entities) == list(registry2.entities)
+    assert list(entity_registry.deleted_entities) == list(registry2.deleted_entities)
     new_entry1 = entity_registry.async_get_or_create("light", "hue", "1234")
     new_entry2 = entity_registry.async_get_or_create("light", "hue", "5678")
+    new_entry3 = entity_registry.async_get_or_create("light", "hue", "ABCD")
+    new_entry4 = entity_registry.async_get_or_create("light", "hue", "EFGH")
 
     assert orig_entry1 == new_entry1
     assert orig_entry2 == new_entry2
+    assert orig_entry3 == new_entry3
+    assert orig_entry4 == new_entry4
 
     assert new_entry2.area_id == "mock-area-id"
     assert new_entry2.capabilities == {"max": 100}
@@ -475,6 +497,42 @@ async def test_removing_config_entry_id(
     assert update_events[1]["entity_id"] == entry.entity_id
 
 
+async def test_deleted_entity_removing_config_entry_id(
+    hass, entity_registry: er.EntityRegistry
+):
+    """Test that we update config entry id in registry on deleted entity."""
+    mock_config = MockConfigEntry(domain="light", entry_id="mock-id-1")
+
+    entry = entity_registry.async_get_or_create(
+        "light", "hue", "5678", config_entry=mock_config
+    )
+    assert entry.config_entry_id == "mock-id-1"
+    entity_registry.async_remove(entry.entity_id)
+
+    assert len(entity_registry.entities) == 0
+    assert len(entity_registry.deleted_entities) == 1
+    assert (
+        entity_registry.deleted_entities[("light", "hue", "5678")].config_entry_id
+        == "mock-id-1"
+    )
+    assert (
+        entity_registry.deleted_entities[("light", "hue", "5678")].orphaned_timestamp
+        is None
+    )
+
+    entity_registry.async_clear_config_entry("mock-id-1")
+    assert len(entity_registry.entities) == 0
+    assert len(entity_registry.deleted_entities) == 1
+    assert (
+        entity_registry.deleted_entities[("light", "hue", "5678")].config_entry_id
+        is None
+    )
+    assert (
+        entity_registry.deleted_entities[("light", "hue", "5678")].orphaned_timestamp
+        is not None
+    )
+
+
 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")
@@ -1527,3 +1585,95 @@ def test_migrate_entity_to_new_platform(
             new_unique_id=new_unique_id,
             new_config_entry_id=new_config_entry.entry_id,
         )
+
+
+async def test_restore_entity(hass, update_events, freezer):
+    """Make sure entity registry id is stable and entity_id is reused if possible."""
+    registry = er.async_get(hass)  # We need the real entity registry for this test
+    config_entry = MockConfigEntry(domain="light")
+    entry1 = registry.async_get_or_create(
+        "light", "hue", "1234", config_entry=config_entry
+    )
+    entry2 = registry.async_get_or_create(
+        "light", "hue", "5678", config_entry=config_entry
+    )
+
+    entry1 = registry.async_update_entity(
+        entry1.entity_id, new_entity_id="light.custom_1"
+    )
+
+    registry.async_remove(entry1.entity_id)
+    registry.async_remove(entry2.entity_id)
+    assert len(registry.entities) == 0
+    assert len(registry.deleted_entities) == 2
+
+    # Re-add entities
+    entry1_restored = registry.async_get_or_create(
+        "light", "hue", "1234", config_entry=config_entry
+    )
+    entry2_restored = registry.async_get_or_create("light", "hue", "5678")
+
+    assert len(registry.entities) == 2
+    assert len(registry.deleted_entities) == 0
+    assert entry1 != entry1_restored
+    # 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
+
+    # Remove two of the entities again, then bump time
+    registry.async_remove(entry1_restored.entity_id)
+    registry.async_remove(entry2.entity_id)
+    assert len(registry.entities) == 0
+    assert len(registry.deleted_entities) == 2
+    freezer.tick(timedelta(seconds=er.ORPHANED_ENTITY_KEEP_SECONDS + 1))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    # Re-add two entities, expect to get a new id after the purge for entity w/o config entry
+    entry1_restored = registry.async_get_or_create(
+        "light", "hue", "1234", config_entry=config_entry
+    )
+    entry2_restored = registry.async_get_or_create("light", "hue", "5678")
+    assert len(registry.entities) == 2
+    assert len(registry.deleted_entities) == 0
+    assert entry1.id == entry1_restored.id
+    assert entry2.id != entry2_restored.id
+
+    # Remove the first entity, then its config entry, finally bump time
+    registry.async_remove(entry1_restored.entity_id)
+    assert len(registry.entities) == 1
+    assert len(registry.deleted_entities) == 1
+    registry.async_clear_config_entry(config_entry.entry_id)
+    freezer.tick(timedelta(seconds=er.ORPHANED_ENTITY_KEEP_SECONDS + 1))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    # Re-add the entity, expect to get a new id after the purge
+    entry1_restored = registry.async_get_or_create(
+        "light", "hue", "1234", config_entry=config_entry
+    )
+    assert len(registry.entities) == 2
+    assert len(registry.deleted_entities) == 0
+    assert entry1.id != entry1_restored.id
+
+    # Check the events
+    await hass.async_block_till_done()
+    assert len(update_events) == 13
+    assert update_events[0] == {"action": "create", "entity_id": "light.hue_1234"}
+    assert update_events[1] == {"action": "create", "entity_id": "light.hue_5678"}
+    assert update_events[2]["action"] == "update"
+    assert update_events[3] == {"action": "remove", "entity_id": "light.custom_1"}
+    assert update_events[4] == {"action": "remove", "entity_id": "light.hue_5678"}
+    # Restore entities the 1st time
+    assert update_events[5] == {"action": "create", "entity_id": "light.hue_1234"}
+    assert update_events[6] == {"action": "create", "entity_id": "light.hue_5678"}
+    assert update_events[7] == {"action": "remove", "entity_id": "light.hue_1234"}
+    assert update_events[8] == {"action": "remove", "entity_id": "light.hue_5678"}
+    # Restore entities the 2nd time
+    assert update_events[9] == {"action": "create", "entity_id": "light.hue_1234"}
+    assert update_events[10] == {"action": "create", "entity_id": "light.hue_5678"}
+    assert update_events[11] == {"action": "remove", "entity_id": "light.hue_1234"}
+    # Restore entities the 3rd time
+    assert update_events[12] == {"action": "create", "entity_id": "light.hue_1234"}
diff --git a/tests/helpers/test_entity_values.py b/tests/helpers/test_entity_values.py
index f953ec0ba9e..1ac8e480f51 100644
--- a/tests/helpers/test_entity_values.py
+++ b/tests/helpers/test_entity_values.py
@@ -10,9 +10,12 @@ def test_override_single_value() -> None:
     """Test values with exact match."""
     store = EV({ent: {"key": "value"}})
     assert store.get(ent) == {"key": "value"}
-    assert len(store._cache) == 1
+    assert store.get.cache_info().currsize == 1
+    assert store.get.cache_info().misses == 1
     assert store.get(ent) == {"key": "value"}
-    assert len(store._cache) == 1
+    assert store.get.cache_info().currsize == 1
+    assert store.get.cache_info().misses == 1
+    assert store.get.cache_info().hits == 1
 
 
 def test_override_by_domain() -> None:
diff --git a/tests/helpers/test_instance_id.py b/tests/helpers/test_instance_id.py
index 453d18b1d2a..8fb6bfd8d7e 100644
--- a/tests/helpers/test_instance_id.py
+++ b/tests/helpers/test_instance_id.py
@@ -1,7 +1,10 @@
 """Tests for instance ID helper."""
+from json import JSONDecodeError
 from typing import Any
 from unittest.mock import patch
 
+import pytest
+
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import instance_id
 
@@ -14,6 +17,25 @@ async def test_get_id_empty(hass: HomeAssistant, hass_storage: dict[str, Any]) -
     assert hass_storage["core.uuid"]["data"]["uuid"] == uuid
 
 
+async def test_get_id_load_fail(
+    hass: HomeAssistant, hass_storage: dict[str, Any], caplog: pytest.LogCaptureFixture
+) -> None:
+    """Migrate existing file with error."""
+    hass_storage["core.uuid"] = None  # Invalid, will make store.async_load raise
+
+    uuid = await instance_id.async_get(hass)
+
+    assert uuid is not None
+
+    # Assert it's stored
+    assert hass_storage["core.uuid"]["data"]["uuid"] == uuid
+
+    assert (
+        "Could not read hass instance ID from 'core.uuid' or '.uuid', a "
+        "new instance ID will be generated" in caplog.text
+    )
+
+
 async def test_get_id_migrate(
     hass: HomeAssistant, hass_storage: dict[str, Any]
 ) -> None:
@@ -30,3 +52,27 @@ async def test_get_id_migrate(
 
     # assert old deleted
     assert len(mock_remove.mock_calls) == 1
+
+
+async def test_get_id_migrate_fail(
+    hass: HomeAssistant, hass_storage: dict[str, Any], caplog: pytest.LogCaptureFixture
+) -> None:
+    """Migrate existing file with error."""
+    with patch(
+        "homeassistant.util.json.load_json",
+        side_effect=JSONDecodeError("test_error", "test", 1),
+    ), patch("os.path.isfile", return_value=True), patch("os.remove") as mock_remove:
+        uuid = await instance_id.async_get(hass)
+
+    assert uuid is not None
+
+    # Assert it's stored
+    assert hass_storage["core.uuid"]["data"]["uuid"] == uuid
+
+    # assert old not deleted
+    assert len(mock_remove.mock_calls) == 0
+
+    assert (
+        "Could not read hass instance ID from 'core.uuid' or '.uuid', a "
+        "new instance ID will be generated" in caplog.text
+    )
diff --git a/tests/helpers/test_intent.py b/tests/helpers/test_intent.py
index edc6a281172..98e93785f58 100644
--- a/tests/helpers/test_intent.py
+++ b/tests/helpers/test_intent.py
@@ -1,4 +1,7 @@
 """Tests for the intent helpers."""
+import asyncio
+from unittest.mock import MagicMock, patch
+
 import pytest
 import voluptuous as vol
 
@@ -184,3 +187,101 @@ async def test_cant_turn_on_lock(hass: HomeAssistant) -> None:
 
     assert result.response.response_type == intent.IntentResponseType.ERROR
     assert result.response.error_code == intent.IntentResponseErrorCode.NO_INTENT_MATCH
+
+
+def test_async_register(hass: HomeAssistant) -> None:
+    """Test registering an intent and verifying it is stored correctly."""
+    handler = MagicMock()
+    handler.intent_type = "test_intent"
+
+    intent.async_register(hass, handler)
+
+    assert hass.data[intent.DATA_KEY]["test_intent"] == handler
+
+
+def test_async_register_overwrite(hass: HomeAssistant) -> None:
+    """Test registering multiple intents with the same type, ensuring the last one overwrites the previous one and a warning is emitted."""
+    handler1 = MagicMock()
+    handler1.intent_type = "test_intent"
+
+    handler2 = MagicMock()
+    handler2.intent_type = "test_intent"
+
+    with patch.object(intent._LOGGER, "warning") as mock_warning:
+        intent.async_register(hass, handler1)
+        intent.async_register(hass, handler2)
+
+        mock_warning.assert_called_once_with(
+            "Intent %s is being overwritten by %s", "test_intent", handler2
+        )
+
+    assert hass.data[intent.DATA_KEY]["test_intent"] == handler2
+
+
+def test_async_remove(hass: HomeAssistant) -> None:
+    """Test removing an intent and verifying it is no longer present in the Home Assistant data."""
+    handler = MagicMock()
+    handler.intent_type = "test_intent"
+
+    intent.async_register(hass, handler)
+    intent.async_remove(hass, "test_intent")
+
+    assert "test_intent" not in hass.data[intent.DATA_KEY]
+
+
+def test_async_remove_no_existing_entry(hass: HomeAssistant) -> None:
+    """Test the removal of a non-existing intent from Home Assistant's data."""
+    handler = MagicMock()
+    handler.intent_type = "test_intent"
+    intent.async_register(hass, handler)
+
+    intent.async_remove(hass, "test_intent2")
+
+    assert "test_intent2" not in hass.data[intent.DATA_KEY]
+
+
+def test_async_remove_no_existing(hass: HomeAssistant) -> None:
+    """Test the removal of an intent where no config exists."""
+
+    intent.async_remove(hass, "test_intent2")
+    # simply shouldn't cause an exception
+
+    assert intent.DATA_KEY not in hass.data
+
+
+async def test_validate_then_run_in_background(hass: HomeAssistant) -> None:
+    """Test we don't execute a service in foreground forever."""
+    hass.states.async_set("light.kitchen", "off")
+    call_done = asyncio.Event()
+    calls = []
+
+    # Register a service that takes 0.1 seconds to execute
+    async def mock_service(call):
+        """Mock service."""
+        await asyncio.sleep(0.1)
+        call_done.set()
+        calls.append(call)
+
+    hass.services.async_register("light", "turn_on", mock_service)
+
+    # Create intent handler with a service timeout of 0.05 seconds
+    handler = intent.ServiceIntentHandler(
+        "TestType", "light", "turn_on", "Turned {} on"
+    )
+    handler.service_timeout = 0.05
+    intent.async_register(hass, handler)
+
+    result = await intent.async_handle(
+        hass,
+        "test",
+        "TestType",
+        slots={"name": {"value": "kitchen"}},
+    )
+
+    assert result.response_type == intent.IntentResponseType.ACTION_DONE
+
+    assert not call_done.is_set()
+    await call_done.wait()
+
+    assert len(calls) == 1
+    assert calls[0].data == {"entity_id": "light.kitchen"}
diff --git a/tests/helpers/test_ratelimit.py b/tests/helpers/test_ratelimit.py
index e7fa639261b..39e83953c45 100644
--- a/tests/helpers/test_ratelimit.py
+++ b/tests/helpers/test_ratelimit.py
@@ -16,7 +16,6 @@ async def test_hit(hass: HomeAssistant) -> None:
     def _refresh():
         nonlocal refresh_called
         refresh_called = True
-        return
 
     rate_limiter = ratelimit.KeyedRateLimit(hass)
     rate_limiter.async_triggered("key1", dt_util.utcnow())
@@ -53,7 +52,6 @@ async def test_miss(hass: HomeAssistant) -> None:
     def _refresh():
         nonlocal refresh_called
         refresh_called = True
-        return
 
     rate_limiter = ratelimit.KeyedRateLimit(hass)
     assert (
@@ -85,7 +83,6 @@ async def test_no_limit(hass: HomeAssistant) -> None:
     def _refresh():
         nonlocal refresh_called
         refresh_called = True
-        return
 
     rate_limiter = ratelimit.KeyedRateLimit(hass)
     rate_limiter.async_triggered("key1", dt_util.utcnow())
diff --git a/tests/helpers/test_restore_state.py b/tests/helpers/test_restore_state.py
index b5ce7afade0..56e931b4345 100644
--- a/tests/helpers/test_restore_state.py
+++ b/tests/helpers/test_restore_state.py
@@ -27,6 +27,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
 from tests.common import (
+    MockEntityPlatform,
     MockModule,
     MockPlatform,
     async_fire_time_changed,
@@ -266,15 +267,16 @@ async def test_dump_data(hass: HomeAssistant) -> None:
         State("input_boolean.b5", "unavailable", {"restored": True}),
     ]
 
+    platform = MockEntityPlatform(hass, domain="input_boolean")
     entity = Entity()
     entity.hass = hass
     entity.entity_id = "input_boolean.b0"
-    await entity.async_internal_added_to_hass()
+    await platform.async_add_entities([entity])
 
     entity = RestoreEntity()
     entity.hass = hass
     entity.entity_id = "input_boolean.b1"
-    await entity.async_internal_added_to_hass()
+    await platform.async_add_entities([entity])
 
     data = async_get(hass)
     now = dt_util.utcnow()
@@ -340,15 +342,16 @@ async def test_dump_error(hass: HomeAssistant) -> None:
         State("input_boolean.b2", "on"),
     ]
 
+    platform = MockEntityPlatform(hass, domain="input_boolean")
     entity = Entity()
     entity.hass = hass
     entity.entity_id = "input_boolean.b0"
-    await entity.async_internal_added_to_hass()
+    await platform.async_add_entities([entity])
 
     entity = RestoreEntity()
     entity.hass = hass
     entity.entity_id = "input_boolean.b1"
-    await entity.async_internal_added_to_hass()
+    await platform.async_add_entities([entity])
 
     data = async_get(hass)
 
@@ -378,10 +381,11 @@ async def test_load_error(hass: HomeAssistant) -> None:
 
 async def test_state_saved_on_remove(hass: HomeAssistant) -> None:
     """Test that we save entity state on removal."""
+    platform = MockEntityPlatform(hass, domain="input_boolean")
     entity = RestoreEntity()
     entity.hass = hass
     entity.entity_id = "input_boolean.b0"
-    await entity.async_internal_added_to_hass()
+    await platform.async_add_entities([entity])
 
     now = dt_util.utcnow()
     hass.states.async_set(
diff --git a/tests/helpers/test_script.py b/tests/helpers/test_script.py
index 5affce5d501..7f66ec25977 100644
--- a/tests/helpers/test_script.py
+++ b/tests/helpers/test_script.py
@@ -23,11 +23,12 @@ from homeassistant.const import (
     SERVICE_TURN_ON,
 )
 from homeassistant.core import (
-    SERVICE_CALL_LIMIT,
     Context,
     CoreState,
     HomeAssistant,
     ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
     callback,
 )
 from homeassistant.exceptions import ConditionError, HomeAssistantError, ServiceNotFound
@@ -264,7 +265,6 @@ async def test_calling_service_basic(
             "0": [
                 {
                     "result": {
-                        "limit": SERVICE_CALL_LIMIT,
                         "params": {
                             "domain": "test",
                             "service": "script",
@@ -317,7 +317,6 @@ async def test_calling_service_template(hass: HomeAssistant) -> None:
             "0": [
                 {
                     "result": {
-                        "limit": SERVICE_CALL_LIMIT,
                         "params": {
                             "domain": "test",
                             "service": "script",
@@ -332,6 +331,126 @@ async def test_calling_service_template(hass: HomeAssistant) -> None:
     )
 
 
+async def test_calling_service_response_data(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test the calling of a service with response data."""
+    context = Context()
+
+    def mock_service(call: ServiceCall) -> ServiceResponse:
+        """Mock service call."""
+        if call.return_response:
+            return {"data": "value-12345"}
+        return None
+
+    hass.services.async_register(
+        "test", "script", mock_service, supports_response=SupportsResponse.OPTIONAL
+    )
+    sequence = cv.SCRIPT_SCHEMA(
+        [
+            {
+                "alias": "service step1",
+                "service": "test.script",
+                # Store the result of the service call as a variable
+                "response_variable": "my_response",
+            },
+            {
+                "alias": "service step2",
+                "service": "test.script",
+                "data_template": {
+                    # Result of previous service call
+                    "key": "{{ my_response.data }}"
+                },
+            },
+        ]
+    )
+    script_obj = script.Script(hass, sequence, "Test Name", "test_domain")
+
+    await script_obj.async_run(context=context)
+    await hass.async_block_till_done()
+
+    assert "Executing step service step1" in caplog.text
+    assert "Executing step service step2" in caplog.text
+
+    assert_action_trace(
+        {
+            "0": [
+                {
+                    "result": {
+                        "params": {
+                            "domain": "test",
+                            "service": "script",
+                            "service_data": {},
+                            "target": {},
+                        },
+                        "running_script": False,
+                    }
+                }
+            ],
+            "1": [
+                {
+                    "result": {
+                        "params": {
+                            "domain": "test",
+                            "service": "script",
+                            "service_data": {"key": "value-12345"},
+                            "target": {},
+                        },
+                        "running_script": False,
+                    },
+                    "variables": {
+                        "my_response": {"data": "value-12345"},
+                    },
+                }
+            ],
+        }
+    )
+
+
+@pytest.mark.parametrize(
+    ("supports_response", "params", "expected_error"),
+    [
+        (
+            SupportsResponse.NONE,
+            {"response_variable": "foo"},
+            "does not support 'response_variable'",
+        ),
+        (SupportsResponse.ONLY, {}, "requires 'response_variable'"),
+    ],
+)
+async def test_service_response_data_errors(
+    hass: HomeAssistant,
+    supports_response: SupportsResponse,
+    params: dict[str, str],
+    expected_error: str,
+) -> None:
+    """Test the calling of a service with response data error cases."""
+    context = Context()
+
+    def mock_service(call: ServiceCall) -> ServiceResponse:
+        """Mock service call."""
+        raise ValueError("Never invoked")
+
+    hass.services.async_register(
+        "test", "script", mock_service, supports_response=supports_response
+    )
+
+    sequence = cv.SCRIPT_SCHEMA(
+        [
+            {
+                "alias": "service step1",
+                "service": "test.script",
+                **params,
+            },
+        ]
+    )
+    script_obj = script.Script(hass, sequence, "Test Name", "test_domain")
+
+    with pytest.raises(vol.Invalid, match=expected_error):
+        await script_obj.async_run(context=context)
+        await hass.async_block_till_done()
+
+
 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()
@@ -356,7 +475,6 @@ async def test_data_template_with_templated_key(hass: HomeAssistant) -> None:
             "0": [
                 {
                     "result": {
-                        "limit": SERVICE_CALL_LIMIT,
                         "params": {
                             "domain": "test",
                             "service": "script",
@@ -3338,7 +3456,6 @@ async def test_parallel_error(
             {
                 "error_type": ServiceNotFound,
                 "result": {
-                    "limit": 10,
                     "params": {
                         "domain": "epic",
                         "service": "failure",
@@ -3387,7 +3504,6 @@ async def test_propagate_error_service_not_found(hass: HomeAssistant) -> None:
             {
                 "error_type": ServiceNotFound,
                 "result": {
-                    "limit": 10,
                     "params": {
                         "domain": "test",
                         "service": "script",
@@ -3424,7 +3540,6 @@ async def test_propagate_error_invalid_service_data(hass: HomeAssistant) -> None
             {
                 "error_type": vol.MultipleInvalid,
                 "result": {
-                    "limit": 10,
                     "params": {
                         "domain": "test",
                         "service": "script",
@@ -3465,7 +3580,6 @@ async def test_propagate_error_service_exception(hass: HomeAssistant) -> None:
             {
                 "error_type": ValueError,
                 "result": {
-                    "limit": 10,
                     "params": {
                         "domain": "test",
                         "service": "script",
@@ -4343,7 +4457,6 @@ async def test_set_variable(
         "1": [
             {
                 "result": {
-                    "limit": SERVICE_CALL_LIMIT,
                     "params": {
                         "domain": "test",
                         "service": "script",
@@ -4386,7 +4499,6 @@ async def test_set_redefines_variable(
         "1": [
             {
                 "result": {
-                    "limit": SERVICE_CALL_LIMIT,
                     "params": {
                         "domain": "test",
                         "service": "script",
@@ -4402,7 +4514,6 @@ async def test_set_redefines_variable(
         "3": [
             {
                 "result": {
-                    "limit": SERVICE_CALL_LIMIT,
                     "params": {
                         "domain": "test",
                         "service": "script",
@@ -4936,7 +5047,6 @@ async def test_continue_on_error(hass: HomeAssistant) -> None:
             "1": [
                 {
                     "result": {
-                        "limit": 10,
                         "params": {
                             "domain": "broken",
                             "service": "service",
@@ -4952,7 +5062,6 @@ async def test_continue_on_error(hass: HomeAssistant) -> None:
                 {
                     "error_type": HomeAssistantError,
                     "result": {
-                        "limit": 10,
                         "params": {
                             "domain": "broken",
                             "service": "service",
@@ -5011,7 +5120,6 @@ async def test_continue_on_error_automation_issue(hass: HomeAssistant) -> None:
                 {
                     "error_type": ServiceNotFound,
                     "result": {
-                        "limit": 10,
                         "params": {
                             "domain": "service",
                             "service": "not_found",
@@ -5059,7 +5167,6 @@ async def test_continue_on_error_unknown_error(hass: HomeAssistant) -> None:
                 {
                     "error_type": MyLibraryError,
                     "result": {
-                        "limit": 10,
                         "params": {
                             "domain": "some",
                             "service": "service",
diff --git a/tests/helpers/test_selector.py b/tests/helpers/test_selector.py
index f95da5c6e66..c518ad227a7 100644
--- a/tests/helpers/test_selector.py
+++ b/tests/helpers/test_selector.py
@@ -979,3 +979,25 @@ def test_constant_selector_schema_error(schema) -> None:
     """Test constant selector."""
     with pytest.raises(vol.Invalid):
         selector.validate_selector({"constant": schema})
+
+
+@pytest.mark.parametrize(
+    ("schema", "valid_selections", "invalid_selections"),
+    (
+        (
+            {},
+            ("home_assistant", "2j4hp3uy4p87wyrpiuhk34"),
+            (None, True, 1),
+        ),
+        (
+            {"language": "nl"},
+            ("home_assistant", "2j4hp3uy4p87wyrpiuhk34"),
+            (None, True, 1),
+        ),
+    ),
+)
+def test_conversation_agent_selector_schema(
+    schema, valid_selections, invalid_selections
+) -> None:
+    """Test conversation agent selector."""
+    _test_selector("conversation_agent", schema, valid_selections, invalid_selections)
diff --git a/tests/helpers/test_service.py b/tests/helpers/test_service.py
index 8e8123ac7af..f6299312b53 100644
--- a/tests/helpers/test_service.py
+++ b/tests/helpers/test_service.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     STATE_ON,
     EntityCategory,
 )
-from homeassistant.core import Context, HomeAssistant, ServiceCall
+from homeassistant.core import Context, HomeAssistant, ServiceCall, SupportsResponse
 from homeassistant.helpers import (
     device_registry as dr,
     entity_registry as er,
@@ -575,8 +575,31 @@ async def test_async_get_all_descriptions(hass: HomeAssistant) -> None:
     hass.services.async_register(
         logger.DOMAIN, "another_new_service", lambda x: None, None
     )
+    hass.services.async_register(
+        logger.DOMAIN,
+        "service_with_optional_response",
+        lambda x: None,
+        None,
+        SupportsResponse.OPTIONAL,
+    )
+    hass.services.async_register(
+        logger.DOMAIN,
+        "service_with_only_response",
+        lambda x: None,
+        None,
+        SupportsResponse.ONLY,
+    )
+
     descriptions = await service.async_get_all_descriptions(hass)
     assert "another_new_service" in descriptions[logger.DOMAIN]
+    assert "service_with_optional_response" in descriptions[logger.DOMAIN]
+    assert descriptions[logger.DOMAIN]["service_with_optional_response"][
+        "response"
+    ] == {"optional": True}
+    assert "service_with_only_response" in descriptions[logger.DOMAIN]
+    assert descriptions[logger.DOMAIN]["service_with_only_response"]["response"] == {
+        "optional": False
+    }
 
     # Verify the cache returns the same object
     assert await service.async_get_all_descriptions(hass) is descriptions
@@ -714,7 +737,8 @@ async def test_call_context_target_all(
         return_value=Mock(
             permissions=PolicyPermissions(
                 {"entities": {"entity_ids": {"light.kitchen": True}}}, None
-            )
+            ),
+            is_admin=False,
         ),
     ):
         await service.entity_service_call(
@@ -767,7 +791,7 @@ async def test_call_context_target_specific_no_auth(
     """Check targeting specific entities without auth."""
     with pytest.raises(exceptions.Unauthorized) as err, patch(
         "homeassistant.auth.AuthManager.async_get_user",
-        return_value=Mock(permissions=PolicyPermissions({}, None)),
+        return_value=Mock(permissions=PolicyPermissions({}, None), is_admin=False),
     ):
         await service.entity_service_call(
             hass,
diff --git a/tests/ruff.toml b/tests/ruff.toml
index dafc6fd6ad7..05971ce9a08 100644
--- a/tests/ruff.toml
+++ b/tests/ruff.toml
@@ -10,4 +10,28 @@ extend-select = [
     "PT015", # Assertion always fails, replace with pytest.fail()
     "PT021", # use yield instead of request.addfinalizer
     "PT022", # No teardown in fixture, replace useless yield with return
+]
+
+extend-ignore = [
+    "PLC", # pylint
+    "PLE", # pylint
+    "PLR", # pylint
+    "PLW", # pylint
+    "N815", # Variable {name} in class scope should not be mixedCase
+]
+
+[isort]
+known-first-party = [
+    "homeassistant",
+    "tests",
+    "script",
+]
+known-third-party = [
+    "syrupy",
+    "pytest",
+    "voluptuous",
+    "pylint",
+]
+forced-separate = [
+    "tests",
 ]
\ No newline at end of file
diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py
index b20f2af7669..68e6fc59987 100644
--- a/tests/test_config_entries.py
+++ b/tests/test_config_entries.py
@@ -68,9 +68,10 @@ def mock_handlers() -> Generator[None, None, None]:
 
 
 @pytest.fixture
-def manager(hass: HomeAssistant) -> config_entries.ConfigEntries:
+async def manager(hass: HomeAssistant) -> config_entries.ConfigEntries:
     """Fixture of a loaded config manager."""
     manager = config_entries.ConfigEntries(hass, {})
+    await manager.async_initialize()
     hass.config_entries = manager
     return manager
 
@@ -712,7 +713,9 @@ async def test_forward_entry_does_not_setup_entry_if_setup_fails(
     assert len(mock_setup_entry.mock_calls) == 0
 
 
-async def test_discovery_notification(hass: HomeAssistant) -> None:
+async def test_discovery_notification(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
     """Test that we create/dismiss a notification when source is discovery."""
     mock_integration(hass, MockModule("test"))
     mock_entity_platform(hass, "config_flow.test", None)
@@ -1052,7 +1055,9 @@ async def test_setup_does_not_retry_during_shutdown(hass: HomeAssistant) -> None
     assert len(mock_setup_entry.mock_calls) == 1
 
 
-async def test_create_entry_options(hass: HomeAssistant) -> None:
+async def test_create_entry_options(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
     """Test a config entry being created with options."""
 
     async def mock_async_setup(hass, config):
@@ -2482,7 +2487,9 @@ async def test_partial_flows_hidden(
         assert "config_entry_discovery" in notifications
 
 
-async def test_async_setup_init_entry(hass: HomeAssistant) -> None:
+async def test_async_setup_init_entry(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
     """Test a config entry being initialized during integration setup."""
 
     async def mock_async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
@@ -2527,7 +2534,7 @@ async def test_async_setup_init_entry(hass: HomeAssistant) -> None:
 
 
 async def test_async_setup_init_entry_completes_before_loaded_event_fires(
-    hass: HomeAssistant,
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
 ) -> None:
     """Test a config entry being initialized during integration setup before the loaded event fires."""
     load_events: list[Event] = []
diff --git a/tests/test_core.py b/tests/test_core.py
index 5cb92ffe5c9..8b63eab7b42 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -33,8 +33,16 @@ from homeassistant.const import (
     __version__,
 )
 import homeassistant.core as ha
-from homeassistant.core import HassJob, HomeAssistant, State
+from homeassistant.core import (
+    HassJob,
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    State,
+    SupportsResponse,
+)
 from homeassistant.exceptions import (
+    HomeAssistantError,
     InvalidEntityFormatError,
     InvalidStateError,
     MaxLengthExceeded,
@@ -957,9 +965,7 @@ async def test_serviceregistry_call_with_blocking_done_in_time(
     assert registered_events[0].data["domain"] == "test_domain"
     assert registered_events[0].data["service"] == "register_calls"
 
-    assert await hass.services.async_call(
-        "test_domain", "REGISTER_CALLS", blocking=True
-    )
+    await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=True)
     assert len(calls) == 1
 
 
@@ -981,9 +987,7 @@ async def test_serviceregistry_async_service(hass: HomeAssistant) -> None:
 
     hass.services.async_register("test_domain", "register_calls", service_handler)
 
-    assert await hass.services.async_call(
-        "test_domain", "REGISTER_CALLS", blocking=True
-    )
+    await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=True)
     assert len(calls) == 1
 
 
@@ -1000,9 +1004,7 @@ async def test_serviceregistry_async_service_partial(hass: HomeAssistant) -> Non
     )
     await hass.async_block_till_done()
 
-    assert await hass.services.async_call(
-        "test_domain", "REGISTER_CALLS", blocking=True
-    )
+    await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=True)
     assert len(calls) == 1
 
 
@@ -1017,9 +1019,7 @@ async def test_serviceregistry_callback_service(hass: HomeAssistant) -> None:
 
     hass.services.async_register("test_domain", "register_calls", service_handler)
 
-    assert await hass.services.async_call(
-        "test_domain", "REGISTER_CALLS", blocking=True
-    )
+    await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=True)
     assert len(calls) == 1
 
 
@@ -1063,12 +1063,10 @@ async def test_serviceregistry_async_service_raise_exception(
     hass.services.async_register("test_domain", "register_calls", service_handler)
 
     with pytest.raises(ValueError):
-        assert await hass.services.async_call(
-            "test_domain", "REGISTER_CALLS", blocking=True
-        )
+        await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=True)
 
     # Non-blocking service call never throw exception
-    await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=False)
+    hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=False)
     await hass.async_block_till_done()
 
 
@@ -1085,15 +1083,168 @@ async def test_serviceregistry_callback_service_raise_exception(
     hass.services.async_register("test_domain", "register_calls", service_handler)
 
     with pytest.raises(ValueError):
-        assert await hass.services.async_call(
-            "test_domain", "REGISTER_CALLS", blocking=True
-        )
+        await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=True)
 
     # Non-blocking service call never throw exception
-    await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=False)
+    hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=False)
     await hass.async_block_till_done()
 
 
+@pytest.mark.parametrize(
+    "supports_response",
+    [
+        SupportsResponse.ONLY,
+        SupportsResponse.OPTIONAL,
+    ],
+)
+async def test_serviceregistry_async_return_response(
+    hass: HomeAssistant, supports_response: SupportsResponse
+) -> None:
+    """Test service call for a service that returns response data."""
+
+    async def service_handler(call: ServiceCall) -> ServiceResponse:
+        """Service handler coroutine."""
+        assert call.return_response
+        return {"test-reply": "test-value1"}
+
+    hass.services.async_register(
+        "test_domain",
+        "test_service",
+        service_handler,
+        supports_response=supports_response,
+    )
+    result = await hass.services.async_call(
+        "test_domain",
+        "test_service",
+        service_data={},
+        blocking=True,
+        return_response=True,
+    )
+    await hass.async_block_till_done()
+    assert result == {"test-reply": "test-value1"}
+
+
+async def test_services_call_return_response_requires_blocking(
+    hass: HomeAssistant,
+) -> None:
+    """Test that non-blocking service calls cannot ask for response data."""
+    async_mock_service(hass, "test_domain", "test_service")
+    with pytest.raises(ValueError, match="when blocking=False"):
+        await hass.services.async_call(
+            "test_domain",
+            "test_service",
+            service_data={},
+            blocking=False,
+            return_response=True,
+        )
+
+
+@pytest.mark.parametrize(
+    ("response_data", "expected_error"),
+    [
+        (True, "expected a dictionary"),
+        (False, "expected a dictionary"),
+        (None, "expected a dictionary"),
+        ("some-value", "expected a dictionary"),
+        (["some-list"], "expected a dictionary"),
+    ],
+)
+async def test_serviceregistry_return_response_invalid(
+    hass: HomeAssistant, response_data: Any, expected_error: str
+) -> None:
+    """Test service call response data must be json serializable objects."""
+
+    def service_handler(call: ServiceCall) -> ServiceResponse:
+        """Service handler coroutine."""
+        assert call.return_response
+        return response_data
+
+    hass.services.async_register(
+        "test_domain",
+        "test_service",
+        service_handler,
+        supports_response=SupportsResponse.ONLY,
+    )
+    with pytest.raises(HomeAssistantError, match=expected_error):
+        await hass.services.async_call(
+            "test_domain",
+            "test_service",
+            service_data={},
+            blocking=True,
+            return_response=True,
+        )
+        await hass.async_block_till_done()
+
+
+@pytest.mark.parametrize(
+    ("supports_response", "return_response", "expected_error"),
+    [
+        (SupportsResponse.NONE, True, "not support responses"),
+        (SupportsResponse.ONLY, False, "caller did not ask for responses"),
+    ],
+)
+async def test_serviceregistry_return_response_arguments(
+    hass: HomeAssistant,
+    supports_response: SupportsResponse,
+    return_response: bool,
+    expected_error: str,
+) -> None:
+    """Test service call response data invalid arguments."""
+
+    hass.services.async_register(
+        "test_domain",
+        "test_service",
+        "service_handler",
+        supports_response=supports_response,
+    )
+
+    with pytest.raises(ValueError, match=expected_error):
+        await hass.services.async_call(
+            "test_domain",
+            "test_service",
+            service_data={},
+            blocking=True,
+            return_response=return_response,
+        )
+
+
+@pytest.mark.parametrize(
+    ("return_response", "expected_response_data"),
+    [
+        (True, {"key": "value"}),
+        (False, None),
+    ],
+)
+async def test_serviceregistry_return_response_optional(
+    hass: HomeAssistant,
+    return_response: bool,
+    expected_response_data: Any,
+) -> None:
+    """Test optional service call response data."""
+
+    def service_handler(call: ServiceCall) -> ServiceResponse:
+        """Service handler coroutine."""
+        if call.return_response:
+            return {"key": "value"}
+        return None
+
+    hass.services.async_register(
+        "test_domain",
+        "test_service",
+        service_handler,
+        supports_response=SupportsResponse.OPTIONAL,
+    )
+    response_data = await hass.services.async_call(
+        "test_domain",
+        "test_service",
+        service_data={},
+        blocking=True,
+        return_response=return_response,
+    )
+    await hass.async_block_till_done()
+    assert response_data == expected_response_data
+
+
 async def test_config_defaults() -> None:
     """Test config defaults."""
     hass = Mock()
@@ -1359,42 +1510,6 @@ async def test_async_functions_with_callback(hass: HomeAssistant) -> None:
     assert len(runs) == 3
 
 
-@pytest.mark.parametrize("cancel_call", [True, False])
-async def test_cancel_service_task(hass: HomeAssistant, cancel_call) -> None:
-    """Test cancellation."""
-    service_called = asyncio.Event()
-    service_cancelled = False
-
-    async def service_handler(call):
-        nonlocal service_cancelled
-        service_called.set()
-        try:
-            await asyncio.sleep(10)
-        except asyncio.CancelledError:
-            service_cancelled = True
-            raise
-
-    hass.services.async_register("test_domain", "test_service", service_handler)
-    call_task = hass.async_create_task(
-        hass.services.async_call("test_domain", "test_service", blocking=True)
-    )
-
-    tasks_1 = asyncio.all_tasks()
-    await asyncio.wait_for(service_called.wait(), timeout=1)
-    tasks_2 = asyncio.all_tasks() - tasks_1
-    assert len(tasks_2) == 1
-    service_task = tasks_2.pop()
-
-    if cancel_call:
-        call_task.cancel()
-    else:
-        service_task.cancel()
-    with pytest.raises(asyncio.CancelledError):
-        await call_task
-
-    assert service_cancelled
-
-
 def test_valid_entity_id() -> None:
     """Test valid entity ID."""
     for invalid in [
diff --git a/tests/test_data_entry_flow.py b/tests/test_data_entry_flow.py
index c3afc3bc8ba..168f97ba779 100644
--- a/tests/test_data_entry_flow.py
+++ b/tests/test_data_entry_flow.py
@@ -462,6 +462,22 @@ async def test_async_has_matching_flow(
     assert result["progress_action"] == "task_one"
     assert len(manager.async_progress()) == 1
     assert len(manager.async_progress_by_handler("test")) == 1
+    assert (
+        len(
+            manager.async_progress_by_handler(
+                "test", match_context={"source": config_entries.SOURCE_HOMEKIT}
+            )
+        )
+        == 1
+    )
+    assert (
+        len(
+            manager.async_progress_by_handler(
+                "test", match_context={"source": config_entries.SOURCE_BLUETOOTH}
+            )
+        )
+        == 0
+    )
     assert manager.async_get(result["flow_id"])["handler"] == "test"
 
     assert (
diff --git a/tests/testing_config/custom_components/test/weather.py b/tests/testing_config/custom_components/test/weather.py
index a2977e114e4..a5c49fb92c2 100644
--- a/tests/testing_config/custom_components/test/weather.py
+++ b/tests/testing_config/custom_components/test/weather.py
@@ -5,10 +5,15 @@ Call init before using it in your tests to ensure clean test data.
 from __future__ import annotations
 
 from homeassistant.components.weather import (
+    ATTR_FORECAST_CLOUD_COVERAGE,
+    ATTR_FORECAST_HUMIDITY,
+    ATTR_FORECAST_NATIVE_APPARENT_TEMP,
+    ATTR_FORECAST_NATIVE_DEW_POINT,
     ATTR_FORECAST_NATIVE_PRECIPITATION,
     ATTR_FORECAST_NATIVE_PRESSURE,
     ATTR_FORECAST_NATIVE_TEMP,
     ATTR_FORECAST_NATIVE_TEMP_LOW,
+    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED,
     ATTR_FORECAST_NATIVE_WIND_SPEED,
     ATTR_FORECAST_PRECIPITATION,
     ATTR_FORECAST_PRESSURE,
@@ -46,6 +51,16 @@ class MockWeather(MockEntity, WeatherEntity):
         """Return the platform temperature."""
         return self._handle("native_temperature")
 
+    @property
+    def native_apparent_temperature(self) -> float | None:
+        """Return the platform apparent temperature."""
+        return self._handle("native_apparent_temperature")
+
+    @property
+    def native_dew_point(self) -> float | None:
+        """Return the platform dewpoint temperature."""
+        return self._handle("native_dew_point")
+
     @property
     def native_temperature_unit(self) -> str | None:
         """Return the unit of measurement for temperature."""
@@ -66,6 +81,11 @@ class MockWeather(MockEntity, WeatherEntity):
         """Return the humidity."""
         return self._handle("humidity")
 
+    @property
+    def native_wind_gust_speed(self) -> float | None:
+        """Return the wind speed."""
+        return self._handle("native_wind_gust_speed")
+
     @property
     def native_wind_speed(self) -> float | None:
         """Return the wind speed."""
@@ -86,6 +106,11 @@ class MockWeather(MockEntity, WeatherEntity):
         """Return the ozone level."""
         return self._handle("ozone")
 
+    @property
+    def cloud_coverage(self) -> float | None:
+        """Return the cloud coverage in %."""
+        return self._handle("cloud_coverage")
+
     @property
     def native_visibility(self) -> float | None:
         """Return the visibility."""
@@ -195,13 +220,18 @@ class MockWeatherMockForecast(MockWeather):
         return [
             {
                 ATTR_FORECAST_NATIVE_TEMP: self.native_temperature,
+                ATTR_FORECAST_NATIVE_APPARENT_TEMP: self.native_apparent_temperature,
                 ATTR_FORECAST_NATIVE_TEMP_LOW: self.native_temperature,
+                ATTR_FORECAST_NATIVE_DEW_POINT: self.native_dew_point,
+                ATTR_FORECAST_CLOUD_COVERAGE: self.cloud_coverage,
                 ATTR_FORECAST_NATIVE_PRESSURE: self.native_pressure,
+                ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: self.native_wind_gust_speed,
                 ATTR_FORECAST_NATIVE_WIND_SPEED: self.native_wind_speed,
                 ATTR_FORECAST_WIND_BEARING: self.wind_bearing,
                 ATTR_FORECAST_NATIVE_PRECIPITATION: self._values.get(
                     "native_precipitation"
                 ),
+                ATTR_FORECAST_HUMIDITY: self.humidity,
             }
         ]
 
diff --git a/tests/util/test_process.py b/tests/util/test_process.py
index 243e9f53fca..ae28f5d82fc 100644
--- a/tests/util/test_process.py
+++ b/tests/util/test_process.py
@@ -12,7 +12,7 @@ async def test_kill_process() -> None:
     """Test killing a process."""
     sleeper = subprocess.Popen(
         "sleep 1000",
-        shell=True,  # nosec # shell by design
+        shell=True,  # noqa: S602 # shell by design
         stdout=subprocess.DEVNULL,
         stderr=subprocess.DEVNULL,
     )