diff --git a/loki/configuration.nix b/loki/configuration.nix
index 4cb13de..b42ba3c 100644
--- a/loki/configuration.nix
+++ b/loki/configuration.nix
@@ -386,16 +386,75 @@ with lib; {
     # virtualbox.host.enable = true;
 
     oci-containers.containers = {
-      hass = {
-        image = "ghcr.io/home-assistant/home-assistant:stable";
-        environment = { TZ = "Europe/Rome"; };
-        extraOptions = [ "--privileged" "--network=host" "--pull=always" ];
-        ports = [ "8123:8123" ];
-        volumes = [ "/var/lib/hass:/config" "/mnt/raid0/condiviso:/media" ];
-      };
+      # hass = {
+      #   image = "ghcr.io/home-assistant/home-assistant:stable";
+      #   environment = { TZ = "Europe/Rome"; };
+      #   extraOptions = [ "--privileged" "--network=host" "--pull=always" ];
+      #   ports = [ "8123:8123" ];
+      #   volumes = [ "/var/lib/hass:/config" "/mnt/raid0/condiviso:/media" ];
+      # };
     };
   };
 
+  services.home-assistant = {
+    enable = true;
+    openFirewall = true;
+    extraComponents = [
+      # "accuweather"
+      "alert"
+      "analytics"
+      "automation"
+      "bayesian"
+      "binary_sensor"
+      "blueprint"
+      # "bluetooth_le_tracker"
+      # "bluetooth_tracker"
+      "button"
+      "camera"
+      # "cast"
+      # "citybikes"
+      "conf"
+      "configurator"
+      "coronavirus"
+      "counter"
+      "cover"
+      "default_config"
+      "derivative"
+      "device_automation"
+      "device_sun_light_trigger"
+      "device_tracker"
+      "dhcp"
+      # "dlib_face_detect"
+      # "dlib_face_identify"
+      # "esphome"
+      # "flux"
+      "group"
+      "hassio"
+      "input_boolean"
+      "input_button"
+      "input_datetime"
+      "input_number"
+      "input_select"
+      "input_text"
+      # "meteoalarm"
+      "ping"
+      "proximity"
+      "random"
+      "schedule"
+      "script"
+      "tcp"
+      "template"
+      "threshold"
+      "timer"
+      "tod" # times of the day
+      "trend"
+      "upnp"
+      "workday"
+      "zeroconf"
+      # "zoneminder"
+    ];
+  };
+
   security.sudo.extraConfig = ''
     Defaults pwfeedback
   '';