diff --git a/system-config/configuration/laptop/default.nix b/system-config/configuration/laptop/default.nix
index aab817e..766ad02 100644
--- a/system-config/configuration/laptop/default.nix
+++ b/system-config/configuration/laptop/default.nix
@@ -13,7 +13,6 @@
 
     nixpkgs.config = {
         allowUnfree = true;
-        #allowBroken = true;
     };
 
 # Bootloader.
@@ -57,6 +56,13 @@
         pulseaudio.enable = false;
     };
 
+    virtualisation.docker.enable = true;
+
+    environment.systemPackages = with pkgs; [
+        docker
+        docker-compose
+    ];
+
     sysconfig.opts = {
         sddm.enable = true;
         openssh.enable = false;
@@ -66,8 +72,17 @@
         hyprland.enable = true;
         git.enable = true;
         nh.enable = true;
+
+        ollama.enable = true;
+        wyoming.enable = true;
+        virtualization.homeassistant = {
+            enable = true;
+            configvol = "/etc/homeassistant/config:/config";
+        };
     };
 
+    
+
     home-manager = {
         backupFileExtension = "backup";
         extraSpecialArgs = { inherit inputs; };
@@ -158,6 +173,7 @@
     extraGroups = [ 
         "wheel"
         "podman"
+        "docker"
     ]; # Enable ‘sudo’ for the user.
     openssh.authorizedKeys.keys = [];
   };
diff --git a/system-config/services/containers/homeassistant/default.nix b/system-config/services/containers/homeassistant/default.nix
index b8d7db8..c3390c3 100644
--- a/system-config/services/containers/homeassistant/default.nix
+++ b/system-config/services/containers/homeassistant/default.nix
@@ -1,8 +1,14 @@
 { config, lib, ... }: {
 
-    options.sysconfig.opts.virtualization.homeassistant.enable = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
+    options.sysconfig.opts.virtualization.homeassistant = {
+        enable = lib.options.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+        configvol = lib.options.mkOption {
+            type = lib.types.str;
+            default = "/ssd1/Home-Assistant/data:/config";
+        };
     };
 
     config = lib.mkIf config.sysconfig.opts.virtualization.homeassistant.enable {
@@ -12,8 +18,8 @@
             containers.homeassistant = {
                 autoStart = true;
                 ports = [ "8123:8123" ];
-                volumes = [ 
-                    "/ssd1/Home-Assistant/data:/config"
+                volumes = [
+                    config.sysconfig.opts.virtualization.homeassistant.configvol
                     "/run/dbus:/run/dbus:ro"
                 ];
                 environment.TZ = "America/Chicago";