From c57f978b1e97ee24c2096046725d0f967ede8796 Mon Sep 17 00:00:00 2001
From: tronikos <tronikos@users.noreply.github.com>
Date: Sun, 25 May 2025 09:51:58 -0700
Subject: [PATCH 01/30] Update Google Search workaround for Google AI (#39191)

---
 source/_integrations/google_generative_ai_conversation.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/_integrations/google_generative_ai_conversation.markdown b/source/_integrations/google_generative_ai_conversation.markdown
index b2c5135f433..5627a96dad4 100644
--- a/source/_integrations/google_generative_ai_conversation.markdown
+++ b/source/_integrations/google_generative_ai_conversation.markdown
@@ -83,7 +83,7 @@ But you can do the following workaround that exposes a script to voice assistant
 
 1. Add a second Google Generative AI service.
 2. Select **Configure**
-3. Select **No control** under **Control Home Assistant**
+3. In the **Control Home Assistant** section, uncheck **Assist** and any other options.
 4. Uncheck **Recommended model settings**
 5. Select **Submit**
 6. Check **Enable Google Search tool**

From 90210faf9bf311efba04f807ca510e5e306fef02 Mon Sep 17 00:00:00 2001
From: Hmmbob <33529490+hmmbob@users.noreply.github.com>
Date: Sun, 25 May 2025 18:53:45 +0200
Subject: [PATCH 02/30] Microsoft TTS: remove note about Neural voices (#39197)

---
 source/_integrations/microsoft.markdown | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/source/_integrations/microsoft.markdown b/source/_integrations/microsoft.markdown
index 60849da6e5f..ba31a7d0f4d 100644
--- a/source/_integrations/microsoft.markdown
+++ b/source/_integrations/microsoft.markdown
@@ -75,12 +75,6 @@ region:
   default: "`eastus`"
 {% endconfiguration %}
 
-{% note %}
-Not all Azure regions support high-quality neural voices. Use [this overview](https://learn.microsoft.com/azure/cognitive-services/speech-service/regions) to determine the availability of standard and neural voices by region/endpoint.
- 
-New users ([any newly created Azure Speech resource after August 31st, 2021](https://learn.microsoft.com/azure/cognitive-services/speech-service/text-to-speech#more-about-neural-text-to-speech-features)) can only use neural voices. Existing resources can continue using standard voices through August 31st, 2024.
-{% endnote %}
-
 {% important %}
 If you set the language to anything other than the default `en-us`, you will need to specify a matching voice type as well.
 {% endimportant %}

From 77d8865a0b6442a16d1e6765f70b602ddd30bce5 Mon Sep 17 00:00:00 2001
From: Jan Bouwhuis <jbouwh@users.noreply.github.com>
Date: Sun, 25 May 2025 18:56:21 +0200
Subject: [PATCH 03/30] Fix mqtt fan speed range min and max config
 descriptions (#39183)

---
 source/_integrations/fan.mqtt.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/_integrations/fan.mqtt.markdown b/source/_integrations/fan.mqtt.markdown
index 29b117987ca..5cb84cbcd0a 100644
--- a/source/_integrations/fan.mqtt.markdown
+++ b/source/_integrations/fan.mqtt.markdown
@@ -294,12 +294,12 @@ retain:
   type: boolean
   default: true
 speed_range_max:
-  description: The maximum of numeric output range (representing 100 %). The number of speeds within the `speed_range` / `100` will determine the `percentage_step`.
+  description: The maximum of numeric output range (representing 100 %). The `percentage_step` is defined by `100` / the number of speeds within the speed range.
   required: false
   type: integer
   default: 100
 speed_range_min:
-  description: The minimum of numeric output range (`off` not included, so `speed_range_min` - `1` represents 0 %). The number of speeds within the speed_range / 100 will determine the `percentage_step`.
+  description: The minimum of numeric output range (`off` not included, so `speed_range_min` - `1` represents 0 %). The `percentage_step` is defined by `100` / the number of speeds within the speed range.
   required: false
   type: integer
   default: 1

From 9e9075c8de1293b7bed4b7148aa87c2ea5563302 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Sun, 25 May 2025 19:09:33 +0200
Subject: [PATCH 04/30] Home Assistant Hardware integration: add links to
 related integrations (#39131)

---
 source/_integrations/homeassistant_hardware.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/_integrations/homeassistant_hardware.markdown b/source/_integrations/homeassistant_hardware.markdown
index 596264d4364..64de73a9bab 100644
--- a/source/_integrations/homeassistant_hardware.markdown
+++ b/source/_integrations/homeassistant_hardware.markdown
@@ -14,7 +14,7 @@ ha_platforms:
 ---
 
 The Home Assistant Hardware integration provides functionality
-shared between Home Assistant Yellow and Home Assistant Connect ZBT-1.
+shared between [Home Assistant Connect ZBT-1](/integrations/homeassistant_sky_connect/), [Home Assistant Green](/integrations/homeassistant_green), and [Home Assistant Yellow](/integrations/homeassistant_yellow/).
 
 ## Configuration
 

From d35ca3f8f0bdd1bf0cce10f55bf71da1f80761f2 Mon Sep 17 00:00:00 2001
From: Didgeridrew <19187320+Didgeridrew@users.noreply.github.com>
Date: Sun, 25 May 2025 13:20:00 -0400
Subject: [PATCH 05/30] Edit notifier service example in group.markdown
 (#39198)

---
 source/_integrations/group.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/_integrations/group.markdown b/source/_integrations/group.markdown
index 27caa127aa9..f5bbc6936f4 100644
--- a/source/_integrations/group.markdown
+++ b/source/_integrations/group.markdown
@@ -354,7 +354,7 @@ notify:
       - action: html5
         data:
           target: "macbook"
-      - action: html5_nexus
+      - action: mobile_app_pauluus
 ```
 
 {% configuration %}

From 9b77fa43b05986577845cb562fc00117e53bade8 Mon Sep 17 00:00:00 2001
From: G Johansson <goran.johansson@shiftit.se>
Date: Sun, 25 May 2025 19:20:26 +0200
Subject: [PATCH 06/30] Add example allowlist_external_dirs in filesize
 (#39136)

---
 source/_integrations/filesize.markdown | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/source/_integrations/filesize.markdown b/source/_integrations/filesize.markdown
index b1724722927..367d6bbc022 100644
--- a/source/_integrations/filesize.markdown
+++ b/source/_integrations/filesize.markdown
@@ -21,6 +21,20 @@ The **File size** {% term integration %} is for displaying the size in MB of a f
 
 File paths must also be added to [allowlist_external_dirs](/integrations/homeassistant/#allowlist_external_dirs) in your `configuration.yaml`.
 
+Example `allowlist_external_dirs` configuration to monitor a file in your configuration folder.
+
+{% raw %}
+
+```yaml
+
+homeassistant:
+  allowlist_external_dirs:
+    - "/config" # Default configuration directory
+
+```
+
+{% endraw %}
+
 File paths should be absolute paths. For example: `/config/home-assistant_v2.db` to monitor the size of the default database.
 
 {% endimportant %}

From 45fd06446eb8598b00427cf86cdaf73b6e121251 Mon Sep 17 00:00:00 2001
From: "Rob C. Maehl" <rcmaehl@gmail.com>
Date: Sun, 25 May 2025 13:25:01 -0400
Subject: [PATCH 07/30] Add remark about Client MAC Address Randomization
 (#39121)

---
 source/_integrations/unifi.markdown | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/_integrations/unifi.markdown b/source/_integrations/unifi.markdown
index 2d58eb1dd27..d4e267bc63a 100644
--- a/source/_integrations/unifi.markdown
+++ b/source/_integrations/unifi.markdown
@@ -109,6 +109,8 @@ This platform allows you to detect presence by looking at devices connected to a
 
 If tracked devices continue to show "Home" when not connect/present and show connected in the UniFi Controller, disable 802.11r Fast Roaming.  When enabled, it has been observed on the various UniFi Controller versions, failure to declare disconnected clients.
 
+Presence detection is not compatible with Client MAC Address Randomization, enabled by default on most modern SmartPhones. This feature will need to be disabled within the client device settings, usually under the settings for the specific network.
+
 Presence detection depends on accurate time configuration between Home Assistant and the UniFi Network application.
 
 If Home Assistant and the UniFi Network application are running on separate machines or VMs ensure that all clocks are synchronized. Failing to have synchronized clocks will lead to Home Assistant failing to mark a device as home.

From a375a339c463436ccc9c132e4f916c6e8fb98781 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 May 2025 08:37:44 +0200
Subject: [PATCH 08/30] build(deps-dev): bump sorbet-runtime from 0.5.12124 to
 0.5.12130 (#39224)

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6575f2805b1..74f797562a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -159,7 +159,7 @@ GEM
       rack-protection (= 4.1.1)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    sorbet-runtime (0.5.12124)
+    sorbet-runtime (0.5.12130)
     stringex (2.8.6)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

From 0374b40727a282a5560cef4c4b0c6fed7b53ab62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 May 2025 08:38:03 +0200
Subject: [PATCH 09/30] build(deps-dev): bump ruby-lsp from 0.23.21 to 0.23.23
 (#39223)

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index abf81fac480..8d1af9974ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ group :development do
   gem 'sassc', '2.1.0'
   gem 'sass-embedded', '1.89.0'
   gem 'rubocop', '1.75.7'
-  gem 'ruby-lsp', '0.23.21'
+  gem 'ruby-lsp', '0.23.23'
   gem 'rackup', '2.2.1'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 74f797562a5..77afd43fc90 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -133,10 +133,10 @@ GEM
     rubocop-ast (1.44.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
-    ruby-lsp (0.23.21)
+    ruby-lsp (0.23.23)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
-      rbs (>= 3, < 4)
+      rbs (>= 3, < 5)
       sorbet-runtime (>= 0.5.10782)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
@@ -186,7 +186,7 @@ DEPENDENCIES
   rackup (= 2.2.1)
   rake (= 13.2.1)
   rubocop (= 1.75.7)
-  ruby-lsp (= 0.23.21)
+  ruby-lsp (= 0.23.23)
   sass-embedded (= 1.89.0)
   sass-globbing (= 1.1.5)
   sassc (= 2.1.0)

From 7cdd52dc27d96f855cfd3f3fef8df755ea5bfe34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 May 2025 08:46:41 +0200
Subject: [PATCH 10/30] build(deps-dev): bump json from 2.12.0 to 2.12.2
 (#39222)

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 77afd43fc90..3e2faf63535 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,7 +70,7 @@ GEM
       nokogiri (~> 1.12)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.12.0)
+    json (2.12.2)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)

From 5a4df61a676c53e60abbf435cb6bcb007dbd6be3 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 09:34:35 +0200
Subject: [PATCH 11/30] Advanced Raspberry Pi: remove Core as installation type
 (#39172)

---
 source/installation/raspberrypi-other.markdown | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/source/installation/raspberrypi-other.markdown b/source/installation/raspberrypi-other.markdown
index cdc363c0471..011f69f34f3 100644
--- a/source/installation/raspberrypi-other.markdown
+++ b/source/installation/raspberrypi-other.markdown
@@ -1,7 +1,10 @@
 ---
-title: "Advanced Raspberry Pi installations"
-description: "Advanced instructions to install Home Assistant variants on a Raspberry Pi"
+title: "Advanced Raspberry Pi installation"
+description: "Instructions to install Home Assistant Container on a Raspberry Pi. This is for advanced users only."
 installation_type: raspberrypi-other
+related:
+  - docs: /installation/raspberrypi/
+    title: Installing the Home Assistant OS on Raspberry Pi
 ---
 
 {% comment %}
@@ -11,8 +14,7 @@ Included section for this page is located under source/_includes/installation
 {% assign board = "Raspberry Pi" %}
 {% assign installation_media = "SD card" %}
 
-While we recommend Home Assistant OS, there are also alternative ways to install Home Assistant. Before you continue, be aware of the limitations and differences compared to Home Assistant OS. You can find more information on the [installation page](/installation/#about-installation-methods). Most notably,
+While we recommend using the {% term "Home Assistant Operating System" %}, you can also use the {% term "Home Assistant Container" %} method to install Home Assistant. Before you continue, be aware of the limitations and differences compared to the {% term "Home Assistant Operating System" %}. You can find more information on the [installation page](/installation/#about-installation-methods). Most notably,
 <a href="/addons">add-ons</a> are only available with the Home Assistant Operating System.
 
 {% include installation/container.md %}
-{% include installation/core.md %}

From ce820fb65e259d1c61e9bee8dd02b5e76c28f193 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 09:54:59 +0200
Subject: [PATCH 12/30] Core: delete installation instructions (#39186)

---
 source/_includes/installation/core.md         | 101 ------------------
 .../installation/core/linux.markdown          |   0
 .../installation/core/macos.markdown          |   0
 .../installation/core/windows.markdown        |   0
 4 files changed, 101 deletions(-)
 delete mode 100644 source/_includes/installation/core.md
 delete mode 100644 source/_includes/installation/core/linux.markdown
 delete mode 100644 source/_includes/installation/core/macos.markdown
 delete mode 100644 source/_includes/installation/core/windows.markdown

diff --git a/source/_includes/installation/core.md b/source/_includes/installation/core.md
deleted file mode 100644
index 96741f93370..00000000000
--- a/source/_includes/installation/core.md
+++ /dev/null
@@ -1,101 +0,0 @@
-## Install Home Assistant Core
-
-{% if page.installation_type == 'windows' %}
-### Install WSL
-
-To install {% term "Home Assistant Core" %}  on Windows, you will need to use the Windows Subsystem for Linux (WSL). Follow the [WSL installation instructions](https://docs.microsoft.com/windows/wsl/install-win10) and install Ubuntu from the Windows Store.
-
-As an alternative, Home Assistant OS can be installed in a Linux guest VM. Running {% term "Home Assistant Core" %}  directly on Windows is not supported.
-{% endif %}
-
-{% caution %}
-This is an advanced installation process, and some steps might differ on your system. Considering the nature of this installation type, we assume you can handle subtle differences between this document and the system configuration you are using. When in doubt, please consider one of the [other installation methods](/installation/), as they might be a better fit instead.
-{% endcaution %}
-
-### Prerequisites
-
-This guide assumes that you already have an operating system setup and have installed Python {{site.installation.versions.python}} (including the package `python3-dev`) or newer.
-
-### Install dependencies
-
-Before you start, make sure your system is fully updated, all packages in this guide are installed with `apt`, if your OS does not have that, look for alternatives.
-
-```bash
-sudo apt-get update
-sudo apt-get upgrade -y
-```
-
-Install the dependencies:
-
-```bash
-sudo apt-get install -y python3 python3-dev python3-venv python3-pip bluez libffi-dev libssl-dev libjpeg-dev zlib1g-dev autoconf build-essential libopenjp2-7 libtiff6 libturbojpeg0-dev tzdata ffmpeg liblapack3 liblapack-dev libatlas-base-dev
-```
-
-The above-listed dependencies might differ or missing, depending on your system or personal use of Home Assistant.
-
-### Create an account
-
-Add an account for Home Assistant Core called `homeassistant`.
-Since this account is only for running Home Assistant Core the extra arguments of `-rm` is added to create a system account and create a home directory.
-{%- if site.installation.types[page.installation_type].board %}
-The arguments `-G dialout,gpio,i2c` adds the user to the `dialout`, `gpio` and the `i2c` group. The first is required for using Z-Wave and Zigbee controllers, while the second is required to communicate with GPIO.
-
-```bash
-sudo useradd -rm homeassistant -G dialout,gpio,i2c
-```
-
-{% else %}
-
-```bash
-sudo useradd -rm homeassistant
-```
-
-{% endif %}
-
-### Create the virtual environment
-
-First we will create a directory for the installation of Home Assistant Core and change the owner to the `homeassistant` account.
-
-```bash
-sudo mkdir /srv/homeassistant
-sudo chown homeassistant:homeassistant /srv/homeassistant
-```
-
-Next up is to create and change to a virtual environment for Home Assistant Core. This will be done as the `homeassistant` account.
-
-```bash
-sudo -u homeassistant -H -s
-cd /srv/homeassistant
-python3 -m venv .
-source bin/activate
-```
-
-Once you have activated the virtual environment (notice the prompt change to `(homeassistant) homeassistant@raspberrypi:/srv/homeassistant $`) you will need to run the following command to install a required Python package.
-
-```bash
-python3 -m pip install wheel
-```
-
-Once you have installed the required Python package, it is now time to install Home Assistant Core!
-
-```bash
-pip3 install homeassistant=={{ site.current_major_version }}.{{ site.current_minor_version }}.{{ site.current_patch_version }}
-```
-
-**Troubleshooting**: If you do not see the above version of Home Assistant package in your environment, make sure you have the correct Python version installed, as defined under the [Prerequisites](#prerequisites).
-
-Start Home Assistant Core for the first time. This will complete the installation for you, automatically creating the `.homeassistant` configuration directory in the `/home/homeassistant` directory, and installing any basic dependencies.
-
-```bash
-hass
-```
-
-You can now reach your installation via the web interface on `http://homeassistant.local:8123`.
-
-If this address doesn't work you may also try `http://localhost:8123` or `http://X.X.X.X:8123` (replace X.X.X.X with your machines’ IP address).
-
-{% note %}
-
-When you run the `hass` command for the first time, it will download, install and cache the necessary libraries/dependencies. This procedure may take anywhere between 5 to 10 minutes. During that time, you may get a **site cannot be reached** error when accessing the web interface. This will only happen the first time. Subsequent restarts will be much faster.
-
-{% endnote %}
diff --git a/source/_includes/installation/core/linux.markdown b/source/_includes/installation/core/linux.markdown
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/source/_includes/installation/core/macos.markdown b/source/_includes/installation/core/macos.markdown
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/source/_includes/installation/core/windows.markdown b/source/_includes/installation/core/windows.markdown
deleted file mode 100644
index e69de29bb2d..00000000000

From 88b53742c77ecd3d4ae7ba5e39cb649ea58fc2c9 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 09:57:46 +0200
Subject: [PATCH 13/30] Common tasks: remove Core and Supervised (#39189)

---
 .../asides/common_tasks_navigation.html       |  2 -
 source/_includes/asides/docs_sitemap.html     |  2 -
 source/common-tasks/supervised.markdown       | 43 -------------------
 3 files changed, 47 deletions(-)
 delete mode 100644 source/common-tasks/supervised.markdown

diff --git a/source/_includes/asides/common_tasks_navigation.html b/source/_includes/asides/common_tasks_navigation.html
index 13369b6edc1..4024367cb2a 100644
--- a/source/_includes/asides/common_tasks_navigation.html
+++ b/source/_includes/asides/common_tasks_navigation.html
@@ -5,8 +5,6 @@
       <li>{% active_link /common-tasks/general/ Installation independent %}</li>
       <li>{% active_link /common-tasks/os/ Home Assistant Operating System %}</li>
       <li>{% active_link /common-tasks/container/ Home Assistant Container %}</li>
-      <li>{% active_link /common-tasks/core/ Home Assistant Core %}</li>
-      <li>{% active_link /common-tasks/supervised/ Home Assistant Supervised %}</li>
     </ul>
   </div>
 </section>
diff --git a/source/_includes/asides/docs_sitemap.html b/source/_includes/asides/docs_sitemap.html
index 578fdbe0521..044d87e0e1e 100644
--- a/source/_includes/asides/docs_sitemap.html
+++ b/source/_includes/asides/docs_sitemap.html
@@ -192,8 +192,6 @@
     <li>{% active_link /common-tasks/general/ Installation independent %}</li>
     <li>{% active_link /common-tasks/os/ Home Assistant Operating System %}</li>
     <li>{% active_link /common-tasks/container/ Home Assistant Container %}</li>
-    <li>{% active_link /common-tasks/core/ Home Assistant Core %}</li>
-    <li>{% active_link /common-tasks/supervised/ Home Assistant Supervised %}</li>
     <li>{% active_link /docs/troubleshooting_general/ General troubleshooting %}</li>
   </ul>
   {% endif %}
diff --git a/source/common-tasks/supervised.markdown b/source/common-tasks/supervised.markdown
deleted file mode 100644
index f401528657e..00000000000
--- a/source/common-tasks/supervised.markdown
+++ /dev/null
@@ -1,43 +0,0 @@
----
-title: "Common tasks - Supervised"
-description: "Common tasks for Home Assistant Supervised"
-installation: supervised
-installation_name: Supervised
-related:
-  - docs: /docs/configuration/
----
-
-
-{% include common-tasks/file_access.md %}
-
-## Backup
-
-To learn how to back up the system or how to restore a system from a backup, refer to the backup documentation under [common tasks](/common-tasks/general/#backups).
-
-### Alternative: Creating a backup using the Home Assistant Command Line Interface
-
-In general, to create or restore from a backup, follow the steps described under [common tasks](/common-tasks/general/#backups). However, If you have the {% term "Home Assistant Supervised" %} installed, you can also create a backup from the command line. Follow these steps:
-
-1. `ha backups list` - lists backups and their slugnames
-2. `ha backups restore slugname` - restores a specific backup
-3. `ha backups new --name nameofbackup` - create a backup
-
-For additional information about command line usage, use the `ha help` command or refer to the [Home Assistant Command Line documentation](/common-tasks/supervised/#home-assistant-via-the-command-line).
-
-## Update
-
-{% include common-tasks/update.md %}
-{% include common-tasks/network_storage.md %}
-{% include common-tasks/lost_password.md %}
-{% include common-tasks/third-party-addons.md %}
-{% include common-tasks/configuration_check.md %}
-
-## Home Assistant versions
-
-To see which version your system is running, go to {% my info title="**Settings** > **About**" %}.
-
-{% include common-tasks/specific_version.md %}
-{% include common-tasks/beta_version.md %}
-{% include common-tasks/development_version.md %}
-
-{% include common-tasks/commandline.md %}
\ No newline at end of file

From f4cb788ddcfe15e9da7891f945d2efeb84857080 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 10:44:26 +0200
Subject: [PATCH 14/30] Common tasks: remove core specific file (#39228)

---
 source/common-tasks/core.markdown | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 source/common-tasks/core.markdown

diff --git a/source/common-tasks/core.markdown b/source/common-tasks/core.markdown
deleted file mode 100644
index da09a975c86..00000000000
--- a/source/common-tasks/core.markdown
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: "Common tasks - Core"
-description: "Common tasks for Home Assistant Core"
-installation: core
----
-
-## Backup
-
-To learn how to back up the system or how to restore a system from a backup, refer to the backup documentation under [common tasks](/common-tasks/general/#backups).
-
-## Update
-
-{% include common-tasks/update.md %}
-{% include common-tasks/specific_version.md %}
-{% include common-tasks/beta_version.md %}
-{% include common-tasks/development_version.md %}
-{% include common-tasks/configuration_check.md %}

From 0e98434f604cb0911c5b2caa9212b5752eb463f8 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 11:47:46 +0200
Subject: [PATCH 15/30] Blueprint selectors: remove mention of Core and
 Supervisor (#39187)

---
 source/_docs/blueprint/selectors.markdown | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/source/_docs/blueprint/selectors.markdown b/source/_docs/blueprint/selectors.markdown
index 4cfe13d1c35..b6cef9cc50f 100644
--- a/source/_docs/blueprint/selectors.markdown
+++ b/source/_docs/blueprint/selectors.markdown
@@ -83,8 +83,7 @@ The output of this selector is a list of actions. For example:
 
 ## Add-on selector
 
-This can only be used on an installation with a Supervisor. For installations
-that do not have that, an error will be displayed.
+This can only be used on Home Assistant Operating System installation. For Home Assistant Container installations, an error will be displayed.
 
 The add-on selector allows the user to input an add-on slug.
 On the user interface, it will list all installed add-ons and use the slug of the
@@ -276,8 +275,7 @@ assist_pipeline:
 
 ## Backup location selector
 
-This can only be used on an installation with a Supervisor (Operating System or
-Supervised). For installations of type {% term "Home Assistant Core" %} or {% term "Home Assistant Container" %}, an error
+This can only be used on an installation with a Home Assistant Operating System. For {% term "Home Assistant Container" %} installations, an error
 will be displayed.
 
 The backup location selector shows a list of places a backup could go, depending

From aa9b2fe90a56a9bf805d90e60932e477ef733b72 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 12:00:07 +0200
Subject: [PATCH 16/30] Configuration check: remove Core and Supervised steps
 (#39233)

---
 .../common-tasks/configuration_check.md       | 52 +------------------
 1 file changed, 1 insertion(+), 51 deletions(-)

diff --git a/source/_includes/common-tasks/configuration_check.md b/source/_includes/common-tasks/configuration_check.md
index 993ef257afa..ccecd87cfdf 100644
--- a/source/_includes/common-tasks/configuration_check.md
+++ b/source/_includes/common-tasks/configuration_check.md
@@ -1,6 +1,6 @@
 ## Configuration check
 
-{% if page.installation == "os" or page.installation == "supervised" %}
+{% if page.installation == "os" %}
 
 After changing configuration or automation files, check if the configuration is valid before restarting Home Assistant Core.
 
@@ -56,54 +56,4 @@ You can get help from the command line using:
 docker exec homeassistant python -m homeassistant --script check_config --help
 ```
 
-{% elsif page.installation == "core" %}
-
-After changing configuration files, check if the configuration is valid before restarting Home Assistant Core.
-
-1. Switch to the user that is running Home Assistant.
-
-    ```bash
-    sudo -u homeassistant -H -s
-    ```
-
-2. Activate the virtual environment that Home Assistant is running in.
-
-    ```bash
-    source /srv/homeassistant/bin/activate
-    ```
-
-3. Run the configuration check.
-
-    Run the full check:
-
-    ```bash
-    hass --script check_config
-    ```
-
-    Listing all loaded files:
-
-    ```bash
-    hass --script check_config --files
-    ```
-
-    Viewing a integration’s configuration ([`light`](/integrations/light) in this example):
-
-    ```bash
-    hass --script check_config --info light
-    ```
-
-    Or all integrations’ configuration
-
-    ```bash
-    hass --script check_config --info all
-    ```
-
-    You can get help from the command line using:
-
-    ```bash
-    hass --script check_config --help
-    ```
-
-4. When that is complete, restart the service for it to use the new files.
-
 {% endif %}

From 4c1d353dab1e1c86bd36660c646b3ea0c56ca276 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 12:02:53 +0200
Subject: [PATCH 17/30] Common tasks development version: remove Supervised
 filter (#39230)

---
 source/_includes/common-tasks/development_version.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/_includes/common-tasks/development_version.md b/source/_includes/common-tasks/development_version.md
index d2e2cbccb9f..524c362743d 100644
--- a/source/_includes/common-tasks/development_version.md
+++ b/source/_includes/common-tasks/development_version.md
@@ -6,9 +6,9 @@ If you want to stay on the bleeding-edge Home Assistant Core development branch,
 The `dev` branch is likely to be unstable. Potential consequences include loss of data and instance corruption.
 {% endcaution %}
 
-{% if page.installation == "os" or page.installation == "supervised" %}
+{% if page.installation == "os" %}
 
-1. Join the dev channel.
+1. Join the dev channel
 
     ```bash
     ha supervisor options --channel dev

From fc14b5d413fa66f91ea7bb043a3b8f59f7ff6b14 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 12:35:55 +0200
Subject: [PATCH 18/30] Secrets remove core specific steps (#39188)

---
 source/_docs/blueprint/selectors.markdown   |  5 +++--
 source/_docs/configuration/secrets.markdown | 12 ++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/source/_docs/blueprint/selectors.markdown b/source/_docs/blueprint/selectors.markdown
index b6cef9cc50f..33a582dc92b 100644
--- a/source/_docs/blueprint/selectors.markdown
+++ b/source/_docs/blueprint/selectors.markdown
@@ -83,7 +83,7 @@ The output of this selector is a list of actions. For example:
 
 ## Add-on selector
 
-This can only be used on Home Assistant Operating System installation. For Home Assistant Container installations, an error will be displayed.
+This can only be used on a {% term "Home Assistant Operating System" %} installation. For {% term "Home Assistant Container" %} installations, an error will be displayed.
 
 The add-on selector allows the user to input an add-on slug.
 On the user interface, it will list all installed add-ons and use the slug of the
@@ -275,7 +275,8 @@ assist_pipeline:
 
 ## Backup location selector
 
-This can only be used on an installation with a Home Assistant Operating System. For {% term "Home Assistant Container" %} installations, an error
+This can only be used on an installation with a {% term "Home Assistant Operating System" %}. For {% term "Home Assistant Container" %} installations, an error
+
 will be displayed.
 
 The backup location selector shows a list of places a backup could go, depending
diff --git a/source/_docs/configuration/secrets.markdown b/source/_docs/configuration/secrets.markdown
index d7130f254df..25092080c1f 100644
--- a/source/_docs/configuration/secrets.markdown
+++ b/source/_docs/configuration/secrets.markdown
@@ -51,20 +51,12 @@ When you start splitting your configuration into multiple files, you might end u
 - A `secrets.yaml` located in the same folder as the {% term YAML %} file referencing the secret,
 - next, parent folders will be searched for a `secrets.yaml` file with the secret, stopping at the folder with the main {% term "`configuration.yaml`" %}.
 
-To see where secrets are being loaded from, you can either add an option to your `secrets.yaml` file or use the `check_config` script. The latter is only available for {% term "Home Assistant Core" %} installations given it's available through [`hass`](/docs/tools/hass/).
+To see where secrets are being loaded from, you can add an option to your `secrets.yaml` file.
 
-*Option 1*: Print where secrets are retrieved from to the Home Assistant log by adding the following to `secrets.yaml`:
+Print where secrets are retrieved from to the Home Assistant log by adding the following to `secrets.yaml`:
 
 ```yaml
 logger: debug
 ```
 
 This will not print the actual secret's value to the log.
-
-*Option 2*: For Home Assistant Core installations, you can also view where secrets are retrieved from and the contents of all `secrets.yaml` files using the [`check_config` script](/docs/tools/check_config/) from the command line:
-
-```bash
-hass --script check_config --secrets
-```
-
-This will print all your secrets.

From d4106616b29cf5d9374429ff3981ba3a1b50e549 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 13:11:44 +0200
Subject: [PATCH 19/30] Onboarding: remove links to Core and Supervised
 specific backup (#39234)

---
 source/getting-started/configuration.markdown | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/source/getting-started/configuration.markdown b/source/getting-started/configuration.markdown
index 45fe1b13274..68e9ec3d083 100644
--- a/source/getting-started/configuration.markdown
+++ b/source/getting-started/configuration.markdown
@@ -36,13 +36,9 @@ To change basic settings such as location, unit system, and language, refer to [
 
 ## Creating a backup
 
-You can back up your Home Assistant, add-on data, and configuration. Backups are used to restore a system or parts of it if a rollback is needed, or to migrate your Home Assistant to new hardware. It is good practice to create a backup before updating.
+You can back up your Home Assistant, add-on data, and configuration. Backups are used to restore the system (or parts of the system) if a rollback is needed. Backups are also used or to migrate your Home Assistant to new hardware. It is good practice to create a backup before updating.
 
-To learn how to create a backup of your Home Assistant installation, select the link below that matches your installation type.
-
-- {% term "Home Assistant Operating System" %}: [Creating a backup from OS](/common-tasks/general/#backups)
-- {% term "Home Assistant Supervised" %}: [Creating a backup from Supervised](/common-tasks/general/#backups)
-- {% term "Home Assistant Core" %} or {% term "Home Assistant Container" %}: [Creating a backup from Core or Container](/integrations/backup/)
+To learn how to create a backup of your Home Assistant installation, refer to the documentation on [creating a backup](/common-tasks/general/#backups).
 
 ## Editing the configuration.yaml and configuring file access
 
@@ -55,4 +51,3 @@ If you need more space to store data, you can configure a [network storage](/com
 ## Getting started with voice assistant
 
 If you want to get started with a voice assistant, refer to the documentation on [Assist](/voice_control/).
-

From 9f7f68fa8be1f2b919612826d8e977616d2583df Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 13:11:57 +0200
Subject: [PATCH 20/30] Beta version: remove Core and Supervised specific steps
 (#39225)

---
 source/_includes/common-tasks/beta_version.md | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/source/_includes/common-tasks/beta_version.md b/source/_includes/common-tasks/beta_version.md
index f1dbf69adb2..c354235b6ae 100644
--- a/source/_includes/common-tasks/beta_version.md
+++ b/source/_includes/common-tasks/beta_version.md
@@ -2,7 +2,7 @@
 
 If you would like to test next release before anyone else, you can install the beta version.
 
-{% if page.installation == "os" or page.installation == "supervised" %}
+{% if page.installation == "os" %}
 
 {% tabbed_block %}
 
@@ -53,28 +53,5 @@ docker pull {{ site.installation.container }}:beta
 
 **[You then need to recreate the container with the new image.](/installation/linux#install-home-assistant-container)**
 
-{% elsif page.installation == "core" %}
-
-1. Stop the Home Assistant service.
-
-2. Switch to the user that is running Home Assistant.
-
-    ```bash
-    sudo -u homeassistant -H -s
-    ```
-
-3. Activate the virtual environment that Home Assistant is running in.
-
-    ```bash
-    source /srv/homeassistant/bin/activate
-    ```
-
-4. Download and install the beta version.
-
-    ```bash
-    pip3 install --pre --upgrade homeassistant
-    ```
-
-5. When that is complete, start the service again for it to use the new files.
 
 {% endif %}

From 10b8d870bc48a45fb3be19728c07e4fe92c32ff1 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 13:15:09 +0200
Subject: [PATCH 21/30] Update: remove Core- and Supervised-specific steps
 (#39221)

---
 source/_includes/common-tasks/update.md | 99 +++++++++----------------
 1 file changed, 37 insertions(+), 62 deletions(-)

diff --git a/source/_includes/common-tasks/update.md b/source/_includes/common-tasks/update.md
index cdff945c3c8..19c6f7cc2dc 100644
--- a/source/_includes/common-tasks/update.md
+++ b/source/_includes/common-tasks/update.md
@@ -3,85 +3,60 @@ Best practice for updating Home Assistant Core:
 1. [Back up your installation](/common-tasks/general/#backups) and store the backup and the [backup emergency kit](/more-info/backup-emergency-kit/) somewhere safe.
    - This ensures that you can [restore your installation from backup](/common-tasks/general/#restoring-a-backup) if needed.
 2. Check the release notes for backward-incompatible changes on [Home Assistant release notes](/blog/categories/core/). Be sure to check all release notes between the version you are running and the one you are upgrading to. Use the search function in your browser (`CTRL + f` / `CMD + f`) and search for **Backward-incompatible changes**.
-3. Update Home Assistant.
-4. Review persistent notifications and log to see if there are any issues with your configuration that need to be addressed.
+3. To update Home Assistant Core, choose one of the following options.
 
-{% if page.installation == "os" or page.installation == "supervised" %}
+{% if page.installation == "os" %}
 
-To update Home Assistant Core when you run Home Assistant {{ page.installation_name }} you have 2 options.
+  {% tabbed_block %}
 
-{% tabbed_block %}
+  - title: Using the UI
+    content: |
 
-- title: Using the UI
-  content: |
+      1. Open your Home Assistant UI.
+      2. Navigate to the **Settings** panel.
+      3. On the top you will be presented with an update notification.
+        - **Troubleshooting**: If you do not see that notification:
+          - In the top right corner, select the three dots {% icon "mdi:dots-vertical" %} menu and select **Check for updates**.
+          - Go to {% my updates title="**System** > **Updates**" %}.
+            - Select the update notification.
+            - Select the cogwheel {% icon "mdi:cog-outline" %}, then set **Visible** to active.
 
-    1. Open your Home Assistant UI.
-    2. Navigate to the **Settings** panel.
-    3. On the top you will be presented with an update notification.
-       - **Troubleshooting**: If you do not see that notification:
-         - In the top right corner, select the three dots {% icon "mdi:dots-vertical" %} menu and select **Check for updates**.
-         - Go to {% my updates title="**System** > **Updates**" %}.
-           - Select the update notification.
-           - Select the cogwheel {% icon "mdi:cog-outline" %}, then set **Visible** to active.
+  - title: Using the CLI
+    content: |
 
-- title: Using the CLI
-  content: |
+      ```bash
+      ha core update --backup
+      ```
 
-    ```bash
-    ha core update --backup
-    ```
+      _The_ `--backup` _flag here ensures that you have a partial backup of your current setup in case you need to downgrade._
 
-    _The_ `--backup` _flag here ensures that you have a partial backup of your current setup incase you need to downgrade._
-
-{% endtabbed_block %}
+  {% endtabbed_block %}
 
 {% elsif page.installation == "container" %}
 
-{% tabbed_block %}
+  {% tabbed_block %}
 
-- title: Docker CLI
-  content: |
+  - title: Docker CLI
+    content: |
 
-    **First start with pulling the new container.**
+      **First start with pulling the new container.**
 
-    ```bash
-    docker pull {{ site.installation.container }}:stable
-    ```
+      ```bash
+      docker pull {{ site.installation.container }}:stable
+      ```
 
-    **[You then need to recreate the container with the new image.](/installation/linux#install-home-assistant-container)**
+      **[You then need to recreate the container with the new image.](/installation/linux#install-home-assistant-container)**
 
-- title: Docker Compose
-  content: |
+  - title: Docker Compose
+    content: |
 
-    ```bash
-    docker compose pull homeassistant
-    docker compose up -d
-    ```
+      ```bash
+      docker compose pull homeassistant
+      docker compose up -d
+      ```
 
-{% endtabbed_block %}
-
-{% elsif page.installation == "core" %}
-
-1. Stop the Home Assistant service.
-
-2. Switch to the user that is running Home Assistant
-
-    ```bash
-    sudo -u homeassistant -H -s
-    ```
-
-3. Activate the virtual environment that Home Assistant is running in
-
-    ```bash
-    source /srv/homeassistant/bin/activate
-    ```
-
-4. Download and install the new version
-
-    ```bash
-    pip3 install --upgrade homeassistant
-    ```
-
-5. When that is complete start the service again for it to use the new files.
+  {% endtabbed_block %}
 
 {% endif %}
+
+4. Check if there are any repair issues and check the logs to see if there are any issues with your configuration that need to be addressed.

From 0bb2036eba483615a23d4b1fcf1d4cda02ca57ec Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 13:32:30 +0200
Subject: [PATCH 22/30] Running a specific version: remove Core and Supervised
 specific steps (#39235)

---
 .../common-tasks/specific_version.md          | 28 ++-----------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/source/_includes/common-tasks/specific_version.md b/source/_includes/common-tasks/specific_version.md
index 69406162d8a..7ab67ae0af6 100644
--- a/source/_includes/common-tasks/specific_version.md
+++ b/source/_includes/common-tasks/specific_version.md
@@ -2,7 +2,7 @@
 
 {% assign current_version = site.current_major_version | append: "." | append: site.current_minor_version | append: "." | append: site.current_patch_version  %}
 
-{% if page.installation != "os" and page.installation != "supervised" %}
+{% if page.installation != "os" %}
 
 To see which version your system is running, go to {% my info title="**Settings** > **About**" %}.
 
@@ -10,7 +10,7 @@ In the event that a Home Assistant Core version doesn't play well with your hard
 
 {% endif %}
 
-{% if page.installation == "os" or page.installation == "supervised" %}
+{% if page.installation == "os"%}
 
 To upgrade to a specific version, you can use the CLI. The example below shows how to upgrade to `{{current_version}}`.
 
@@ -30,28 +30,4 @@ docker pull {{ site.installation.container }}:{{current_version}}
 
 **[You then need to recreate the container with the new image.](/installation/linux#install-home-assistant-container)**
 
-{% elsif page.installation == "core" %}
-
-1. Stop the Home Assistant service.
-
-2. Switch to the user that is running Home Assistant.
-
-    ```bash
-    sudo -u homeassistant -H -s
-    ```
-
-3. Activate the virtual environment that Home Assistant is running in.
-
-    ```bash
-    source /srv/homeassistant/bin/activate
-    ```
-
-4. Download and install the version you want.
-
-    ```bash
-    pip3 install homeassistant=={{current_version}}
-    ```
-
-5. When that is complete start the service again for it to use the new files.
-
 {% endif %}

From a545e263bfdc805f08237a3d8a366cf5d57d4aa7 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 13:53:27 +0200
Subject: [PATCH 23/30] Locked out: remove ref to Supervised installation
 method (#39237)

---
 source/_docs/locked_out.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/_docs/locked_out.md b/source/_docs/locked_out.md
index 5132314b321..d7139b99550 100644
--- a/source/_docs/locked_out.md
+++ b/source/_docs/locked_out.md
@@ -50,7 +50,7 @@ If you are the owner or have administrator, there are different methods to reset
 - [Reset an owner's password when logged out](#to-reset-an-owners-password-via-console)
 - [reset a user's password, via the container command line](#to-reset-a-users-password-via-the-container-command-line)
 
-#### To reset a password while still logged in (including Supervised)
+#### To reset a password while still logged in
 
 The method used to reset a password depends on your user rights:
 
@@ -118,7 +118,7 @@ If you lose the password associated with the owner account and the steps above d
 - If you have a Home Assistant Green, [reset the Green](https://support.nabucasa.com/hc/en-us/articles/25161225495837).
 - If you have a Home Assistant Yellow, [reset the Yellow](https://support.nabucasa.com/hc/en-us/articles/25463622043165).
 
-## Recovering data for Home Assistant (including Supervised)
+## Recovering data for Home Assistant
 
 Unless your SD card/data is corrupted, you can still get to your files or troubleshoot further.
 There are a few routes:

From 2d2da41558313f3647f8d65f577523f2b33fa73f Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 13:53:49 +0200
Subject: [PATCH 24/30] Running a dev version: remove Core and Supervised
 specific steps (#39236)

---
 .../common-tasks/development_version.md       | 26 +------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/source/_includes/common-tasks/development_version.md b/source/_includes/common-tasks/development_version.md
index 524c362743d..950b4e713b3 100644
--- a/source/_includes/common-tasks/development_version.md
+++ b/source/_includes/common-tasks/development_version.md
@@ -8,7 +8,7 @@ The `dev` branch is likely to be unstable. Potential consequences include loss o
 
 {% if page.installation == "os" %}
 
-1. Join the dev channel
+1. Join the dev channel.
 
     ```bash
     ha supervisor options --channel dev
@@ -36,28 +36,4 @@ docker pull {{ site.installation.container }}:dev
 
 **[You then need to recreate the container with the new image.](/installation/linux#install-home-assistant-container)**
 
-{% elsif page.installation == "core" %}
-
-1. Stop the Home Assistant service.
-
-2. Switch to the user that is running Home Assistant.
-
-    ```bash
-    sudo -u homeassistant -H -s
-    ```
-
-3. Activate the virtual environment that Home Assistant is running in.
-
-    ```bash
-    source /srv/homeassistant/bin/activate
-    ```
-
-4. Download and install the version you want.
-
-    ```bash
-    pip3 install --upgrade git+https://github.com/home-assistant/core.git@dev
-    ```
-
-5. When that is complete, start the service again for it to use the new files.
-
 {% endif %}

From 09a32d3c5ca9b7f85fc4cd281a98c04901a80c26 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 14:02:14 +0200
Subject: [PATCH 25/30] Remove links to common tasks for Core and Supervisor
 (#39238)

---
 source/_docs/configuration/splitting_configuration.markdown | 2 --
 source/_docs/configuration/troubleshooting.markdown         | 2 --
 source/_faq/component.markdown                              | 4 +---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/source/_docs/configuration/splitting_configuration.markdown b/source/_docs/configuration/splitting_configuration.markdown
index 55ddb8a7aa8..99d4a507abf 100644
--- a/source/_docs/configuration/splitting_configuration.markdown
+++ b/source/_docs/configuration/splitting_configuration.markdown
@@ -229,8 +229,6 @@ If you have many configuration files, Home Assistant provides a CLI that allows
 
 - [Operating System](/common-tasks/os/#configuration-check)
 - [Container](/common-tasks/container/#configuration-check)
-- [Core](/common-tasks/core/#configuration-check)
-- [Supervised](/common-tasks/supervised/#configuration-check)
 
 ## Advanced usage
 
diff --git a/source/_docs/configuration/troubleshooting.markdown b/source/_docs/configuration/troubleshooting.markdown
index 30a4f7a7b0b..41107da42e7 100644
--- a/source/_docs/configuration/troubleshooting.markdown
+++ b/source/_docs/configuration/troubleshooting.markdown
@@ -26,8 +26,6 @@ One of the most common problems with Home Assistant is an invalid {% term "`conf
 - Home Assistant provides a CLI that allows you to see how it interprets them, each installation type has its own section in the common-tasks about this:
   - [Operating System](/common-tasks/os/#configuration-check)
   - [Container](/common-tasks/container/#configuration-check)
-  - [Core](/common-tasks/core/#configuration-check)
-  - [Supervised](/common-tasks/supervised/#configuration-check)
 
 - The configuration files, including {% term "`configuration.yaml`" %} must be UTF-8 encoded. If you see error like `'utf-8' codec can't decode byte`, edit the offending configuration and re-save it as UTF-8.
 - You can verify your configuration's {% term YAML %} structure using [this online YAML parser](https://yaml-online-parser.appspot.com/) or [YAML Validator](https://codebeautify.org/yaml-validator/).
diff --git a/source/_faq/component.markdown b/source/_faq/component.markdown
index 0c0dd67b607..4b5617563d0 100644
--- a/source/_faq/component.markdown
+++ b/source/_faq/component.markdown
@@ -9,6 +9,4 @@ When an integration does not show up, many different things can be the case. Bef
 If you have incorrect entries in your configuration files you can use the CLI script to check your configuration, each installation type has its own section in the common-tasks about this:
 
 - [Operating System](/common-tasks/os/#configuration-check)
-- [Container](/common-tasks/container/#configuration-check)
-- [Core](/common-tasks/core/#configuration-check)
-- [Supervised](/common-tasks/supervised/#configuration-check)
\ No newline at end of file
+- [Container](/common-tasks/container/#configuration-check)
\ No newline at end of file

From 56d9b55dc297a54d4ef8c5c273b82ec8a687367a Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 14:10:02 +0200
Subject: [PATCH 26/30] Alexa: remove mention of Supervised install method
 (#39240)

---
 source/_integrations/alexa.intent.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/_integrations/alexa.intent.markdown b/source/_integrations/alexa.intent.markdown
index e79d7f99681..ed36cb24646 100644
--- a/source/_integrations/alexa.intent.markdown
+++ b/source/_integrations/alexa.intent.markdown
@@ -20,7 +20,7 @@ The built-in Alexa integration allows you to integrate Home Assistant into Alexa
 
 - Amazon Developer Account. You can sign on [here](https://developer.amazon.com).
 - An [AWS account](https://aws.amazon.com/free/) is needed if you want to use the Alexa Custom Skill API. Part of your Alexa Custom Skill will be hosted on [AWS Lambda](https://aws.amazon.com/lambda/pricing/). However, you don't need to worry about the cost, as AWS Lambda allows for free to use up to 1 million requests and 1GB outbound data transfer per month.
-- The Alexa Custom Skill API also needs your Home Assistant instance to be accessible from the internet via HTTPS on port 443 using a certificate signed by [an Amazon approved certificate authority](https://ccadb-public.secure.force.com/mozilla/IncludedCACertificateReport). This is so account linking can take place. Read more on [our blog](/blog/2015/12/13/setup-encryption-using-lets-encrypt/) about how to set up encryption for Home Assistant. When running Home Assistant OS or Supervised, using the [Duck DNS](/addons/duckdns/) add-on is the easiest method.
+- The Alexa Custom Skill API also needs your Home Assistant instance to be accessible from the internet via HTTPS on port 443 using a certificate signed by [an Amazon approved certificate authority](https://ccadb-public.secure.force.com/mozilla/IncludedCACertificateReport). This is so account linking can take place. Read more on [our blog](/blog/2015/12/13/setup-encryption-using-lets-encrypt/) about how to set up encryption for Home Assistant. When running {% term "Home Assistant Operating System" %}, using the [Duck DNS](/addons/duckdns/) add-on is the easiest method.
 
 ### Create Your Amazon Alexa Custom Skill
 

From 55a362bc3b9aa85c19c1328b417ec3848bbb35f4 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 14:37:03 +0200
Subject: [PATCH 27/30] Hassio integration: remove mention of Supervised, Core
 (#39241)

---
 source/_integrations/hassio.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/_integrations/hassio.markdown b/source/_integrations/hassio.markdown
index 163a0d4df94..1ec9a25437d 100644
--- a/source/_integrations/hassio.markdown
+++ b/source/_integrations/hassio.markdown
@@ -22,8 +22,8 @@ ha_integration_type: integration
 ---
 
 Supervisor integration allows you to monitor and control Supervisor add-ons and operating system from Home Assistant.
-This integration is already installed if you run Home Assistant OS or Supervised. Please note that this integration
-cannot be installed on Home Assistant Container or Core (Python venv) installation types.
+This integration is already installed if you run {% term "Home Assistant Operating System" %}. Please note that this integration
+cannot be installed on {% term "Home Assistant Container" %}.
 
 ## Sensor entities
 

From f4f53fa9bf9e3442780825b8b7faf195972a235e Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 17:02:22 +0200
Subject: [PATCH 28/30] Z-Wave controllers: remove steps specific to Supervised
 (#39239)

---
 source/_docs/z-wave/controllers.markdown | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/source/_docs/z-wave/controllers.markdown b/source/_docs/z-wave/controllers.markdown
index 7f822190be9..79a0dacc826 100644
--- a/source/_docs/z-wave/controllers.markdown
+++ b/source/_docs/z-wave/controllers.markdown
@@ -73,7 +73,7 @@ Firmware can be upgraded using the below directions:
 If you are just starting out, we recommend that you purchase a 700 series controller or a Raspberry Pi module. The 700 series controllers are the more recent version (when compared to the 500 series). The 700 series controllers support SmartStart, which allows you to add a device by scanning a QR code.
 
 {% tip %}
-If you're using Home Assistant OS, Supervised, or Container, it's recommended to use a USB stick, not a module. Passing a module through Docker is more complicated than passing a USB stick through.
+It's recommended to use a USB stick, not a module. Passing a module through Docker is more complicated than passing a USB stick through.
 {% endtip %}
 
 ## Stick alternatives
@@ -107,8 +107,7 @@ On Raspberry Pi 3 and 4, you need to disable the on-board Bluetooth since the bo
 
 For both processes below you will need to insert your SD card into your PC and open the configuration file with your favorite text editor.
 
-- If you are using {% term "Home Assistant Operating System" %}, once you mounted the disk, you will see the `config.txt` directly in the root directory.
-- If you are using {% term "Home Assistant Supervised" %}, the config file is stored in the boot folder: `/boot/config.txt`.
+- Once you mounted the disk, you will see the `config.txt` directly in the root directory.
 
 #### Raspberry Pi 5 procedure
 

From 548e3fa0547598e7f8e0244a2dbb974dd539f55c Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 17:02:40 +0200
Subject: [PATCH 29/30] Adding local media: remove mention of Supervised, Core
 (#39242)

---
 source/more-info/local-media/add-media.markdown | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/source/more-info/local-media/add-media.markdown b/source/more-info/local-media/add-media.markdown
index 239e2d7902c..979445d0c81 100644
--- a/source/more-info/local-media/add-media.markdown
+++ b/source/more-info/local-media/add-media.markdown
@@ -14,9 +14,9 @@ You can access your (automatically) created media folder using the dashboard.
 Navigate to the {% my media_browser title="Media > Local Media" %}, and in the 
 top right corner, click manage. Here you can add and delete your media. 
 
-## Home Assistant OS & Supervised
+## Home Assistant OS
 
-If you are running Home Assistant OS or Supervised, you can also use the 
+If you are running {% term "Home Assistant Operating System" %}, you can also use the 
 Samba add-on. If you haven't installed the Samba add-on yet, you can do 
 so by browsing to the {% my supervisor title="Settings > Add-ons" %} panel. 
 Next, click on the "Add-on store" tab and search for "Samba" and click on it.
@@ -28,18 +28,11 @@ media onto your device using drag and drop in your file explorer.
 Other add-ons are available, for example, SSH and others provide access to the
 media folders as well.
 
-## Home Assistant Docker
+## Home Assistant Container
 
 After you have [set up a local media][setup-media] folder, you can add
 any media to that folder you have mounted in.
 
 Your media will show up in the Home Assistant frontend automatically.
 
-## Home Assistant Core
-
-After you have [set up a local media][setup-media] folder, you can add any
-media to that folder you have set up.
-
-Your media will show up in the Home Assistant frontend automatically.
-
 [setup-media]: /more-info/local-media/setup-media

From cf686732db15f298dc3dfad3b397964ddd3eca12 Mon Sep 17 00:00:00 2001
From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com>
Date: Mon, 26 May 2025 21:26:43 +0200
Subject: [PATCH 30/30] QNAP installation: remove section on armhf (#39248)

---
 source/_includes/installation/container/alternative.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/_includes/installation/container/alternative.md b/source/_includes/installation/container/alternative.md
index d47e78f970b..3aaaaeb68ae 100644
--- a/source/_includes/installation/container/alternative.md
+++ b/source/_includes/installation/container/alternative.md
@@ -73,7 +73,6 @@ The steps would be:
 - Install "Container Station" package on your Qnap NAS
 - Launch Container Station and move to "Create Container"-section
 - Search image "homeassistant/home-assistant" with Docker Hub and click on "Install"
-  Make attention to CPU architecture of your NAS. For ARM CPU types the correct image is "homeassistant/armhf-homeassistant"
 - Choose "stable" version and click next
 - Choose a container-name you want (e.g., "homeassistant")
 - Click on "Advanced Settings"