diff --git a/hassio/src/hassio-panel-router.ts b/hassio/src/hassio-panel-router.ts
index 054f5fef34..6cad299188 100644
--- a/hassio/src/hassio-panel-router.ts
+++ b/hassio/src/hassio-panel-router.ts
@@ -29,7 +29,7 @@ class HassioPanelRouter extends HassRouterPage {
 
   @property({ attribute: false }) public hassioInfo!: HassioInfo;
 
-  @property({ attribute: false }) public hostInfo: HassioHostInfo;
+  @property({ attribute: false }) public hostInfo?: HassioHostInfo;
 
   @property({ attribute: false }) public hassInfo?: HassioHomeAssistantInfo;
 
diff --git a/hassio/src/hassio-router.ts b/hassio/src/hassio-router.ts
index 36620f368e..52168d1b3f 100644
--- a/hassio/src/hassio-router.ts
+++ b/hassio/src/hassio-router.ts
@@ -68,7 +68,7 @@ class HassioRouter extends HassRouterPage {
 
   @internalProperty() private _supervisorInfo?: HassioSupervisorInfo;
 
-  @internalProperty() private _hostInfo: HassioHostInfo;
+  @internalProperty() private _hostInfo?: HassioHostInfo;
 
   @internalProperty() private _hassioInfo?: HassioInfo;
 
diff --git a/hassio/src/system/hassio-host-info.ts b/hassio/src/system/hassio-host-info.ts
index bc25836f3c..5a2c5776bc 100644
--- a/hassio/src/system/hassio-host-info.ts
+++ b/hassio/src/system/hassio-host-info.ts
@@ -109,7 +109,7 @@ class HassioHostInfo extends LitElement {
               ${this.hostInfo.operating_system}
             </span>
             ${this.hostInfo.features.includes("hassos") &&
-            this.hostInfo.update_available
+            this.hassOsInfo.update_available
               ? html`
                   <ha-progress-button
                     title="Update the host OS"
diff --git a/hassio/src/system/hassio-supervisor-info.ts b/hassio/src/system/hassio-supervisor-info.ts
index 543ee5bb80..9a1fa07f5f 100644
--- a/hassio/src/system/hassio-supervisor-info.ts
+++ b/hassio/src/system/hassio-supervisor-info.ts
@@ -7,6 +7,7 @@ import {
   property,
   TemplateResult,
 } from "lit-element";
+import { fireEvent } from "../../../src/common/dom/fire_event";
 import "../../../src/components/buttons/ha-progress-button";
 import "../../../src/components/ha-card";
 import "../../../src/components/ha-settings-row";
@@ -206,7 +207,7 @@ class HassioSupervisorInfo extends LitElement {
       };
       await setSupervisorOption(this.hass, data);
       await reloadSupervisor(this.hass);
-      this.supervisorInfo = await fetchHassioSupervisorInfo(this.hass);
+      fireEvent(this, "hass-api-called", { success: true, response: null });
     } catch (err) {
       showAlertDialog(this, {
         title: "Failed to set supervisor option",
diff --git a/src/data/hassio/host.ts b/src/data/hassio/host.ts
index bbe2e4d852..ebdc606832 100644
--- a/src/data/hassio/host.ts
+++ b/src/data/hassio/host.ts
@@ -1,13 +1,23 @@
 import { HomeAssistant } from "../../types";
 import { hassioApiResultExtractor, HassioResponse } from "./common";
 
-export type HassioHostInfo = any;
+export type HassioHostInfo = {
+  chassis: string;
+  cpe: string;
+  deployment: string;
+  disk_free: number;
+  disk_total: number;
+  disk_used: number;
+  features: string[];
+  hostname: string;
+  kernel: string;
+  operating_system: string;
+};
 
 export interface HassioHassOSInfo {
-  board: "ova" | "rpi";
+  board: string;
+  boot: string;
   update_available: boolean;
-  version_cli_latest: string;
-  version_cli: string;
   version_latest: string;
   version: string;
 }