diff --git a/profiles/homebox/default.nix b/profiles/homebox/default.nix
index 2981c29..ca3d382 100644
--- a/profiles/homebox/default.nix
+++ b/profiles/homebox/default.nix
@@ -93,7 +93,6 @@
                 netbird.enable = true;
                 
                 openwebui.enable = true;
-                homeassistant.enable = true;
                 
                 wyoming = {
                     enable = false;
diff --git a/profiles/laptop/default.nix b/profiles/laptop/default.nix
index 5b21687..df335e2 100644
--- a/profiles/laptop/default.nix
+++ b/profiles/laptop/default.nix
@@ -68,10 +68,6 @@
                 wyoming = {
                     enable = mkDefault false;
                 };
-
-                homeassistant = {
-                    enable = mkDefault false;
-                };
             };
         };
 
diff --git a/system/virtualization/containers/homeassistant/default.nix b/system/virtualization/containers/homeassistant/default.nix
deleted file mode 100644
index a4ecb52..0000000
--- a/system/virtualization/containers/homeassistant/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ config, lib, ... }: {
-
-    options.sysconfig.containers.homeassistant = {
-        enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = lib.mkIf config.sysconfig.containers.homeassistant.enable {
-
-        containers.home-assistant = {
-
-            autoStart = true;
-            privateNetwork = true;
-            hostAddress = "192.168.100.10";
-            localAddress = "192.168.100.25";
-
-            config = {
-
-                services.home-assistant = {
-                    enable = true;
-
-                    openFirewall = true;
-
-                    extraComponents = [
-                        "wyoming"
-                        "ollama"
-                    ];
-
-                    config = {
-                        homeassistant.unit_system = "us_customary";
-                    };
-
-                    configWritable = true;
-
-                };
-                
-                system.stateVersion = "25.05";
-            };
-        };
-    };
-}
diff --git a/system/virtualization/virtual-machines/default.nix b/system/virtualization/virtual-machines/default.nix
index c25a2f6..eb7f397 100644
--- a/system/virtualization/virtual-machines/default.nix
+++ b/system/virtualization/virtual-machines/default.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }: {
 
-    options.sysconfig.virtualization.enable = with lib; mkOption {
+    options.sysconfig.virtual-machines.enable = with lib; mkOption {
         type = with types; bool;
         default = false;
     };
@@ -12,7 +12,7 @@
         (builtins.attrNames dir)
     );
 
-    config = lib.mkIf config.sysconfig.virtualisation.enable {
+    config = lib.mkIf config.sysconfig.virtual-machines.enable {
         programs.virt-manager.enable = true;
 
         virtualisation.libvirtd.enable = true;
diff --git a/system/virtualization/virtual-machines/home-assistant/default.nix b/system/virtualization/virtual-machines/home-assistant/default.nix
new file mode 100644
index 0000000..f4bb2bb
--- /dev/null
+++ b/system/virtualization/virtual-machines/home-assistant/default.nix
@@ -0,0 +1,12 @@
+{ config, lib, ... }: {
+
+    options.sysconfig.virtual-machines.home-assistant = {
+        enable = lib.options.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+    };
+
+    config = lib.mkIf config.sysconfig.virtual-machines.home-assistant.enable {
+    };
+}