diff --git a/secrets.nix b/secrets.nix
index 48e9326..650cd17 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -1,7 +1,8 @@
 let
   motiejus_yk1 = "age1yubikey1qtwmhf7h7ljs3dyx06wyzme4st6w4calkdpmsxgpxc9t2cldezvasd6n8wg";
+  motiejus_yk2 = "age1yubikey1qgyvs2ul0enzqf4sscq96zyxk73jnj4lknpemak2hp39lejdwc0s5uzzhpc";
   motiejus_bk1 = "age1kyehn8yr9tfu3w0z4d9p9qrj0tjjh92ljxmz2nyr6xnm7y8kpv5spwwc9n";
-  motiejus = [motiejus_yk1 motiejus_bk1];
+  motiejus = [motiejus_yk1 motiejus_yk2 motiejus_bk1];
 
   hel1-a = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF6Wd2lKrpP2Gqul10obMo2dc1xKaaLv0I4FAnfIaFKu";
   systems = [hel1-a];
diff --git a/secrets/hel1-a/borgbackup/password.age b/secrets/hel1-a/borgbackup/password.age
index e43bd63..c6fa180 100644
--- a/secrets/hel1-a/borgbackup/password.age
+++ b/secrets/hel1-a/borgbackup/password.age
@@ -1,11 +1,13 @@
 age-encryption.org/v1
--> ssh-ed25519 vDjOfg yV3BxKKBmsDJJDpTbTpW8ZQBEw1dzsAZcEhlcr1efwA
-WPG4olU+AEQOPOXCGVYyN9J/h5jItJkQilUr5x/3UqQ
--> X25519 k28YknTZR1ETWY1PhXwmRv/rAmvsL0YVzV5/x2qHGX0
-ooqcWrdQ4gBxq6Y0WNVr41NJFarC5g+3xZDdo1NKooo
--> piv-p256 +y2G/w AlBGJoImuKrcEvQCLwk8NJX+YwzpaTSX7rT01NAbYp6f
-ihlhk5+itPJ3skH/4Rkx+Taq+JboQ0s+6My86WSaCmg
--> c-grease
-1P4Pqguo6ZtYcXzdDQVm26RGywukVnkR0Mnk/lzXkjtr4Sk
---- xMODuPBdbFKgzh1mWly/CGFwUFA/10L1z3EQiDDNYD0
-�P8�<J]q�����5Z�9	t�ȩĀ���O��<���
(�{��-��a�6{�����
\ No newline at end of file
+-> ssh-ed25519 vDjOfg 364C2os+n+Ql2jN/VGkAn/qGpDuv1Z3tlR8a7LD6PAo
+brzOmjiJfHq/GhUs+Q+HduKPNry2/s5Az4fi3QHaQ6A
+-> X25519 41BIZvGJSE92whjPVIdMtZ2mrv+nYFR3fAX6Qnga6Fg
+cAkPwGWiBO3uzHHlI9mA+BVioIJKnoLZRjvllfkbeJY
+-> piv-p256 +y2G/w ApIK4bPqVqhXyTv2QtApM/SwAwKrcB9euOuOXxOsGtW1
+EmPYaZRboONQOJr/T//a5unCgRYW3BVQ3g2ejtexQj8
+-> piv-p256 jNqd3A Ak+73XGPLVb/5TcGB8w8HFPyFLnyvKHHVD6ND9ohJ2F/
+bvC8Uu3A9m6ZFBI7CzimK14GSdcPBrGmflBPePWpHlY
+-> (!/%-grease Bxza_u 0eL_gi*M v$Tr2Q
+r7xxL43b6wPWEc4rp/bck9ooqIj3e183nvUbwOkBISeB9Yj5DfjcnPohBGyXM8k
+--- VrBiKWQ+JMwANJxNjgYbIuMvRawFHnNEyAnyRCq8vX4
+����/���x��f 7F��RS�#�y�rY�V���0��K,�h	��ق���/t��
��*��
\ No newline at end of file
diff --git a/secrets/hel1-a/postfix/sasl_passwd.age b/secrets/hel1-a/postfix/sasl_passwd.age
index 66a34db..32d612f 100644
--- a/secrets/hel1-a/postfix/sasl_passwd.age
+++ b/secrets/hel1-a/postfix/sasl_passwd.age
@@ -1,12 +1,13 @@
 age-encryption.org/v1
--> ssh-ed25519 vDjOfg b1Zx1w3fzcOwPX6PPgXEGP9fNMu2G+9GP21ozLAdpFw
-H9WBB2lD83ZaU7EeNBjH3FmAMcArO/58IvMltFCI+R0
--> X25519 eHDSOyattfnleSYopf54sbh0ZBsJkBYHTwKiIrAIoHo
-Zq3Ic+MuhT8apWBXFSvipCGMIpgi0VD3cogXSqXUKQA
--> piv-p256 +y2G/w Ay1FiQ7KMDPuGVc1JM0IQGf5Nuf+veaeO2V9TnxGE0Zt
-agLLHpBgOM+hQSci8S/nKlMa5EMsAQhQaOc2XET7dx4
--> pI8`h-grease Y}P!N p[
-7ecvACao/g
---- udtUjLi1oDBLTDbEm/jD2T43Vd8uCPXIVBDhVaL0CVU
-b��5�/�b� �ӽ���
�������<
�܂Z_��T���5,
Ú=J^�Nɍ�;B����aı��Q��k�ͧ����wO�N8\̘��n�(w:�*>�8���3��0V��A�'P�~̚�bl�,ר�
-7	�
\ No newline at end of file
+-> ssh-ed25519 vDjOfg ngmEbOz23tQLgiJzOGIuKDGsaft9eT8kXPwUumN3CCY
+KhBqqJTh6pIkYmWjWGR0uyL1SYSa7CUgT4/Xb5YOuLo
+-> X25519 vgCAjRrutL3rin6f+q0ZPf9F2B/G5pxkAS6wSjx3wCg
+j4W5qXxmXMCb/0617UEnYrubducF0ygnaOWi9sZj54c
+-> piv-p256 +y2G/w ApVjA5UB02NegvmSKwwwP+mgkMD8avfVl0zKU+N9LOWg
+fPPrhddPxY/3nBuFHgY4dwxZeDF5UwpMCvsZSuJTapc
+-> piv-p256 jNqd3A AwTWO0cfJpWeFhHBl5Bmpg+n8NjoZsXvEjiKrmkfod0P
+rTDg0IcVdhSju1PgWO3l/dcYxnOVdnDPDQ8zQm65FzA
+-> {KHV%-grease _\ &_[r:H
+voJUJWRoeCSkjy/1g4mXSrFD
+--- mtoAbOyJYe7vOIwWrr2/GMijv3LMqjwjmevwBN7I0p0
+����$ko~�{?�}	/�2���[�n�Ȁ!��3�V�7�|=�:��T��Vn'0	ͅD�{�6)���5�cKk�̉�n�7��ѣ��- _�1
�o����N`uw`���/�����;�.�٨E��
\ No newline at end of file
diff --git a/secrets/hel1-a/synapse/jakstys_lt_signing_key.age b/secrets/hel1-a/synapse/jakstys_lt_signing_key.age
index cfbc9ce..6fa494e 100644
--- a/secrets/hel1-a/synapse/jakstys_lt_signing_key.age
+++ b/secrets/hel1-a/synapse/jakstys_lt_signing_key.age
@@ -1,12 +1,15 @@
 age-encryption.org/v1
--> ssh-ed25519 vDjOfg FDCOq/6TT4MiTydElRtbJYGQkf5Dp9Rz+pGJbGNyEUk
-w3FZziEXQZdhesTjJ1klAHoIOSKdgXBwBoLys60BjJE
--> X25519 RzOTSjA6boL+kwZ4F7TZkuzhP8HIXNDzIfM3tgLAURw
-ThbibWPRI3F1PwlXls96SDeTMLpUau/freOw/rCdadE
--> piv-p256 +y2G/w ArbH4qK3h6v1FmARFCMivDuJ8zeA85sP6NrpPDuiI8se
-zskm+i/Ox8DlhZplggvBBN3Nb9mEIsgcLsNR1/hejoY
--> n.bS-grease .8*'{}4t
-/QdO2N7yjPjur3KSMV/Se/hASwhzjPXbz+wlI6UbJnxkbmSer+wdg9nYMbBtINU7
-aHsmE/Sm1fWeLKP7T4RvftqJtLZWDkn6BG4PA6sxqzQV
---- IU8CbpKKUO1yxNKrOSwKDZ7thZ3D4CKjA1H6N/Fw+fs
-<*qL3�,�@�O��AM�b���=jn1�Qبizn���3�e�mQ!:o���1䭹\=mn�G�����a�M>Tͥ��� fN�S��y
\ No newline at end of file
+-> ssh-ed25519 vDjOfg ZBRrssRIYquwn2i4yllnV4Z4+3uJCFPL1ZpiLiLOVzA
++ECDOrPhYGurrRwfuAeW0onljTVtH6INsfhuTE02WjQ
+-> X25519 c7IFSSRMP2mYxO98jwQpuZPZT3Y1sb+MCrdj98XGzTw
+71yIHbKtUnP8ny/ybt3GJOLk/9GBGZGSf3AomPLKwHk
+-> piv-p256 +y2G/w A7rxQ5314WRX4yuJ3Xkj5Xu9/eEgfiO9GQK6zM8PmMCd
+HT5xoyuqoDww18sVTbBu7+6wLafkLEQyScl2qQy/nx8
+-> piv-p256 jNqd3A A5FAUTJzUPitFdZJiYng0Ip4PFNc+/mN9mFYcxad1msd
+0xu3bdh0o0jK926xWESw0cYkMnvQNm0zcX81V9F7+Bc
+-> osYvWi-grease V 0jQ}
+sBvPo6kjiRcyQdRq5yF0ZjAbe+18VmirDjv6B+ClnhjfH3WtwB1t9SEmZ8tBpf1x
+TsRJxUvWqDvodGRNcEKi3NLbYw
+--- GsIP/zj+ij5/bsHbtty50EtzS0+/+/teNr3JwWV1WwE
+p)R��S��8sCML��;W���
+W�����u����f�\�g��ٙHf�PQ�i6?������(ۃ��d��6�B�.�ǢU�fw�O�0e�
\ No newline at end of file
diff --git a/secrets/hel1-a/synapse/macaroon_secret_key.age b/secrets/hel1-a/synapse/macaroon_secret_key.age
index 27f0afc..52f64b9 100644
--- a/secrets/hel1-a/synapse/macaroon_secret_key.age
+++ b/secrets/hel1-a/synapse/macaroon_secret_key.age
@@ -1,11 +1,14 @@
 age-encryption.org/v1
--> ssh-ed25519 vDjOfg 99J07yNSb9UAfoiGi3ABFV6M4xl3iApYRv1HGNdQgT8
-LBMxQ+eAizZ2nWVQyD7lOzJfe8+3wPv+vNgxw/WEKk0
--> X25519 FLS0fXs2R32jedMkvavMYoc+pZBfaOPfkm1qCc+RJjY
-g9YlhVMu2DZ5GjBXCF51g0VY8STp0wbMI+lS0GQ4k2o
--> piv-p256 +y2G/w A9bUaREVnU6o1QAyqaCs5y5T+jQHbYvQQqOs8NRAe7mQ
-8Z3p5ZpyI3O1peY8E6OGUyMUONlMEVDrfOVLMcJhzeY
--> L?a5-grease
-A0lbHu5aBHSBIrwMz+QG4Mc6m2sEl/Z5TBmTsf1h
---- Df+ap67pp9N2RGb9OCkd5gVogMfXXqSJPeHMNk98TdU
-��5�r�����L����(���uZ�b�қ{;��V8Ah�`�h sP�--��uu���J���)XwX6�"�������Td��nm�*bi��&)Ə�K�
\ No newline at end of file
+-> ssh-ed25519 vDjOfg 42YAxDFlxe1D/QtOuTTxJQwQFd/UBeyr0u4nXLELg0o
+ZWpch+uIQpWLabAniu50jWuClGhuanpst5LmD8TMb2w
+-> X25519 S4rBmji8MMR1P7Tq50s0K4qH/C5qn3wQfDZMNOc3aWg
+tzr8hdNgQxmlK5mpulxFvWLu1ZjFowwjIFzlKQ8eB40
+-> piv-p256 +y2G/w AwaOodmcswGL7jfWMCJDhGHV+J4M1XXyFjLl2AYWO4wS
+SNWw57cIpxAbPXQ0VLZ2Qft4UpHy8px3buRHbOKFgoc
+-> piv-p256 jNqd3A Arm8Dp8cJd95gWJYrIiAdMF7nGRhM/F21wvw259/4fmZ
+RVZrDgXr4rQZRh2zhMQ2u9hkve8e1Xi3DxWVh9lTjMw
+-> Pb,-grease I
+2YN+l4gWzWxUJFyavaRBH6nqqraVLRMCRJr3DayjUkGU2XOAgzO76CCQ1WCwuCid
+qe3mEnNw9IEFiNsHCToTh6OWg6apoFOrkaS9SX6DDfbHJB0NuyhIsRNnIArNeg
+--- HG3rTLBVtF/mQlb0GuzId2wUaXuHjjid+uJ/Jw7SfCk
+��K�ߤ�a�7�Bfs�=��:��-�yًO�����];���l��^D��'A<�xM�6I�Z�r̓�|����
�}���2���y{E����X
\ No newline at end of file
diff --git a/secrets/hel1-a/synapse/registration_shared_secret.age b/secrets/hel1-a/synapse/registration_shared_secret.age
index e3a82f0..02ca7dc 100644
Binary files a/secrets/hel1-a/synapse/registration_shared_secret.age and b/secrets/hel1-a/synapse/registration_shared_secret.age differ
diff --git a/secrets/hel1-a/turn/static_auth_secret.age b/secrets/hel1-a/turn/static_auth_secret.age
index 8128652..773d646 100644
--- a/secrets/hel1-a/turn/static_auth_secret.age
+++ b/secrets/hel1-a/turn/static_auth_secret.age
@@ -1,12 +1,14 @@
 age-encryption.org/v1
--> ssh-ed25519 vDjOfg DGNmUpEoo4KB2XQG7bOC9m81RHSK19Rg/UKzXVV4oRI
-WWrASGb+TwRmVW57v/CjhHvkwbJ8N6JFKuzEgSnujzk
--> X25519 m9VcMyeq72eZJWl9DU6W5Tg/fPthO6mjyevoAgtG4CU
-x7rBS+gYeM0vZ/ZBV9O9wpoW3x+RX9D4xkfCJ4ddBfg
--> piv-p256 +y2G/w A+q8rvVRfAP/PjfCtRFhvX7FmtYMeIjucSbQKU0o9Shx
-k9uFNzhWZQfaMKUx6nXiKXf9fVFrE4y6ybmnXpeiblk
--> 3">;=-grease
-wEXSvaFLu5VvuoelMWG1GMyGnHIEkBo
---- pTNrYbbGlOhK7RhK1VkzaNoCcEMa/e5pYwxSf5/sIj8
-W
-��P�H'���[��@�����-��x����W��	
-`p�� t�4<�
\ No newline at end of file
+-> ssh-ed25519 vDjOfg sssiHOBSAurbFuJ4qF/l0sYbzBGefkLLSEssQK/a2zM
+//zfg58LEypmb8l8qNor4g1BwPyHY+qTKWV2T27bW08
+-> X25519 SCePnzyA6LXuqk6R0jG3BIf8Ob7Dvq7N/JLsga50lEw
+qkH63cU+OETgLLSKf/1/0BEbcgfmUGruZTyIcrrVUAE
+-> piv-p256 +y2G/w A/ZT7U+JXFoR3Y7sRkwXfW97g4U2UWsJWSKZMoZkXHKF
+vLi2hp4urxD43Yij0EzEcJLFy8iwxNF2Zyjs4u+zJCM
+-> piv-p256 jNqd3A A4ZwZmNfClY2uexezHA6iDnoA4p2ytdcp+9MARGIbXnq
+Xpf5gYsq9wKscXHgDTUtJr3IJ9P7yEHsec2d0UjbM4g
+-> :w2e_Y-grease qQ6Bzl 2Yc P 1QW>yU&*
+3sKAkYimXCaUqRwR845ezZu+rxLU0AbSCLrHoSVC6C0ZkfJzMEzVDWuRYaS67mKw
+EKFB8LAkMMb4ITwOVMYCVw43QTbFJDwsXbrxBSncrfHt
+--- mOUW0xQCSaVszKC9HqG7p8qNjVyiKAXHgFZ2QzSYX0Q
+n��և����*ǰ�Dq^�`+~@&*p��Y����J�<P�t�t�v���+����
\ No newline at end of file
diff --git a/secrets/motiejus_bk1.pub.txt b/secrets/motiejus_bk1.pub.txt
old mode 100755
new mode 100644
diff --git a/secrets/motiejus_passwd_hash.age b/secrets/motiejus_passwd_hash.age
index 8b8a476..38840aa 100644
Binary files a/secrets/motiejus_passwd_hash.age and b/secrets/motiejus_passwd_hash.age differ
diff --git a/secrets/motiejus_yk2.txt b/secrets/motiejus_yk2.txt
new file mode 100644
index 0000000..01f12c1
--- /dev/null
+++ b/secrets/motiejus_yk2.txt
@@ -0,0 +1,7 @@
+#       Serial: 23762242, Slot: 1
+#         Name: yk2
+#      Created: Thu, 20 Jul 2023 13:19:41 +0000
+#   PIN policy: Once   (A PIN is required once per session, if set)
+# Touch policy: Cached (A physical touch is required for decryption, and is cached for 15 seconds)
+#    Recipient: age1yubikey1qgyvs2ul0enzqf4sscq96zyxk73jnj4lknpemak2hp39lejdwc0s5uzzhpc
+AGE-PLUGIN-YUBIKEY-1G22K5QVZ3NDFMHQTFDUY9
diff --git a/secrets/root_passwd_hash.age b/secrets/root_passwd_hash.age
index 20f5a3f..9156821 100644
Binary files a/secrets/root_passwd_hash.age and b/secrets/root_passwd_hash.age differ