Modifies the async_set_temperature method to execute logic synchronously in the event loop, to avoid thread safety violations with legacy synchronous implementations.

Improve target temperature management by executing the adjustment method in an executor to avoid blocking the event loop.
Execute the temperature definition directly in the event loop to ensure thread safety.
2026-05-06 08:36:42 +02:00 · 2025-11-22 21:04:02 +00:00 · 2025-11-22 20:40:10 +00:00 · 2025-11-22 18:18:50 +00:00 · 2025-11-22 18:50:15 +01:00 · 2025-11-22 18:48:59 +01:00
3038 changed files with 195351 additions and 90972 deletions
@@ -27,7 +27,7 @@ jobs:
      publish: ${{ steps.version.outputs.publish }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          fetch-depth: 0

@@ -90,7 +90,7 @@ jobs:
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

      - name: Download nightly wheels of frontend
        if: needs.init.outputs.channel == 'dev'
@@ -162,18 +162,6 @@ jobs:
            sed -i "s|home-assistant-intents==.*||" requirements_all.txt
          fi

-      - name: Adjustments for armhf
-        if: matrix.arch == 'armhf'
-        run: |
-          # Pandas has issues building on armhf, it is expected they
-          # 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|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
-
      - name: Download translations
        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
@@ -226,24 +214,16 @@ jobs:
          - odroid-c4
          - odroid-m1
          - odroid-n2
-          - odroid-xu
-          - qemuarm
          - qemuarm-64
-          - qemux86
          - qemux86-64
-          - raspberrypi
-          - raspberrypi2
-          - raspberrypi3
          - raspberrypi3-64
-          - raspberrypi4
          - raspberrypi4-64
          - raspberrypi5-64
-          - tinker
          - yellow
          - green
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

      - name: Set build additional args
        run: |
@@ -281,7 +261,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

      - name: Initialize git
        uses: home-assistant/actions/helpers/git-init@master
@@ -297,6 +277,7 @@ jobs:
          key-description: "Home Assistant Core"
          version: ${{ needs.init.outputs.version }}
          channel: ${{ needs.init.outputs.channel }}
+          exclude-list: '["odroid-xu","qemuarm","qemux86","raspberrypi","raspberrypi2","raspberrypi3","raspberrypi4","tinker"]'

      - name: Update version file (stable -> beta)
        if: needs.init.outputs.channel == 'stable'
@@ -306,6 +287,7 @@ jobs:
          key-description: "Home Assistant Core"
          version: ${{ needs.init.outputs.version }}
          channel: beta
+          exclude-list: '["odroid-xu","qemuarm","qemux86","raspberrypi","raspberrypi2","raspberrypi3","raspberrypi4","tinker"]'

  publish_container:
    name: Publish meta container for ${{ matrix.registry }}
@@ -323,7 +305,7 @@ jobs:
        registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

      - name: Install Cosign
        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
@@ -357,27 +339,12 @@ jobs:

            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 "${registry}/home-assistant:${tag_l}" \
              "${registry}/amd64-homeassistant:${tag_r}" \
              --os linux --arch amd64

-            docker manifest annotate "${registry}/home-assistant:${tag_l}" \
-              "${registry}/i386-homeassistant:${tag_r}" \
-              --os linux --arch 386
-
-            docker manifest annotate "${registry}/home-assistant:${tag_l}" \
-              "${registry}/armhf-homeassistant:${tag_r}" \
-              --os linux --arch arm --variant=v6
-
-            docker manifest annotate "${registry}/home-assistant:${tag_l}" \
-              "${registry}/armv7-homeassistant:${tag_r}" \
-              --os linux --arch arm --variant=v7
-
            docker manifest annotate "${registry}/home-assistant:${tag_l}" \
              "${registry}/aarch64-homeassistant:${tag_r}" \
              --os linux --arch arm64 --variant=v8
@@ -405,23 +372,14 @@ jobs:

          # 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 }}"

          if [[ "${{ matrix.registry }}" ==  "docker.io/homeassistant" ]]; then
            # 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 }}"
          fi

@@ -456,7 +414,7 @@ jobs:
    if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
@@ -501,7 +459,7 @@ jobs:
      HASSFEST_IMAGE_TAG: ghcr.io/home-assistant/hassfest:${{ needs.init.outputs.version }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

      - name: Login to GitHub Container Registry
        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
@@ -37,10 +37,10 @@ on:
        type: boolean

 env:
-  CACHE_VERSION: 1
+  CACHE_VERSION: 2
  UV_CACHE_VERSION: 1
  MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2025.11"
+  HA_SHORT_VERSION: "2025.12"
  DEFAULT_PYTHON: "3.13"
  ALL_PYTHON_VERSIONS: "['3.13', '3.14']"
  # 10.3 is the oldest supported version
@@ -99,7 +99,7 @@ jobs:
    steps:
      - &checkout
        name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
      - name: Generate partial Python venv restore key
        id: generate_python_cache_key
        run: |
@@ -364,13 +364,13 @@ jobs:
      - name: Run check-json
        run: |
          . venv/bin/activate
-          pre-commit run --hook-stage manual check-json --all-files
+          pre-commit run --hook-stage manual check-json --all-files --show-diff-on-failure

      - name: Run prettier (fully)
        if: needs.info.outputs.test_full_suite == 'true'
        run: |
          . venv/bin/activate
-          pre-commit run --hook-stage manual prettier --all-files
+          pre-commit run --hook-stage manual prettier --all-files --show-diff-on-failure

      - name: Run prettier (partially)
        if: needs.info.outputs.test_full_suite == 'false'
@@ -378,7 +378,7 @@ jobs:
        run: |
          . venv/bin/activate
          shopt -s globstar
-          pre-commit run --hook-stage manual prettier --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/{*,**/*}
+          pre-commit run --hook-stage manual prettier --show-diff-on-failure --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/{*,**/*}

      - name: Register check executables problem matcher
        run: |
@@ -386,7 +386,7 @@ jobs:
      - name: Run executables check
        run: |
          . venv/bin/activate
-          pre-commit run --hook-stage manual check-executables-have-shebangs --all-files
+          pre-commit run --hook-stage manual check-executables-have-shebangs --all-files --show-diff-on-failure

      - name: Register codespell problem matcher
        run: |
@@ -502,7 +502,6 @@ jobs:
            libavfilter-dev \
            libavformat-dev \
            libavutil-dev \
-            libgammu-dev \
            libswresample-dev \
            libswscale-dev \
            libudev-dev
@@ -623,7 +622,7 @@ jobs:
    steps:
      - *checkout
      - name: Dependency review
-        uses: actions/dependency-review-action@40c09b7dc99638e5ddb0bfd91c1673effc064d8a # v4.8.1
+        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
        with:
          license-check: false # We use our own license audit checks

@@ -801,8 +800,7 @@ jobs:
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            bluez \
            ffmpeg \
-            libturbojpeg \
-            libgammu-dev
+            libturbojpeg
      - *checkout
      - *setup-python-default
      - *cache-restore-python-default
@@ -853,7 +851,6 @@ jobs:
            bluez \
            ffmpeg \
            libturbojpeg \
-            libgammu-dev \
            libxml2-utils
      - *checkout
      - *setup-python-matrix
@@ -1233,7 +1230,6 @@ jobs:
            bluez \
            ffmpeg \
            libturbojpeg \
-            libgammu-dev \
            libxml2-utils
      - *checkout
      - *setup-python-matrix
@@ -21,14 +21,14 @@ jobs:

    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
        with:
          languages: python

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/analyze@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
        with:
          category: "/language:python"
@@ -19,7 +19,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
@@ -33,7 +33,7 @@ jobs:
    steps:
      - &checkout
        name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
@@ -77,20 +77,8 @@ jobs:

            # Use C-Extension for SQLAlchemy
            echo "REQUIRE_SQLALCHEMY_CEXT=1"
-
-            # Add additional pip wheel build constraints
-            echo "PIP_CONSTRAINT=build_constraints.txt"
          ) > .env_file

-      - name: Write pip wheel build constraints
-        run: |
-          (
-            # ninja 1.11.1.2 + 1.11.1.3 seem to be broken on at least armhf
-            # this caused the numpy builds to fail
-            # https://github.com/scikit-build/ninja-python-distributions/issues/274
-            echo "ninja==1.11.1.1"
-          ) > build_constraints.txt
-
      - name: Upload env_file
        uses: &actions-upload-artifact actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
@@ -99,13 +87,6 @@ jobs:
          include-hidden-files: true
          overwrite: true

-      - name: Upload build_constraints
-        uses: *actions-upload-artifact
-        with:
-          name: build_constraints
-          path: ./build_constraints.txt
-          overwrite: true
-
      - name: Upload requirements_diff
        uses: *actions-upload-artifact
        with:
@@ -138,13 +119,6 @@ jobs:
          - os: ubuntu-latest
          - arch: aarch64
            os: ubuntu-24.04-arm
-        exclude:
-          - abi: cp314
-            arch: armv7
-          - abi: cp314
-            arch: armhf
-          - abi: cp314
-            arch: i386
    steps:
      - *checkout

@@ -154,12 +128,6 @@ jobs:
        with:
          name: env_file

-      - &download-build-constraints
-        name: Download build_constraints
-        uses: *actions-download-artifact
-        with:
-          name: build_constraints
-
      - &download-requirements-diff
        name: Download requirements_diff
        uses: *actions-download-artifact
@@ -199,7 +167,7 @@ jobs:
      - *checkout

      - *download-env-file
-      - *download-build-constraints
+
      - *download-requirements-diff

      - name: Download requirements_all_wheels
@@ -209,10 +177,6 @@ jobs:

      - name: Adjust build env
        run: |
-          if [ "${{ matrix.arch }}" = "i386" ]; then
-            echo "NPY_DISABLE_SVML=1" >> .env_file
-          fi
-
          # Do not pin numpy in wheels building
          sed -i "/numpy/d" homeassistant/package_constraints.txt
          # Don't build wheels for uv as uv requires a greater version of rust as currently available on alpine
@@ -228,7 +192,7 @@ jobs:
          arch: ${{ matrix.arch }}
          wheels-key: ${{ secrets.WHEELS_KEY }}
          env-file: true
-          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm;zlib-ng-dev"
+          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm;zlib-ng-dev"
          skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
          constraints: "homeassistant/package_constraints.txt"
          requirements-diff: "requirements_diff.txt"
@@ -33,10 +33,13 @@ repos:
    rev: v1.37.1
    hooks:
      - id: yamllint
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.3
+  - repo: https://github.com/rbubley/mirrors-prettier
+    rev: v3.6.2
    hooks:
      - id: prettier
+        additional_dependencies:
+          - prettier@3.6.2
+          - prettier-plugin-sort-json@4.1.1
  - repo: https://github.com/cdce8p/python-typing-update
    rev: v0.6.0
    hooks:
@@ -84,7 +87,7 @@ repos:
        pass_filenames: false
        language: script
        types: [text]
-        files: ^(homeassistant/.+/(icons|manifest|strings)\.json|homeassistant/.+/(quality_scale)\.yaml|homeassistant/brands/.*\.json|homeassistant/.+/services\.yaml|script/hassfest/(?!metadata|mypy_config).+\.py|requirements.+\.txt)$
+        files: ^(homeassistant/.+/(icons|manifest|strings)\.json|homeassistant/.+/(conditions|quality_scale|services|triggers)\.yaml|homeassistant/brands/.*\.json|script/hassfest/(?!metadata|mypy_config).+\.py|requirements.+\.txt)$
      - id: hassfest-metadata
        name: hassfest-metadata
        entry: script/run-in-env.sh python3 -m script.hassfest -p metadata,docker
@@ -0,0 +1,24 @@
+/** @type {import("prettier").Config} */
+module.exports = {
+  overrides: [
+    {
+      files: "./homeassistant/**/*.json",
+      options: {
+        plugins: [require.resolve("prettier-plugin-sort-json")],
+        jsonRecursiveSort: true,
+        jsonSortOrder: JSON.stringify({ [/.*/]: "numeric" }),
+      },
+    },
+    {
+      files: ["manifest.json", "./**/brands/*.json"],
+      options: {
+        // domain and name should stay at the top
+        jsonSortOrder: JSON.stringify({
+          domain: null,
+          name: null,
+          [/.*/]: "numeric",
+        }),
+      },
+    },
+  ],
+};
@@ -107,6 +107,7 @@ homeassistant.components.automation.*
 homeassistant.components.awair.*
 homeassistant.components.axis.*
 homeassistant.components.azure_storage.*
+homeassistant.components.backblaze_b2.*
 homeassistant.components.backup.*
 homeassistant.components.baf.*
 homeassistant.components.bang_olufsen.*
@@ -230,6 +231,7 @@ homeassistant.components.google_cloud.*
 homeassistant.components.google_drive.*
 homeassistant.components.google_photos.*
 homeassistant.components.google_sheets.*
+homeassistant.components.google_weather.*
 homeassistant.components.govee_ble.*
 homeassistant.components.gpsd.*
 homeassistant.components.greeneye_monitor.*
@@ -395,7 +397,6 @@ homeassistant.components.otbr.*
 homeassistant.components.overkiz.*
 homeassistant.components.overseerr.*
 homeassistant.components.p1_monitor.*
-homeassistant.components.pandora.*
 homeassistant.components.panel_custom.*
 homeassistant.components.paperless_ngx.*
 homeassistant.components.peblar.*
@@ -578,6 +579,7 @@ homeassistant.components.wiz.*
 homeassistant.components.wled.*
 homeassistant.components.workday.*
 homeassistant.components.worldclock.*
+homeassistant.components.xbox.*
 homeassistant.components.xiaomi_ble.*
 homeassistant.components.yale_smart_alarm.*
 homeassistant.components.yalexs_ble.*
@@ -10,16 +10,16 @@
  // Pyright is too pedantic for Home Assistant
  "python.analysis.typeCheckingMode": "basic",
  "[python]": {
-    "editor.defaultFormatter": "charliermarsh.ruff"
+    "editor.defaultFormatter": "charliermarsh.ruff",
  },
  "[json][jsonc][yaml]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
  },
  "json.schemas": [
    {
      "fileMatch": ["homeassistant/components/*/manifest.json"],
      // This value differs between working with devcontainer and locally, therefore this value should NOT be in sync!
-      "url": "./script/json_schemas/manifest_schema.json"
-    }
-  ]
+      "url": "./script/json_schemas/manifest_schema.json",
+    },
+  ],
 }
@@ -196,6 +196,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/azure_service_bus/ @hfurubotten
 /homeassistant/components/azure_storage/ @zweckj
 /tests/components/azure_storage/ @zweckj
+/homeassistant/components/backblaze_b2/ @hugo-vrijswijk @ElCruncharino
+/tests/components/backblaze_b2/ @hugo-vrijswijk @ElCruncharino
 /homeassistant/components/backup/ @home-assistant/core
 /tests/components/backup/ @home-assistant/core
 /homeassistant/components/baf/ @bdraco @jfroy
@@ -316,8 +318,6 @@ build.json @home-assistant/supervisor
 /tests/components/cpuspeed/ @fabaff
 /homeassistant/components/crownstone/ @Crownstone @RicArch97
 /tests/components/crownstone/ @Crownstone @RicArch97
-/homeassistant/components/cups/ @fabaff
-/tests/components/cups/ @fabaff
 /homeassistant/components/cync/ @Kinachi249
 /tests/components/cync/ @Kinachi249
 /homeassistant/components/daikin/ @fredrike
@@ -510,8 +510,6 @@ build.json @home-assistant/supervisor
 /tests/components/fjaraskupan/ @elupus
 /homeassistant/components/flexit_bacnet/ @lellky @piotrbulinski
 /tests/components/flexit_bacnet/ @lellky @piotrbulinski
-/homeassistant/components/flick_electric/ @ZephireNZ
-/tests/components/flick_electric/ @ZephireNZ
 /homeassistant/components/flipr/ @cnico
 /tests/components/flipr/ @cnico
 /homeassistant/components/flo/ @dmulcahey
@@ -609,6 +607,8 @@ build.json @home-assistant/supervisor
 /tests/components/google_tasks/ @allenporter
 /homeassistant/components/google_travel_time/ @eifinger
 /tests/components/google_travel_time/ @eifinger
+/homeassistant/components/google_weather/ @tronikos
+/tests/components/google_weather/ @tronikos
 /homeassistant/components/govee_ble/ @bdraco
 /tests/components/govee_ble/ @bdraco
 /homeassistant/components/govee_light_local/ @Galorhallen
@@ -627,6 +627,8 @@ build.json @home-assistant/supervisor
 /tests/components/guardian/ @bachya
 /homeassistant/components/habitica/ @tr4nt0r
 /tests/components/habitica/ @tr4nt0r
+/homeassistant/components/hanna/ @bestycame
+/tests/components/hanna/ @bestycame
 /homeassistant/components/hardkernel/ @home-assistant/core
 /tests/components/hardkernel/ @home-assistant/core
 /homeassistant/components/hardware/ @home-assistant/core
@@ -846,6 +848,8 @@ build.json @home-assistant/supervisor
 /tests/components/kraken/ @eifinger
 /homeassistant/components/kulersky/ @emlove
 /tests/components/kulersky/ @emlove
+/homeassistant/components/labs/ @home-assistant/core
+/tests/components/labs/ @home-assistant/core
 /homeassistant/components/lacrosse_view/ @IceBotYT
 /tests/components/lacrosse_view/ @IceBotYT
 /homeassistant/components/lamarzocco/ @zweckj
@@ -1019,8 +1023,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/msteams/ @peroyvind
 /homeassistant/components/mullvad/ @meichthys
 /tests/components/mullvad/ @meichthys
-/homeassistant/components/music_assistant/ @music-assistant
-/tests/components/music_assistant/ @music-assistant
+/homeassistant/components/music_assistant/ @music-assistant @arturpragacz
+/tests/components/music_assistant/ @music-assistant @arturpragacz
 /homeassistant/components/mutesync/ @currentoor
 /tests/components/mutesync/ @currentoor
 /homeassistant/components/my/ @home-assistant/core
@@ -1376,6 +1380,8 @@ build.json @home-assistant/supervisor
 /tests/components/sanix/ @tomaszsluszniak
 /homeassistant/components/satel_integra/ @Tommatheussen
 /tests/components/satel_integra/ @Tommatheussen
+/homeassistant/components/saunum/ @mettolen
+/tests/components/saunum/ @mettolen
 /homeassistant/components/scene/ @home-assistant/core
 /tests/components/scene/ @home-assistant/core
 /homeassistant/components/schedule/ @home-assistant/core
@@ -1479,8 +1485,6 @@ build.json @home-assistant/supervisor
 /tests/components/smhi/ @gjohansson-ST
 /homeassistant/components/smlight/ @tl-sl
 /tests/components/smlight/ @tl-sl
-/homeassistant/components/sms/ @ocalvo
-/tests/components/sms/ @ocalvo
 /homeassistant/components/snapcast/ @luar123
 /tests/components/snapcast/ @luar123
 /homeassistant/components/snmp/ @nmaggioni
@@ -1543,8 +1547,8 @@ build.json @home-assistant/supervisor
 /tests/components/suez_water/ @ooii @jb101010-2
 /homeassistant/components/sun/ @home-assistant/core
 /tests/components/sun/ @home-assistant/core
-/homeassistant/components/sunricher_dali_center/ @niracler
-/tests/components/sunricher_dali_center/ @niracler
+/homeassistant/components/sunricher_dali/ @niracler
+/tests/components/sunricher_dali/ @niracler
 /homeassistant/components/supla/ @mwegrzynek
 /homeassistant/components/surepetcare/ @benleb @danielhiversen
 /tests/components/surepetcare/ @benleb @danielhiversen
@@ -1721,8 +1725,8 @@ build.json @home-assistant/supervisor
 /tests/components/vallox/ @andre-richter @slovdahl @viiru- @yozik04
 /homeassistant/components/valve/ @home-assistant/core
 /tests/components/valve/ @home-assistant/core
-/homeassistant/components/vegehub/ @ghowevege
-/tests/components/vegehub/ @ghowevege
+/homeassistant/components/vegehub/ @thulrus
+/tests/components/vegehub/ @thulrus
 /homeassistant/components/velbus/ @Cereal2nd @brefra
 /tests/components/velbus/ @Cereal2nd @brefra
 /homeassistant/components/velux/ @Julius2342 @DeerMaximum @pawlizio @wollew
@@ -1736,6 +1740,8 @@ build.json @home-assistant/supervisor
 /tests/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak @sapuseven
 /homeassistant/components/vicare/ @CFenner
 /tests/components/vicare/ @CFenner
+/homeassistant/components/victron_ble/ @rajlaud
+/tests/components/victron_ble/ @rajlaud
 /homeassistant/components/victron_remote_monitoring/ @AndyTempel
 /tests/components/victron_remote_monitoring/ @AndyTempel
 /homeassistant/components/vilfo/ @ManneW
@@ -1821,8 +1827,8 @@ build.json @home-assistant/supervisor
 /tests/components/ws66i/ @ssaenger
 /homeassistant/components/wyoming/ @synesthesiam
 /tests/components/wyoming/ @synesthesiam
-/homeassistant/components/xbox/ @hunterjm
-/tests/components/xbox/ @hunterjm
+/homeassistant/components/xbox/ @hunterjm @tr4nt0r
+/tests/components/xbox/ @hunterjm @tr4nt0r
 /homeassistant/components/xiaomi_aqara/ @danielhiversen @syssi
 /tests/components/xiaomi_aqara/ @danielhiversen @syssi
 /homeassistant/components/xiaomi_ble/ @Jc2k @Ernst79
@@ -21,17 +21,15 @@ ARG BUILD_ARCH
 RUN \
    case "${BUILD_ARCH}" in \
        "aarch64") go2rtc_suffix='arm64' ;; \
-        "armhf") go2rtc_suffix='armv6' ;; \
-        "armv7") go2rtc_suffix='arm' ;; \
        *) go2rtc_suffix=${BUILD_ARCH} ;; \
    esac \
-    && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.11/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
+    && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.12/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
    && chmod +x /bin/go2rtc \
    # Verify go2rtc can be executed
    && go2rtc --version

 # Install uv
-RUN pip3 install uv==0.9.5
+RUN pip3 install uv==0.9.6

 WORKDIR /usr/src

@@ -13,7 +13,6 @@ RUN \
        libavcodec-dev \
        libavdevice-dev \
        libavutil-dev \
-        libgammu-dev \
        libswscale-dev \
        libswresample-dev \
        libavfilter-dev \
@@ -1,10 +1,7 @@
 image: ghcr.io/home-assistant/{arch}-homeassistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.10.1
-  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.10.1
-  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.10.1
-  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.10.1
-  i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.10.1
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.11.0
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.11.0
 cosign:
  base_identity: https://github.com/home-assistant/docker/.*
  identity: https://github.com/home-assistant/core/.*
@@ -6,7 +6,6 @@ Sending HOTP through notify service
 from __future__ import annotations

 import asyncio
-from collections import OrderedDict
 import logging
 from typing import Any, cast

@@ -304,14 +303,15 @@ class NotifySetupFlow(SetupFlow[NotifyAuthModule]):
        if not self._available_notify_services:
            return self.async_abort(reason="no_available_service")

-        schema: dict[str, Any] = OrderedDict()
-        schema["notify_service"] = vol.In(self._available_notify_services)
-        schema["target"] = vol.Optional(str)
-
-        return self.async_show_form(
-            step_id="init", data_schema=vol.Schema(schema), errors=errors
+        schema = vol.Schema(
+            {
+                vol.Required("notify_service"): vol.In(self._available_notify_services),
+                vol.Optional("target"): str,
+            }
        )

+        return self.async_show_form(step_id="init", data_schema=schema, errors=errors)
+
    async def async_step_setup(
        self, user_input: dict[str, str] | None = None
    ) -> FlowResult:
@@ -179,12 +179,18 @@ class Data:
        user_hash = base64.b64decode(found["password"])

        # bcrypt.checkpw is timing-safe
-        if not bcrypt.checkpw(password.encode(), user_hash):
+        # With bcrypt 5.0 passing a password longer than 72 bytes raises a ValueError.
+        # Previously the password was silently truncated.
+        # https://github.com/pyca/bcrypt/pull/1000
+        if not bcrypt.checkpw(password.encode()[:72], user_hash):
            raise InvalidAuth

    def hash_password(self, password: str, for_storage: bool = False) -> bytes:
        """Encode a password."""
-        hashed: bytes = bcrypt.hashpw(password.encode(), bcrypt.gensalt(rounds=12))
+        # With bcrypt 5.0 passing a password longer than 72 bytes raises a ValueError.
+        # Previously the password was silently truncated.
+        # https://github.com/pyca/bcrypt/pull/1000
+        hashed: bytes = bcrypt.hashpw(password.encode()[:72], bcrypt.gensalt(rounds=12))

        if for_storage:
            hashed = base64.b64encode(hashed)
@@ -176,6 +176,8 @@ FRONTEND_INTEGRATIONS = {
 STAGE_0_INTEGRATIONS = (
    # Load logging and http deps as soon as possible
    ("logging, http deps", LOGGING_AND_HTTP_DEPS_INTEGRATIONS, None),
+    # Setup labs for preview features
+    ("labs", {"labs"}, STAGE_0_SUBSTAGE_TIMEOUT),
    # Setup frontend
    ("frontend", FRONTEND_INTEGRATIONS, None),
    # Setup recorder
@@ -212,6 +214,7 @@ DEFAULT_INTEGRATIONS = {
    "backup",
    "frontend",
    "hardware",
+    "labs",
    "logger",
    "network",
    "system_health",
@@ -15,6 +15,7 @@
    "google_tasks",
    "google_translate",
    "google_travel_time",
+    "google_weather",
    "google_wifi",
    "google",
    "nest",
@@ -0,0 +1,5 @@
+{
+  "domain": "victron",
+  "name": "Victron",
+  "integrations": ["victron_ble", "victron_remote_monitoring"]
+}
@@ -1,11 +1,5 @@
 {
  "domain": "yale",
-  "name": "Yale",
-  "integrations": [
-    "august",
-    "yale_smart_alarm",
-    "yalexs_ble",
-    "yale_home",
-    "yale"
-  ]
+  "name": "Yale (non-US/Canada)",
+  "integrations": ["yale", "yalexs_ble", "yale_smart_alarm"]
 }
@@ -0,0 +1,5 @@
+{
+  "domain": "yale_august",
+  "name": "Yale August (US/Canada)",
+  "integrations": ["august", "august_ble"]
+}
@@ -1,70 +1,70 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "title": "Fill in your Abode login information",
-        "data": {
-          "username": "[%key:common::config_flow::data::email%]",
-          "password": "[%key:common::config_flow::data::password%]"
-        }
-      },
-      "mfa": {
-        "title": "Enter your MFA code for Abode",
-        "data": {
-          "mfa_code": "MFA code (6-digits)"
-        }
-      },
-      "reauth_confirm": {
-        "title": "[%key:component::abode::config::step::user::title%]",
-        "data": {
-          "username": "[%key:common::config_flow::data::email%]",
-          "password": "[%key:common::config_flow::data::password%]"
-        }
-      }
-    },
-    "error": {
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_mfa_code": "Invalid MFA code"
-    },
    "abort": {
      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "invalid_mfa_code": "Invalid MFA code"
+    },
+    "step": {
+      "mfa": {
+        "data": {
+          "mfa_code": "MFA code (6-digits)"
+        },
+        "title": "Enter your MFA code for Abode"
+      },
+      "reauth_confirm": {
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]",
+          "username": "[%key:common::config_flow::data::email%]"
+        },
+        "title": "[%key:component::abode::config::step::user::title%]"
+      },
+      "user": {
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]",
+          "username": "[%key:common::config_flow::data::email%]"
+        },
+        "title": "Fill in your Abode login information"
+      }
    }
  },
  "services": {
    "capture_image": {
-      "name": "Capture image",
      "description": "Requests a new image capture from a camera device.",
      "fields": {
        "entity_id": {
-          "name": "Entity",
-          "description": "Entity ID of the camera to request an image from."
+          "description": "Entity ID of the camera to request an image from.",
+          "name": "Entity"
        }
-      }
+      },
+      "name": "Capture image"
    },
    "change_setting": {
-      "name": "Change setting",
      "description": "Changes an Abode system setting.",
      "fields": {
        "setting": {
-          "name": "Setting",
-          "description": "Setting to change."
+          "description": "Setting to change.",
+          "name": "Setting"
        },
        "value": {
-          "name": "Value",
-          "description": "Value of the setting."
+          "description": "Value of the setting.",
+          "name": "Value"
        }
-      }
+      },
+      "name": "Change setting"
    },
    "trigger_automation": {
-      "name": "Trigger automation",
      "description": "Triggers an Abode automation.",
      "fields": {
        "entity_id": {
-          "name": "Entity",
-          "description": "Entity ID of the automation to trigger."
+          "description": "Entity ID of the automation to trigger.",
+          "name": "Entity"
        }
-      }
+      },
+      "name": "Trigger automation"
    }
  }
 }
@@ -4,20 +4,20 @@
      "timer_running": {
        "default": "mdi:timer",
        "state": {
-          "on": "mdi:timer-play",
-          "off": "mdi:timer-off"
+          "off": "mdi:timer-off",
+          "on": "mdi:timer-play"
        }
      }
    },
    "button": {
-      "tare": {
-        "default": "mdi:scale-balance"
-      },
      "reset_timer": {
        "default": "mdi:timer-refresh"
      },
      "start_stop": {
        "default": "mdi:timer-play"
+      },
+      "tare": {
+        "default": "mdi:scale-balance"
      }
    }
  }
@@ -1,6 +1,5 @@
 {
  "config": {
-    "flow_title": "{name}",
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
@@ -10,18 +9,19 @@
      "device_not_found": "Device could not be found.",
      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
+    "flow_title": "{name}",
    "step": {
      "bluetooth_confirm": {
        "description": "[%key:component::bluetooth::config::step::bluetooth_confirm::description%]"
      },
      "user": {
-        "description": "[%key:component::bluetooth::config::step::user::description%]",
        "data": {
          "address": "[%key:common::config_flow::data::device%]"
        },
        "data_description": {
          "address": "Select Acaia scale you want to set up"
-        }
+        },
+        "description": "[%key:component::bluetooth::config::step::user::description%]"
      }
    }
  },
@@ -32,14 +32,14 @@
      }
    },
    "button": {
-      "tare": {
-        "name": "Tare"
-      },
      "reset_timer": {
        "name": "Reset timer"
      },
      "start_stop": {
        "name": "Start/stop timer"
+      },
+      "tare": {
+        "name": "Tare"
      }
    }
  }
@@ -1,25 +1,8 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "data": {
-          "name": "[%key:common::config_flow::data::name%]",
-          "api_key": "[%key:common::config_flow::data::api_key%]",
-          "latitude": "[%key:common::config_flow::data::latitude%]",
-          "longitude": "[%key:common::config_flow::data::longitude%]"
-        },
-        "data_description": {
-          "api_key": "API key generated in the AccuWeather APIs portal."
-        }
-      },
-      "reauth_confirm": {
-        "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]"
-        },
-        "data_description": {
-          "api_key": "[%key:component::accuweather::config::step::user::data_description::api_key%]"
-        }
-      }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
    },
    "create_entry": {
      "default": "Some sensors are not enabled by default. You can enable them in the entity registry after the integration configuration."
@@ -29,9 +12,26 @@
      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
      "requests_exceeded": "The allowed number of requests to the AccuWeather API has been exceeded. You have to wait or change the API key."
    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+    "step": {
+      "reauth_confirm": {
+        "data": {
+          "api_key": "[%key:common::config_flow::data::api_key%]"
+        },
+        "data_description": {
+          "api_key": "[%key:component::accuweather::config::step::user::data_description::api_key%]"
+        }
+      },
+      "user": {
+        "data": {
+          "api_key": "[%key:common::config_flow::data::api_key%]",
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]",
+          "name": "[%key:common::config_flow::data::name%]"
+        },
+        "data_description": {
+          "api_key": "API key generated in the AccuWeather APIs portal."
+        }
+      }
    }
  },
  "entity": {
@@ -120,9 +120,9 @@
      "pressure_tendency": {
        "name": "Pressure tendency",
        "state": {
-          "steady": "Steady",
+          "falling": "Falling",
          "rising": "Rising",
-          "falling": "Falling"
+          "steady": "Steady"
        },
        "state_attributes": {
          "options": {
@@ -227,9 +227,6 @@
      "wet_bulb_temperature": {
        "name": "Wet bulb temperature"
      },
-      "wind_speed": {
-        "name": "[%key:component::weather::entity_component::_::state_attributes::wind_speed::name%]"
-      },
      "wind_chill_temperature": {
        "name": "Wind chill temperature"
      },
@@ -242,6 +239,9 @@
      "wind_gust_speed_night": {
        "name": "Wind gust speed night {forecast_day}"
      },
+      "wind_speed": {
+        "name": "[%key:component::weather::entity_component::_::state_attributes::wind_speed::name%]"
+      },
      "wind_speed_day": {
        "name": "Wind speed day {forecast_day}"
      },
@@ -1,15 +1,15 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "title": "Pick a hub to add",
-        "data": {
-          "id": "Host ID"
-        }
-      }
-    },
    "abort": {
      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "id": "Host ID"
+        },
+        "title": "Pick a hub to add"
+      }
    }
  }
 }
@@ -1,10 +1,10 @@
 """The Actron Air integration."""

 from actron_neo_api import (
-    ActronAirNeoACSystem,
-    ActronNeoAPI,
-    ActronNeoAPIError,
-    ActronNeoAuthError,
+    ActronAirACSystem,
+    ActronAirAPI,
+    ActronAirAPIError,
+    ActronAirAuthError,
 )

 from homeassistant.const import CONF_API_TOKEN, Platform
@@ -23,16 +23,16 @@ PLATFORM = [Platform.CLIMATE]
 async def async_setup_entry(hass: HomeAssistant, entry: ActronAirConfigEntry) -> bool:
    """Set up Actron Air integration from a config entry."""

-    api = ActronNeoAPI(refresh_token=entry.data[CONF_API_TOKEN])
-    systems: list[ActronAirNeoACSystem] = []
+    api = ActronAirAPI(refresh_token=entry.data[CONF_API_TOKEN])
+    systems: list[ActronAirACSystem] = []

    try:
        systems = await api.get_ac_systems()
        await api.update_status()
-    except ActronNeoAuthError:
+    except ActronAirAuthError:
        _LOGGER.error("Authentication error while setting up Actron Air integration")
        raise
-    except ActronNeoAPIError as err:
+    except ActronAirAPIError as err:
        _LOGGER.error("API error while setting up Actron Air integration: %s", err)
        raise

@@ -2,7 +2,7 @@

 from typing import Any

-from actron_neo_api import ActronAirNeoStatus, ActronAirNeoZone
+from actron_neo_api import ActronAirStatus, ActronAirZone

 from homeassistant.components.climate import (
    FAN_AUTO,
@@ -132,7 +132,7 @@ class ActronSystemClimate(BaseClimateEntity):
        return self._status.max_temp

    @property
-    def _status(self) -> ActronAirNeoStatus:
+    def _status(self) -> ActronAirStatus:
        """Get the current status from the coordinator."""
        return self.coordinator.data

@@ -194,7 +194,7 @@ class ActronZoneClimate(BaseClimateEntity):
    def __init__(
        self,
        coordinator: ActronAirSystemCoordinator,
-        zone: ActronAirNeoZone,
+        zone: ActronAirZone,
    ) -> None:
        """Initialize an Actron Air unit."""
        super().__init__(coordinator, zone.title)
@@ -221,7 +221,7 @@ class ActronZoneClimate(BaseClimateEntity):
        return self._zone.max_temp

    @property
-    def _zone(self) -> ActronAirNeoZone:
+    def _zone(self) -> ActronAirZone:
        """Get the current zone data from the coordinator."""
        status = self.coordinator.data
        return status.zones[self._zone_id]
@@ -3,7 +3,7 @@
 import asyncio
 from typing import Any

-from actron_neo_api import ActronNeoAPI, ActronNeoAuthError
+from actron_neo_api import ActronAirAPI, ActronAirAuthError

 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_TOKEN
@@ -17,7 +17,7 @@ class ActronAirConfigFlow(ConfigFlow, domain=DOMAIN):

    def __init__(self) -> None:
        """Initialize the config flow."""
-        self._api: ActronNeoAPI | None = None
+        self._api: ActronAirAPI | None = None
        self._device_code: str | None = None
        self._user_code: str = ""
        self._verification_uri: str = ""
@@ -30,10 +30,10 @@ class ActronAirConfigFlow(ConfigFlow, domain=DOMAIN):
        """Handle the initial step."""
        if self._api is None:
            _LOGGER.debug("Initiating device authorization")
-            self._api = ActronNeoAPI()
+            self._api = ActronAirAPI()
            try:
                device_code_response = await self._api.request_device_code()
-            except ActronNeoAuthError as err:
+            except ActronAirAuthError as err:
                _LOGGER.error("OAuth2 flow failed: %s", err)
                return self.async_abort(reason="oauth2_error")

@@ -50,7 +50,7 @@ class ActronAirConfigFlow(ConfigFlow, domain=DOMAIN):
            try:
                await self._api.poll_for_token(self._device_code)
                _LOGGER.debug("Authorization successful")
-            except ActronNeoAuthError as ex:
+            except ActronAirAuthError as ex:
                _LOGGER.exception("Error while waiting for device authorization")
                raise CannotConnect from ex

@@ -89,7 +89,7 @@ class ActronAirConfigFlow(ConfigFlow, domain=DOMAIN):

        try:
            user_data = await self._api.get_user_info()
-        except ActronNeoAuthError as err:
+        except ActronAirAuthError as err:
            _LOGGER.error("Error getting user info: %s", err)
            return self.async_abort(reason="oauth2_error")

@@ -5,7 +5,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from datetime import timedelta

-from actron_neo_api import ActronAirNeoACSystem, ActronAirNeoStatus, ActronNeoAPI
+from actron_neo_api import ActronAirACSystem, ActronAirAPI, ActronAirStatus

 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -23,7 +23,7 @@ ERROR_UNKNOWN = "unknown_error"
 class ActronAirRuntimeData:
    """Runtime data for the Actron Air integration."""

-    api: ActronNeoAPI
+    api: ActronAirAPI
    system_coordinators: dict[str, ActronAirSystemCoordinator]


@@ -33,15 +33,15 @@ AUTH_ERROR_THRESHOLD = 3
 SCAN_INTERVAL = timedelta(seconds=30)


-class ActronAirSystemCoordinator(DataUpdateCoordinator[ActronAirNeoACSystem]):
+class ActronAirSystemCoordinator(DataUpdateCoordinator[ActronAirACSystem]):
    """System coordinator for Actron Air integration."""

    def __init__(
        self,
        hass: HomeAssistant,
        entry: ActronAirConfigEntry,
-        api: ActronNeoAPI,
-        system: ActronAirNeoACSystem,
+        api: ActronAirAPI,
+        system: ActronAirACSystem,
    ) -> None:
        """Initialize the coordinator."""
        super().__init__(
@@ -57,7 +57,7 @@ class ActronAirSystemCoordinator(DataUpdateCoordinator[ActronAirNeoACSystem]):
        self.status = self.api.state_manager.get_status(self.serial_number)
        self.last_seen = dt_util.utcnow()

-    async def _async_update_data(self) -> ActronAirNeoStatus:
+    async def _async_update_data(self) -> ActronAirStatus:
        """Fetch updates and merge incremental changes into the full state."""
        await self.api.update_status()
        self.status = self.api.state_manager.get_status(self.serial_number)
@@ -12,5 +12,5 @@
  "documentation": "https://www.home-assistant.io/integrations/actron_air",
  "iot_class": "cloud_polling",
  "quality_scale": "bronze",
-  "requirements": ["actron-neo-api==0.1.84"]
+  "requirements": ["actron-neo-api==0.1.87"]
 }
@@ -1,29 +1,29 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "title": "Actron Air OAuth2 Authorization"
-      },
-      "timeout": {
-        "title": "Authorization timeout",
-        "description": "The authorization process timed out. Please try again.",
-        "data": {}
-      },
-      "connection_error": {
-        "title": "Connection error",
-        "description": "Failed to connect to Actron Air. Please check your internet connection and try again.",
-        "data": {}
-      }
-    },
-    "progress": {
-      "wait_for_authorization": "To authenticate, open the following URL and login at Actron Air:\n{verification_uri}\nIf the code is not automatically copied, paste the following code to authorize the integration:\n\n```{user_code}```\n\n\nThe login attempt will time out after {expires_minutes} minutes."
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "oauth2_error": "Failed to start OAuth2 flow"
    },
    "error": {
      "oauth2_error": "Failed to start OAuth2 flow. Please try again later."
    },
-    "abort": {
-      "oauth2_error": "Failed to start OAuth2 flow",
-      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
+    "progress": {
+      "wait_for_authorization": "To authenticate, open the following URL and login at Actron Air:\n{verification_uri}\nIf the code is not automatically copied, paste the following code to authorize the integration:\n\n```{user_code}```\n\n\nThe login attempt will time out after {expires_minutes} minutes."
+    },
+    "step": {
+      "connection_error": {
+        "data": {},
+        "description": "Failed to connect to Actron Air. Please check your internet connection and try again.",
+        "title": "Connection error"
+      },
+      "timeout": {
+        "data": {},
+        "description": "The authorization process timed out. Please try again.",
+        "title": "Authorization timeout"
+      },
+      "user": {
+        "title": "Actron Air OAuth2 Authorization"
+      }
    }
  }
 }
@@ -17,6 +17,11 @@ from homeassistant.const import (
    CONF_UNIQUE_ID,
 )
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.selector import (
+    TextSelector,
+    TextSelectorConfig,
+    TextSelectorType,
+)

 from .const import (
    ACCOUNT_ID,
@@ -66,7 +71,15 @@ class AdaxConfigFlow(ConfigFlow, domain=DOMAIN):
    ) -> ConfigFlowResult:
        """Handle the local step."""
        data_schema = vol.Schema(
-            {vol.Required(WIFI_SSID): str, vol.Required(WIFI_PSWD): str}
+            {
+                vol.Required(WIFI_SSID): str,
+                vol.Required(WIFI_PSWD): TextSelector(
+                    TextSelectorConfig(
+                        type=TextSelectorType.PASSWORD,
+                        autocomplete="current-password",
+                    ),
+                ),
+            }
        )
        if user_input is None:
            return self.async_show_form(
@@ -2,14 +2,16 @@

 from __future__ import annotations

+from dataclasses import dataclass
 from typing import cast

 from homeassistant.components.sensor import (
    SensorDeviceClass,
    SensorEntity,
+    SensorEntityDescription,
    SensorStateClass,
 )
-from homeassistant.const import UnitOfEnergy
+from homeassistant.const import UnitOfEnergy, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -20,44 +22,74 @@ from .const import CONNECTION_TYPE, DOMAIN, LOCAL
 from .coordinator import AdaxCloudCoordinator


+@dataclass(kw_only=True, frozen=True)
+class AdaxSensorDescription(SensorEntityDescription):
+    """Describes Adax sensor entity."""
+
+    data_key: str
+
+
+SENSORS: tuple[AdaxSensorDescription, ...] = (
+    AdaxSensorDescription(
+        key="temperature",
+        data_key="temperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=1,
+    ),
+    AdaxSensorDescription(
+        key="energy",
+        data_key="energyWh",
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        suggested_display_precision=3,
+    ),
+)
+
+
 async def async_setup_entry(
    hass: HomeAssistant,
    entry: AdaxConfigEntry,
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
-    """Set up the Adax energy sensors with config flow."""
+    """Set up the Adax sensors with config flow."""
    if entry.data.get(CONNECTION_TYPE) != LOCAL:
        cloud_coordinator = cast(AdaxCloudCoordinator, entry.runtime_data)

        # Create individual energy sensors for each device
        async_add_entities(
-            AdaxEnergySensor(cloud_coordinator, device_id)
-            for device_id in cloud_coordinator.data
+            [
+                AdaxSensor(cloud_coordinator, entity_description, device_id)
+                for device_id in cloud_coordinator.data
+                for entity_description in SENSORS
+            ]
        )


-class AdaxEnergySensor(CoordinatorEntity[AdaxCloudCoordinator], SensorEntity):
-    """Representation of an Adax energy sensor."""
+class AdaxSensor(CoordinatorEntity[AdaxCloudCoordinator], SensorEntity):
+    """Representation of an Adax sensor."""

+    entity_description: AdaxSensorDescription
    _attr_has_entity_name = True
-    _attr_translation_key = "energy"
-    _attr_device_class = SensorDeviceClass.ENERGY
-    _attr_native_unit_of_measurement = UnitOfEnergy.WATT_HOUR
-    _attr_suggested_unit_of_measurement = UnitOfEnergy.KILO_WATT_HOUR
-    _attr_state_class = SensorStateClass.TOTAL_INCREASING
-    _attr_suggested_display_precision = 3

    def __init__(
        self,
        coordinator: AdaxCloudCoordinator,
+        entity_description: AdaxSensorDescription,
        device_id: str,
    ) -> None:
-        """Initialize the energy sensor."""
+        """Initialize the sensor."""
        super().__init__(coordinator)
+        self.entity_description = entity_description
        self._device_id = device_id
        room = coordinator.data[device_id]

-        self._attr_unique_id = f"{room['homeId']}_{device_id}_energy"
+        self._attr_unique_id = (
+            f"{room['homeId']}_{device_id}_{self.entity_description.key}"
+        )
        self._attr_device_info = DeviceInfo(
            identifiers={(DOMAIN, device_id)},
            name=room["name"],
@@ -68,10 +100,14 @@ class AdaxEnergySensor(CoordinatorEntity[AdaxCloudCoordinator], SensorEntity):
    def available(self) -> bool:
        """Return True if entity is available."""
        return (
-            super().available and "energyWh" in self.coordinator.data[self._device_id]
+            super().available
+            and self.entity_description.data_key
+            in self.coordinator.data[self._device_id]
        )

    @property
-    def native_value(self) -> int:
+    def native_value(self) -> int | float | None:
        """Return the native value of the sensor."""
-        return int(self.coordinator.data[self._device_id]["energyWh"])
+        return self.coordinator.data[self._device_id].get(
+            self.entity_description.data_key
+        )
@@ -1,34 +1,34 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "data": {
-          "connection_type": "Select connection type"
-        },
-        "description": "Select connection type. Local requires heaters with Bluetooth"
-      },
-      "local": {
-        "data": {
-          "wifi_ssid": "Wi-Fi SSID",
-          "wifi_pswd": "Wi-Fi password"
-        },
-        "description": "Reset the heater by pressing + and OK until display shows 'Reset'. Then press and hold OK button on the heater until the blue LED starts blinking before pressing Submit. Configuring heater might take some minutes."
-      },
-      "cloud": {
-        "data": {
-          "account_id": "Account ID",
-          "password": "[%key:common::config_flow::data::password%]"
-        }
-      }
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
      "heater_not_available": "Heater not available. Try to reset the heater by pressing + and OK for some seconds.",
      "heater_not_found": "Heater not found. Try to move the heater closer to Home Assistant computer.",
      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "step": {
+      "cloud": {
+        "data": {
+          "account_id": "Account ID",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      },
+      "local": {
+        "data": {
+          "wifi_pswd": "Wi-Fi password",
+          "wifi_ssid": "Wi-Fi SSID"
+        },
+        "description": "Reset the heater by pressing + and OK until display shows 'Reset'. Then press and hold OK button on the heater until the blue LED starts blinking before pressing Submit. Configuring heater might take some minutes."
+      },
+      "user": {
+        "data": {
+          "connection_type": "Select connection type"
+        },
+        "description": "Select connection type. Local requires heaters with Bluetooth"
+      }
    }
  }
 }
@@ -45,7 +45,7 @@ SERVICE_REFRESH_SCHEMA = vol.Schema(
    {vol.Optional(CONF_FORCE, default=False): cv.boolean}
 )

-PLATFORMS = [Platform.SENSOR, Platform.SWITCH]
+PLATFORMS = [Platform.SENSOR, Platform.SWITCH, Platform.UPDATE]
 type AdGuardConfigEntry = ConfigEntry[AdGuardData]


@@ -1,6 +1,9 @@
 {
  "entity": {
    "sensor": {
+      "average_processing_speed": {
+        "default": "mdi:speedometer"
+      },
      "dns_queries": {
        "default": "mdi:magnify"
      },
@@ -13,21 +16,18 @@
      "parental_control_blocked": {
        "default": "mdi:human-male-girl"
      },
+      "rules_count": {
+        "default": "mdi:counter"
+      },
      "safe_browsing_blocked": {
        "default": "mdi:shield-half-full"
      },
      "safe_searches_enforced": {
        "default": "mdi:shield-search"
-      },
-      "average_processing_speed": {
-        "default": "mdi:speedometer"
-      },
-      "rules_count": {
-        "default": "mdi:counter"
      }
    },
    "switch": {
-      "protection": {
+      "filtering": {
        "default": "mdi:shield-check",
        "state": {
          "off": "mdi:shield-off"
@@ -39,7 +39,13 @@
          "off": "mdi:shield-off"
        }
      },
-      "safe_search": {
+      "protection": {
+        "default": "mdi:shield-check",
+        "state": {
+          "off": "mdi:shield-off"
+        }
+      },
+      "query_log": {
        "default": "mdi:shield-check",
        "state": {
          "off": "mdi:shield-off"
@@ -51,13 +57,7 @@
          "off": "mdi:shield-off"
        }
      },
-      "filtering": {
-        "default": "mdi:shield-check",
-        "state": {
-          "off": "mdi:shield-off"
-        }
-      },
-      "query_log": {
+      "safe_search": {
        "default": "mdi:shield-check",
        "state": {
          "off": "mdi:shield-off"
@@ -69,17 +69,17 @@
    "add_url": {
      "service": "mdi:link-plus"
    },
-    "remove_url": {
-      "service": "mdi:link-off"
+    "disable_url": {
+      "service": "mdi:link-variant-off"
    },
    "enable_url": {
      "service": "mdi:link-variant"
    },
-    "disable_url": {
-      "service": "mdi:link-variant-off"
-    },
    "refresh": {
      "service": "mdi:refresh"
+    },
+    "remove_url": {
+      "service": "mdi:link-off"
    }
  }
 }
@@ -7,5 +7,5 @@
  "integration_type": "service",
  "iot_class": "local_polling",
  "loggers": ["adguardhome"],
-  "requirements": ["adguardhome==0.7.0"]
+  "requirements": ["adguardhome==0.8.1"]
 }
@@ -1,35 +1,38 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "description": "Set up your AdGuard Home instance to allow monitoring and control.",
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]",
-          "password": "[%key:common::config_flow::data::password%]",
-          "port": "[%key:common::config_flow::data::port%]",
-          "username": "[%key:common::config_flow::data::username%]",
-          "ssl": "[%key:common::config_flow::data::ssl%]",
-          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
-        },
-        "data_description": {
-          "host": "The hostname or IP address of the device running your AdGuard Home."
-        }
-      },
-      "hassio_confirm": {
-        "title": "AdGuard Home via Home Assistant add-on",
-        "description": "Do you want to configure Home Assistant to connect to the AdGuard Home provided by the add-on: {addon}?"
-      }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
+      "existing_instance_updated": "Updated existing configuration."
    },
    "error": {
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
    },
-    "abort": {
-      "existing_instance_updated": "Updated existing configuration.",
-      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
+    "step": {
+      "hassio_confirm": {
+        "description": "Do you want to configure Home Assistant to connect to the AdGuard Home provided by the add-on: {addon}?",
+        "title": "AdGuard Home via Home Assistant add-on"
+      },
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]",
+          "password": "[%key:common::config_flow::data::password%]",
+          "port": "[%key:common::config_flow::data::port%]",
+          "ssl": "[%key:common::config_flow::data::ssl%]",
+          "username": "[%key:common::config_flow::data::username%]",
+          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
+        },
+        "data_description": {
+          "host": "The hostname or IP address of the device running your AdGuard Home."
+        },
+        "description": "Set up your AdGuard Home instance to allow monitoring and control."
+      }
    }
  },
  "entity": {
    "sensor": {
+      "average_processing_speed": {
+        "name": "Average processing speed"
+      },
      "dns_queries": {
        "name": "DNS queries"
      },
@@ -42,94 +45,91 @@
      "parental_control_blocked": {
        "name": "Parental control blocked"
      },
+      "rules_count": {
+        "name": "Rules count"
+      },
      "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"
+      "filtering": {
+        "name": "Filtering"
      },
      "parental": {
        "name": "Parental control"
      },
-      "safe_search": {
-        "name": "Safe search"
+      "protection": {
+        "name": "Protection"
+      },
+      "query_log": {
+        "name": "Query log"
      },
      "safe_browsing": {
        "name": "Safe browsing"
      },
-      "filtering": {
-        "name": "Filtering"
-      },
-      "query_log": {
-        "name": "Query log"
+      "safe_search": {
+        "name": "Safe search"
      }
    }
  },
  "services": {
    "add_url": {
-      "name": "Add URL",
      "description": "Adds a new filter subscription to AdGuard Home.",
      "fields": {
        "name": {
-          "name": "[%key:common::config_flow::data::name%]",
-          "description": "The name of the filter subscription."
+          "description": "The name of the filter subscription.",
+          "name": "[%key:common::config_flow::data::name%]"
        },
        "url": {
-          "name": "[%key:common::config_flow::data::url%]",
-          "description": "The filter URL to subscribe to, containing the filter rules."
+          "description": "The filter URL to subscribe to, containing the filter rules.",
+          "name": "[%key:common::config_flow::data::url%]"
        }
-      }
-    },
-    "remove_url": {
-      "name": "Remove URL",
-      "description": "Removes a filter subscription from AdGuard Home.",
-      "fields": {
-        "url": {
-          "name": "[%key:common::config_flow::data::url%]",
-          "description": "The filter subscription URL to remove."
-        }
-      }
-    },
-    "enable_url": {
-      "name": "Enable URL",
-      "description": "Enables a filter subscription in AdGuard Home.",
-      "fields": {
-        "url": {
-          "name": "[%key:common::config_flow::data::url%]",
-          "description": "The filter subscription URL to enable."
-        }
-      }
+      },
+      "name": "Add URL"
    },
    "disable_url": {
-      "name": "Disable URL",
      "description": "Disables a filter subscription in AdGuard Home.",
      "fields": {
        "url": {
-          "name": "[%key:common::config_flow::data::url%]",
-          "description": "The filter subscription URL to disable."
+          "description": "The filter subscription URL to disable.",
+          "name": "[%key:common::config_flow::data::url%]"
        }
-      }
+      },
+      "name": "Disable URL"
+    },
+    "enable_url": {
+      "description": "Enables a filter subscription in AdGuard Home.",
+      "fields": {
+        "url": {
+          "description": "The filter subscription URL to enable.",
+          "name": "[%key:common::config_flow::data::url%]"
+        }
+      },
+      "name": "Enable URL"
    },
    "refresh": {
-      "name": "Refresh",
      "description": "Refreshes all filter subscriptions in AdGuard Home.",
      "fields": {
        "force": {
-          "name": "Force",
-          "description": "Force update (bypasses AdGuard Home throttling), omit for a regular refresh."
+          "description": "Force update (bypasses AdGuard Home throttling), omit for a regular refresh.",
+          "name": "Force"
        }
-      }
+      },
+      "name": "Refresh"
+    },
+    "remove_url": {
+      "description": "Removes a filter subscription from AdGuard Home.",
+      "fields": {
+        "url": {
+          "description": "The filter subscription URL to remove.",
+          "name": "[%key:common::config_flow::data::url%]"
+        }
+      },
+      "name": "Remove URL"
    }
  }
 }
@@ -0,0 +1,71 @@
+"""AdGuard Home Update platform."""
+
+from __future__ import annotations
+
+from datetime import timedelta
+from typing import Any
+
+from adguardhome import AdGuardHomeError
+
+from homeassistant.components.update import UpdateEntity, UpdateEntityFeature
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import AdGuardConfigEntry, AdGuardData
+from .const import DOMAIN
+from .entity import AdGuardHomeEntity
+
+SCAN_INTERVAL = timedelta(seconds=300)
+PARALLEL_UPDATES = 1
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: AdGuardConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up AdGuard Home update entity based on a config entry."""
+    data = entry.runtime_data
+
+    if (await data.client.update.update_available()).disabled:
+        return
+
+    async_add_entities([AdGuardHomeUpdate(data, entry)], True)
+
+
+class AdGuardHomeUpdate(AdGuardHomeEntity, UpdateEntity):
+    """Defines an AdGuard Home update."""
+
+    _attr_supported_features = UpdateEntityFeature.INSTALL
+    _attr_name = None
+
+    def __init__(
+        self,
+        data: AdGuardData,
+        entry: AdGuardConfigEntry,
+    ) -> None:
+        """Initialize AdGuard Home update."""
+        super().__init__(data, entry)
+
+        self._attr_unique_id = "_".join(
+            [DOMAIN, self.adguard.host, str(self.adguard.port), "update"]
+        )
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        value = await self.adguard.update.update_available()
+        self._attr_installed_version = self.data.version
+        self._attr_latest_version = value.new_version
+        self._attr_release_summary = value.announcement
+        self._attr_release_url = value.announcement_url
+
+    async def async_install(
+        self, version: str | None, backup: bool, **kwargs: Any
+    ) -> None:
+        """Install latest update."""
+        try:
+            await self.adguard.update.begin_update()
+        except AdGuardHomeError as err:
+            raise HomeAssistantError(f"Failed to install update: {err}") from err
+        self.hass.config_entries.async_schedule_reload(self._entry.entry_id)
@@ -1,22 +1,22 @@
 {
  "services": {
    "write_data_by_name": {
-      "name": "Write data by name",
      "description": "Write a value to the connected ADS device.",
      "fields": {
-        "adsvar": {
-          "name": "ADS variable",
-          "description": "The name of the variable to write to."
-        },
        "adstype": {
-          "name": "ADS type",
-          "description": "The data type of the variable to write to."
+          "description": "The data type of the variable to write to.",
+          "name": "ADS type"
+        },
+        "adsvar": {
+          "description": "The name of the variable to write to.",
+          "name": "ADS variable"
        },
        "value": {
-          "name": "Value",
-          "description": "The value to write to the variable."
+          "description": "The value to write to the variable.",
+          "name": "Value"
        }
-      }
+      },
+      "name": "Write data by name"
    }
  }
 }
@@ -1,11 +1,11 @@
 {
  "config": {
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
    "step": {
      "user": {
        "data": {
@@ -19,14 +19,14 @@
  },
  "services": {
    "set_time_to": {
-      "name": "Set time to",
      "description": "Controls timers to turn the system on or off after a set number of minutes.",
      "fields": {
        "minutes": {
-          "name": "Minutes",
-          "description": "Minutes until action."
+          "description": "Minutes until action.",
+          "name": "Minutes"
        }
-      }
+      },
+      "name": "Set time to"
    }
  }
 }
@@ -1,57 +1,57 @@
 {
  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
    "step": {
      "user": {
        "data": {
          "api_key": "[%key:common::config_flow::data::api_key%]"
        }
      }
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    }
-  },
-  "services": {
-    "add_tracking": {
-      "name": "Add tracking",
-      "description": "Adds a new tracking number to Aftership.",
-      "fields": {
-        "tracking_number": {
-          "name": "Tracking number",
-          "description": "Tracking number for the new tracking."
-        },
-        "title": {
-          "name": "Title",
-          "description": "A custom title for the new tracking."
-        },
-        "slug": {
-          "name": "Slug",
-          "description": "Slug (carrier) of the new tracking."
-        }
-      }
-    },
-    "remove_tracking": {
-      "name": "Remove tracking",
-      "description": "Removes a tracking number from Aftership.",
-      "fields": {
-        "tracking_number": {
-          "name": "[%key:component::aftership::services::add_tracking::fields::tracking_number::name%]",
-          "description": "Tracking number of the tracking to remove."
-        },
-        "slug": {
-          "name": "[%key:component::aftership::services::add_tracking::fields::slug::name%]",
-          "description": "Slug (carrier) of the tracking to remove."
-        }
-      }
    }
  },
  "issues": {
    "deprecated_yaml_import_issue_cannot_connect": {
-      "title": "The {integration_title} YAML configuration import failed",
-      "description": "Configuring {integration_title} using YAML is being removed but there was a connection error importing your YAML configuration.\n\nEnsure connection to {integration_title} works and restart Home Assistant to try again or remove the {integration_title} YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
+      "description": "Configuring {integration_title} using YAML is being removed but there was a connection error importing your YAML configuration.\n\nEnsure connection to {integration_title} works and restart Home Assistant to try again or remove the {integration_title} YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually.",
+      "title": "The {integration_title} YAML configuration import failed"
+    }
+  },
+  "services": {
+    "add_tracking": {
+      "description": "Adds a new tracking number to Aftership.",
+      "fields": {
+        "slug": {
+          "description": "Slug (carrier) of the new tracking.",
+          "name": "Slug"
+        },
+        "title": {
+          "description": "A custom title for the new tracking.",
+          "name": "Title"
+        },
+        "tracking_number": {
+          "description": "Tracking number for the new tracking.",
+          "name": "Tracking number"
+        }
+      },
+      "name": "Add tracking"
+    },
+    "remove_tracking": {
+      "description": "Removes a tracking number from Aftership.",
+      "fields": {
+        "slug": {
+          "description": "Slug (carrier) of the tracking to remove.",
+          "name": "[%key:component::aftership::services::add_tracking::fields::slug::name%]"
+        },
+        "tracking_number": {
+          "description": "Tracking number of the tracking to remove.",
+          "name": "[%key:component::aftership::services::add_tracking::fields::tracking_number::name%]"
+        }
+      },
+      "name": "Remove tracking"
    }
  }
 }
@@ -1,19 +1,19 @@
 {
  "services": {
+    "disable_alerts": {
+      "service": "mdi:bell-off"
+    },
+    "enable_alerts": {
+      "service": "mdi:bell-alert"
+    },
+    "snapshot": {
+      "service": "mdi:camera"
+    },
    "start_recording": {
      "service": "mdi:record-rec"
    },
    "stop_recording": {
      "service": "mdi:stop"
-    },
-    "enable_alerts": {
-      "service": "mdi:bell-alert"
-    },
-    "disable_alerts": {
-      "service": "mdi:bell-off"
-    },
-    "snapshot": {
-      "service": "mdi:camera"
    }
  }
 }
@@ -1,45 +1,45 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "title": "Set up Agent DVR",
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]",
-          "port": "[%key:common::config_flow::data::port%]"
-        },
-        "data_description": {
-          "host": "The IP address of the Agent DVR server."
-        }
-      }
-    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    },
    "error": {
      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]",
+          "port": "[%key:common::config_flow::data::port%]"
+        },
+        "data_description": {
+          "host": "The IP address of the Agent DVR server."
+        },
+        "title": "Set up Agent DVR"
+      }
    }
  },
  "services": {
-    "start_recording": {
-      "name": "Start recording",
-      "description": "Enables continuous recording."
-    },
-    "stop_recording": {
-      "name": "Stop recording",
-      "description": "Disables continuous recording."
+    "disable_alerts": {
+      "description": "Disables alerts.",
+      "name": "Disable alerts"
    },
    "enable_alerts": {
-      "name": "Enable alerts",
-      "description": "Enables alerts."
-    },
-    "disable_alerts": {
-      "name": "Disable alerts",
-      "description": "Disables alerts."
+      "description": "Enables alerts.",
+      "name": "Enable alerts"
    },
    "snapshot": {
-      "name": "Snapshot",
-      "description": "Takes a photo."
+      "description": "Takes a photo.",
+      "name": "Snapshot"
+    },
+    "start_recording": {
+      "description": "Enables continuous recording.",
+      "name": "Start recording"
+    },
+    "stop_recording": {
+      "description": "Disables continuous recording.",
+      "name": "Stop recording"
    }
  }
 }
@@ -30,6 +30,7 @@ generate_data:
        media:
          accept:
            - "*"
+          multiple: true
 generate_image:
  fields:
    task_name:
@@ -57,3 +58,4 @@ generate_image:
        media:
          accept:
            - "*"
+          multiple: true
@@ -1,52 +1,52 @@
 {
  "services": {
    "generate_data": {
-      "name": "Generate data",
      "description": "Uses AI to run a task that generates data.",
      "fields": {
-        "task_name": {
-          "name": "Task name",
-          "description": "Name of the task."
-        },
-        "instructions": {
-          "name": "Instructions",
-          "description": "Instructions on what needs to be done."
+        "attachments": {
+          "description": "List of files to attach for multi-modal AI analysis.",
+          "name": "Attachments"
        },
        "entity_id": {
-          "name": "Entity ID",
-          "description": "Entity ID to run the task on. If not provided, the preferred entity will be used."
+          "description": "Entity ID to run the task on. If not provided, the preferred entity will be used.",
+          "name": "Entity ID"
+        },
+        "instructions": {
+          "description": "Instructions on what needs to be done.",
+          "name": "Instructions"
        },
        "structure": {
-          "name": "Structured output",
-          "description": "When set, the AI Task will output fields with this in structure. The structure is a dictionary where the keys are the field names and the values contain a 'description', a 'selector', and an optional 'required' field."
+          "description": "When set, the AI Task will output fields with this in structure. The structure is a dictionary where the keys are the field names and the values contain a 'description', a 'selector', and an optional 'required' field.",
+          "name": "Structured output"
        },
-        "attachments": {
-          "name": "Attachments",
-          "description": "List of files to attach for multi-modal AI analysis."
+        "task_name": {
+          "description": "Name of the task.",
+          "name": "Task name"
        }
-      }
+      },
+      "name": "Generate data"
    },
    "generate_image": {
-      "name": "Generate image",
      "description": "Uses AI to generate image.",
      "fields": {
-        "task_name": {
-          "name": "Task name",
-          "description": "Name of the task."
-        },
-        "instructions": {
-          "name": "Instructions",
-          "description": "Instructions that explains the image to be generated."
+        "attachments": {
+          "description": "List of files to attach for using as references.",
+          "name": "Attachments"
        },
        "entity_id": {
-          "name": "Entity ID",
-          "description": "Entity ID to run the task on."
+          "description": "Entity ID to run the task on.",
+          "name": "Entity ID"
        },
-        "attachments": {
-          "name": "Attachments",
-          "description": "List of files to attach for using as references."
+        "instructions": {
+          "description": "Instructions that explains the image to be generated.",
+          "name": "Instructions"
+        },
+        "task_name": {
+          "description": "Name of the task.",
+          "name": "Task name"
        }
-      }
+      },
+      "name": "Generate image"
    }
  }
 }
@@ -9,14 +9,17 @@
      }
    },
    "number": {
-      "led_bar_brightness": {
+      "display_brightness": {
        "default": "mdi:brightness-percent"
      },
-      "display_brightness": {
+      "led_bar_brightness": {
        "default": "mdi:brightness-percent"
      }
    },
    "select": {
+      "co2_automatic_baseline_calibration": {
+        "default": "mdi:molecule-co2"
+      },
      "configuration_control": {
        "default": "mdi:cloud-cog"
      },
@@ -31,23 +34,11 @@
      },
      "voc_index_learning_time_offset": {
        "default": "mdi:clock-outline"
-      },
-      "co2_automatic_baseline_calibration": {
-        "default": "mdi:molecule-co2"
      }
    },
    "sensor": {
-      "total_volatile_organic_component_index": {
-        "default": "mdi:molecule"
-      },
-      "nitrogen_index": {
-        "default": "mdi:molecule"
-      },
-      "pm003_count": {
-        "default": "mdi:blur"
-      },
-      "led_bar_brightness": {
-        "default": "mdi:brightness-percent"
+      "co2_automatic_baseline_calibration": {
+        "default": "mdi:molecule-co2"
      },
      "display_brightness": {
        "default": "mdi:brightness-percent"
@@ -55,17 +46,26 @@
      "display_temperature_unit": {
        "default": "mdi:thermometer-lines"
      },
+      "led_bar_brightness": {
+        "default": "mdi:brightness-percent"
+      },
      "led_bar_mode": {
        "default": "mdi:led-strip"
      },
+      "nitrogen_index": {
+        "default": "mdi:molecule"
+      },
      "nox_index_learning_time_offset": {
        "default": "mdi:clock-outline"
      },
+      "pm003_count": {
+        "default": "mdi:blur"
+      },
+      "total_volatile_organic_component_index": {
+        "default": "mdi:molecule"
+      },
      "voc_index_learning_time_offset": {
        "default": "mdi:clock-outline"
-      },
-      "co2_automatic_baseline_calibration": {
-        "default": "mdi:molecule-co2"
      }
    },
    "switch": {
@@ -1,19 +1,5 @@
 {
  "config": {
-    "flow_title": "{model}",
-    "step": {
-      "user": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]"
-        },
-        "data_description": {
-          "host": "The hostname or IP address of the Airgradient device."
-        }
-      },
-      "discovery_confirm": {
-        "description": "Do you want to set up {model}?"
-      }
-    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
@@ -24,6 +10,20 @@
    "error": {
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "flow_title": "{model}",
+    "step": {
+      "discovery_confirm": {
+        "description": "Do you want to set up {model}?"
+      },
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        },
+        "data_description": {
+          "host": "The hostname or IP address of the Airgradient device."
+        }
+      }
    }
  },
  "entity": {
@@ -36,14 +36,25 @@
      }
    },
    "number": {
-      "led_bar_brightness": {
-        "name": "LED bar brightness"
-      },
      "display_brightness": {
        "name": "Display brightness"
+      },
+      "led_bar_brightness": {
+        "name": "LED bar brightness"
      }
    },
    "select": {
+      "co2_automatic_baseline_calibration": {
+        "name": "CO2 automatic baseline duration",
+        "state": {
+          "0": "[%key:common::state::off%]",
+          "1": "1 day",
+          "8": "8 days",
+          "30": "30 days",
+          "90": "90 days",
+          "180": "180 days"
+        }
+      },
      "configuration_control": {
        "name": "Configuration source",
        "state": {
@@ -51,13 +62,6 @@
          "local": "Local"
        }
      },
-      "display_temperature_unit": {
-        "name": "Display temperature unit",
-        "state": {
-          "c": "Celsius",
-          "f": "Fahrenheit"
-        }
-      },
      "display_pm_standard": {
        "name": "Display PM standard",
        "state": {
@@ -65,11 +69,18 @@
          "us_aqi": "US AQI"
        }
      },
+      "display_temperature_unit": {
+        "name": "Display temperature unit",
+        "state": {
+          "c": "Celsius",
+          "f": "Fahrenheit"
+        }
+      },
      "led_bar_mode": {
        "name": "LED bar mode",
        "state": {
-          "off": "[%key:common::state::off%]",
          "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
+          "off": "[%key:common::state::off%]",
          "pm": "Particulate matter"
        }
      },
@@ -92,37 +103,14 @@
          "360": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::state::360%]",
          "720": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::state::720%]"
        }
-      },
-      "co2_automatic_baseline_calibration": {
-        "name": "CO2 automatic baseline duration",
-        "state": {
-          "1": "1 day",
-          "8": "8 days",
-          "30": "30 days",
-          "90": "90 days",
-          "180": "180 days",
-          "0": "[%key:common::state::off%]"
-        }
      }
    },
    "sensor": {
-      "total_volatile_organic_component_index": {
-        "name": "VOC index"
+      "co2_automatic_baseline_calibration_days": {
+        "name": "Carbon dioxide automatic baseline calibration"
      },
-      "nitrogen_index": {
-        "name": "NOx index"
-      },
-      "pm003_count": {
-        "name": "PM0.3"
-      },
-      "raw_total_volatile_organic_component": {
-        "name": "Raw VOC"
-      },
-      "raw_nitrogen": {
-        "name": "Raw NOx"
-      },
-      "raw_pm02": {
-        "name": "Raw PM2.5"
+      "display_brightness": {
+        "name": "[%key:component::airgradient::entity::number::display_brightness::name%]"
      },
      "display_pm_standard": {
        "name": "[%key:component::airgradient::entity::select::display_pm_standard::name%]",
@@ -131,26 +119,6 @@
          "us_aqi": "[%key:component::airgradient::entity::select::display_pm_standard::state::us_aqi%]"
        }
      },
-      "co2_automatic_baseline_calibration_days": {
-        "name": "Carbon dioxide automatic baseline calibration"
-      },
-      "nox_learning_offset": {
-        "name": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::name%]"
-      },
-      "tvoc_learning_offset": {
-        "name": "[%key:component::airgradient::entity::select::voc_index_learning_time_offset::name%]"
-      },
-      "led_bar_mode": {
-        "name": "[%key:component::airgradient::entity::select::led_bar_mode::name%]",
-        "state": {
-          "off": "[%key:common::state::off%]",
-          "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
-          "pm": "[%key:component::airgradient::entity::select::led_bar_mode::state::pm%]"
-        }
-      },
-      "led_bar_brightness": {
-        "name": "[%key:component::airgradient::entity::number::led_bar_brightness::name%]"
-      },
      "display_temperature_unit": {
        "name": "[%key:component::airgradient::entity::select::display_temperature_unit::name%]",
        "state": {
@@ -158,8 +126,40 @@
          "f": "[%key:component::airgradient::entity::select::display_temperature_unit::state::f%]"
        }
      },
-      "display_brightness": {
-        "name": "[%key:component::airgradient::entity::number::display_brightness::name%]"
+      "led_bar_brightness": {
+        "name": "[%key:component::airgradient::entity::number::led_bar_brightness::name%]"
+      },
+      "led_bar_mode": {
+        "name": "[%key:component::airgradient::entity::select::led_bar_mode::name%]",
+        "state": {
+          "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
+          "off": "[%key:common::state::off%]",
+          "pm": "[%key:component::airgradient::entity::select::led_bar_mode::state::pm%]"
+        }
+      },
+      "nitrogen_index": {
+        "name": "NOx index"
+      },
+      "nox_learning_offset": {
+        "name": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::name%]"
+      },
+      "pm003_count": {
+        "name": "PM0.3"
+      },
+      "raw_nitrogen": {
+        "name": "Raw NOx"
+      },
+      "raw_pm02": {
+        "name": "Raw PM2.5"
+      },
+      "raw_total_volatile_organic_component": {
+        "name": "Raw VOC"
+      },
+      "total_volatile_organic_component_index": {
+        "name": "VOC index"
+      },
+      "tvoc_learning_offset": {
+        "name": "[%key:component::airgradient::entity::select::voc_index_learning_time_offset::name%]"
      }
    },
    "switch": {
@@ -1,30 +1,23 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "description": "To generate API key go to {developer_registration_url}",
-        "data": {
-          "name": "[%key:common::config_flow::data::name%]",
-          "api_key": "[%key:common::config_flow::data::api_key%]",
-          "latitude": "[%key:common::config_flow::data::latitude%]",
-          "longitude": "[%key:common::config_flow::data::longitude%]"
-        }
-      }
-    },
-    "error": {
-      "wrong_location": "No Airly measuring stations in this area.",
-      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]"
-    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]",
      "wrong_location": "[%key:component::airly::config::error::wrong_location%]"
-    }
-  },
-  "system_health": {
-    "info": {
-      "can_reach_server": "Reach Airly server",
-      "requests_remaining": "Remaining allowed requests",
-      "requests_per_day": "Allowed requests per day"
+    },
+    "error": {
+      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
+      "wrong_location": "No Airly measuring stations in this area."
+    },
+    "step": {
+      "user": {
+        "data": {
+          "api_key": "[%key:common::config_flow::data::api_key%]",
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]",
+          "name": "[%key:common::config_flow::data::name%]"
+        },
+        "description": "To generate API key go to {developer_registration_url}"
+      }
    }
  },
  "entity": {
@@ -38,11 +31,18 @@
    }
  },
  "exceptions": {
-    "update_error": {
-      "message": "An error occurred while retrieving data from the Airly API for {entry}: {error}"
-    },
    "no_station": {
      "message": "An error occurred while retrieving data from the Airly API for {entry}: no measuring stations in this area"
+    },
+    "update_error": {
+      "message": "An error occurred while retrieving data from the Airly API for {entry}: {error}"
+    }
+  },
+  "system_health": {
+    "info": {
+      "can_reach_server": "Reach Airly server",
+      "requests_per_day": "Allowed requests per day",
+      "requests_remaining": "Remaining allowed requests"
    }
  }
 }
@@ -4,15 +4,15 @@
      "aqi": {
        "default": "mdi:blur"
      },
+      "o3": {
+        "default": "mdi:blur"
+      },
      "pm10": {
        "default": "mdi:blur"
      },
      "pm25": {
        "default": "mdi:blur"
      },
-      "o3": {
-        "default": "mdi:blur"
-      },
      "station": {
        "default": "mdi:blur"
      }
@@ -1,15 +1,7 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "description": "To generate API key go to {api_key_url}",
-        "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]",
-          "latitude": "[%key:common::config_flow::data::latitude%]",
-          "longitude": "[%key:common::config_flow::data::longitude%]",
-          "radius": "Station radius (miles; optional)"
-        }
-      }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    },
    "error": {
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -17,16 +9,15 @@
      "invalid_location": "No results found for that location, try changing the location or station radius.",
      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    }
-  },
-  "options": {
    "step": {
-      "init": {
+      "user": {
        "data": {
-          "radius": "Station radius (miles)"
-        }
+          "api_key": "[%key:common::config_flow::data::api_key%]",
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]",
+          "radius": "Station radius (miles; optional)"
+        },
+        "description": "To generate API key go to {api_key_url}"
      }
    }
  },
@@ -43,5 +34,14 @@
        }
      }
    }
+  },
+  "options": {
+    "step": {
+      "init": {
+        "data": {
+          "radius": "Station radius (miles)"
+        }
+      }
+    }
  }
 }
@@ -1,5 +1,17 @@
 {
  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
+      "unique_id_mismatch": "Re-authentication should be used for the same device not a new one"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "key_data_missing": "Expected data not returned from the device, check the documentation for supported devices",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
    "flow_title": "Ubiquiti airOS device",
    "step": {
      "reauth_confirm": {
@@ -19,7 +31,6 @@
        },
        "sections": {
          "advanced_settings": {
-            "name": "[%key:component::airos::config::step::user::sections::advanced_settings::name%]",
            "data": {
              "ssl": "[%key:component::airos::config::step::user::sections::advanced_settings::data::ssl%]",
              "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
@@ -27,24 +38,24 @@
            "data_description": {
              "ssl": "[%key:component::airos::config::step::user::sections::advanced_settings::data_description::ssl%]",
              "verify_ssl": "[%key:component::airos::config::step::user::sections::advanced_settings::data_description::verify_ssl%]"
-            }
+            },
+            "name": "[%key:component::airos::config::step::user::sections::advanced_settings::name%]"
          }
        }
      },
      "user": {
        "data": {
          "host": "[%key:common::config_flow::data::host%]",
-          "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]"
+          "password": "[%key:common::config_flow::data::password%]",
+          "username": "[%key:common::config_flow::data::username%]"
        },
        "data_description": {
          "host": "IP address or hostname of the airOS device",
-          "username": "Administrator username for the airOS device, normally 'ubnt'",
-          "password": "Password configured through the UISP app or web interface"
+          "password": "Password configured through the UISP app or web interface",
+          "username": "Administrator username for the airOS device, normally 'ubnt'"
        },
        "sections": {
          "advanced_settings": {
-            "name": "Advanced settings",
            "data": {
              "ssl": "Use HTTPS",
              "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
@@ -52,28 +63,17 @@
            "data_description": {
              "ssl": "Whether the connection should be encrypted (required for most devices)",
              "verify_ssl": "Whether the certificate should be verified when using HTTPS. This should be off for self-signed certificates"
-            }
+            },
+            "name": "Advanced settings"
          }
        }
      }
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "key_data_missing": "Expected data not returned from the device, check the documentation for supported devices",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
-      "unique_id_mismatch": "Re-authentication should be used for the same device not a new one"
    }
  },
  "entity": {
    "binary_sensor": {
-      "port_forwarding": {
-        "name": "Port forwarding"
+      "dhcp6_server": {
+        "name": "DHCPv6 server"
      },
      "dhcp_client": {
        "name": "DHCP client"
@@ -81,8 +81,8 @@
      "dhcp_server": {
        "name": "DHCP server"
      },
-      "dhcp6_server": {
-        "name": "DHCPv6 server"
+      "port_forwarding": {
+        "name": "Port forwarding"
      },
      "pppoe": {
        "name": "PPPoE link"
@@ -99,20 +99,27 @@
          "router": "Router"
        }
      },
-      "wireless_frequency": {
-        "name": "Wireless frequency"
-      },
-      "wireless_essid": {
-        "name": "Wireless SSID"
+      "host_uptime": {
+        "name": "Uptime"
      },
      "wireless_antenna_gain": {
        "name": "Antenna gain"
      },
-      "wireless_throughput_tx": {
-        "name": "Throughput transmit (actual)"
+      "wireless_distance": {
+        "name": "Wireless distance"
      },
-      "wireless_throughput_rx": {
-        "name": "Throughput receive (actual)"
+      "wireless_essid": {
+        "name": "Wireless SSID"
+      },
+      "wireless_frequency": {
+        "name": "Wireless frequency"
+      },
+      "wireless_mode": {
+        "name": "Wireless mode",
+        "state": {
+          "point_to_multipoint": "Point-to-multipoint",
+          "point_to_point": "Point-to-point"
+        }
      },
      "wireless_polling_dl_capacity": {
        "name": "Download capacity"
@@ -123,12 +130,6 @@
      "wireless_remote_hostname": {
        "name": "Remote hostname"
      },
-      "host_uptime": {
-        "name": "Uptime"
-      },
-      "wireless_distance": {
-        "name": "Wireless distance"
-      },
      "wireless_role": {
        "name": "Wireless role",
        "state": {
@@ -136,27 +137,26 @@
          "station": "Station"
        }
      },
-      "wireless_mode": {
-        "name": "Wireless mode",
-        "state": {
-          "point_to_point": "Point-to-point",
-          "point_to_multipoint": "Point-to-multipoint"
-        }
+      "wireless_throughput_rx": {
+        "name": "Throughput receive (actual)"
+      },
+      "wireless_throughput_tx": {
+        "name": "Throughput transmit (actual)"
      }
    }
  },
  "exceptions": {
-    "invalid_auth": {
-      "message": "[%key:common::config_flow::error::invalid_auth%]"
-    },
    "cannot_connect": {
      "message": "[%key:common::config_flow::error::cannot_connect%]"
    },
-    "key_data_missing": {
-      "message": "Key data not returned from device"
-    },
    "error_data_missing": {
      "message": "Data incomplete or missing"
+    },
+    "invalid_auth": {
+      "message": "[%key:common::config_flow::error::invalid_auth%]"
+    },
+    "key_data_missing": {
+      "message": "Key data not returned from device"
    }
  }
 }
@@ -1,36 +1,21 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "title": "Identify the device",
-        "description": "Provide the IP address or mDNS of the device and its password",
-        "data": {
-          "ip_address": "[%key:common::config_flow::data::ip%]",
-          "password": "[%key:common::config_flow::data::password%]"
-        }
-      }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    },
    "error": {
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
      "invalid_input": "[%key:common::config_flow::error::invalid_host%]"
    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    }
-  },
-  "options": {
    "step": {
-      "init": {
-        "title": "Configure air-Q integration",
+      "user": {
        "data": {
-          "return_average": "Show values averaged by the device",
-          "clip_negatives": "Clip negative values"
+          "ip_address": "[%key:common::config_flow::data::ip%]",
+          "password": "[%key:common::config_flow::data::password%]"
        },
-        "data_description": {
-          "return_average": "air-Q allows to poll both the noisy sensor readings as well as the values averaged on the device (default)",
-          "clip_negatives": "For baseline calibration purposes, certain sensor values may briefly become negative. The default behavior is to clip such values to 0"
-        }
+        "description": "Provide the IP address or mDNS of the device and its password",
+        "title": "Identify the device"
      }
    }
  },
@@ -53,8 +38,11 @@
      "bromine": {
        "name": "Bromine"
      },
-      "methanethiol": {
-        "name": "Methanethiol"
+      "carbon_disulfide": {
+        "name": "Carbon disulfide"
+      },
+      "carbon_monoxide": {
+        "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
      },
      "chlorine": {
        "name": "Chlorine"
@@ -62,12 +50,6 @@
      "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"
      },
@@ -77,36 +59,51 @@
      "ethylene": {
        "name": "Ethylene"
      },
-      "formaldehyde": {
-        "name": "Formaldehyde"
-      },
      "fluorine": {
        "name": "Fluorine"
      },
-      "hydrogen_sulfide": {
-        "name": "Hydrogen sulfide"
+      "formaldehyde": {
+        "name": "Formaldehyde"
+      },
+      "health_index": {
+        "name": "Health index"
      },
      "hydrochloric_acid": {
        "name": "Hydrochloric acid"
      },
+      "hydrogen": {
+        "name": "Hydrogen"
+      },
      "hydrogen_cyanide": {
        "name": "Hydrogen cyanide"
      },
      "hydrogen_fluoride": {
        "name": "Hydrogen fluoride"
      },
-      "health_index": {
-        "name": "Health index"
-      },
-      "hydrogen": {
-        "name": "Hydrogen"
-      },
      "hydrogen_peroxide": {
        "name": "Hydrogen peroxide"
      },
+      "hydrogen_phosphide": {
+        "name": "Hydrogen phosphide"
+      },
+      "hydrogen_sulfide": {
+        "name": "Hydrogen sulfide"
+      },
+      "industrial_volatile_organic_compounds": {
+        "name": "VOCs (industrial)"
+      },
+      "maximum_noise": {
+        "name": "Noise (maximum)"
+      },
      "methane": {
        "name": "Methane"
      },
+      "methanethiol": {
+        "name": "Methanethiol"
+      },
+      "noise": {
+        "name": "Noise"
+      },
      "organic_acid": {
        "name": "Organic acid"
      },
@@ -116,36 +113,39 @@
      "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)"
+      "refigerant": {
+        "name": "Refrigerant"
+      },
+      "relative_pressure": {
+        "name": "Relative pressure"
+      },
+      "silicon_hydride": {
+        "name": "Silicon hydride"
      },
      "virus_index": {
        "name": "Virus index"
      }
    }
+  },
+  "options": {
+    "step": {
+      "init": {
+        "data": {
+          "clip_negatives": "Clip negative values",
+          "return_average": "Show values averaged by the device"
+        },
+        "data_description": {
+          "clip_negatives": "For baseline calibration purposes, certain sensor values may briefly become negative. The default behavior is to clip such values to 0",
+          "return_average": "air-Q allows to poll both the noisy sensor readings as well as the values averaged on the device (default)"
+        },
+        "title": "Configure air-Q integration"
+      }
+    }
  }
 }
@@ -1,5 +1,13 @@
 {
  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
+    },
+    "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%]"
+    },
    "step": {
      "user": {
        "data": {
@@ -8,29 +16,21 @@
        },
        "description": "Log in at {url} to find your credentials"
      }
-    },
-    "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%]"
    }
  },
  "entity": {
    "sensor": {
-      "radon": {
-        "name": "Radon"
-      },
      "light": {
        "name": "Light"
      },
-      "virus_risk": {
-        "name": "Virus Risk"
-      },
      "mold": {
        "name": "Mold"
+      },
+      "radon": {
+        "name": "Radon"
+      },
+      "virus_risk": {
+        "name": "Virus Risk"
      }
    }
  }
@@ -23,7 +23,7 @@ from homeassistant.components.bluetooth import (
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_ADDRESS

-from .const import DOMAIN, MFCT_ID
+from .const import DEVICE_MODEL, DOMAIN, MFCT_ID

 _LOGGER = logging.getLogger(__name__)

@@ -128,15 +128,15 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
        self, user_input: dict[str, Any] | None = None
    ) -> ConfigFlowResult:
        """Confirm discovery."""
+        assert self._discovered_device is not None
+
        if user_input is not None:
-            if (
-                self._discovered_device is not None
-                and self._discovered_device.device.firmware.need_firmware_upgrade
-            ):
+            if self._discovered_device.device.firmware.need_firmware_upgrade:
                return self.async_abort(reason="firmware_upgrade_required")

            return self.async_create_entry(
-                title=self.context["title_placeholders"]["name"], data={}
+                title=self.context["title_placeholders"]["name"],
+                data={DEVICE_MODEL: self._discovered_device.device.model.value},
            )

        self._set_confirm_only()
@@ -164,7 +164,10 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):

            self._discovered_device = discovery

-            return self.async_create_entry(title=discovery.name, data={})
+            return self.async_create_entry(
+                title=discovery.name,
+                data={DEVICE_MODEL: discovery.device.model.value},
+            )

        current_addresses = self._async_current_ids(include_ignore=False)
        devices: list[BluetoothServiceInfoBleak] = []
@@ -1,11 +1,16 @@
 """Constants for Airthings BLE."""

+from airthings_ble import AirthingsDeviceType
+
 DOMAIN = "airthings_ble"
 MFCT_ID = 820

 VOLUME_BECQUEREL = "Bq/m³"
 VOLUME_PICOCURIE = "pCi/L"

+DEVICE_MODEL = "device_model"
+
 DEFAULT_SCAN_INTERVAL = 300
+DEVICE_SPECIFIC_SCAN_INTERVAL = {AirthingsDeviceType.CORENTIUM_HOME_2.value: 1800}

 MAX_RETRIES_AFTER_STARTUP = 5
@@ -16,7 +16,12 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util.unit_system import METRIC_SYSTEM

-from .const import DEFAULT_SCAN_INTERVAL, DOMAIN
+from .const import (
+    DEFAULT_SCAN_INTERVAL,
+    DEVICE_MODEL,
+    DEVICE_SPECIFIC_SCAN_INTERVAL,
+    DOMAIN,
+)

 _LOGGER = logging.getLogger(__name__)

@@ -34,12 +39,18 @@ class AirthingsBLEDataUpdateCoordinator(DataUpdateCoordinator[AirthingsDevice]):
        self.airthings = AirthingsBluetoothDeviceData(
            _LOGGER, hass.config.units is METRIC_SYSTEM
        )
+
+        device_model = entry.data.get(DEVICE_MODEL)
+        interval = DEVICE_SPECIFIC_SCAN_INTERVAL.get(
+            device_model, DEFAULT_SCAN_INTERVAL
+        )
+
        super().__init__(
            hass,
            _LOGGER,
            config_entry=entry,
            name=DOMAIN,
-            update_interval=timedelta(seconds=DEFAULT_SCAN_INTERVAL),
+            update_interval=timedelta(seconds=interval),
        )

    async def _async_setup(self) -> None:
@@ -58,11 +69,29 @@ class AirthingsBLEDataUpdateCoordinator(DataUpdateCoordinator[AirthingsDevice]):
            )
        self.ble_device = ble_device

+        if DEVICE_MODEL not in self.config_entry.data:
+            _LOGGER.debug("Fetching device info for migration")
+            try:
+                data = await self.airthings.update_device(self.ble_device)
+            except Exception as err:
+                raise UpdateFailed(
+                    f"Unable to fetch data for migration: {err}"
+                ) from err
+
+            self.hass.config_entries.async_update_entry(
+                self.config_entry,
+                data={**self.config_entry.data, DEVICE_MODEL: data.model.value},
+            )
+            self.update_interval = timedelta(
+                seconds=DEVICE_SPECIFIC_SCAN_INTERVAL.get(
+                    data.model.value, DEFAULT_SCAN_INTERVAL
+                )
+            )
+
    async def _async_update_data(self) -> AirthingsDevice:
        """Get data from Airthings BLE."""
        try:
            data = await self.airthings.update_device(self.ble_device)
        except Exception as err:
            raise UpdateFailed(f"Unable to fetch data: {err}") from err
-
        return data
@@ -4,10 +4,10 @@
      "radon_1day_avg": {
        "default": "mdi:radioactive"
      },
-      "radon_longterm_avg": {
+      "radon_1day_level": {
        "default": "mdi:radioactive"
      },
-      "radon_1day_level": {
+      "radon_longterm_avg": {
        "default": "mdi:radioactive"
      },
      "radon_longterm_level": {
@@ -28,5 +28,5 @@
  "dependencies": ["bluetooth_adapters"],
  "documentation": "https://www.home-assistant.io/integrations/airthings_ble",
  "iot_class": "local_polling",
-  "requirements": ["airthings-ble==1.1.1"]
+  "requirements": ["airthings-ble==1.2.0"]
 }
@@ -1,49 +1,49 @@
 {
  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "firmware_upgrade_required": "Your device requires a firmware upgrade. Please use the Airthings app (Android/iOS) to upgrade it.",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "unsupported_device": "Unsupported device"
+    },
    "flow_title": "{name}",
    "step": {
+      "bluetooth_confirm": {
+        "description": "[%key:component::bluetooth::config::step::bluetooth_confirm::description%]"
+      },
      "user": {
-        "description": "[%key:component::bluetooth::config::step::user::description%]",
        "data": {
          "address": "[%key:common::config_flow::data::device%]"
        },
        "data_description": {
          "address": "The Airthings devices discovered via Bluetooth."
-        }
-      },
-      "bluetooth_confirm": {
-        "description": "[%key:component::bluetooth::config::step::bluetooth_confirm::description%]"
+        },
+        "description": "[%key:component::bluetooth::config::step::user::description%]"
      }
-    },
-    "abort": {
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "firmware_upgrade_required": "Your device requires a firmware upgrade. Please use the Airthings app (Android/iOS) to upgrade it.",
-      "unsupported_device": "Unsupported device",
-      "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"
+      "ambient_noise": {
+        "name": "Ambient noise"
      },
      "illuminance": {
        "name": "[%key:component::sensor::entity_component::illuminance::name%]"
      },
-      "ambient_noise": {
-        "name": "Ambient noise"
+      "radon_1day_avg": {
+        "name": "Radon 1-day average"
+      },
+      "radon_1day_level": {
+        "name": "Radon 1-day level"
+      },
+      "radon_longterm_avg": {
+        "name": "Radon longterm average"
+      },
+      "radon_longterm_level": {
+        "name": "Radon longterm level"
      }
    }
  }
@@ -9,13 +9,13 @@
    },
    "step": {
      "user": {
-        "title": "Set up your AirTouch 4 connection details.",
        "data": {
          "host": "[%key:common::config_flow::data::host%]"
        },
        "data_description": {
          "host": "The hostname or IP address of your AirTouch controller."
-        }
+        },
+        "title": "Set up your AirTouch 4 connection details."
      }
    }
  }
@@ -1,18 +1,18 @@
 {
  "config": {
+    "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%]"
+    },
    "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%]"
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    }
  },
  "entity": {
@@ -21,8 +21,8 @@
        "state_attributes": {
          "fan_mode": {
            "state": {
-              "turbo": "Turbo",
-              "intelligent_auto": "Intelligent Auto"
+              "intelligent_auto": "Intelligent Auto",
+              "turbo": "Turbo"
            }
          }
        }
@@ -1,11 +1,11 @@
 {
  "entity": {
    "sensor": {
-      "pollutant_level": {
-        "default": "mdi:gauge"
-      },
      "pollutant_label": {
        "default": "mdi:chemical-weapon"
+      },
+      "pollutant_level": {
+        "default": "mdi:gauge"
      }
    }
  }
@@ -1,54 +1,44 @@
 {
  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
+      "location_not_found": "Location not found",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
    "step": {
      "geography_by_coords": {
-        "title": "Configure a geography",
-        "description": "Use the AirVisual cloud API to monitor a latitude/longitude.",
        "data": {
          "api_key": "[%key:common::config_flow::data::api_key%]",
          "latitude": "[%key:common::config_flow::data::latitude%]",
          "longitude": "[%key:common::config_flow::data::longitude%]"
-        }
+        },
+        "description": "Use the AirVisual cloud API to monitor a latitude/longitude.",
+        "title": "Configure a geography"
      },
      "geography_by_name": {
-        "title": "[%key:component::airvisual::config::step::geography_by_coords::title%]",
-        "description": "Use the AirVisual cloud API to monitor a city/state/country.",
        "data": {
          "api_key": "[%key:common::config_flow::data::api_key%]",
          "city": "City",
-          "state": "State",
-          "country": "[%key:common::config_flow::data::country%]"
-        }
+          "country": "[%key:common::config_flow::data::country%]",
+          "state": "State"
+        },
+        "description": "Use the AirVisual cloud API to monitor a city/state/country.",
+        "title": "[%key:component::airvisual::config::step::geography_by_coords::title%]"
      },
      "reauth_confirm": {
-        "title": "Re-authenticate AirVisual",
        "data": {
          "api_key": "[%key:common::config_flow::data::api_key%]"
-        }
+        },
+        "title": "Re-authenticate AirVisual"
      },
      "user": {
-        "title": "Configure AirVisual",
-        "description": "Pick what type of AirVisual data you want to monitor."
-      }
-    },
-    "error": {
-      "unknown": "[%key:common::config_flow::error::unknown%]",
-      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
-      "location_not_found": "Location not found",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
-    }
-  },
-  "options": {
-    "step": {
-      "init": {
-        "title": "[%key:component::airvisual::config::step::user::title%]",
-        "data": {
-          "show_on_map": "Show monitored geography on the map"
-        }
+        "description": "Pick what type of AirVisual data you want to monitor.",
+        "title": "Configure AirVisual"
      }
    }
  },
@@ -67,19 +57,29 @@
      "pollutant_level": {
        "state": {
          "good": "Good",
+          "hazardous": "Hazardous",
          "moderate": "Moderate",
          "unhealthy": "Unhealthy",
          "unhealthy_sensitive": "Unhealthy for sensitive groups",
-          "very_unhealthy": "Very unhealthy",
-          "hazardous": "Hazardous"
+          "very_unhealthy": "Very unhealthy"
        }
      }
    }
  },
  "issues": {
    "airvisual_pro_migration": {
-      "title": "{ip_address} is now part of the AirVisual Pro integration",
-      "description": "AirVisual Pro units are now their own Home Assistant integration (as opposed to be included with the original AirVisual integration that uses the AirVisual cloud API). The Pro device located at `{ip_address}` has automatically been migrated.\n\nAs part of that migration, the Pro's device ID has changed from `{old_device_id}` to `{new_device_id}`. Please update these automations to use the new device ID: {device_automations_string}."
+      "description": "AirVisual Pro units are now their own Home Assistant integration (as opposed to be included with the original AirVisual integration that uses the AirVisual cloud API). The Pro device located at `{ip_address}` has automatically been migrated.\n\nAs part of that migration, the Pro's device ID has changed from `{old_device_id}` to `{new_device_id}`. Please update these automations to use the new device ID: {device_automations_string}.",
+      "title": "{ip_address} is now part of the AirVisual Pro integration"
+    }
+  },
+  "options": {
+    "step": {
+      "init": {
+        "data": {
+          "show_on_map": "Show monitored geography on the map"
+        },
+        "title": "[%key:component::airvisual::config::step::user::title%]"
+      }
    }
  }
 }
@@ -1,40 +1,40 @@
 {
  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+    },
+    "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%]"
+    },
    "step": {
      "reauth_confirm": {
-        "description": "[%key:component::airvisual_pro::config::step::user::description%]",
        "data": {
          "password": "[%key:common::config_flow::data::password%]"
-        }
+        },
+        "description": "[%key:component::airvisual_pro::config::step::user::description%]"
      },
      "user": {
-        "description": "The password can be retrieved from the AirVisual Pro's UI.",
        "data": {
          "ip_address": "[%key:common::config_flow::data::host%]",
          "password": "[%key:common::config_flow::data::password%]"
        },
        "data_description": {
          "ip_address": "The hostname or IP address of your AirVisual Pro device."
-        }
+        },
+        "description": "The password can be retrieved from the AirVisual Pro's UI."
      }
-    },
-    "error": {
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
    }
  },
  "entity": {
    "sensor": {
-      "pm01": {
-        "name": "PM0.1"
-      },
      "outdoor_air_quality_index": {
        "name": "Outdoor air quality index"
+      },
+      "pm01": {
+        "name": "PM0.1"
      }
    }
  }
@@ -10,15 +10,15 @@
    "step": {
      "discovered_connection": {
        "data": {
-          "id": "[%key:component::airzone::config::step::user::data::id%]",
          "host": "[%key:common::config_flow::data::host%]",
+          "id": "[%key:component::airzone::config::step::user::data::id%]",
          "port": "[%key:common::config_flow::data::port%]"
        }
      },
      "user": {
        "data": {
-          "id": "System ID",
          "host": "[%key:common::config_flow::data::host%]",
+          "id": "System ID",
          "port": "[%key:common::config_flow::data::port%]"
        }
      }
@@ -37,19 +37,19 @@
      "grille_angles": {
        "name": "Cold angle",
        "state": {
-          "90deg": "90°",
-          "50deg": "50°",
+          "40deg": "40°",
          "45deg": "45°",
-          "40deg": "40°"
+          "50deg": "50°",
+          "90deg": "90°"
        }
      },
      "heat_angles": {
        "name": "Heat angle",
        "state": {
-          "90deg": "[%key:component::airzone::entity::select::grille_angles::state::90deg%]",
-          "50deg": "[%key:component::airzone::entity::select::grille_angles::state::50deg%]",
+          "40deg": "[%key:component::airzone::entity::select::grille_angles::state::40deg%]",
          "45deg": "[%key:component::airzone::entity::select::grille_angles::state::45deg%]",
-          "40deg": "[%key:component::airzone::entity::select::grille_angles::state::40deg%]"
+          "50deg": "[%key:component::airzone::entity::select::grille_angles::state::50deg%]",
+          "90deg": "[%key:component::airzone::entity::select::grille_angles::state::90deg%]"
        }
      },
      "modes": {
@@ -66,20 +66,20 @@
      "q_adapt": {
        "name": "Q-Adapt",
        "state": {
-          "standard": "Standard",
+          "maximum": "Maximum",
+          "minimum": "Minimum",
          "power": "Power",
          "silence": "Silence",
-          "minimum": "Minimum",
-          "maximum": "Maximum"
+          "standard": "Standard"
        }
      },
      "sleep_times": {
        "name": "Sleep",
        "state": {
-          "off": "[%key:common::state::off%]",
          "30m": "30 minutes",
          "60m": "60 minutes",
-          "90m": "90 minutes"
+          "90m": "90 minutes",
+          "off": "[%key:common::state::off%]"
        }
      }
    },
@@ -10,8 +10,8 @@
      "user": {
        "data": {
          "id": "Installation",
-          "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]"
+          "password": "[%key:common::config_flow::data::password%]",
+          "username": "[%key:common::config_flow::data::username%]"
        }
      }
    }
@@ -32,9 +32,9 @@
      "air_quality": {
        "name": "Air Quality mode",
        "state": {
+          "auto": "[%key:common::state::auto%]",
          "off": "[%key:common::state::off%]",
-          "on": "[%key:common::state::on%]",
-          "auto": "[%key:common::state::auto%]"
+          "on": "[%key:common::state::on%]"
        }
      },
      "modes": {
@@ -1,34 +1,34 @@
 {
  "config": {
-    "step": {
-      "pick_implementation": {
-        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
-      },
-      "reauth_confirm": {
-        "title": "[%key:common::config_flow::title::reauth%]",
-        "description": "Aladdin Connect needs to re-authenticate your account"
-      },
-      "oauth_discovery": {
-        "description": "Home Assistant has found an Aladdin Connect device on your network. Press **Submit** to continue setting up Aladdin Connect."
-      }
-    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
+      "cloud_not_enabled": "Please make sure you run Home Assistant with `{default_config}` enabled in your configuration.yaml.",
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
+      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
      "oauth_error": "[%key:common::config_flow::abort::oauth2_error%]",
      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]",
      "oauth_timeout": "[%key:common::config_flow::abort::oauth2_timeout%]",
      "oauth_unauthorized": "[%key:common::config_flow::abort::oauth2_unauthorized%]",
-      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
-      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
-      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
-      "user_rejected_authorize": "[%key:common::config_flow::abort::oauth2_user_rejected_authorize%]",
      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "wrong_account": "You are authenticated with a different account than the one set up. Please authenticate with the configured account.",
-      "cloud_not_enabled": "Please make sure you run Home Assistant with `{default_config}` enabled in your configuration.yaml."
+      "user_rejected_authorize": "[%key:common::config_flow::abort::oauth2_user_rejected_authorize%]",
+      "wrong_account": "You are authenticated with a different account than the one set up. Please authenticate with the configured account."
    },
    "create_entry": {
      "default": "[%key:common::config_flow::create_entry::authenticated%]"
+    },
+    "step": {
+      "oauth_discovery": {
+        "description": "Home Assistant has found an Aladdin Connect device on your network. Press **Submit** to continue setting up Aladdin Connect."
+      },
+      "pick_implementation": {
+        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
+      },
+      "reauth_confirm": {
+        "description": "Aladdin Connect needs to re-authenticate your account",
+        "title": "[%key:common::config_flow::title::reauth%]"
+      }
    }
  }
 }
@@ -18,23 +18,23 @@
    "alarm_arm_away": {
      "service": "mdi:shield-lock"
    },
+    "alarm_arm_custom_bypass": {
+      "service": "mdi:security"
+    },
    "alarm_arm_home": {
      "service": "mdi:shield-home"
    },
    "alarm_arm_night": {
      "service": "mdi:shield-moon"
    },
-    "alarm_arm_custom_bypass": {
-      "service": "mdi:security"
+    "alarm_arm_vacation": {
+      "service": "mdi:shield-airplane"
    },
    "alarm_disarm": {
      "service": "mdi:shield-off"
    },
    "alarm_trigger": {
      "service": "mdi:bell-ring"
-    },
-    "alarm_arm_vacation": {
-      "service": "mdi:shield-airplane"
    }
  }
 }
@@ -1,5 +1,4 @@
 {
-  "title": "Alarm control panel",
  "device_automation": {
    "action_type": {
      "arm_away": "Arm {entity_name} away",
@@ -10,24 +9,24 @@
      "trigger": "Trigger {entity_name}"
    },
    "condition_type": {
-      "is_triggered": "{entity_name} is triggered",
-      "is_disarmed": "{entity_name} is disarmed",
-      "is_armed_home": "{entity_name} is armed home",
      "is_armed_away": "{entity_name} is armed away",
+      "is_armed_home": "{entity_name} is armed home",
      "is_armed_night": "{entity_name} is armed night",
-      "is_armed_vacation": "{entity_name} is armed vacation"
+      "is_armed_vacation": "{entity_name} is armed vacation",
+      "is_disarmed": "{entity_name} is disarmed",
+      "is_triggered": "{entity_name} is triggered"
    },
    "extra_fields": {
      "code": "Code",
      "for": "[%key:common::device_automation::extra_fields::for%]"
    },
    "trigger_type": {
-      "triggered": "{entity_name} triggered",
-      "disarmed": "{entity_name} disarmed",
-      "armed_home": "{entity_name} armed home",
      "armed_away": "{entity_name} armed away",
+      "armed_home": "{entity_name} armed home",
      "armed_night": "{entity_name} armed night",
-      "armed_vacation": "{entity_name} armed vacation"
+      "armed_vacation": "{entity_name} armed vacation",
+      "disarmed": "{entity_name} disarmed",
+      "triggered": "{entity_name} triggered"
    }
  },
  "entity_component": {
@@ -35,106 +34,34 @@
      "name": "[%key:component::alarm_control_panel::title%]",
      "state": {
        "armed": "Armed",
-        "disarmed": "Disarmed",
-        "armed_home": "Armed home",
        "armed_away": "Armed away",
+        "armed_custom_bypass": "Armed custom bypass",
+        "armed_home": "Armed home",
        "armed_night": "Armed night",
        "armed_vacation": "Armed vacation",
-        "armed_custom_bypass": "Armed custom bypass",
-        "pending": "Pending",
        "arming": "Arming",
+        "disarmed": "Disarmed",
        "disarming": "Disarming",
+        "pending": "Pending",
        "triggered": "Triggered"
      },
      "state_attributes": {
-        "code_format": {
-          "name": "Code format",
-          "state": {
-            "text": "Text",
-            "number": "Number"
-          }
-        },
        "changed_by": {
          "name": "Changed by"
        },
        "code_arm_required": {
          "name": "Code for arming",
          "state": {
-            "true": "Required",
-            "false": "Not required"
+            "false": "Not required",
+            "true": "Required"
+          }
+        },
+        "code_format": {
+          "name": "Code format",
+          "state": {
+            "number": "Number",
+            "text": "Text"
          }
-        }
-      }
-    }
-  },
-  "services": {
-    "alarm_disarm": {
-      "name": "Disarm",
-      "description": "Disarms the alarm.",
-      "fields": {
-        "code": {
-          "name": "Code",
-          "description": "Code to disarm the alarm."
-        }
-      }
-    },
-    "alarm_arm_custom_bypass": {
-      "name": "Arm with custom bypass",
-      "description": "Arms the alarm while allowing to bypass a custom area.",
-      "fields": {
-        "code": {
-          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
-          "description": "Code to arm the alarm."
-        }
-      }
-    },
-    "alarm_arm_home": {
-      "name": "Arm home",
-      "description": "Arms the alarm in the home mode.",
-      "fields": {
-        "code": {
-          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
-          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]"
-        }
-      }
-    },
-    "alarm_arm_away": {
-      "name": "Arm away",
-      "description": "Arms the alarm in the away mode.",
-      "fields": {
-        "code": {
-          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
-          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]"
-        }
-      }
-    },
-    "alarm_arm_night": {
-      "name": "Arm night",
-      "description": "Arms the alarm in the night mode.",
-      "fields": {
-        "code": {
-          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
-          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]"
-        }
-      }
-    },
-    "alarm_arm_vacation": {
-      "name": "Arm vacation",
-      "description": "Arms the alarm in the vacation mode.",
-      "fields": {
-        "code": {
-          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
-          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]"
-        }
-      }
-    },
-    "alarm_trigger": {
-      "name": "Trigger",
-      "description": "Triggers the alarm manually.",
-      "fields": {
-        "code": {
-          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
-          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]"
        }
      }
    }
@@ -143,5 +70,78 @@
    "code_arm_required": {
      "message": "Arming requires a code but none was given for {entity_id}."
    }
-  }
+  },
+  "services": {
+    "alarm_arm_away": {
+      "description": "Arms the alarm in the away mode.",
+      "fields": {
+        "code": {
+          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]",
+          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
+        }
+      },
+      "name": "Arm away"
+    },
+    "alarm_arm_custom_bypass": {
+      "description": "Arms the alarm while allowing to bypass a custom area.",
+      "fields": {
+        "code": {
+          "description": "Code to arm the alarm.",
+          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
+        }
+      },
+      "name": "Arm with custom bypass"
+    },
+    "alarm_arm_home": {
+      "description": "Arms the alarm in the home mode.",
+      "fields": {
+        "code": {
+          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]",
+          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
+        }
+      },
+      "name": "Arm home"
+    },
+    "alarm_arm_night": {
+      "description": "Arms the alarm in the night mode.",
+      "fields": {
+        "code": {
+          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]",
+          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
+        }
+      },
+      "name": "Arm night"
+    },
+    "alarm_arm_vacation": {
+      "description": "Arms the alarm in the vacation mode.",
+      "fields": {
+        "code": {
+          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]",
+          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
+        }
+      },
+      "name": "Arm vacation"
+    },
+    "alarm_disarm": {
+      "description": "Disarms the alarm.",
+      "fields": {
+        "code": {
+          "description": "Code to disarm the alarm.",
+          "name": "Code"
+        }
+      },
+      "name": "Disarm"
+    },
+    "alarm_trigger": {
+      "description": "Triggers the alarm manually.",
+      "fields": {
+        "code": {
+          "description": "[%key:component::alarm_control_panel::services::alarm_arm_custom_bypass::fields::code::description%]",
+          "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
+        }
+      },
+      "name": "Trigger"
+    }
+  },
+  "title": "Alarm control panel"
 }
@@ -1,101 +1,101 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "title": "Choose AlarmDecoder protocol",
-        "data": {
-          "protocol": "Protocol"
-        }
-      },
-      "protocol": {
-        "title": "Configure connection settings",
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]",
-          "port": "[%key:common::config_flow::data::port%]",
-          "device_baudrate": "Device baud rate",
-          "device_path": "Device path"
-        },
-        "data_description": {
-          "host": "The hostname or IP address of the AlarmDecoder device that is connected to your alarm panel.",
-          "port": "The port on which AlarmDecoder is accessible (for example, 10000)"
-        }
-      }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "create_entry": {
+      "default": "Successfully connected to AlarmDecoder."
    },
    "error": {
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
-    "create_entry": {
-      "default": "Successfully connected to AlarmDecoder."
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    "step": {
+      "protocol": {
+        "data": {
+          "device_baudrate": "Device baud rate",
+          "device_path": "Device path",
+          "host": "[%key:common::config_flow::data::host%]",
+          "port": "[%key:common::config_flow::data::port%]"
+        },
+        "data_description": {
+          "host": "The hostname or IP address of the AlarmDecoder device that is connected to your alarm panel.",
+          "port": "The port on which AlarmDecoder is accessible (for example, 10000)"
+        },
+        "title": "Configure connection settings"
+      },
+      "user": {
+        "data": {
+          "protocol": "Protocol"
+        },
+        "title": "Choose AlarmDecoder protocol"
+      }
    }
  },
  "options": {
+    "error": {
+      "int": "The field below must be an integer.",
+      "loop_range": "'RF loop' must be an integer between 1 and 4.",
+      "loop_rfid": "'RF loop' cannot be used without 'RF serial'.",
+      "relay_inclusive": "'Relay address' and 'Relay channel' are codependent and must be included together."
+    },
    "step": {
+      "arm_settings": {
+        "data": {
+          "alt_night_mode": "Alternative night mode",
+          "auto_bypass": "Auto-bypass on arm",
+          "code_arm_required": "Code required for arming"
+        },
+        "title": "[%key:component::alarmdecoder::options::step::init::title%]"
+      },
      "init": {
-        "title": "Configure AlarmDecoder",
-        "description": "What would you like to edit?",
        "data": {
          "edit_selection": "Edit"
-        }
-      },
-      "arm_settings": {
-        "title": "[%key:component::alarmdecoder::options::step::init::title%]",
-        "data": {
-          "auto_bypass": "Auto-bypass on arm",
-          "code_arm_required": "Code required for arming",
-          "alt_night_mode": "Alternative night mode"
-        }
-      },
-      "zone_select": {
-        "title": "[%key:component::alarmdecoder::options::step::init::title%]",
-        "description": "Enter the zone number you'd like to to add, edit, or remove.",
-        "data": {
-          "zone_number": "Zone number"
-        }
+        },
+        "description": "What would you like to edit?",
+        "title": "Configure AlarmDecoder"
      },
      "zone_details": {
-        "title": "[%key:component::alarmdecoder::options::step::init::title%]",
-        "description": "Enter details for zone {zone_number}. To delete zone {zone_number}, leave 'Zone name' blank.",
        "data": {
-          "zone_name": "Zone name",
-          "zone_type": "Zone type",
-          "zone_rfid": "RF serial",
          "zone_loop": "RF loop",
+          "zone_name": "Zone name",
          "zone_relayaddr": "Relay address",
-          "zone_relaychan": "Relay channel"
-        }
+          "zone_relaychan": "Relay channel",
+          "zone_rfid": "RF serial",
+          "zone_type": "Zone type"
+        },
+        "description": "Enter details for zone {zone_number}. To delete zone {zone_number}, leave 'Zone name' blank.",
+        "title": "[%key:component::alarmdecoder::options::step::init::title%]"
+      },
+      "zone_select": {
+        "data": {
+          "zone_number": "Zone number"
+        },
+        "description": "Enter the zone number you'd like to to add, edit, or remove.",
+        "title": "[%key:component::alarmdecoder::options::step::init::title%]"
      }
-    },
-    "error": {
-      "relay_inclusive": "'Relay address' and 'Relay channel' are codependent and must be included together.",
-      "int": "The field below must be an integer.",
-      "loop_rfid": "'RF loop' cannot be used without 'RF serial'.",
-      "loop_range": "'RF loop' must be an integer between 1 and 4."
    }
  },
  "services": {
    "alarm_keypress": {
-      "name": "Key press",
      "description": "Sends custom keypresses to the alarm.",
      "fields": {
        "keypress": {
-          "name": "[%key:component::alarmdecoder::services::alarm_keypress::name%]",
-          "description": "String to send to the alarm panel."
+          "description": "String to send to the alarm panel.",
+          "name": "[%key:component::alarmdecoder::services::alarm_keypress::name%]"
        }
-      }
+      },
+      "name": "Key press"
    },
    "alarm_toggle_chime": {
-      "name": "Toggle chime",
      "description": "Sends the alarm the toggle chime command.",
      "fields": {
        "code": {
-          "name": "Code",
-          "description": "Code to toggle the alarm control panel chime with."
+          "description": "Code to toggle the alarm control panel chime with.",
+          "name": "Code"
        }
-      }
+      },
+      "name": "Toggle chime"
    }
  }
 }
@@ -1,5 +1,4 @@
 {
-  "title": "Alert",
  "entity_component": {
    "_": {
      "name": "[%key:component::alert::title%]",
@@ -12,16 +11,17 @@
  },
  "services": {
    "toggle": {
-      "name": "[%key:common::action::toggle%]",
-      "description": "Toggles alert's notifications."
+      "description": "Toggles alert's notifications.",
+      "name": "[%key:common::action::toggle%]"
    },
    "turn_off": {
-      "name": "[%key:common::action::turn_off%]",
-      "description": "Silences alert's notifications."
+      "description": "Silences alert's notifications.",
+      "name": "[%key:common::action::turn_off%]"
    },
    "turn_on": {
-      "name": "[%key:common::action::turn_on%]",
-      "description": "Resets alert's notifications."
+      "description": "Resets alert's notifications.",
+      "name": "[%key:common::action::turn_on%]"
    }
-  }
+  },
+  "title": "Alert"
 }
@@ -58,7 +58,10 @@ from homeassistant.const import (
 from homeassistant.helpers import network
 from homeassistant.util import color as color_util, dt as dt_util
 from homeassistant.util.decorator import Registry
-from homeassistant.util.unit_conversion import TemperatureConverter
+from homeassistant.util.unit_conversion import (
+    TemperatureConverter,
+    TemperatureDeltaConverter,
+)

 from .config import AbstractConfig
 from .const import (
@@ -844,7 +847,7 @@ def temperature_from_object(
        temp -= 273.15

    if interval:
-        return TemperatureConverter.convert_interval(temp, from_unit, to_unit)
+        return TemperatureDeltaConverter.convert(temp, from_unit, to_unit)
    return TemperatureConverter.convert(temp, from_unit, to_unit)


@@ -6,8 +6,8 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Final

-from aioamazondevices.api import AmazonDevice
-from aioamazondevices.const import SENSOR_STATE_OFF
+from aioamazondevices.const.metadata import SENSOR_STATE_OFF
+from aioamazondevices.structures import AmazonDevice

 from homeassistant.components.binary_sensor import (
    DOMAIN as BINARY_SENSOR_DOMAIN,
@@ -26,3 +26,6 @@ COUNTRY_DOMAINS = {
    "us": DEFAULT_DOMAIN,
    "za": "co.za",
 }
+
+CATEGORY_SENSORS = "sensors"
+CATEGORY_NOTIFICATIONS = "notifications"
@@ -2,12 +2,13 @@

 from datetime import timedelta

-from aioamazondevices.api import AmazonDevice, AmazonEchoApi
+from aioamazondevices.api import AmazonEchoApi
 from aioamazondevices.exceptions import (
    CannotAuthenticate,
    CannotConnect,
    CannotRetrieveData,
 )
+from aioamazondevices.structures import AmazonDevice
 from aiohttp import ClientSession

 from homeassistant.config_entries import ConfigEntry
@@ -15,6 +16,7 @@ from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

 from .const import _LOGGER, CONF_LOGIN_DATA, DOMAIN
@@ -42,6 +44,9 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
            name=entry.title,
            config_entry=entry,
            update_interval=timedelta(seconds=SCAN_INTERVAL),
+            request_refresh_debouncer=Debouncer(
+                hass, _LOGGER, cooldown=30, immediate=False
+            ),
        )
        self.api = AmazonEchoApi(
            session,
@@ -2,9 +2,10 @@

 from __future__ import annotations

+from dataclasses import asdict
 from typing import Any

-from aioamazondevices.api import AmazonDevice
+from aioamazondevices.structures import AmazonDevice

 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_USERNAME
@@ -60,5 +61,5 @@ def build_device_data(device: AmazonDevice) -> dict[str, Any]:
        "online": device.online,
        "serial number": device.serial_number,
        "software version": device.software_version,
-        "sensors": device.sensors,
+        "sensors": {key: asdict(sensor) for key, sensor in device.sensors.items()},
    }
@@ -1,7 +1,7 @@
 """Defines a base Alexa Devices entity."""

-from aioamazondevices.api import AmazonDevice
-from aioamazondevices.const import SPEAKER_GROUP_MODEL
+from aioamazondevices.const.devices import SPEAKER_GROUP_MODEL
+from aioamazondevices.structures import AmazonDevice

 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
@@ -8,5 +8,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["aioamazondevices"],
  "quality_scale": "platinum",
-  "requirements": ["aioamazondevices==6.4.6"]
+  "requirements": ["aioamazondevices==8.0.1"]
 }
@@ -6,8 +6,9 @@ from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from typing import Any, Final

-from aioamazondevices.api import AmazonDevice, AmazonEchoApi
-from aioamazondevices.const import SPEAKER_GROUP_FAMILY
+from aioamazondevices.api import AmazonEchoApi
+from aioamazondevices.const.devices import SPEAKER_GROUP_FAMILY
+from aioamazondevices.structures import AmazonDevice

 from homeassistant.components.notify import NotifyEntity, NotifyEntityDescription
 from homeassistant.core import HomeAssistant
@@ -4,9 +4,15 @@ from __future__ import annotations

 from collections.abc import Callable
 from dataclasses import dataclass
+from datetime import datetime
 from typing import Final

-from aioamazondevices.api import AmazonDevice
+from aioamazondevices.const.schedules import (
+    NOTIFICATION_ALARM,
+    NOTIFICATION_REMINDER,
+    NOTIFICATION_TIMER,
+)
+from aioamazondevices.structures import AmazonDevice

 from homeassistant.components.sensor import (
    SensorDeviceClass,
@@ -19,6 +25,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType

+from .const import CATEGORY_NOTIFICATIONS, CATEGORY_SENSORS
 from .coordinator import AmazonConfigEntry
 from .entity import AmazonEntity

@@ -36,6 +43,20 @@ class AmazonSensorEntityDescription(SensorEntityDescription):
        and (sensor := device.sensors.get(key)) is not None
        and sensor.error is False
    )
+    category: str = CATEGORY_SENSORS
+
+
+@dataclass(frozen=True, kw_only=True)
+class AmazonNotificationEntityDescription(SensorEntityDescription):
+    """Amazon Devices notification entity description."""
+
+    native_unit_of_measurement_fn: Callable[[AmazonDevice, str], str] | None = None
+    is_available_fn: Callable[[AmazonDevice, str], bool] = lambda device, key: (
+        device.online
+        and (notification := device.notifications.get(key)) is not None
+        and notification.next_occurrence is not None
+    )
+    category: str = CATEGORY_NOTIFICATIONS


 SENSORS: Final = (
@@ -56,6 +77,23 @@ SENSORS: Final = (
        state_class=SensorStateClass.MEASUREMENT,
    ),
 )
+NOTIFICATIONS: Final = (
+    AmazonNotificationEntityDescription(
+        key=NOTIFICATION_ALARM,
+        translation_key="alarm",
+        device_class=SensorDeviceClass.TIMESTAMP,
+    ),
+    AmazonNotificationEntityDescription(
+        key=NOTIFICATION_REMINDER,
+        translation_key="reminder",
+        device_class=SensorDeviceClass.TIMESTAMP,
+    ),
+    AmazonNotificationEntityDescription(
+        key=NOTIFICATION_TIMER,
+        translation_key="timer",
+        device_class=SensorDeviceClass.TIMESTAMP,
+    ),
+)


 async def async_setup_entry(
@@ -74,12 +112,18 @@ async def async_setup_entry(
        new_devices = current_devices - known_devices
        if new_devices:
            known_devices.update(new_devices)
-            async_add_entities(
+            sensors_list = [
                AmazonSensorEntity(coordinator, serial_num, sensor_desc)
                for sensor_desc in SENSORS
                for serial_num in new_devices
                if coordinator.data[serial_num].sensors.get(sensor_desc.key) is not None
-            )
+            ]
+            notifications_list = [
+                AmazonSensorEntity(coordinator, serial_num, notification_desc)
+                for notification_desc in NOTIFICATIONS
+                for serial_num in new_devices
+            ]
+            async_add_entities(sensors_list + notifications_list)

    _check_device()
    entry.async_on_unload(coordinator.async_add_listener(_check_device))
@@ -88,7 +132,9 @@ async def async_setup_entry(
 class AmazonSensorEntity(AmazonEntity, SensorEntity):
    """Sensor device."""

-    entity_description: AmazonSensorEntityDescription
+    entity_description: (
+        AmazonSensorEntityDescription | AmazonNotificationEntityDescription
+    )

    @property
    def native_unit_of_measurement(self) -> str | None:
@@ -101,9 +147,13 @@ class AmazonSensorEntity(AmazonEntity, SensorEntity):
        return super().native_unit_of_measurement

    @property
-    def native_value(self) -> StateType:
+    def native_value(self) -> StateType | datetime:
        """Return the state of the sensor."""
-        return self.device.sensors[self.entity_description.key].value
+        # Sensors
+        if self.entity_description.category == CATEGORY_SENSORS:
+            return self.device.sensors[self.entity_description.key].value
+        # Notifications
+        return self.device.notifications[self.entity_description.key].next_occurrence

    @property
    def available(self) -> bool:
@@ -1,6 +1,6 @@
 """Support for services."""

-from aioamazondevices.sounds import SOUNDS_LIST
+from aioamazondevices.const.sounds import SOUNDS_LIST
 import voluptuous as vol

 from homeassistant.config_entries import ConfigEntryState
@@ -1,47 +1,12 @@
 {
  "common": {
    "data_code": "One-time password (OTP code)",
-    "data_description_username": "The email address of your Amazon account.",
-    "data_description_password": "The password of your Amazon account.",
    "data_description_code": "The one-time password to log in to your account. Currently, only tokens from OTP applications are supported.",
+    "data_description_password": "The password of your Amazon account.",
+    "data_description_username": "The email address of your Amazon account.",
    "device_id_description": "The ID of the device to send the command to."
  },
  "config": {
-    "flow_title": "{username}",
-    "step": {
-      "user": {
-        "data": {
-          "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]",
-          "code": "[%key:component::alexa_devices::common::data_code%]"
-        },
-        "data_description": {
-          "username": "[%key:component::alexa_devices::common::data_description_username%]",
-          "password": "[%key:component::alexa_devices::common::data_description_password%]",
-          "code": "[%key:component::alexa_devices::common::data_description_code%]"
-        }
-      },
-      "reauth_confirm": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]",
-          "code": "[%key:component::alexa_devices::common::data_code%]"
-        },
-        "data_description": {
-          "password": "[%key:component::alexa_devices::common::data_description_password%]",
-          "code": "[%key:component::alexa_devices::common::data_description_code%]"
-        }
-      },
-      "reconfigure": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]",
-          "code": "[%key:component::alexa_devices::common::data_code%]"
-        },
-        "data_description": {
-          "password": "[%key:component::alexa_devices::common::data_description_password%]",
-          "code": "[%key:component::alexa_devices::common::data_description_code%]"
-        }
-      }
-    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -55,15 +20,61 @@
      "cannot_retrieve_data": "Unable to retrieve data from Amazon. Please try again later.",
      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "flow_title": "{username}",
+    "step": {
+      "reauth_confirm": {
+        "data": {
+          "code": "[%key:component::alexa_devices::common::data_code%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "code": "[%key:component::alexa_devices::common::data_description_code%]",
+          "password": "[%key:component::alexa_devices::common::data_description_password%]"
+        }
+      },
+      "reconfigure": {
+        "data": {
+          "code": "[%key:component::alexa_devices::common::data_code%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "code": "[%key:component::alexa_devices::common::data_description_code%]",
+          "password": "[%key:component::alexa_devices::common::data_description_password%]"
+        }
+      },
+      "user": {
+        "data": {
+          "code": "[%key:component::alexa_devices::common::data_code%]",
+          "password": "[%key:common::config_flow::data::password%]",
+          "username": "[%key:common::config_flow::data::username%]"
+        },
+        "data_description": {
+          "code": "[%key:component::alexa_devices::common::data_description_code%]",
+          "password": "[%key:component::alexa_devices::common::data_description_password%]",
+          "username": "[%key:component::alexa_devices::common::data_description_username%]"
+        }
+      }
    }
  },
  "entity": {
    "notify": {
-      "speak": {
-        "name": "Speak"
-      },
      "announce": {
        "name": "Announce"
+      },
+      "speak": {
+        "name": "Speak"
+      }
+    },
+    "sensor": {
+      "alarm": {
+        "name": "Next alarm"
+      },
+      "reminder": {
+        "name": "Next reminder"
+      },
+      "timer": {
+        "name": "Next timer"
      }
    },
    "switch": {
@@ -72,34 +83,24 @@
      }
    }
  },
-  "services": {
-    "send_sound": {
-      "name": "Send sound",
-      "description": "Sends a sound to a device",
-      "fields": {
-        "device_id": {
-          "name": "Device",
-          "description": "[%key:component::alexa_devices::common::device_id_description%]"
-        },
-        "sound": {
-          "name": "Alexa Skill sound file",
-          "description": "The sound file to play."
-        }
-      }
+  "exceptions": {
+    "cannot_connect_with_error": {
+      "message": "Error connecting: {error}"
    },
-    "send_text_command": {
-      "name": "Send text command",
-      "description": "Sends a text command to a device",
-      "fields": {
-        "text_command": {
-          "name": "Alexa text command",
-          "description": "The text command to send."
-        },
-        "device_id": {
-          "name": "Device",
-          "description": "[%key:component::alexa_devices::common::device_id_description%]"
-        }
-      }
+    "cannot_retrieve_data_with_error": {
+      "message": "Error retrieving data: {error}"
+    },
+    "device_serial_number_missing": {
+      "message": "Device serial number missing: {device_id}"
+    },
+    "entry_not_loaded": {
+      "message": "Entry not loaded: {entry}"
+    },
+    "invalid_device_id": {
+      "message": "Invalid device ID specified: {device_id}"
+    },
+    "invalid_sound_value": {
+      "message": "Invalid sound {sound} specified"
    }
  },
  "selector": {
@@ -149,24 +150,34 @@
      }
    }
  },
-  "exceptions": {
-    "cannot_connect_with_error": {
-      "message": "Error connecting: {error}"
+  "services": {
+    "send_sound": {
+      "description": "Sends a sound to a device",
+      "fields": {
+        "device_id": {
+          "description": "[%key:component::alexa_devices::common::device_id_description%]",
+          "name": "Device"
+        },
+        "sound": {
+          "description": "The sound file to play.",
+          "name": "Alexa Skill sound file"
+        }
+      },
+      "name": "Send sound"
    },
-    "cannot_retrieve_data_with_error": {
-      "message": "Error retrieving data: {error}"
-    },
-    "device_serial_number_missing": {
-      "message": "Device serial number missing: {device_id}"
-    },
-    "invalid_device_id": {
-      "message": "Invalid device ID specified: {device_id}"
-    },
-    "invalid_sound_value": {
-      "message": "Invalid sound {sound} specified"
-    },
-    "entry_not_loaded": {
-      "message": "Entry not loaded: {entry}"
+    "send_text_command": {
+      "description": "Sends a text command to a device",
+      "fields": {
+        "device_id": {
+          "description": "[%key:component::alexa_devices::common::device_id_description%]",
+          "name": "Device"
+        },
+        "text_command": {
+          "description": "The text command to send.",
+          "name": "Alexa text command"
+        }
+      },
+      "name": "Send text command"
    }
  }
 }
@@ -6,7 +6,7 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Final

-from aioamazondevices.api import AmazonDevice
+from aioamazondevices.structures import AmazonDevice

 from homeassistant.components.switch import (
    DOMAIN as SWITCH_DOMAIN,
@@ -4,7 +4,7 @@ from collections.abc import Awaitable, Callable, Coroutine
 from functools import wraps
 from typing import Any, Concatenate

-from aioamazondevices.const import SPEAKER_GROUP_FAMILY
+from aioamazondevices.const.devices import SPEAKER_GROUP_FAMILY
 from aioamazondevices.exceptions import CannotConnect, CannotRetrieveData

 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
@@ -1,5 +1,12 @@
 {
  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
+    },
+    "error": {
+      "no_device_found": "[%key:common::config_flow::error::cannot_connect%]"
+    },
    "flow_title": "{name}",
    "step": {
      "discovery_confirm": {
@@ -14,37 +21,30 @@
        },
        "description": "Fill in Altruist IP address or hostname in your local network"
      }
-    },
-    "abort": {
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "error": {
-      "no_device_found": "[%key:common::config_flow::error::cannot_connect%]"
    }
  },
  "entity": {
    "sensor": {
+      "co2": {
+        "name": "{sensor_name} CO2"
+      },
      "humidity": {
        "name": "{sensor_name} humidity"
      },
-      "pressure": {
-        "name": "{sensor_name} pressure"
-      },
-      "temperature": {
-        "name": "{sensor_name} temperature"
-      },
-      "noise_max": {
-        "name": "Maximum noise"
-      },
      "noise_avg": {
        "name": "Average noise"
      },
-      "co2": {
-        "name": "{sensor_name} CO2"
+      "noise_max": {
+        "name": "Maximum noise"
+      },
+      "pressure": {
+        "name": "{sensor_name} pressure"
      },
      "radiation": {
        "name": "Radiation level"
+      },
+      "temperature": {
+        "name": "{sensor_name} temperature"
      }
    }
  }
@@ -9,14 +9,14 @@ from homeassistant.helpers import config_validation as cv

 from .const import CONF_SITE_ID, DOMAIN, PLATFORMS
 from .coordinator import AmberConfigEntry, AmberUpdateCoordinator
-from .services import setup_services
+from .services import async_setup_services

 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)


 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
    """Set up the Amber component."""
-    setup_services(hass)
+    async_setup_services(hass)
    return True


@@ -1,19 +1,5 @@
 {
  "entity": {
-    "sensor": {
-      "general": {
-        "default": "mdi:transmission-tower"
-      },
-      "controlled_load": {
-        "default": "mdi:clock-outline"
-      },
-      "feed_in": {
-        "default": "mdi:solar-power"
-      },
-      "renewables": {
-        "default": "mdi:solar-power"
-      }
-    },
    "binary_sensor": {
      "demand_window": {
        "default": "mdi:meter-electric",
@@ -21,6 +7,20 @@
          "off": "mdi:meter-electric-outline"
        }
      }
+    },
+    "sensor": {
+      "controlled_load": {
+        "default": "mdi:clock-outline"
+      },
+      "feed_in": {
+        "default": "mdi:solar-power"
+      },
+      "general": {
+        "default": "mdi:transmission-tower"
+      },
+      "renewables": {
+        "default": "mdi:solar-power"
+      }
    }
  },
  "services": {
@@ -10,6 +10,7 @@ from homeassistant.core import (
    ServiceCall,
    ServiceResponse,
    SupportsResponse,
+    callback,
 )
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers.selector import ConfigEntrySelector
@@ -102,7 +103,8 @@ def get_forecasts(channel_type: str, data: dict) -> list[JsonValueType]:
    return results


-def setup_services(hass: HomeAssistant) -> None:
+@callback
+def async_setup_services(hass: HomeAssistant) -> None:
    """Set up the services for the Amber integration."""

    async def handle_get_forecasts(call: ServiceCall) -> ServiceResponse:
@@ -22,40 +22,40 @@
      }
    }
  },
-  "services": {
-    "get_forecasts": {
-      "name": "Get price forecasts",
-      "description": "Retrieves price forecasts from Amber Electric for a site.",
-      "fields": {
-        "config_entry_id": {
-          "description": "The config entry of the site to get forecasts for.",
-          "name": "Config entry"
-        },
-        "channel_type": {
-          "name": "Channel type",
-          "description": "The channel to get forecasts for."
-        }
-      }
-    }
-  },
  "exceptions": {
+    "channel_not_found": {
+      "message": "There is no {channel_type} channel at this site."
+    },
    "integration_not_found": {
      "message": "Config entry \"{target}\" not found in registry."
    },
    "not_loaded": {
      "message": "{target} is not loaded."
-    },
-    "channel_not_found": {
-      "message": "There is no {channel_type} channel at this site."
    }
  },
  "selector": {
    "channel_type": {
      "options": {
-        "general": "General",
        "controlled_load": "Controlled load",
-        "feed_in": "Feed-in"
+        "feed_in": "Feed-in",
+        "general": "General"
      }
    }
+  },
+  "services": {
+    "get_forecasts": {
+      "description": "Retrieves price forecasts from Amber Electric for a site.",
+      "fields": {
+        "channel_type": {
+          "description": "The channel to get forecasts for.",
+          "name": "Channel type"
+        },
+        "config_entry_id": {
+          "description": "The config entry of the site to get forecasts for.",
+          "name": "Config entry"
+        }
+      },
+      "name": "Get price forecasts"
+    }
  }
 }
@@ -4,15 +4,15 @@
      "last_rain": {
        "default": "mdi:water"
      },
+      "lightning_distance": {
+        "default": "mdi:lightning-bolt"
+      },
      "lightning_strikes_per_day": {
        "default": "mdi:lightning-bolt"
      },
      "lightning_strikes_per_hour": {
        "default": "mdi:lightning-bolt"
      },
-      "lightning_distance": {
-        "default": "mdi:lightning-bolt"
-      },
      "wind_direction": {
        "default": "mdi:compass-outline"
      }
@@ -106,7 +106,7 @@ SENSOR_DESCRIPTIONS = (
        translation_key="daily_rain",
        native_unit_of_measurement=UnitOfPrecipitationDepth.INCHES,
        device_class=SensorDeviceClass.PRECIPITATION,
-        state_class=SensorStateClass.TOTAL,
+        state_class=SensorStateClass.TOTAL_INCREASING,
        suggested_display_precision=2,
    ),
    SensorEntityDescription(
@@ -150,7 +150,7 @@ SENSOR_DESCRIPTIONS = (
        key=TYPE_LIGHTNING_PER_DAY,
        translation_key="lightning_strikes_per_day",
        native_unit_of_measurement="strikes",
-        state_class=SensorStateClass.TOTAL,
+        state_class=SensorStateClass.TOTAL_INCREASING,
        entity_registry_enabled_default=False,
    ),
    SensorEntityDescription(
@@ -182,7 +182,7 @@ SENSOR_DESCRIPTIONS = (
        translation_key="monthly_rain",
        native_unit_of_measurement=UnitOfPrecipitationDepth.INCHES,
        device_class=SensorDeviceClass.PRECIPITATION,
-        state_class=SensorStateClass.TOTAL,
+        state_class=SensorStateClass.TOTAL_INCREASING,
        suggested_display_precision=2,
        entity_registry_enabled_default=False,
    ),
@@ -229,7 +229,7 @@ SENSOR_DESCRIPTIONS = (
        translation_key="weekly_rain",
        native_unit_of_measurement=UnitOfPrecipitationDepth.INCHES,
        device_class=SensorDeviceClass.PRECIPITATION,
-        state_class=SensorStateClass.TOTAL,
+        state_class=SensorStateClass.TOTAL_INCREASING,
        suggested_display_precision=2,
        entity_registry_enabled_default=False,
    ),
@@ -262,7 +262,7 @@ SENSOR_DESCRIPTIONS = (
        translation_key="yearly_rain",
        native_unit_of_measurement=UnitOfPrecipitationDepth.INCHES,
        device_class=SensorDeviceClass.PRECIPITATION,
-        state_class=SensorStateClass.TOTAL,
+        state_class=SensorStateClass.TOTAL_INCREASING,
        suggested_display_precision=2,
        entity_registry_enabled_default=False,
    ),
@@ -1,42 +1,30 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "title": "Select region",
-        "description": "Choose the region you want to survey in order to locate Ambient personal weather stations."
-      },
-      "station": {
-        "title": "Select station",
-        "description": "Select the weather station you want to add to Home Assistant.",
-        "data": {
-          "station": "Station"
-        }
-      }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    },
    "error": {
      "no_stations_found": "Did not find any stations in the selected region."
    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    "step": {
+      "station": {
+        "data": {
+          "station": "Station"
+        },
+        "description": "Select the weather station you want to add to Home Assistant.",
+        "title": "Select station"
+      },
+      "user": {
+        "description": "Choose the region you want to survey in order to locate Ambient personal weather stations.",
+        "title": "Select region"
+      }
    }
  },
  "entity": {
    "sensor": {
-      "pm25_24h_average": {
-        "name": "PM2.5 (24 hour average)"
-      },
-      "pm25_aqi": {
-        "name": "PM2.5 AQI"
-      },
-      "pm25_aqi_24h_average": {
-        "name": "PM2.5 AQI (24 hour average)"
-      },
      "absolute_pressure": {
        "name": "Absolute pressure"
      },
-      "relative_pressure": {
-        "name": "Relative pressure"
-      },
      "daily_rain": {
        "name": "Daily rain"
      },
@@ -52,21 +40,33 @@
      "last_rain": {
        "name": "Last rain"
      },
+      "lightning_distance": {
+        "name": "Lightning distance"
+      },
      "lightning_strikes_per_day": {
        "name": "Lightning strikes per day"
      },
      "lightning_strikes_per_hour": {
        "name": "Lightning strikes per hour"
      },
-      "lightning_distance": {
-        "name": "Lightning distance"
-      },
      "max_daily_gust": {
        "name": "Max daily gust"
      },
      "monthly_rain": {
        "name": "Monthly rain"
      },
+      "pm25_24h_average": {
+        "name": "PM2.5 (24 hour average)"
+      },
+      "pm25_aqi": {
+        "name": "PM2.5 AQI"
+      },
+      "pm25_aqi_24h_average": {
+        "name": "PM2.5 AQI (24 hour average)"
+      },
+      "relative_pressure": {
+        "name": "Relative pressure"
+      },
      "uv_index": {
        "name": "UV index"
      },
@@ -1,20 +1,20 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "title": "Fill in your information",
-        "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]",
-          "app_key": "Application Key"
-        }
-      }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
    },
    "error": {
      "invalid_key": "[%key:common::config_flow::error::invalid_api_key%]",
      "no_devices": "No devices found in account"
    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
+    "step": {
+      "user": {
+        "data": {
+          "api_key": "[%key:common::config_flow::data::api_key%]",
+          "app_key": "Application Key"
+        },
+        "title": "Fill in your information"
+      }
    }
  },
  "entity": {
@@ -22,6 +22,9 @@
      "battery_1": {
        "name": "Battery 1"
      },
+      "battery_10": {
+        "name": "Battery 10"
+      },
      "battery_2": {
        "name": "Battery 2"
      },
@@ -46,59 +49,11 @@
      "battery_9": {
        "name": "Battery 9"
      },
-      "battery_10": {
-        "name": "Battery 10"
-      },
-      "interior_battery": {
-        "name": "Interior battery"
-      },
-      "leak_detector_battery_1": {
-        "name": "Leak detector battery 1"
-      },
-      "leak_detector_battery_2": {
-        "name": "Leak detector battery 2"
-      },
-      "leak_detector_battery_3": {
-        "name": "Leak detector battery 3"
-      },
-      "leak_detector_battery_4": {
-        "name": "Leak detector battery 4"
-      },
-      "soil_monitor_battery_1": {
-        "name": "Soil monitor battery 1"
-      },
-      "soil_monitor_battery_2": {
-        "name": "Soil monitor battery 2"
-      },
-      "soil_monitor_battery_3": {
-        "name": "Soil monitor battery 3"
-      },
-      "soil_monitor_battery_4": {
-        "name": "Soil monitor battery 4"
-      },
-      "soil_monitor_battery_5": {
-        "name": "Soil monitor battery 5"
-      },
-      "soil_monitor_battery_6": {
-        "name": "Soil monitor battery 6"
-      },
-      "soil_monitor_battery_7": {
-        "name": "Soil monitor battery 7"
-      },
-      "soil_monitor_battery_8": {
-        "name": "Soil monitor battery 8"
-      },
-      "soil_monitor_battery_9": {
-        "name": "Soil monitor battery 9"
-      },
-      "soil_monitor_battery_10": {
-        "name": "Soil monitor battery 10"
-      },
      "co2_battery": {
        "name": "Carbon dioxide battery"
      },
-      "lightning_detector_battery": {
-        "name": "Lightning detector battery"
+      "interior_battery": {
+        "name": "Interior battery"
      },
      "leak_detector_1": {
        "name": "Leak detector 1"
@@ -112,15 +67,33 @@
      "leak_detector_4": {
        "name": "Leak detector 4"
      },
-      "pm25_indoor_battery": {
-        "name": "PM25 indoor battery"
+      "leak_detector_battery_1": {
+        "name": "Leak detector battery 1"
+      },
+      "leak_detector_battery_2": {
+        "name": "Leak detector battery 2"
+      },
+      "leak_detector_battery_3": {
+        "name": "Leak detector battery 3"
+      },
+      "leak_detector_battery_4": {
+        "name": "Leak detector battery 4"
+      },
+      "lightning_detector_battery": {
+        "name": "Lightning detector battery"
      },
      "pm25_battery": {
        "name": "PM25 battery"
      },
+      "pm25_indoor_battery": {
+        "name": "PM25 indoor battery"
+      },
      "relay_1": {
        "name": "Relay 1"
      },
+      "relay_10": {
+        "name": "Relay 10"
+      },
      "relay_2": {
        "name": "Relay 2"
      },
@@ -145,32 +118,44 @@
      "relay_9": {
        "name": "Relay 9"
      },
-      "relay_10": {
-        "name": "Relay 10"
+      "soil_monitor_battery_1": {
+        "name": "Soil monitor battery 1"
+      },
+      "soil_monitor_battery_10": {
+        "name": "Soil monitor battery 10"
+      },
+      "soil_monitor_battery_2": {
+        "name": "Soil monitor battery 2"
+      },
+      "soil_monitor_battery_3": {
+        "name": "Soil monitor battery 3"
+      },
+      "soil_monitor_battery_4": {
+        "name": "Soil monitor battery 4"
+      },
+      "soil_monitor_battery_5": {
+        "name": "Soil monitor battery 5"
+      },
+      "soil_monitor_battery_6": {
+        "name": "Soil monitor battery 6"
+      },
+      "soil_monitor_battery_7": {
+        "name": "Soil monitor battery 7"
+      },
+      "soil_monitor_battery_8": {
+        "name": "Soil monitor battery 8"
+      },
+      "soil_monitor_battery_9": {
+        "name": "Soil monitor battery 9"
      }
    },
    "sensor": {
      "24_hour_rain": {
        "name": "Rain 24 hours"
      },
-      "pm25_aqi": {
-        "name": "PM2.5 AQI"
-      },
-      "pm25_aqi_24h_average": {
-        "name": "PM2.5 AQI 24 hour average"
-      },
-      "pm25_indoor_aqi": {
-        "name": "PM2.5 indoor AQI"
-      },
-      "pm25_indoor_aqi_24h_average": {
-        "name": "PM2.5 indoor AQI"
-      },
      "absolute_pressure": {
        "name": "Absolute pressure"
      },
-      "relative_pressure": {
-        "name": "Relative pressure"
-      },
      "daily_rain": {
        "name": "Daily rain"
      },
@@ -186,6 +171,9 @@
      "humidity_1": {
        "name": "Humidity 1"
      },
+      "humidity_10": {
+        "name": "Humidity 10"
+      },
      "humidity_2": {
        "name": "Humidity 2"
      },
@@ -210,14 +198,11 @@
      "humidity_9": {
        "name": "Humidity 9"
      },
-      "humidity_10": {
-        "name": "Humidity 10"
-      },
      "humidity_indoor": {
        "name": "Humidity indoor"
      },
-      "last_rain": {
-        "name": "Last rain"
+      "inside_temperature": {
+        "name": "Inside temperature"
      },
      "last_lightning_strike": {
        "name": "Last Lightning strike"
@@ -225,6 +210,12 @@
      "last_lightning_strike_distance": {
        "name": "Last Lightning strike distance"
      },
+      "last_rain": {
+        "name": "Last rain"
+      },
+      "lifetime_rain": {
+        "name": "Lifetime rain"
+      },
      "lightning_strikes_per_day": {
        "name": "Lightning strikes per day"
      },
@@ -240,15 +231,33 @@
      "pm25_24h_average": {
        "name": "PM2.5 24 hour average"
      },
+      "pm25_aqi": {
+        "name": "PM2.5 AQI"
+      },
+      "pm25_aqi_24h_average": {
+        "name": "PM2.5 AQI 24 hour average"
+      },
      "pm25_indoor": {
        "name": "PM2.5 indoor"
      },
      "pm25_indoor_24h_average": {
        "name": "PM2.5 indoor 24 hour average"
      },
+      "pm25_indoor_aqi": {
+        "name": "PM2.5 indoor AQI"
+      },
+      "pm25_indoor_aqi_24h_average": {
+        "name": "PM2.5 indoor AQI"
+      },
+      "relative_pressure": {
+        "name": "Relative pressure"
+      },
      "soil_humidity_1": {
        "name": "Soil humidity 1"
      },
+      "soil_humidity_10": {
+        "name": "Soil humidity 10"
+      },
      "soil_humidity_2": {
        "name": "Soil humidity 2"
      },
@@ -273,12 +282,12 @@
      "soil_humidity_9": {
        "name": "Soil humidity 9"
      },
-      "soil_humidity_10": {
-        "name": "Soil humidity 10"
-      },
      "soil_temperature_1": {
        "name": "Soil temperature 1"
      },
+      "soil_temperature_10": {
+        "name": "Soil temperature 10"
+      },
      "soil_temperature_2": {
        "name": "Soil temperature 2"
      },
@@ -303,12 +312,12 @@
      "soil_temperature_9": {
        "name": "Soil temperature 9"
      },
-      "soil_temperature_10": {
-        "name": "Soil temperature 10"
-      },
      "temperature_1": {
        "name": "Temperature 1"
      },
+      "temperature_10": {
+        "name": "Temperature 10"
+      },
      "temperature_2": {
        "name": "Temperature 2"
      },
@@ -333,21 +342,18 @@
      "temperature_9": {
        "name": "Temperature 9"
      },
-      "temperature_10": {
-        "name": "Temperature 10"
-      },
-      "inside_temperature": {
-        "name": "Inside temperature"
-      },
-      "lifetime_rain": {
-        "name": "Lifetime rain"
-      },
      "uv_index": {
        "name": "UV index"
      },
      "weekly_rain": {
        "name": "Weekly rain"
      },
+      "wind_average_10m": {
+        "name": "Wind average 10 minutes"
+      },
+      "wind_average_2m": {
+        "name": "Wind average 2 minutes"
+      },
      "wind_direction": {
        "name": "Wind direction"
      },
@@ -357,17 +363,11 @@
      "wind_direction_average_2m": {
        "name": "Wind direction average 2 minutes"
      },
-      "wind_gust_direction": {
-        "name": "Wind gust direction"
-      },
      "wind_gust": {
        "name": "Wind gust"
      },
-      "wind_average_10m": {
-        "name": "Wind average 10 minutes"
-      },
-      "wind_average_2m": {
-        "name": "Wind average 2 minutes"
+      "wind_gust_direction": {
+        "name": "Wind gust direction"
      },
      "yearly_rain": {
        "name": "Yearly rain"
@@ -1,7 +1,10 @@
 {
  "services": {
-    "enable_recording": {
-      "service": "mdi:record-rec"
+    "disable_audio": {
+      "service": "mdi:volume-off"
+    },
+    "disable_motion_recording": {
+      "service": "mdi:motion-sensor-off"
    },
    "disable_recording": {
      "service": "mdi:stop"
@@ -9,18 +12,18 @@
    "enable_audio": {
      "service": "mdi:volume-high"
    },
-    "disable_audio": {
-      "service": "mdi:volume-off"
-    },
    "enable_motion_recording": {
      "service": "mdi:motion-sensor"
    },
-    "disable_motion_recording": {
-      "service": "mdi:motion-sensor-off"
+    "enable_recording": {
+      "service": "mdi:record-rec"
    },
    "goto_preset": {
      "service": "mdi:pan"
    },
+    "ptz_control": {
+      "service": "mdi:pan"
+    },
    "set_color_bw": {
      "service": "mdi:palette"
    },
@@ -29,9 +32,6 @@
    },
    "stop_tour": {
      "service": "mdi:panorama-outline"
-    },
-    "ptz_control": {
-      "service": "mdi:pan"
    }
  }
 }
@@ -1,130 +1,130 @@
 {
  "services": {
-    "enable_recording": {
-      "name": "Enable recording",
-      "description": "Enables continuous recording to camera storage.",
-      "fields": {
-        "entity_id": {
-          "name": "Entity",
-          "description": "Name(s) of the cameras, or 'all' for all cameras."
-        }
-      }
-    },
-    "disable_recording": {
-      "name": "Disable recording",
-      "description": "Disables continuous recording to camera storage.",
-      "fields": {
-        "entity_id": {
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
-        }
-      }
-    },
-    "enable_audio": {
-      "name": "Enable audio",
-      "description": "Enables audio stream.",
-      "fields": {
-        "entity_id": {
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
-        }
-      }
-    },
    "disable_audio": {
-      "name": "Disable audio",
      "description": "Disables audio stream.",
      "fields": {
        "entity_id": {
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
        }
-      }
-    },
-    "enable_motion_recording": {
-      "name": "Enable motion recording",
-      "description": "Enables recording a clip to camera storage when motion is detected.",
-      "fields": {
-        "entity_id": {
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
-        }
-      }
+      },
+      "name": "Disable audio"
    },
    "disable_motion_recording": {
-      "name": "Disable motion recording",
      "description": "Disables recording a clip to camera storage when motion is detected.",
      "fields": {
        "entity_id": {
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
        }
-      }
+      },
+      "name": "Disable motion recording"
+    },
+    "disable_recording": {
+      "description": "Disables continuous recording to camera storage.",
+      "fields": {
+        "entity_id": {
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
+        }
+      },
+      "name": "Disable recording"
+    },
+    "enable_audio": {
+      "description": "Enables audio stream.",
+      "fields": {
+        "entity_id": {
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
+        }
+      },
+      "name": "Enable audio"
+    },
+    "enable_motion_recording": {
+      "description": "Enables recording a clip to camera storage when motion is detected.",
+      "fields": {
+        "entity_id": {
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
+        }
+      },
+      "name": "Enable motion recording"
+    },
+    "enable_recording": {
+      "description": "Enables continuous recording to camera storage.",
+      "fields": {
+        "entity_id": {
+          "description": "Name(s) of the cameras, or 'all' for all cameras.",
+          "name": "Entity"
+        }
+      },
+      "name": "Enable recording"
    },
    "goto_preset": {
-      "name": "Go to preset",
      "description": "Moves camera to PTZ preset.",
      "fields": {
        "entity_id": {
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
        },
        "preset": {
-          "name": "Preset",
-          "description": "Preset number."
+          "description": "Preset number.",
+          "name": "Preset"
        }
-      }
-    },
-    "set_color_bw": {
-      "name": "Set color",
-      "description": "Sets camera color mode.",
-      "fields": {
-        "entity_id": {
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
-        },
-        "color_bw": {
-          "name": "Color",
-          "description": "Color mode."
-        }
-      }
-    },
-    "start_tour": {
-      "name": "Start tour",
-      "description": "Starts camera's PTZ tour function.",
-      "fields": {
-        "entity_id": {
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
-        }
-      }
-    },
-    "stop_tour": {
-      "name": "Stop tour",
-      "description": "Stops camera's PTZ tour function.",
-      "fields": {
-        "entity_id": {
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
-        }
-      }
+      },
+      "name": "Go to preset"
    },
    "ptz_control": {
-      "name": "PTZ control",
      "description": "Moves (pan/tilt) and/or zoom a PTZ camera.",
      "fields": {
        "entity_id": {
-          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]",
-          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]"
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
        },
        "movement": {
-          "name": "Movement",
-          "description": "Direction to move the camera."
+          "description": "Direction to move the camera.",
+          "name": "Movement"
        },
        "travel_time": {
-          "name": "Travel time",
-          "description": "Travel time in fractional seconds: from 0 to 1."
+          "description": "Travel time in fractional seconds: from 0 to 1.",
+          "name": "Travel time"
        }
-      }
+      },
+      "name": "PTZ control"
+    },
+    "set_color_bw": {
+      "description": "Sets camera color mode.",
+      "fields": {
+        "color_bw": {
+          "description": "Color mode.",
+          "name": "Color"
+        },
+        "entity_id": {
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
+        }
+      },
+      "name": "Set color"
+    },
+    "start_tour": {
+      "description": "Starts camera's PTZ tour function.",
+      "fields": {
+        "entity_id": {
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
+        }
+      },
+      "name": "Start tour"
+    },
+    "stop_tour": {
+      "description": "Stops camera's PTZ tour function.",
+      "fields": {
+        "entity_id": {
+          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
+          "name": "[%key:component::amcrest::services::enable_recording::fields::entity_id::name%]"
+        }
+      },
+      "name": "Stop tour"
    }
  }
 }
@@ -6,9 +6,8 @@ import voluptuous as vol

 from homeassistant.components import websocket_api
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED
-from homeassistant.core import Event, HassJob, HomeAssistant, callback
+from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.event import async_call_later, async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.hass_dict import HassKey

@@ -20,7 +19,7 @@ from .analytics import (
    EntityAnalyticsModifications,
    async_devices_payload,
 )
-from .const import ATTR_ONBOARDED, ATTR_PREFERENCES, DOMAIN, INTERVAL, PREFERENCE_SCHEMA
+from .const import ATTR_ONBOARDED, ATTR_PREFERENCES, DOMAIN, PREFERENCE_SCHEMA
 from .http import AnalyticsDevicesView

 __all__ = [
@@ -43,28 +42,9 @@ async def async_setup(hass: HomeAssistant, _: ConfigType) -> bool:
    # Load stored data
    await analytics.load()

-    @callback
-    def start_schedule(_event: Event) -> None:
+    async def start_schedule(_event: Event) -> None:
        """Start the send schedule after the started event."""
-        # Wait 15 min after started
-        async_call_later(
-            hass,
-            900,
-            HassJob(
-                analytics.send_analytics,
-                name="analytics schedule",
-                cancel_on_shutdown=True,
-            ),
-        )
-
-        # Send every day
-        async_track_time_interval(
-            hass,
-            analytics.send_analytics,
-            INTERVAL,
-            name="analytics daily",
-            cancel_on_shutdown=True,
-        )
+        await analytics.async_schedule()

    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, start_schedule)

@@ -111,7 +91,7 @@ async def websocket_analytics_preferences(
    analytics = hass.data[DATA_COMPONENT]

    await analytics.save_preferences(preferences)
-    await analytics.send_analytics()
+    await analytics.async_schedule()

    connection.send_result(
        msg["id"],
@@ -7,6 +7,8 @@ from asyncio import timeout
 from collections.abc import Awaitable, Callable, Iterable, Mapping
 from dataclasses import asdict as dataclass_asdict, dataclass, field
 from datetime import datetime
+import random
+import time
 from typing import Any, Protocol
 import uuid

@@ -31,10 +33,18 @@ from homeassistant.const import (
    BASE_PLATFORMS,
    __version__ as HA_VERSION,
 )
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import (
+    CALLBACK_TYPE,
+    HassJob,
+    HomeAssistant,
+    ReleaseChannel,
+    callback,
+    get_release_channel,
+)
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.event import async_call_later, async_track_time_interval
 from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.singleton import singleton
 from homeassistant.helpers.storage import Store
@@ -51,6 +61,7 @@ from homeassistant.setup import async_get_loaded_integrations
 from .const import (
    ANALYTICS_ENDPOINT_URL,
    ANALYTICS_ENDPOINT_URL_DEV,
+    ANALYTICS_SNAPSHOT_ENDPOINT_URL,
    ATTR_ADDON_COUNT,
    ATTR_ADDONS,
    ATTR_ARCH,
@@ -71,6 +82,7 @@ from .const import (
    ATTR_PROTECTED,
    ATTR_RECORDER,
    ATTR_SLUG,
+    ATTR_SNAPSHOTS,
    ATTR_STATE_COUNT,
    ATTR_STATISTICS,
    ATTR_SUPERVISOR,
@@ -80,8 +92,10 @@ from .const import (
    ATTR_UUID,
    ATTR_VERSION,
    DOMAIN,
+    INTERVAL,
    LOGGER,
    PREFERENCE_SCHEMA,
+    SNAPSHOT_VERSION,
    STORAGE_KEY,
    STORAGE_VERSION,
 )
@@ -194,13 +208,18 @@ def gen_uuid() -> str:
    return uuid.uuid4().hex


+RELEASE_CHANNEL = get_release_channel()
+
+
@dataclass
 class AnalyticsData:
    """Analytics data."""

    onboarded: bool
    preferences: dict[str, bool]
-    uuid: str | None
+    uuid: str | None = None
+    submission_identifier: str | None = None
+    snapshot_submission_time: float | None = None

    @classmethod
    def from_dict(cls, data: dict[str, Any]) -> AnalyticsData:
@@ -209,6 +228,8 @@ class AnalyticsData:
            data["onboarded"],
            data["preferences"],
            data["uuid"],
+            data.get("submission_identifier"),
+            data.get("snapshot_submission_time"),
        )


@@ -219,8 +240,10 @@ class Analytics:
        """Initialize the Analytics class."""
        self.hass: HomeAssistant = hass
        self.session = async_get_clientsession(hass)
-        self._data = AnalyticsData(False, {}, None)
+        self._data = AnalyticsData(False, {})
        self._store = Store[dict[str, Any]](hass, STORAGE_VERSION, STORAGE_KEY)
+        self._basic_scheduled: CALLBACK_TYPE | None = None
+        self._snapshot_scheduled: CALLBACK_TYPE | None = None

    @property
    def preferences(self) -> dict:
@@ -228,6 +251,7 @@ class Analytics:
        preferences = self._data.preferences
        return {
            ATTR_BASE: preferences.get(ATTR_BASE, False),
+            ATTR_SNAPSHOTS: preferences.get(ATTR_SNAPSHOTS, False),
            ATTR_DIAGNOSTICS: preferences.get(ATTR_DIAGNOSTICS, False),
            ATTR_USAGE: preferences.get(ATTR_USAGE, False),
            ATTR_STATISTICS: preferences.get(ATTR_STATISTICS, False),
@@ -244,9 +268,9 @@ class Analytics:
        return self._data.uuid

    @property
-    def endpoint(self) -> str:
+    def endpoint_basic(self) -> str:
        """Return the endpoint that will receive the payload."""
-        if HA_VERSION.endswith("0.dev0"):
+        if RELEASE_CHANNEL is ReleaseChannel.DEV:
            # dev installations will contact the dev analytics environment
            return ANALYTICS_ENDPOINT_URL_DEV
        return ANALYTICS_ENDPOINT_URL
@@ -277,13 +301,17 @@ class Analytics:
                ):
                    self._data.preferences[ATTR_DIAGNOSTICS] = False

+    async def _save(self) -> None:
+        """Save data."""
+        await self._store.async_save(dataclass_asdict(self._data))
+
    async def save_preferences(self, preferences: dict) -> None:
        """Save preferences."""
        preferences = PREFERENCE_SCHEMA(preferences)
        self._data.preferences.update(preferences)
        self._data.onboarded = True

-        await self._store.async_save(dataclass_asdict(self._data))
+        await self._save()

        if self.supervisor:
            await hassio.async_update_diagnostics(
@@ -292,17 +320,16 @@ class Analytics:

    async def send_analytics(self, _: datetime | None = None) -> None:
        """Send analytics."""
+        if not self.onboarded or not self.preferences.get(ATTR_BASE, False):
+            return
+
        hass = self.hass
        supervisor_info = None
        operating_system_info: dict[str, Any] = {}

-        if not self.onboarded or not self.preferences.get(ATTR_BASE, False):
-            LOGGER.debug("Nothing to submit")
-            return
-
        if self._data.uuid is None:
            self._data.uuid = gen_uuid()
-            await self._store.async_save(dataclass_asdict(self._data))
+            await self._save()

        if self.supervisor:
            supervisor_info = hassio.get_supervisor_info(hass)
@@ -436,7 +463,7 @@ class Analytics:

        try:
            async with timeout(30):
-                response = await self.session.post(self.endpoint, json=payload)
+                response = await self.session.post(self.endpoint_basic, json=payload)
                if response.status == 200:
                    LOGGER.info(
                        (
@@ -449,7 +476,7 @@ class Analytics:
                    LOGGER.warning(
                        "Sending analytics failed with statuscode %s from %s",
                        response.status,
-                        self.endpoint,
+                        self.endpoint_basic,
                    )
        except TimeoutError:
            LOGGER.error("Timeout sending analytics to %s", ANALYTICS_ENDPOINT_URL)
@@ -489,6 +516,182 @@ class Analytics:
            if entry.source != SOURCE_IGNORE and entry.disabled_by is None
        )

+    async def send_snapshot(self, _: datetime | None = None) -> None:
+        """Send a snapshot."""
+        if not self.onboarded or not self.preferences.get(ATTR_SNAPSHOTS, False):
+            return
+
+        payload = await _async_snapshot_payload(self.hass)
+
+        headers = {
+            "Content-Type": "application/json",
+            "User-Agent": f"home-assistant/{HA_VERSION}",
+        }
+        if self._data.submission_identifier is not None:
+            headers["X-Device-Database-Submission-Identifier"] = (
+                self._data.submission_identifier
+            )
+
+        try:
+            async with timeout(30):
+                response = await self.session.post(
+                    ANALYTICS_SNAPSHOT_ENDPOINT_URL, json=payload, headers=headers
+                )
+
+                if response.status == 200:  # OK
+                    response_data = await response.json()
+                    new_identifier = response_data.get("submission_identifier")
+
+                    if (
+                        new_identifier is not None
+                        and new_identifier != self._data.submission_identifier
+                    ):
+                        self._data.submission_identifier = new_identifier
+                        await self._save()
+
+                    LOGGER.info(
+                        "Submitted snapshot analytics to Home Assistant servers"
+                    )
+
+                elif response.status == 400:  # Bad Request
+                    response_data = await response.json()
+                    error_kind = response_data.get("kind", "unknown")
+                    error_message = response_data.get("message", "Unknown error")
+
+                    if error_kind == "invalid-submission-identifier":
+                        # Clear the invalid identifier and retry on next cycle
+                        LOGGER.warning(
+                            "Invalid submission identifier to %s, clearing: %s",
+                            ANALYTICS_SNAPSHOT_ENDPOINT_URL,
+                            error_message,
+                        )
+                        self._data.submission_identifier = None
+                        await self._save()
+                    else:
+                        LOGGER.warning(
+                            "Malformed snapshot analytics submission (%s) to %s: %s",
+                            error_kind,
+                            ANALYTICS_SNAPSHOT_ENDPOINT_URL,
+                            error_message,
+                        )
+
+                elif response.status == 503:  # Service Unavailable
+                    response_text = await response.text()
+                    LOGGER.warning(
+                        "Snapshot analytics service %s unavailable: %s",
+                        ANALYTICS_SNAPSHOT_ENDPOINT_URL,
+                        response_text,
+                    )
+
+                else:
+                    LOGGER.warning(
+                        "Unexpected status code %s when submitting snapshot analytics to %s",
+                        response.status,
+                        ANALYTICS_SNAPSHOT_ENDPOINT_URL,
+                    )
+
+        except TimeoutError:
+            LOGGER.error(
+                "Timeout sending snapshot analytics to %s",
+                ANALYTICS_SNAPSHOT_ENDPOINT_URL,
+            )
+        except aiohttp.ClientError as err:
+            LOGGER.error(
+                "Error sending snapshot analytics to %s: %r",
+                ANALYTICS_SNAPSHOT_ENDPOINT_URL,
+                err,
+            )
+
+    async def async_schedule(self) -> None:
+        """Schedule analytics."""
+        if not self.onboarded:
+            LOGGER.debug("Analytics not scheduled")
+            if self._basic_scheduled is not None:
+                self._basic_scheduled()
+                self._basic_scheduled = None
+            if self._snapshot_scheduled:
+                self._snapshot_scheduled()
+                self._snapshot_scheduled = None
+            return
+
+        if not self.preferences.get(ATTR_BASE, False):
+            LOGGER.debug("Basic analytics not scheduled")
+            if self._basic_scheduled is not None:
+                self._basic_scheduled()
+                self._basic_scheduled = None
+        elif self._basic_scheduled is None:
+            # Wait 15 min after started for basic analytics
+            self._basic_scheduled = async_call_later(
+                self.hass,
+                900,
+                HassJob(
+                    self._async_schedule_basic,
+                    name="basic analytics schedule",
+                    cancel_on_shutdown=True,
+                ),
+            )
+
+        if not self.preferences.get(ATTR_SNAPSHOTS, False) or RELEASE_CHANNEL not in (
+            ReleaseChannel.DEV,
+            ReleaseChannel.NIGHTLY,
+        ):
+            LOGGER.debug("Snapshot analytics not scheduled")
+            if self._snapshot_scheduled:
+                self._snapshot_scheduled()
+                self._snapshot_scheduled = None
+        elif self._snapshot_scheduled is None:
+            snapshot_submission_time = self._data.snapshot_submission_time
+
+            if snapshot_submission_time is None:
+                # Randomize the submission time within the 24 hours
+                snapshot_submission_time = random.uniform(0, 86400)
+                self._data.snapshot_submission_time = snapshot_submission_time
+                await self._save()
+                LOGGER.debug(
+                    "Initialized snapshot submission time to %s",
+                    snapshot_submission_time,
+                )
+
+            # Calculate delay until next submission
+            current_time = time.time()
+            delay = (snapshot_submission_time - current_time) % 86400
+
+            self._snapshot_scheduled = async_call_later(
+                self.hass,
+                delay,
+                HassJob(
+                    self._async_schedule_snapshots,
+                    name="snapshot analytics schedule",
+                    cancel_on_shutdown=True,
+                ),
+            )
+
+    async def _async_schedule_basic(self, _: datetime | None = None) -> None:
+        """Schedule basic analytics."""
+        await self.send_analytics()
+
+        # Send basic analytics every day
+        self._basic_scheduled = async_track_time_interval(
+            self.hass,
+            self.send_analytics,
+            INTERVAL,
+            name="basic analytics daily",
+            cancel_on_shutdown=True,
+        )
+
+    async def _async_schedule_snapshots(self, _: datetime | None = None) -> None:
+        """Schedule snapshot analytics."""
+        await self.send_snapshot()
+
+        # Send snapshot analytics every day
+        self._snapshot_scheduled = async_track_time_interval(
+            self.hass,
+            self.send_snapshot,
+            INTERVAL,
+            name="snapshot analytics daily",
+            cancel_on_shutdown=True,
+        )
+

 def _domains_from_yaml_config(yaml_configuration: dict[str, Any]) -> set[str]:
    """Extract domains from the YAML configuration."""
@@ -505,8 +708,8 @@ DEFAULT_DEVICE_ANALYTICS_CONFIG = DeviceAnalyticsModifications()
 DEFAULT_ENTITY_ANALYTICS_CONFIG = EntityAnalyticsModifications()


-async def async_devices_payload(hass: HomeAssistant) -> dict:  # noqa: C901
-    """Return detailed information about entities and devices."""
+async def _async_snapshot_payload(hass: HomeAssistant) -> dict:  # noqa: C901
+    """Return detailed information about entities and devices for a snapshot."""
    dev_reg = dr.async_get(hass)
    ent_reg = er.async_get(hass)

@@ -711,8 +914,13 @@ async def async_devices_payload(hass: HomeAssistant) -> dict:  # noqa: C901

            entities_info.append(entity_info)

+    return integrations_info
+
+
+async def async_devices_payload(hass: HomeAssistant) -> dict:
+    """Return detailed information about entities and devices for a direct download."""
    return {
-        "version": "home-assistant:1",
+        "version": f"home-assistant:{SNAPSHOT_VERSION}",
        "home_assistant": HA_VERSION,
-        "integrations": integrations_info,
+        "integrations": await _async_snapshot_payload(hass),
    }
@@ -7,6 +7,8 @@ import voluptuous as vol

 ANALYTICS_ENDPOINT_URL = "https://analytics-api.home-assistant.io/v1"
 ANALYTICS_ENDPOINT_URL_DEV = "https://analytics-api-dev.home-assistant.io/v1"
+SNAPSHOT_VERSION = "1"
+ANALYTICS_SNAPSHOT_ENDPOINT_URL = f"https://device-database.eco-dev-aws.openhomefoundation.com/api/v1/snapshot/{SNAPSHOT_VERSION}"
 DOMAIN = "analytics"
 INTERVAL = timedelta(days=1)
 STORAGE_KEY = "core.analytics"
@@ -38,6 +40,7 @@ ATTR_PREFERENCES = "preferences"
 ATTR_PROTECTED = "protected"
 ATTR_RECORDER = "recorder"
 ATTR_SLUG = "slug"
+ATTR_SNAPSHOTS = "snapshots"
 ATTR_STATE_COUNT = "state_count"
 ATTR_STATISTICS = "statistics"
 ATTR_SUPERVISOR = "supervisor"
@@ -51,6 +54,7 @@ ATTR_VERSION = "version"
 PREFERENCE_SCHEMA = vol.Schema(
    {
        vol.Optional(ATTR_BASE): bool,
+        vol.Optional(ATTR_SNAPSHOTS): bool,
        vol.Optional(ATTR_DIAGNOSTICS): bool,
        vol.Optional(ATTR_STATISTICS): bool,
        vol.Optional(ATTR_USAGE): bool,
@@ -1,47 +1,25 @@
 {
  "config": {
-    "step": {
-      "user": {
-        "data": {
-          "tracked_addons": "Add-ons",
-          "tracked_integrations": "Integrations",
-          "tracked_custom_integrations": "Custom integrations"
-        },
-        "data_description": {
-          "tracked_addons": "Select the add-ons you want to track",
-          "tracked_integrations": "Select the integrations you want to track",
-          "tracked_custom_integrations": "Select the custom integrations you want to track"
-        }
-      }
-    },
    "abort": {
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
    "error": {
      "no_integrations_selected": "You must select at least one integration to track"
-    }
-  },
-  "options": {
+    },
    "step": {
-      "init": {
+      "user": {
        "data": {
-          "tracked_addons": "[%key:component::analytics_insights::config::step::user::data::tracked_addons%]",
-          "tracked_integrations": "[%key:component::analytics_insights::config::step::user::data::tracked_integrations%]",
-          "tracked_custom_integrations": "[%key:component::analytics_insights::config::step::user::data::tracked_custom_integrations%]"
+          "tracked_addons": "Add-ons",
+          "tracked_custom_integrations": "Custom integrations",
+          "tracked_integrations": "Integrations"
        },
        "data_description": {
-          "tracked_addons": "[%key:component::analytics_insights::config::step::user::data_description::tracked_addons%]",
-          "tracked_integrations": "[%key:component::analytics_insights::config::step::user::data_description::tracked_integrations%]",
-          "tracked_custom_integrations": "[%key:component::analytics_insights::config::step::user::data_description::tracked_custom_integrations%]"
+          "tracked_addons": "Select the add-ons you want to track",
+          "tracked_custom_integrations": "Select the custom integrations you want to track",
+          "tracked_integrations": "Select the integrations you want to track"
        }
      }
-    },
-    "abort": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
-    "error": {
-      "no_integrations_selected": "[%key:component::analytics_insights::config::error::no_integrations_selected%]"
    }
  },
  "entity": {
@@ -56,5 +34,27 @@
        "name": "Total reported integrations"
      }
    }
+  },
+  "options": {
+    "abort": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "error": {
+      "no_integrations_selected": "[%key:component::analytics_insights::config::error::no_integrations_selected%]"
+    },
+    "step": {
+      "init": {
+        "data": {
+          "tracked_addons": "[%key:component::analytics_insights::config::step::user::data::tracked_addons%]",
+          "tracked_custom_integrations": "[%key:component::analytics_insights::config::step::user::data::tracked_custom_integrations%]",
+          "tracked_integrations": "[%key:component::analytics_insights::config::step::user::data::tracked_integrations%]"
+        },
+        "data_description": {
+          "tracked_addons": "[%key:component::analytics_insights::config::step::user::data_description::tracked_addons%]",
+          "tracked_custom_integrations": "[%key:component::analytics_insights::config::step::user::data_description::tracked_custom_integrations%]",
+          "tracked_integrations": "[%key:component::analytics_insights::config::step::user::data_description::tracked_integrations%]"
+        }
+      }
+    }
  }
 }
--- a/Show More
+++ b/Show More