diff --git a/home/features/desktop/spotifyd/default.nix b/home/features/desktop/spotifyd/default.nix
deleted file mode 100644
index abf3628..0000000
--- a/home/features/desktop/spotifyd/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }: {
-  services.spotifyd = {
-    enable = true;
-    settings = {
-      global = {
-        username = "mjmsimuzc910khmr6yoccgtyr";
-        device_name = "nix"; # TODO: perhaps include the hostname here?
-        password_cmd =
-          # TODO: move this in it's own module
-          let identities = builtins.concatStringsSep " " (map (path: "-i ${path}") config.homeage.identityPaths);
-          in "${lib.getExe pkgs.age} --decrypt ${identities} ${./password.age}";
-      };
-    };
-  };
-}
-
diff --git a/home/features/desktop/spotifyd/password.age b/home/features/desktop/spotifyd/password.age
deleted file mode 100644
index bbe9ffd..0000000
--- a/home/features/desktop/spotifyd/password.age
+++ /dev/null
@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 UUF9JQ FSx8O2svnwtbQ14eDPxFaBpnnUwx8rZbbzPKbg6yP2c
-iZSfXaCF4b3vdpceO6cjdD4e+s+a0wowJJFNflO/JJQ
--> _nE-grease ,,1|@
-RtO87gZKvnqPCFUe5XcXgXuIOmMFMrJU7YU
---- dA0HKjUgZYdBU/DF+t6K7oeVu725up4Ve7ya7alP7yk
-D�$9?|���G0>͊|�4Z5>e�����$ ���
-#�kDg��q
\ No newline at end of file
diff --git a/home/features/desktop/wakatime/wakatime_config.age b/home/features/desktop/wakatime/wakatime_config.age
index 573c5a0..452a0bf 100644
--- a/home/features/desktop/wakatime/wakatime_config.age
+++ b/home/features/desktop/wakatime/wakatime_config.age
@@ -1,8 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 UUF9JQ xZrl2Wl0woDhkVrg+1pI+BbWHCg3XV3T7pFoXgedR30
-+/LVZ/HO8Larngohcw1qJlNOrx81U4dUwgZjl3eSr8E
--> ><tHMt-grease P^L r%s
-Tr98KsZbbA+iwetDDuqha/D3aNESSYJTeiziDjNrCCtQpVvdJ4+5R9UKfR3PCPcE
-dx1DrUOF1XLlEX/cjnGP02J/CsfRJXN0vqI
---- 5zpFcCG6y7y2C8dwzwHQ8bJsIvyObCVkGovZMOLIGio
-�"DڇW��g:�^^����G"I�?�hae�+|1�|�1�m8X��}İ�$��8�/�0Ʒh�x����4=������F�~Z�ka��"Fp_�
\ No newline at end of file
+-> ssh-ed25519 UUF9JQ VBRqGf79Jw0ciCQMqgtfcHJJKBLXtFHYFsNMIACcWFw
+HPXapSSEJnShJe5N25jQ6HMzuaUgwsPrF+uol2+yA54
+-> .,=H1-grease E<lR |?0-\ 51kNek I
+6nleWMlQxU7piSjnKjlwGQ
+--- GGH+hS3jvOBwKIu2BlNEvMN/dYHJRQnb+fkhXRr29Ps
+�[%��+'e�1V�����,z�ew�Dj��5Ř6��5��*$�iŐ�d�?���zL���A�?�'$�X� n��#����D�ӹ�u��$�Tq�y=p
\ No newline at end of file
diff --git a/hosts/nixos/common/global/wireless/wifi_passwords.age b/hosts/nixos/common/global/wireless/wifi_passwords.age
index 7567621..11a811f 100644
--- a/hosts/nixos/common/global/wireless/wifi_passwords.age
+++ b/hosts/nixos/common/global/wireless/wifi_passwords.age
@@ -1,10 +1,12 @@
 age-encryption.org/v1
--> ssh-ed25519 UUF9JQ DSej3R3rllWa8hJPGoMZcEIMNb5Fdr2kj3QT2VP4Slg
-eq6+W/naFadnfA6iuZ4mLeJA8mIATenivmSPvM0IOdk
--> ssh-ed25519 qgVaDQ iXTnXO2YIarah7rk8p2585tdpei6s+xMyr3iZAlmAj0
-M7cBqZZrxnImgcXp6saeBLMPnw3ogmVIOn/NMhRI97Y
--> TED-grease z ;"0 [2 G5M
-u7n1btlGnv/Qz0jJ
---- eu72XdP32dvM2PHwBp2a8Z5qbN8XuIQpOlWE7VVWN6c
-nݑ�r��=|�(�Ei�5�
-��S=-n#���7\�����+�`���.3՘��|I�B~�2էvi ��Q�P_��4Ǽ,l6�qS�d�ͻ[>�k�0~�lr�i�$r�4�8�>��X�]�3e�g��#��9�e�%lS�@f
\ No newline at end of file
+-> ssh-ed25519 qgVaDQ X59wGhVy2/t73FguLETsah+pqaGei4ymRNOIF+KF7WQ
+nBdcTHQYSNA8rhR8FBsT1jCx7oc5UHCSYJOw6fqH14c
+-> ssh-ed25519 3gahUA GVCyPuugr3JY9+TSB1PqjoDUy5T+Y/5IaKSnxNQNCwk
+TVp38LLUz5IXf7jA1w+B4MUBpeqY1b64l5/rKkUcNv4
+-> ssh-ed25519 UUF9JQ TqslGhrZP5LaNDz0tVlgSnPPsXIWImKrsTTcJ+Bxkz4
+HE9+CcjE3krbP1BOEvFCK0nm380sU9L717PnZYUOCbM
+-> xWO"m-grease DUn8[ ^ucb +1wP(\@
+XDAjzkQ7ll4iKEBO88q99cBcai3wuOqeYEk2d407mqoDAAbm2KRwrYpTr6aKpArD
+7yax3W5t8Y1PJ3uUEMnr1KhJiSZ0PHB3Ej+dKgL0Og
+--- 4wnYq4dm1hZwXh+Z1xiZIabJr7rtXZP63Gemxkmsy0k
+ӭ}f>�j��
:�m�����8:��Z����B�s��<3��GG�Z����~W�W��
Ct@X��P̄�b}Q��Fa�&��HS��eh�z$-��<D*�5\�<1����^43��o�(�=U�f@(Z�
\ No newline at end of file
diff --git a/hosts/nixos/common/users/adrielus_password.age b/hosts/nixos/common/users/adrielus_password.age
index ad65376..5a564a4 100644
Binary files a/hosts/nixos/common/users/adrielus_password.age and b/hosts/nixos/common/users/adrielus_password.age differ
diff --git a/secrets.nix b/secrets.nix
index 91cf4d1..f876448 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -1,13 +1,15 @@
 let
-  adrielus = builtins.readFile ./hosts/nixos/tethys/id_ed25519.pub;
+  adrielus_tethys = builtins.readFile ./hosts/nixos/tethys/id_ed25519.pub;
   tethys = builtins.readFile ./hosts/nixos/tethys/ssh_host_ed25519_key.pub;
+  lapetus = builtins.readFile ./hosts/nixos/lapetus/ssh_host_ed25519_key.pub;
+  all_hosts = [ tethys lapetus ];
 in
 {
   # Scoped for entire systems
-  "./hosts/nixos/common/global/wireless/wifi_passwords.age".publicKeys = [ adrielus tethys ];
-  "./hosts/nixos/common/users/adrielus_password.age".publicKeys = [ adrielus tethys ];
+  "./hosts/nixos/common/global/wireless/wifi_passwords.age".publicKeys = all_hosts ++ [ adrielus_tethys ];
+  "./hosts/nixos/common/users/adrielus_password.age".publicKeys = all_hosts ++ [ adrielus_tethys ];
 
   # Scoped for the user
-  "./home/features/desktop/wakatime/wakatime_config.age".publicKeys = [ adrielus ];
-  "./home/features/desktop/spotifyd/password.age".publicKeys = [ adrielus ];
+  # TODO: move this into `pass`.
+  "./home/features/desktop/wakatime/wakatime_config.age".publicKeys = [ adrielus_tethys ];
 }