diff --git a/instances/loki/configuration.nix b/instances/loki/configuration.nix
index dfdb052..ad9fa15 100644
--- a/instances/loki/configuration.nix
+++ b/instances/loki/configuration.nix
@@ -267,6 +267,7 @@ in
   services.home-assistant = {
     enable = true;
     openFirewall = true;
+    package = pkgs.unstable_pkgs.home-assistant;
     config = {
       default_config = { };
 
@@ -364,7 +365,7 @@ in
       logbook = { };
       # logger.default = "debug";
       logger.default = "info";
-      "map" = { };
+      # "map" = { };
       mobile_app = { };
       notify = [
         # { platform = "telegram"; name = "t_filippo"; chat_id = "!secret filippo_t_chat_id"; }
@@ -372,43 +373,46 @@ in
       ];
       recorder.purge_keep_days = 30;
       script = "!include scripts.yaml";
-      sensor = [{
-        platform = "systemmonitor";
-        resources = [
-          { type = "disk_use_percent"; }
-          { type = "disk_use"; }
-          { type = "disk_free"; }
-          { type = "memory_use_percent"; }
-          { type = "memory_use"; }
-          { type = "memory_free"; }
-          { type = "swap_use_percent"; }
-          { type = "swap_use"; }
-          { type = "swap_free"; }
-          { type = "load_1m"; }
-          { type = "load_5m"; }
-          { type = "load_15m"; }
-          { type = "network_in"; arg = "eno1"; }
-          { type = "network_out"; arg = "eno1"; }
-          { type = "throughput_network_in"; arg = "eno1"; }
-          { type = "throughput_network_out"; arg = "eno1"; }
-          { type = "packets_in"; arg = "eno1"; }
-          { type = "packets_out"; arg = "eno1"; }
-          { type = "ipv4_address"; arg = "eno1"; }
-          { type = "ipv6_address"; arg = "eno1"; }
-          { type = "network_in"; arg = "ztmjfdwjkp"; }
-          { type = "network_out"; arg = "ztmjfdwjkp"; }
-          { type = "throughput_network_in"; arg = "ztmjfdwjkp"; }
-          { type = "throughput_network_out"; arg = "ztmjfdwjkp"; }
-          { type = "packets_in"; arg = "ztmjfdwjkp"; }
-          { type = "packets_out"; arg = "ztmjfdwjkp"; }
-          { type = "ipv4_address"; arg = "ztmjfdwjkp"; }
-          { type = "ipv6_address"; arg = "ztmjfdwjkp"; }
-          { type = "processor_use"; }
-          { type = "processor_temperature"; }
-          # { type = "process"; arg = "octave-cli"; }
-          { type = "last_boot"; }
-        ];
-      }];
+      sensor = [
+        # {
+        #   platform = "systemmonitor";
+        #   resources = [
+        #     { type = "disk_use_percent"; }
+        #     { type = "disk_use"; }
+        #     { type = "disk_free"; }
+        #     { type = "memory_use_percent"; }
+        #     { type = "memory_use"; }
+        #     { type = "memory_free"; }
+        #     { type = "swap_use_percent"; }
+        #
+        { type = "swap_use"; }
+        #     { type = "swap_free"; }
+        #     { type = "load_1m"; }
+        #     { type = "load_5m"; }
+        #     { type = "load_15m"; }
+        #     { type = "network_in"; arg = "eno1"; }
+        #     { type = "network_out"; arg = "eno1"; }
+        #     { type = "throughput_network_in"; arg = "eno1"; }
+        #     { type = "throughput_network_out"; arg = "eno1"; }
+        #     { type = "packets_in"; arg = "eno1"; }
+        #     { type = "packets_out"; arg = "eno1"; }
+        #     { type = "ipv4_address"; arg = "eno1"; }
+        #     { type = "ipv6_address"; arg = "eno1"; }
+        #     { type = "network_in"; arg = "ztmjfdwjkp"; }
+        #     { type = "network_out"; arg = "ztmjfdwjkp"; }
+        #     { type = "throughput_network_in"; arg = "ztmjfdwjkp"; }
+        #     { type = "throughput_network_out"; arg = "ztmjfdwjkp"; }
+        #     { type = "packets_in"; arg = "ztmjfdwjkp"; }
+        #     { type = "packets_out"; arg = "ztmjfdwjkp"; }
+        #     { type = "ipv4_address"; arg = "ztmjfdwjkp"; }
+        #     { type = "ipv6_address"; arg = "ztmjfdwjkp"; }
+        #     { type = "processor_use"; }
+        #     { type = "processor_temperature"; }
+        #     # { type = "process"; arg = "octave-cli"; }
+        #     { type = "last_boot"; }
+        #   ];
+        # }
+      ];
       shopping_list = { };
       sun = { };
       system_health = { };
@@ -473,7 +477,7 @@ in
       "met"
       "meteoalarm"
       "network"
-      "nextcloud"
+      # "nextcloud"
       "nmap_tracker"
       "notify"
       "open_meteo"