diff --git a/machines/aresix/modules/home-assistant/default.nix b/machines/aresix/modules/home-assistant/default.nix
index 36ed26b..4d89b7f 100644
--- a/machines/aresix/modules/home-assistant/default.nix
+++ b/machines/aresix/modules/home-assistant/default.nix
@@ -38,9 +38,19 @@
     };
   };
 
-  services.esphome = {
-    enable = true;
-    address = "::1"; # Proxied trough home assistant
+  virtualisation.oci-containers.containers.esphome = {
+    image = "ghcr.io/esphome/esphome:2025.6.3";
+    volumes = [
+      "/var/lib/esphome:/config"
+    ];
+    privileged = true;
+    extraOptions = ["--network=host"]; # Host networking mode is required for online status indicators
+    cmd = [
+      "dashboard"
+      "--address"
+      "::1"
+      "/config"
+    ];
   };
 
   services.home-assistant = {