diff --git a/source/_includes/common-tasks/update.md b/source/_includes/common-tasks/update.md
index 19c6f7cc2dc..bacdb23648f 100644
--- a/source/_includes/common-tasks/update.md
+++ b/source/_includes/common-tasks/update.md
@@ -1,9 +1,12 @@
-Best practice for updating Home Assistant Core:
+#### Prerequisites
 
 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. To update Home Assistant Core, choose one of the following options.
+
+#### To update Home Assistant Core
+
+To update Home Assistant Core, choose one of the following options.
 
 {% if page.installation == "os" %}
 
@@ -20,6 +23,10 @@ Best practice for updating Home Assistant Core:
           - Go to {% my updates title="**System** > **Updates**" %}.
             - Select the update notification.
             - Select the cogwheel {% icon "mdi:cog-outline" %}, then set **Visible** to active.
+      4. Open the notification for the component you want to update.
+      5. If you want to backup the system first (recommended), enable the backup toggle.
+      6. Select **Update**.
+      7. After the update completed, 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.
 
   - title: Using the CLI
     content: |
@@ -57,6 +64,7 @@ Best practice for updating Home Assistant Core:
 
   {% endtabbed_block %}
 
+After the update, 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.
+
 {% 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.
diff --git a/source/common-tasks/os.markdown b/source/common-tasks/os.markdown
index 833a4e851ae..e49b4b6a7be 100644
--- a/source/common-tasks/os.markdown
+++ b/source/common-tasks/os.markdown
@@ -31,7 +31,9 @@ If you have the {% term "Home Assistant Operating System" %} installed, you rece
 - {% term "Home Assistant Operating System" %}
 - {% term "Home Assistant Supervisor" %}
 - {% term "Home Assistant Core" %}
-- Add-ons, if you have any installed
+- {% term "Add-ons" %}, if you have any installed
+
+Each of these components needs to be updated separately.
 
 ### Updating the Home Assistant Operating System
 
@@ -39,8 +41,9 @@ Updates of the {% term "Home Assistant Operating System" %} are independent of o
 
 #### Prerequisites
 
-- [Backup](/common-tasks/general/#backups) your installation.
-  - Make sure the backup is downloaded and stored outside of the system.
+- [Backup your installation](/common-tasks/general/#backups).
+  - Make sure the backup is stored on a [backup location](/common-tasks/general/#defining-backup-locations) outside of the device where Home Assistant is installed.
+    - For example, if Home Assistant is installed on [Home Assistant Green](https://www.home-assistant.io/green), make sure it is stored on [Home Assistant Cloud](/common-tasks/general/#about-the-backup-storage-on-home-assistant-cloud) or another location.
   - So that you can [restore from that backup](/common-tasks/general/#restoring-a-backup) in case there is an issue with the system.
 
 #### To update the Home Assistant Operating System
@@ -52,9 +55,16 @@ Updates of the {% term "Home Assistant Operating System" %} are independent of o
 
     1. Open the **Settings** panel.
     2. On the top you will be presented with an update notification.
-
-    _If you do not see that notification, in the top right, select the three dots menu and select **Check for updates**"._
-
+       - **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.
+    3. Open the notification for the component you want to update.
+    4. If you want to update the system first (recommended), enable the backup toggle.
+    5. Select **Update**.
+    6. 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.
+   
 - title: Using the CLI
   content: |
 
@@ -66,6 +76,8 @@ Updates of the {% term "Home Assistant Operating System" %} are independent of o
 
 {% endtabbed_block %}
 
+{% details "Advanced: changing the boot slot used during the update" %}
+
 #### About boot slots used during the update
 
 The {% term "Home Assistant Operating System" %} uses two boot slots. On first installation, boot slot A is used. After that, on each Operating System update, the other boot slot is updated and reboot is triggered. On that reboot, the system boots from the other boot slot (A ➝ B ➝ A,...). When booting fails, the system automatically uses the previous boot slot, so that it boots from the last working operating system.
@@ -89,6 +101,8 @@ You can manually define that the previous boot slot is used. This can be useful
 
 Alternatively, if the Operating Systems runs on a platform that uses the GRUB bootloader, a boot menu is presented early in the boot. The alternative boot slot can be selected here, marking it active for future boots if the following boot attempt is successful.
 
+{% enddetails %}
+
 ### Updating Home Assistant Core
 
 {% include common-tasks/update.md %}