diff --git a/secrets/cube/id.age b/secrets/cube/id.age
index 88fdbc8..6e6f5b9 100644
Binary files a/secrets/cube/id.age and b/secrets/cube/id.age differ
diff --git a/secrets/cube/password.acme.age b/secrets/cube/password.acme.age
index e3e4aeb..83a7dba 100644
--- a/secrets/cube/password.acme.age
+++ b/secrets/cube/password.acme.age
@@ -1,16 +1,5 @@
 age-encryption.org/v1
--> ssh-ed25519 +rZ0Tw YCezdwFjiENHpkN+5+e05LqAIVkQZLiTOljrYCliI2k
-ILqS62E/hnMEBpOnOEx8o7e3xB/SBx7f3zwRUeutzpE
--> ssh-rsa jPaU3Q
-JPklzYqybikEwvlFRqkbfHLgGiJS75aGnB3AaJaUm9ikIvr7mcOr805ZIIurv8+b
-K0h7HU5oz+Qz3u6fLio7BkRXSFyAaJCqgNA/8xmroHD1i/hxGDsd/5fT9aaQOCb/
-2FbKtyRIwrOeX1DV4Lsh8MUOdRvkT3JyyJHSH+XfuqOJpKzJlCEdCQzFpC0X33Ii
-rpNZ1C76G+bHqV9D4yT0JMT6vaIvDaUfj3pfks5PVe+nKhnEkq5y4HAXtX3v6j0T
-cSiWNUPCuHhg9DaBxK3fAD+lNpcMw/ES++b5bddv5Ujy5T7qR0cguQhpCeN0nevo
-dFAqkAJiAbqXcK+58GyxyyNunHWCrFgq/x3lenbQv30EnZEkU9ZZM6074llT0U4Z
-xlgLG7wXx4SKC6uUhKTnzH9XLXaKuTEBWtbFWQu+PKCshFt8ii0hlUAgxe7LMoxe
-UXmAe2otnAwqJBf2YBM6XNLOZhmpKAxd79vJMZ8S5KsmUrwxRoerlItd9wFYIhHM
-
---- EOCnGCt6JxdlHrDFeOU/HFM5QeIRoKYIAMEespLIPzQ
-?Oc4K�2f�m
pv�J���S��
YΆ�gC�@dp�+�
�I���`��5��|�÷�,{!{s%�wⲉ{��ƗFk4t��>%��h��x�u;���f-Z��ll��%��!#�r�ұ�dX�S#9)�}��f-��eP�O 9@�PEH]P�ahp�R:%H_*���J��T>�!^�
-�;ћ{��d����͊�{�E$���
\ No newline at end of file
+-> ssh-ed25519 +rZ0Tw FIt0hA2bl/r3zRNh/Ge0falVQFtN0nEaEnB+yVM8xAQ
+R5FMyM3mvsY9VN5M5BZUnONIXYEK+apQAz/eo23u6pY
+--- YmsJMVVOqUkeffeu8Y0kvQj1jPw7LHPc3t8kMGME5mM
+Э�2��R��C�ם�;�fm
{�)���)�gN)��}U4��zr�����Z��~�{A;f���%��4��a��w�����b.�ϗ��qQ��7�S�$ɠ�����|��|G�4��oWZK������R4ﮭ˽��[on
����B"��dl�4ð9��U�~c��G,N
��0��`������鿇
\ No newline at end of file
diff --git a/secrets/cube/password.grafana.age b/secrets/cube/password.grafana.age
index b9524db..2994a4b 100644
Binary files a/secrets/cube/password.grafana.age and b/secrets/cube/password.grafana.age differ
diff --git a/secrets/cube/password.hash.mail.age b/secrets/cube/password.hash.mail.age
index aac8128..ee2e918 100644
--- a/secrets/cube/password.hash.mail.age
+++ b/secrets/cube/password.hash.mail.age
@@ -1,15 +1,5 @@
 age-encryption.org/v1
--> ssh-ed25519 +rZ0Tw F5KrCe7KJwgz4aujjN5VJEtMAcSL9S5j5QtVrjH0aAk
-5cqOZsM1WAU8dfiG8RX7cO0WsxnPz42W8UaOF5ToqGA
--> ssh-rsa jPaU3Q
-JhTbEAz5Tw4A4+ZYzW67iHGRCYsdfdOeR1Ak0/SkrjIQYK/naZ8wfKeyLIUuyiir
-9lFRrO9BO1JmEAvOpOA+vJnCApMhCpgLRfBZIBdPAWmEgQ3KBT8C3J8D8btXTB+b
-heGwtyNvE9jb2au4rSJi06LZPjx2dBkHuyqz73JwpwPrhlMce5i5LICN4CJl8cen
-7nWahHqjJf/XHLcZ5yUIBB7RXcvVa00j5s1AErabyz6WwPIl+Bar/NySoxD/giJ/
-OUc8nk4j5PAekqQAykKoCdksz9AmliZ1zYU1uBX/ojoe/7rNDJFu8HXZPpVUAL/i
-wWLeXJ1cvAC+H6sZr7Zvw9AeupW+iIMprYH0FIjflu9Q87H8T7SrMxj7CRF4zNVN
-FaB+O612OJuDpAQlIOgocLIPR3OpUlyMe8X05oMIaCi6O34L2AIJstJpVfCgPhKg
-TXbWKhcNqiOOWyf7BI0ItJ2A3A6YkF6FdBwBaTMdIbtPX++HlIaAcbxapyPNkDeH
-
---- F59VIl0fhnjg9YH7l1KiCiLT92C2svx8ZEnEyeHnOuQ
-U��
-���+xz�V�*��L�W�lvYU�'��pj�]�b��x��G�6oI�=
�d&���^�:6)Y��9h7T"�b�{y�����C�
\ No newline at end of file
+-> ssh-ed25519 +rZ0Tw 9umH7uCQ70QwO6MxQutKpazOcTfLH2w0XoEbhKIVCls
+052qFDNcYPVtpAd9o/gVl2h/yR5LviLYPKXD4mxdDkE
+--- uldKptLWhSWkYbOwoOKRCUaIvRkHmAeK5j8KQ6jspHI
+�r�p�Y�8�6ώ��/:�O��t�k��U0��q��
��8��x��kX@�2	g�}�z�v�.�������i���I<���:Y���
\ No newline at end of file
diff --git a/secrets/cube/password.hash.rgb.age b/secrets/cube/password.hash.rgb.age
index fe26b5d..fdf511c 100644
--- a/secrets/cube/password.hash.rgb.age
+++ b/secrets/cube/password.hash.rgb.age
@@ -1,16 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 +rZ0Tw LKpZTjdS0NHaafzP0X/i4ki83tD4y29wTtpSio+JtyM
-xbuw0ZJ+NhQS2RM874z4taRrh0oebKAElTL8g2DL15s
--> ssh-rsa jPaU3Q
-Awl4xZk9cl5EZ4JzFDcO2oGXQZYyaE39YjWIRIZM355F2z7qqQTv34rifVzRpBar
-bMT/YEi6s8OpjZnRKtR7LEUjgi2vGTcsZ0SRFOUWKcX+bCrE9O5/HkNcVaZxSyR2
-LogOIsiGLySm04SQ0NPPmzCGTJXEbg8umi5+inn+4UI0o5hxr23Ftai319ygO3pM
-CKeOjE32HBTxaifIAWugktjWUykXZwBvI+0o+ddi5ykT2WeNDIFdOTuCUHh/Oh15
-OYuR7BKCIX4k58Nsx2u2DxsTYVDqW4huQTUNMpD46F5PJYGM6lyU+lkJcRMctQtb
-Pic9Lkqlog4XutIxDX49DcDSuw4f8Zm2QGYBjp5xYQVGxVgCOib1DMA45fHkG8D2
-UYWRBtEeqtVlLzxBGpuKAjCOis+SbjypV9gTdy3nb4+5EydHi6FdW/2I+IztLgRf
-gJ/aQZf+TSkNJ+cL3f+O3PP3L3fE2nfeE1hU1Z0P8TUkr5aJ+NOwmHWkJcQbNAjN
-
---- X/sIjAHL3EHD2RgxOhkRSMavUxrmoqcYW1QJv0/yN6I
-�%l�K��-N�[4as��Z�����D+=0�������(p@w^ҹ���e�C����F���:�
-�����=o���h���A2*��
\ No newline at end of file
+-> ssh-ed25519 +rZ0Tw pavYW4DxwidelX0yh6W3xD0uGv+RSK8AOGccIXRbu24
+SB21TrxyZUNxBaBjrCWHDGRyeUWAM5jbM/Ps2w1GdgM
+--- js5hNinbe1Y7pq6RF75ScCdjMU/IxYJk9m9zbQUz9z4
+�V���`����D9�U��|Ӟ�T
+GC�yGu�0m9GQ��(�k�����'��g+���
���腍
+��?o )s>��$g7�?Lo�:��X{
\ No newline at end of file
diff --git a/secrets/cube/password.mail.grafana.age b/secrets/cube/password.mail.grafana.age
index 571240d..2113e92 100644
--- a/secrets/cube/password.mail.grafana.age
+++ b/secrets/cube/password.mail.grafana.age
@@ -1,15 +1,6 @@
 age-encryption.org/v1
--> ssh-ed25519 +rZ0Tw 4WdxKNo+oFCxOFFnAlPBxrtTQA+LLWl42dP5LzMpx2M
-OJVzp1UdVW03Vy1mo/lRvZT1cNgGHFeXagxT51RdzBM
--> ssh-rsa jPaU3Q
-qoQtmd/FAAc6YAwOAkXm149l1fkuDPFFo7IWNlnIUnWTSizitNqSsjTsb9GbkIWi
-CG7jXhDc/eYjd/6D4/hmdBWsOn+Q/CRV8zOgfBBzeIIlObb3avQceVeyrNPj6dG1
-FRR5+odp9y6oO0Y3ybMa7VKGlvjGOnWXQQgbiy5xfw7gsKAdC8fQuqNUldOEWHwX
-IEioVKT69mbTfd/RP+vasWudbn9fTRk224Jyj4+GhMqcqj1BT/uxmpMVqN3BKoH7
-Q4HjFjvOkgCy7Ic7v11enPqzmGeBLdIfQ7zNgDBMZ8kQ+/w0wcULi2Z0vMGraqFL
-/72PJuKPCHx8tlwhaBFHZZ80H2GwDynd4XGr8ZnrEJ23iJZSvsAWZ+QjXtkpE4b6
-5xTgUxDPD8if3SHZ+b4sJPZeG3PlOgIvDo+BcrMLOpsICwfHUDR4spy3PDZSLIev
-Vypq0ColGX7+izdq4FnkBdPXpJ0/B7F38kPSLq3DgMRY/ZnTQRLvQIhekYbQjcHf
-
---- Wd4kWT5O4dMYmDb98q+f/PHt49rMtbzoV1f+zqQY9gc
-ھ�`wf!�$����m_�g���Z��
��M��'�V����
\ No newline at end of file
+-> ssh-ed25519 +rZ0Tw k4u86tbxSaZTIr9QzN2P+md9WwGvn93jOXqR2JHWy30
+tG7p/GaP0MhTqbAin3KmIMCrE67Ls3NYoztcJT8r7po
+--- cmz8sBFqHk8RyAae/gBqrWgjCyHrVtngjZGn1xQOze8
+9rgM��׶9�������g����z�
+�@���uO���0ץ�a
\ No newline at end of file
diff --git a/secrets/cube/password.mail.nextcloud.age b/secrets/cube/password.mail.nextcloud.age
index 21ec1b8..c25798c 100644
--- a/secrets/cube/password.mail.nextcloud.age
+++ b/secrets/cube/password.mail.nextcloud.age
@@ -1,15 +1,5 @@
 age-encryption.org/v1
--> ssh-ed25519 +rZ0Tw CX4GDRE5ufJeZ6/z+rR1OI948oXfmwqvXYdNWKZ8DFA
-sTJLWk9pxlLPXAgYK3NzwjNTXGjcy3W2q722BZNlHig
--> ssh-rsa jPaU3Q
-GbbuDZ3avCfs592ELJNwQyQp28njwLKLLr7+os68mpMHMah1DlFfRPLIgc/gQ7o9
-8w/Nzo1+43jVVzlW7zhsPlSVFRX4q0BHxvvoizy8DsD9Lp6ZcSKSa70Vg64iHFMf
-C6oGkQ2eSraab5/P8oRfeY/RoSuILTEKVOs12Ct5gdslSYJNhUDwLzSWf2m54yg4
-1hPmt0ppfYNZioASzfycWdlJSsqXoQJsMSAQTf2BjEL6uS36ivrGSRH1Ox9jcs8D
-Q8aaUTe8vX+b184GDLut18vqL5HRUS3LJuRZ1eizNfVE+QuxhtqzCUaR7X+nb2/Q
-pgUQrsfBNsfhsrV3uxUDCP9NmeQKw5JqWbRmovt0F70MHneDBnaZcc1rbSBZLhI1
-0n6AP3SUuvONRCtpzkmYOGkuH6Z5aESv+sanPwkjjQgzi6HK1B24zoAqyFAAUrQ8
-z3pTes03EIW/yKWqXgIY5bPwucXptVam6dMVn1/lpBsci4xPZUDcKTC3S2VFrnpA
-
---- dkfT+Q5Cujh1cRa6+5wW/3CSl68j6p7j5wkEhfwCOQo
-�i����ߢ�MCeO"�|�'�n�����W��B^��~}���.��Wx]���7<D5�b�ku�V�z=�0P>*
\ No newline at end of file
+-> ssh-ed25519 +rZ0Tw QYW+HqjO+q32C4V4l7aUV3GDdxGpxbFPvZK35fyzhCE
+5vSIKxqXlGo6BhpE+4IqaJ/O8zE+eyxpIKSzI8XJq1A
+--- CIO9C6tsQ0Ep777o0XYvFfBlzUIbaVpXoSDidoMQwVg
+Q�"�Yi
6y��#CadW�����NX��$]��gh�FiA�hWyIE{>-w�6�vi�q�H��;�8�����
\ No newline at end of file
diff --git a/secrets/cube/password.nextcloud.age b/secrets/cube/password.nextcloud.age
index 4d300e3..17033a8 100644
--- a/secrets/cube/password.nextcloud.age
+++ b/secrets/cube/password.nextcloud.age
@@ -1,15 +1,5 @@
 age-encryption.org/v1
--> ssh-ed25519 +rZ0Tw NfZ+5i2o7oRW1uvAyt2SqRwjH5NZc3WCO1bP87CzbRk
-RwK2uhrHmVkbPeB4bl5VpYZfumvwi2o3MgTkJqjqM7w
--> ssh-rsa jPaU3Q
-JEXEbpd4HIwMOQR3o6QI596K81kfab4EXAxzaRdCviupis3eAck+jmJKWn/sFPkP
-VyYJNWWf3DmNrV0/bw7CPzeoyGYlM1kHKwXfai8oOQlI4C6n45lavV02ft4BAz+W
-B7D93BMfi5cI2aYn+5PI1F7zGoxSFL07du6HQVuYLvYP3PowsPoeSbEsoXyfS3EN
-6+S1gQi/sQPYFl5ocs8eKxF+7yiqzc4i/jQQqtais3A+VjqA3nQRm9c5UBGoWwdr
-DKbVk+CxK8uLFIMqhZaUT+AJ4vjTAgJmssVoQOIRhBA9cxylqJYV3xHLF0AhTsVe
-mWbd8+zgw713wjqT9r1Otb5zCrMUC6KUcEGKEoUvOw7bjzg72CVoAe0cz0PNVz7I
-8tjL8H49lqz+dPYEUR3OuQMiQdTtKUVgHg5fv612bo2mbEQv1PXguYlMXkoARSFh
-+CD6GTDpVMrRMQ1RO3gY2nNmeuuLx/976v53Ln5rlywfGGUkDOyNO5tdXhVTJVaP
-
---- 4cXoZf9zPpY7SjfG9xbJKnJwbauSTpUwVStceIeUm/M
-Sq!�#;b%Kn����jH߆�XG�X��b`F���&�:Χ�W�~
\ No newline at end of file
+-> ssh-ed25519 +rZ0Tw okdsP260oVUSzMwXwa71LPNIxKCH9IqA99r632rFk0M
+IYV5CmqbsbDX4GhLA+OkcPTXD0Cen+8s1AQ0wzyeSbc
+--- QDLGYNZYfCfioRt85MeDYj5bXY21Zsx8NA9IGae6Mvo
+��Ҽ�M`2.��|s���Y����W�Y�&���SCh�z
\ No newline at end of file
diff --git a/secrets/enka/password.hash.orhan.age b/secrets/enka/password.hash.orhan.age
index c82bc44..f01abf4 100644
Binary files a/secrets/enka/password.hash.orhan.age and b/secrets/enka/password.hash.orhan.age differ
diff --git a/secrets/enka/password.hash.said.age b/secrets/enka/password.hash.said.age
index f93d1ba..902ccfa 100644
Binary files a/secrets/enka/password.hash.said.age and b/secrets/enka/password.hash.said.age differ
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 838b7d4..176bd68 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -4,24 +4,23 @@ let
     cube     = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMkCJeHcD0SIOZ4HkyF6rqUmbvlKhSha3HWMZ0hbIjp rgb@cube";
   };
 
-  server = key: [ key keys.rgbcube ];
-  normal = key: [ key ];
-in {
+  key = key: [ key ];
+in with keys; {
   inherit keys;
 
-  "cube/id.age".publicKeys = server keys.cube;
+  "cube/id.age".publicKeys = key cube;
 
-  "cube/password.hash.mail.age".publicKeys = server keys.cube;
-  "cube/password.hash.rgb.age".publicKeys  = server keys.cube;
+  "cube/password.hash.mail.age".publicKeys = key cube;
+  "cube/password.hash.rgb.age".publicKeys  = key cube;
 
-  "cube/password.acme.age".publicKeys = server keys.cube;
+  "cube/password.acme.age".publicKeys = key cube;
 
-  "cube/password.grafana.age".publicKeys      = server keys.cube;
-  "cube/password.mail.grafana.age".publicKeys = server keys.cube;
+  "cube/password.grafana.age".publicKeys      = key cube;
+  "cube/password.mail.grafana.age".publicKeys = key cube;
 
-  "cube/password.nextcloud.age".publicKeys      = server keys.cube;
-  "cube/password.mail.nextcloud.age".publicKeys = server keys.cube;
+  "cube/password.nextcloud.age".publicKeys      = key cube;
+  "cube/password.mail.nextcloud.age".publicKeys = key cube;
 
-  "enka/password.hash.orhan.age".publicKeys = normal keys.rgbcube;
-  "enka/password.hash.said.age".publicKeys  = normal keys.rgbcube;
+  "enka/password.hash.orhan.age".publicKeys = key rgbcube;
+  "enka/password.hash.said.age".publicKeys  = key rgbcube;
 }