diff --git a/loki/configuration.nix b/loki/configuration.nix
index 1281b1c..063b12a 100644
--- a/loki/configuration.nix
+++ b/loki/configuration.nix
@@ -94,14 +94,14 @@ with lib; {
     gnome.gnome-keyring.enable = true;
     gvfs.enable = true;
     jackett = {
-      # enable = true;
-      # package = pkgs.unstable.jackett;
+      enable = true;
+      # package = pkgs.unstable_pkgs.jackett;
       openFirewall = true;
       group = "users";
     };
     jellyfin = {
-      # enable = true;
-      # package = pkgs.unstable.jellyfin;
+      enable = true;
+      # package = pkgs.unstable_pkgs.jellyfin;
       openFirewall = true;
       group = "users";
     };
@@ -114,7 +114,7 @@ with lib; {
     # plex = { enable = true; openFirewall = true; group = "users"; };
     power-profiles-daemon.enable = true;
     radarr = {
-      # enable = true;
+      enable = true;
       openFirewall = true;
       group = "users";
     };
@@ -123,7 +123,7 @@ with lib; {
       discovery = true;
     };
     samba = {
-      # enable = true;
+      enable = true;
       enableNmbd = true;
       enableWinbindd = true;
       nsswins = true;
@@ -171,13 +171,13 @@ with lib; {
     };
     smartd.enable = true;
     sonarr = {
-      # enable = true;
+      enable = true;
       openFirewall = true;
       group = "users";
     };
     thermald.enable = true;
     transmission = {
-      # enable = true;
+      enable = true;
       openFirewall = true;
       group = "users";
       settings = {
@@ -249,27 +249,27 @@ with lib; {
         '';
       in
       {
-        # bertof = {
-        #   subvolume = "/home/bertof/";
-        #   extraConfig = ''
-        #     ALLOW_USERS="bertof"
-        #     ${commonExtraConfig}
-        #   '';
-        # };
-        # tiziano = {
-        #   subvolume = "/home/tiziano/";
-        #   extraConfig = ''
-        #     ALLOW_USERS="tiziano"
-        #     ${commonExtraConfig}
-        #   '';
-        # };
-        # condiviso = {
-        #   subvolume = "/mnt/condiviso";
-        #   extraConfig = ''
-        #     ALLOW_USERS="bertof tiziano"
-        #     ${commonExtraConfig}
-        #   '';
-        # };
+        bertof = {
+          subvolume = "/home/bertof/";
+          extraConfig = ''
+            ALLOW_USERS="bertof"
+            ${commonExtraConfig}
+          '';
+        };
+        tiziano = {
+          subvolume = "/home/tiziano/";
+          extraConfig = ''
+            ALLOW_USERS="tiziano"
+            ${commonExtraConfig}
+          '';
+        };
+        condiviso = {
+          subvolume = "/mnt/condiviso";
+          extraConfig = ''
+            ALLOW_USERS="bertof tiziano"
+            ${commonExtraConfig}
+          '';
+        };
       };
   };
 
@@ -312,8 +312,8 @@ with lib; {
   };
 
   services.home-assistant = {
-    # enable = true;
-    # openFirewall = true;
+    enable = true;
+    openFirewall = true;
     config = {
       default_config = { };
 
diff --git a/loki/hardware-configuration.nix b/loki/hardware-configuration.nix
index 2425796..20c9b02 100644
--- a/loki/hardware-configuration.nix
+++ b/loki/hardware-configuration.nix
@@ -22,23 +22,23 @@
     fsType = "vfat";
   };
 
-  # fileSystems."/home/bertof" = {
-  #   device = "/dev/disk/by-partlabel/5T";
-  #   fsType = "btrfs";
-  #   options = [ "subvol=@bertof" "compress=lzo" ];
-  # };
+  fileSystems."/home/bertof" = {
+    device = "/dev/disk/by-uuid/2e897ea5-c8f9-4fa8-9cc6-3f5807ba8afc";
+    fsType = "btrfs";
+    options = [ "subvol=@bertof" "compress=lzo" ];
+  };
 
-  # fileSystems."/home/tiziano" = {
-  #   device = "/dev/disk/by-partlabel/5T";
-  #   fsType = "btrfs";
-  #   options = [ "subvol=@tiziano" "compress=lzo" ];
-  # };
+  fileSystems."/home/tiziano" = {
+    device = "/dev/disk/by-uuid/2e897ea5-c8f9-4fa8-9cc6-3f5807ba8afc";
+    fsType = "btrfs";
+    options = [ "subvol=@tiziano" "compress=lzo" ];
+  };
 
-  # fileSystems."/mnt/condiviso" = {
-  #   device = "/dev/disk/by-partlabel/5T";
-  #   fsType = "btrfs";
-  #   options = [ "subvol=@condiviso" "compress=lzo" ];
-  # };
+  fileSystems."/mnt/condiviso" = {
+    device = "/dev/disk/by-uuid/2e897ea5-c8f9-4fa8-9cc6-3f5807ba8afc";
+    fsType = "btrfs";
+    options = [ "subvol=@condiviso" "compress=lzo" ];
+  };
 
   swapDevices = [{
     device = "/swapfile";
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 414b3f3..d51e2d2 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -4,7 +4,7 @@ let
   bertof_freya =
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAg2XYk1zynb713ky1JRcmXMCbuEt41AoIEemtmvgV7p";
   bertof_loki =
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFviqAN0S+wZ5BQRpWpmsrkduPox3L4C7iLlCOQk7+pE";
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK13mAQgkc8oTXj5VbGrwAJ3ragiZIG/WuVUdnVOnsu1";
   bertof_odin =
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAhxOjo9Ac9hVd3eOR56F6sClUMUh1m7VpcmzA18dslj";
   bertof_thor =
diff --git a/secrets/spotify_password.age b/secrets/spotify_password.age
index 0736a75..bd7873e 100644
--- a/secrets/spotify_password.age
+++ b/secrets/spotify_password.age
@@ -1,25 +1,27 @@
 age-encryption.org/v1
--> ssh-ed25519 lC44xg tiYP7fCE1gD+yhYwslETXyKThRgspc4Py38qpivlRhM
-HwNdYAj16o0KkFrrt94l2VwJpoe/era6QME/CsQw40o
--> ssh-ed25519 2L7QNA tlGHfQqSxB0TKD+Y27ZTD5C8uAVh5YG9nD68dThckGg
-wC9V13uoe0Wo4bOzEMypOjlQdD4jdLgUUIIREJvwcLU
--> ssh-ed25519 YLoUYg ddSouksMA6ptfakgvaW+tqzVJWiOlkYLazYc8EiKFhA
-igLwyrB+QILMoFYbA4od8+od9quKU8/9mGgHZXpmaog
--> ssh-ed25519 13iwjQ 9Vods4aLJRWMmSUotoGCalqeEICIK54mwSZmrH5TYHk
-v5+Afa45E52pIgpDFB+WhiwtLcVSCY/e/0K4BEKrMDs
--> ssh-ed25519 7MB20A 8hqsc5k6VY9RDo5g8j59tpMTaCMzQN0Q8Hak3ot1RHA
-SAeV+0/5zwRM5ZIqzo/JkiHmxupHre61SvVigC/obFg
--> ssh-ed25519 IvyYug fh44hhHy9J2MfgbggbJrvaJtBBUH4D4DpvPNnYCJ1lQ
-UwU5LbHTLE7iYOpzTZ13HzkJv8ZlGrqYQYA4DF5BtCA
--> ssh-ed25519 v7O/FA 8gnHRHHtbEO7gDT9F4wd25/us/V7gpgAln6pNngaUiY
-dfS/OW8Lidv/MpwRAr59ORzClmM7P0Lr5vDRj0VMd4A
--> ssh-ed25519 Wzv8ew AfcCZ5krfBnfGPuBjkxZQuHdb5GAqb/PAgvXhRzYnRA
-P3mbflDNzTLWHeuTMi/njwuEPYvCH656GB6m6IHFWWM
--> ssh-ed25519 XgC3XA 4Z4MVLsv0n+b5Eo7mNvIqRRoJo0VntOEknlEfpLivHc
-collu1bXOX7RoUF5m9AZosaFo/ZExpo3hNVYdt7sWFE
--> ssh-ed25519 l795CA 6YKyuLTr/CWGg84ydmE24AzNxSGanr5LuIbhGpR6AWU
-9xPPQ92fRfCFhTtpNTiheyFXNy4j0ld5GwL3Nle5SsA
--> ]DcD-S-grease [h\j +e?g> ']YX]K]> HP1=w
-R9hOduE7LgexWwrxkkZ6fQcH6HJUUnwXV7vuz5DsS58l7C4xbpVbHMlpyXWt6gc
---- i5BXGOIIYt6nxS5obhJujPP+k2bQRCy4cVQhlShXiko
-ŠBMÕá—Ï ª‚U‰Œ‰
çám,6®£’'e¾wJÍ‘Fê¿,i¦jRÓZøB@Èñ
\ No newline at end of file
+-> ssh-ed25519 lC44xg +5dYF6Tqqo+U547RevPMoife9Vkh0djnmIhpMkAwJH8
+8bz5Cx5WpNUnS4MQeSg6/zZrmrMknKDkRWULSjjdY4w
+-> ssh-ed25519 2L7QNA rtT/Li8vXcAwXDgDstIHuf1TyxcFnbq/grYGlurPaGs
+UUsj46M35WK4gpDHcXABp2XZEUv/hmTVZ6gkhC6H9JM
+-> ssh-ed25519 cNZgxQ uDTG0JhJq9I8R2eykXwvAWHbTXwJDYekdqIVM4xu0lI
+2FKO53M05T7b/qSsgLC9u7H2s591XbOi6Sw53NUXDgA
+-> ssh-ed25519 13iwjQ 8Ksy+jkRPFvdpzoNZQfFWefOoS+zZeMGQXA2AHpsZws
+V2pp6PYuMvANXPYdF2rdPRNuMcoOL9jKNFMKx8dDP0A
+-> ssh-ed25519 7MB20A VXr5bxIiz5b77QgCMiFBWRD9BoXMcG8OTtiowHNGCXE
+q3J8OpqA2hG3fBQNQgVRX0EpbqBF4vXD5mWEFIC0VWI
+-> ssh-ed25519 IvyYug Aggq9sBm+WXcGrnOTpXcyMboU0bOKqWWKOV+vnKiEW8
+27bVXEyUu+6K+q+uOK7Kst1Ap/sHngRjzdtIQJppwas
+-> ssh-ed25519 v7O/FA fyhjCEqvPevtNCakMZC3b+sC1tqKHb8DN4EX6kkW6EU
+97mOdPqoqgsoLDCb4TS58iQl11mhWBdMLhv2KrU5lJg
+-> ssh-ed25519 Wzv8ew 8HwTlkcVQllpuQ2IOJEXm7ULskzru6QYKxtI2uzPjmg
+BjHxuCDORfI1CLVl/bwavFiktcORfl5Y/U7zmd6/Gck
+-> ssh-ed25519 XgC3XA bv3KpMp0WdpiIAQf1ZtyR5YcM8BG2DPJq5aBvw/V72Q
+MeSg/SJqOgQwAypfErX7bDUnkOS+j4qnjwztchoYLJE
+-> ssh-ed25519 l795CA 4w9zFHlFers1yB/ZIAaK4p6Fa/I/6xQcnt+zfgE2Pgg
+6HetmoUXTRLBcWPis6NZQW2bpH8/TE2FpDBQWWwANEs
+-> GP7-grease lH1)!] >|, ry DLD*$c<
++jaIgDL4jtbrtjMtaQWOlfTwdMQwVeWBO1sEkoRP
+--- Z7fL3vF48UW9qXbomtkBhI2CZUg2u2Fa43DptEci3i0
+ÌHí¢¾WĘ
'
+/íVi¬
+ðòœ|ÿU�¶=RÃ)r‘G·’@I.æ>{6€(
\ No newline at end of file