diff --git a/source/_integrations/system_health.markdown b/source/_integrations/system_health.markdown
index 87ddc4c1943..1dc7252539f 100644
--- a/source/_integrations/system_health.markdown
+++ b/source/_integrations/system_health.markdown
@@ -11,13 +11,15 @@ ha_integration_type: integration
The System Health integration provides an API to offer information on the system and its components. It also allows to run diagnostic tools to diagnose problems.
+System Health integration data can be viewed at **Settings** -> **System** -> **Repairs** -> **System Information** in the overflow menu (top right).
+
+{% my system_health badge %}
+
+Data includes information about your system architecture, operating system and version, Home Assistant installation type and version, Python version, frontend version, the number of [Dashboards](/dashboards/dashboards/) and [Views](/dashboards/views/) you have, and more.
+
This integration is by default enabled, unless you've disabled or removed the [`default_config:`](/integrations/default_config/) line from your configuration. If that is the case, the following example shows you how to enable this integration manually:
```yaml
# Example configuration.yaml entry
system_health:
-```
-
-System Health integration data can be viewed at **Settings** -> **System** -> **System Health**.
-
-Data includes information about your system architecture, operating system and version, Home Assistant installation type and version, Python version, frontend version, the number of [Dashboards](/dashboards/dashboards/) and [Views](/dashboards/views/) you have, and more.
+```
\ No newline at end of file
diff --git a/source/images/more-info/system_health.png b/source/images/more-info/system_health.png
index 46e38366209..7ce9a29df86 100644
Binary files a/source/images/more-info/system_health.png and b/source/images/more-info/system_health.png differ
diff --git a/source/images/more-info/system_health_github.png b/source/images/more-info/system_health_github.png
index 3763d09781a..7c3313c1754 100644
Binary files a/source/images/more-info/system_health_github.png and b/source/images/more-info/system_health_github.png differ
diff --git a/source/more-info/system-health.markdown b/source/more-info/system-health.markdown
index 10a047bf65f..9ac68fcd5c2 100644
--- a/source/more-info/system-health.markdown
+++ b/source/more-info/system-health.markdown
@@ -3,21 +3,21 @@ title: "System Health"
description: "More information about System Health."
---
-System health is the card on the Information part of the configuration section in the Home Assistant UI.
-This provides information about your environment and enabled integrations.
+System health is information about your Home Assistant instance. Information including data on your system architecture, operating system and version, Home Assistant installation type and version, Python version, frontend version, the number of [Dashboards](/dashboards/dashboards/) and [Views](/dashboards/views/) you have, and more.
-To find this card first navigate to the Configuration panel, then scroll all
-the way to the bottom and select "Info". At the bottom of that page, you will see the System Health card.
+System Health integration data can be viewed at **Settings** -> **System** -> **Repairs** -> **System Information** in the overflow menu (top right). Or by using the My link below:
-
+{% my system_health badge %}
+
+
## GitHub issues
GitHub issues often call for the data presented in the System Health.
The Home Assistant UI provides an easy way to get this information.
-In the top-right corner of the System Health card click on the copy icon
-and select "For GitHub" this will format the content of the card and place
-it on your clipboard so you can easily paste it into a GitHub issue.
+In the bottom-right corner of the System information dialog click on the copy button.
+This will format the content of the card and place it on your clipboard so you
+can easily paste it into a GitHub issue.
-
+