diff --git a/src/panels/config/ha-panel-config.ts b/src/panels/config/ha-panel-config.ts
index 2f1e3fd402..a5b23c5af6 100644
--- a/src/panels/config/ha-panel-config.ts
+++ b/src/panels/config/ha-panel-config.ts
@@ -6,6 +6,7 @@ import {
   mdiCog,
   mdiDatabase,
   mdiDevices,
+  mdiHeart,
   mdiInformation,
   mdiInformationOutline,
   mdiLightningBolt,
@@ -316,6 +317,13 @@ export const configSections: { [name: string]: PageNavigation[] } = {
       iconColor: "#301A8E",
       component: "hassio",
     },
+    {
+      path: "/config/system_health",
+      translationKey: "ui.panel.config.system_health.caption",
+      iconPath: mdiHeart,
+      iconColor: "#507FfE",
+      component: "system_health",
+    },
   ],
   about: [
     {
@@ -438,6 +446,10 @@ class HaPanelConfig extends HassRouterPage {
         tag: "ha-config-section-storage",
         load: () => import("./core/ha-config-section-storage"),
       },
+      system_health: {
+        tag: "ha-config-system-health",
+        load: () => import("./system-health/ha-config-system-health"),
+      },
       updates: {
         tag: "ha-config-section-updates",
         load: () => import("./core/ha-config-section-updates"),
diff --git a/src/panels/config/info/ha-config-info.ts b/src/panels/config/info/ha-config-info.ts
index e27f489d92..aad0d589be 100644
--- a/src/panels/config/info/ha-config-info.ts
+++ b/src/panels/config/info/ha-config-info.ts
@@ -6,7 +6,6 @@ import { haStyle } from "../../../resources/styles";
 import { HomeAssistant, Route } from "../../../types";
 import { documentationUrl } from "../../../util/documentation-url";
 import "./integrations-card";
-import "./system-health-card";
 
 const JS_TYPE = __BUILD__;
 const JS_VERSION = __VERSION__;
@@ -131,7 +130,6 @@ class HaConfigInfo extends LitElement {
           </p>
         </div>
         <div>
-          <system-health-card .hass=${this.hass}></system-health-card>
           <integrations-card
             .hass=${this.hass}
             .narrow=${this.narrow}
@@ -180,7 +178,6 @@ class HaConfigInfo extends LitElement {
           color: var(--primary-color);
         }
 
-        system-health-card,
         integrations-card {
           display: block;
           max-width: 600px;
diff --git a/src/panels/config/info/system-health-card.ts b/src/panels/config/system-health/ha-config-system-health.ts
similarity index 72%
rename from src/panels/config/info/system-health-card.ts
rename to src/panels/config/system-health/ha-config-system-health.ts
index 301d9c1e64..2df1526a38 100644
--- a/src/panels/config/info/system-health-card.ts
+++ b/src/panels/config/system-health/ha-config-system-health.ts
@@ -1,24 +1,21 @@
-import "@material/mwc-button/mwc-button";
-import { ActionDetail } from "@material/mwc-list/mwc-list-foundation";
+import { ActionDetail } from "@material/mwc-list";
 import "@material/mwc-list/mwc-list-item";
 import { mdiContentCopy } from "@mdi/js";
-import "@polymer/paper-tooltip/paper-tooltip";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { property, state } from "lit/decorators";
-import { isComponentLoaded } from "../../../common/config/is_component_loaded";
+import { customElement, property, state } from "lit/decorators";
 import { formatDateTime } from "../../../common/datetime/format_date_time";
 import { copyToClipboard } from "../../../common/util/copy-clipboard";
 import "../../../components/ha-button-menu";
 import "../../../components/ha-card";
 import "../../../components/ha-circular-progress";
-import "../../../components/ha-icon-button";
 import { domainToName } from "../../../data/integration";
 import {
   subscribeSystemHealthInfo,
   SystemCheckValueObject,
   SystemHealthInfo,
 } from "../../../data/system_health";
-import { HomeAssistant } from "../../../types";
+import "../../../layouts/hass-subpage";
+import type { HomeAssistant } from "../../../types";
 import { showToast } from "../../../util/toast";
 
 const sortKeys = (a: string, b: string) => {
@@ -37,15 +34,25 @@ const sortKeys = (a: string, b: string) => {
   return 0;
 };
 
-class SystemHealthCard extends LitElement {
+@customElement("ha-config-system-health")
+class HaConfigSystemHealth extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
+  @property({ type: Boolean }) public narrow!: boolean;
+
   @state() private _info?: SystemHealthInfo;
 
+  protected firstUpdated(changedProps) {
+    super.firstUpdated(changedProps);
+
+    this.hass!.loadBackendTranslation("system_health");
+
+    subscribeSystemHealthInfo(this.hass!, (info) => {
+      this._info = info;
+    });
+  }
+
   protected render(): TemplateResult {
-    if (!this.hass) {
-      return html``;
-    }
     const sections: TemplateResult[] = [];
 
     if (!this._info) {
@@ -139,57 +146,38 @@ class SystemHealthCard extends LitElement {
     }
 
     return html`
-      <ha-card>
-        <h1 class="card-header">
-          <div class="card-header-text">
-            ${domainToName(this.hass.localize, "system_health")}
-          </div>
-          <ha-button-menu
-            corner="BOTTOM_START"
-            slot="toolbar-icon"
-            @action=${this._copyInfo}
-          >
-            <ha-icon-button
-              slot="trigger"
-              .label=${this.hass.localize("ui.panel.config.info.copy_menu")}
-              .path=${mdiContentCopy}
-            ></ha-icon-button>
-            <mwc-list-item>
-              ${this.hass.localize("ui.panel.config.info.copy_raw")}
-            </mwc-list-item>
-            <mwc-list-item>
-              ${this.hass.localize("ui.panel.config.info.copy_github")}
-            </mwc-list-item>
-          </ha-button-menu>
-        </h1>
-        <div class="card-content">${sections}</div>
-      </ha-card>
+      <hass-subpage
+        .hass=${this.hass}
+        .narrow=${this.narrow}
+        back-path="/config/system"
+        .header=${this.hass.localize("ui.panel.config.system_health.caption")}
+      >
+        <ha-button-menu
+          corner="BOTTOM_START"
+          slot="toolbar-icon"
+          @action=${this._copyInfo}
+        >
+          <ha-icon-button
+            slot="trigger"
+            .label=${this.hass.localize("ui.panel.config.info.copy_menu")}
+            .path=${mdiContentCopy}
+          ></ha-icon-button>
+          <mwc-list-item>
+            ${this.hass.localize("ui.panel.config.info.copy_raw")}
+          </mwc-list-item>
+          <mwc-list-item>
+            ${this.hass.localize("ui.panel.config.info.copy_github")}
+          </mwc-list-item>
+        </ha-button-menu>
+        <div class="content">
+          <ha-card outlined>
+            <div class="card-content">${sections}</div>
+          </ha-card>
+        </div>
+      </hass-subpage>
     `;
   }
 
-  protected firstUpdated(changedProps) {
-    super.firstUpdated(changedProps);
-
-    this.hass!.loadBackendTranslation("system_health");
-
-    if (!isComponentLoaded(this.hass!, "system_health")) {
-      this._info = {
-        system_health: {
-          info: {
-            error: this.hass.localize(
-              "ui.panel.config.info.system_health_error"
-            ),
-          },
-        },
-      };
-      return;
-    }
-
-    subscribeSystemHealthInfo(this.hass!, (info) => {
-      this._info = info;
-    });
-  }
-
   private async _copyInfo(ev: CustomEvent<ActionDetail>): Promise<void> {
     const github = ev.detail.index === 1;
     let haContent: string | undefined;
@@ -254,45 +242,59 @@ class SystemHealthCard extends LitElement {
     });
   }
 
-  static get styles(): CSSResultGroup {
-    return css`
-      table {
-        width: 100%;
-      }
+  static styles: CSSResultGroup = css`
+    .content {
+      padding: 28px 20px 0;
+      max-width: 1040px;
+      margin: 0 auto;
+    }
+    ha-card {
+      display: block;
+      max-width: 500px;
+      margin: 0 auto;
+      padding-bottom: 16px;
+      margin-bottom: max(24px, env(safe-area-inset-bottom));
+    }
+    table {
+      width: 100%;
+    }
 
-      td:first-child {
-        width: 45%;
-      }
+    td:first-child {
+      width: 45%;
+    }
 
-      td:last-child {
-        direction: ltr;
-      }
+    td:last-child {
+      direction: ltr;
+    }
 
-      .loading-container {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
+    .loading-container {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
 
-      .card-header {
-        justify-content: space-between;
-        display: flex;
-        align-items: center;
-      }
+    .card-header {
+      justify-content: space-between;
+      display: flex;
+      align-items: center;
+    }
 
-      .error {
-        color: var(--error-color);
-      }
+    .error {
+      color: var(--error-color);
+    }
 
-      a {
-        color: var(--primary-color);
-      }
+    a {
+      color: var(--primary-color);
+    }
 
-      a.manage {
-        text-decoration: none;
-      }
-    `;
-  }
+    a.manage {
+      text-decoration: none;
+    }
+  `;
 }
 
-customElements.define("system-health-card", SystemHealthCard);
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-config-system-health": HaConfigSystemHealth;
+  }
+}
diff --git a/src/translations/en.json b/src/translations/en.json
index 6be593f38e..813307db81 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1676,6 +1676,7 @@
             }
           }
         },
+
         "automation": {
           "caption": "Automations",
           "description": "Create custom behavior rules for your home",
@@ -3151,6 +3152,9 @@
           "caption": "Storage",
           "used_space": "Used Space",
           "emmc_lifetime_used": "eMMC Lifetime Used"
+        },
+        "system_health": {
+          "caption": "System Health"
         }
       },
       "lovelace": {