diff --git a/flake.nix b/flake.nix
index d239164f..e06b2970 100644
--- a/flake.nix
+++ b/flake.nix
@@ -190,7 +190,7 @@
         };
 
         nougat-2 = {
-          sshUser = "yule";
+          sshUser = "barkeeper";
           hostname = "nougat-2.b12f.io";
           fastConnect = true;
           profilesOrder = ["system" "direnv"];
diff --git a/hosts/nougat-2/acme.nix b/hosts/nougat-2/acme.nix
index cf224d3e..1af6c539 100644
--- a/hosts/nougat-2/acme.nix
+++ b/hosts/nougat-2/acme.nix
@@ -11,7 +11,7 @@
   hostingdeProviderConf = {
     dnsProvider = "hostingde";
     credentialsFile = "${pkgs.writeText "hostingde-creds" ''
-      HOSTINGDE_API_KEY_FILE=${config.age.secrets."hosting.de-api.key".path}
+      HOSTINGDE_API_KEY_FILE=${config.age.secrets."hosting.de-api-key.age".path}
     ''}";
   };
 in {
diff --git a/secrets/drone-db-secrets.age b/secrets/drone-db-secrets.age
index 769002b0..95e8e9d7 100644
--- a/secrets/drone-db-secrets.age
+++ b/secrets/drone-db-secrets.age
@@ -1,21 +1,24 @@
 age-encryption.org/v1
--> ssh-ed25519 Y0ZZaw aeKyGeq9/rWQneJZIkrovdlgAdRTqYuUeqPIhT5dEwk
-pkwICt3TV2RSMo93GMqVNZ6kYorTE48yyVuSdbLlLDc
--> ssh-ed25519 BVsyTA nNb8z1VNBdzeojDeQ0aRO9W12LVN/Zc5mQmN+jOxInc
-VeoBXWSz2ZbXcFTNc+XtWFtWUomC+PaG8pUrRoF1CCU
+-> ssh-ed25519 Y0ZZaw 4IYDRUd6wQzWDLzyFLPzy/t8L1V1UT/KwgfMLvDn5GQ
+4lKiqrafTVNtmcbbWdDsEkPSaN0/1Ud1k+rW1p0Wi0I
+-> ssh-ed25519 BVsyTA 5kVXS829ZZONa7iqxXQXpcQ4eoKEH14Aah6Oo6plWjE
+Rv06OqEOnVjrlwBy8JtfV+v+arbqrO2Cv6paIx0Bzf0
 -> ssh-rsa kFDS0A
-h7Wk2206zM8zX9RE1DSSmaEiMI/v3A3p7h+uQB5uLz9nK+l7z92H9nHMExErdA9u
-CjS2/uG8pjHtktNk5/nOyx64myrr3Y/HvJlHKhshiQF26CKiANO1LZa+Vy+P/LyM
-8uI1T+bvqSJLPVr0CJ4gJ32YL9CPp0BJCpR27RHtXhdni9n08biBaib8c6loaD8K
-fZr7TPH40F1mrn9+3paR9vKedJuPwEj2dKiHKcqC2zHr4GW28HwL03xNfCtdWw7x
-Zxjyxk1cagVfPHeG9ObliJOohWZSQB/B4byVaRs6EyhYI0noqg/hl60VcizMmu/+
-PvXxOq2llAnOF0A5gA5b5LtFQD1xRPNLwe6F+rt076Fgt2qn3q3BQGKOahRv0vy6
-d3fEGiZvSgiMFlB6JRHIz2PDbpYHHIAUDEPP3M7a5mdwgKyYyFjsboc5MbRSK609
-oM1QmZg+14fdddisGjuzz96p2SYwcbQu7i4Haf/4i142FYUHYYLtreMTGsW3oCYq
-Qa/SQ2Ip07BFBhGve73W8XXzNyYUW+GLsZOcX/NrxSjAYoVFKMzMVv8DGrt6SXap
-yu6aR6065HJgKEWdssWce/g4xkVpYv7frXnYLdDseMFz7ZfMOc7ieAKYpS5Sb9r3
-LMifMXPRAXkam5JMbVr6aF2k3FkTzeDKrhlH6aKgh5Q
--> ;cm1-grease
-TvutGCeP
---- +a2HtxLwZbsg0VlFHB2tIo/ULFcjS6VZ+4EhyvnDVq8
-�uDz�l�TN�?{��pAjKSz�U�n.C��pQ�������Y��o���u.?��k9';�|ڀ>�Q�lhd)��Sˀ7�5?ț�+���p"�.(�r�Dɝ�P�@��0+;Wh� ��'�
\ No newline at end of file
+dvnz72ZtLpuBJfJEoXBb9TyQuEtNK1VZBXtSq9X7RL4fg4rbvGWRiGwl+IH1u8Tp
+6TPephD603lGkxhglh9KlmVp7vqZ4ILRN9836b4Ic0kPttK7iCWoRQsLzHMpwQyD
+Lb8ViRCIj+a2ZWfThaxjSXjXgDR5ZJGrnSwHhxsK9R3A4YUhT8jLvVRCfrUYhtPu
+9AhhT3P9FceflBJzIrD0lozYyaFi5eV4dySAgGyuuBzPXmdWZiOoEbArV9M/N1ss
+LJ/Nf23Ki39qe8w6YelcbhZTi6D2zfOA34Rd+QO8xzZFKKk0iZVSJ0ODk0I42itY
+rxiOQFX3Mpv2/FoqOzJY9WeFHHw61pfZid5UkjFLaongel60a0QSrJvhNoz8J5Jp
+k1GitKbBJl9V69XDY8RqQyDspImOkf7M7497C3OjdUtQkzC2cHzIfbDIi36Oifyp
+254KLVyCtArCqKZClnwcXAl9KtP4d9FM1TL7vSsJM67wfSpWakm5gptSM3WyYsZy
+Y2NkVU/Mk1AQLyrYKz+jtEwTmcrGo8zUFwKQZrXkytNV+vlWxwUAjZupNef5Ih7F
+6okWpmRTjozIZzdJgAHSJ96nnbu5QZt0GmmJ+LtCfIZ+1W3M156hODwCaN9Qg6Ki
+30MR/njAjWE7o5TB+gI6iV2OYxd0/Yqyy9lIdEEllFk
+-> ssh-ed25519 cakP9w usfEkp11W/3dAIKp0EcTL0NJe8cMHLJamShjSEbc+EA
+cVK/YSYLIvcXeZWpqEUHkwufHxOIR4uYOvZGi2eMNz4
+-> ym-grease
+INN4gag+EYKDUsKFd8N2CrLBWtRGC/BKP4IEfaAt4a5L1FFUAeEaRRAfuQ5ZWvnG
+vV0T8ASMwsMJ07X2X2faghc
+--- 7BrGKq+40E31/Jz0C6jg7Jequ0k4W+71wjLGLdR+9vg
+��"	чdRY$�����Z��w2�	�AK�M��./����U!���j'$����� 8n`��5�D��0J<ہ�߈��*�Y�>����R�f͕��|/�lS���J���`2��[�����
\ No newline at end of file
diff --git a/secrets/drone-secrets.age b/secrets/drone-secrets.age
index 80a14ef4..0b2206dc 100644
Binary files a/secrets/drone-secrets.age and b/secrets/drone-secrets.age differ
diff --git a/secrets/gitea-database-password.age b/secrets/gitea-database-password.age
index 5e161796..c949d641 100644
Binary files a/secrets/gitea-database-password.age and b/secrets/gitea-database-password.age differ
diff --git a/secrets/gitea-mailer-password.age b/secrets/gitea-mailer-password.age
index 8677fa14..46d28f8a 100644
Binary files a/secrets/gitea-mailer-password.age and b/secrets/gitea-mailer-password.age differ
diff --git a/secrets/hosting.de-api-key.age b/secrets/hosting.de-api-key.age
index 648b725c..f62deb65 100644
--- a/secrets/hosting.de-api-key.age
+++ b/secrets/hosting.de-api-key.age
@@ -1,21 +1,24 @@
 age-encryption.org/v1
--> ssh-ed25519 Y0ZZaw mpeEJ0Pmd9BR/HQ6tcY4H38pCNrel+8L6WgnPj77ByQ
-UdF11WoYedaNjDwLhGplUlHYtAW9wSTLrf6BMSQGXa8
--> ssh-ed25519 BVsyTA V8CrvHHBOPuJE6xqdQlC+dLoc5CU625aysWOk8oS6Sw
-jJtQYWFVhCwwBGpQph8WNKPNLWrXiJVJj05EY0PZFzw
+-> ssh-ed25519 Y0ZZaw 20k6EMk3iFO98VaGMQVxAxLuCIKp8M8DN3SucCtNNlM
+Za5+geQFA/CVkj/IADKmrj3EIsKcj4l9jETuvQbApCE
+-> ssh-ed25519 BVsyTA vqpU3pzGierKMAKK0Gn/xvEkdebGgfahP5CmRE8tZTY
+ZsmYvYgFzOL2PL1mLJ8vwoWiT1bngJq1Y4P3MBYcbbI
 -> ssh-rsa kFDS0A
-QXSYUXN04FSQofXobqNcPEApTKsDcUJV6eXYpS+9HffRE1PDt5JKRXWMk+3RMw0Z
-fBlWPBMmS4M/letqH3PHG1gFv6MFrGaddfJbZo4FYUzMNeT+Fh5ZWM2bQO6iczd9
-WUYYKonOzgRd8Nwg3DAHxJ8zXzocHp6F+cAqnw4y1ou50erVDMEIQ+wc16R8yT3t
-OEKfz2Vr8FadAsCw2JBqouwyvdM6bd/+AjnJZbFrIq/gKlgIe0KuSZK1lr08v2aL
-Nbk0bykb83N22kIG7kecYuY9Tz/Jh0geotkti7MIcsLez6OQW0+IC9bDZ/Swl/Cb
-oXJdrjRCZipD1PKGdxzyb+bXZHmk778kc9WHB8NRas8ICFcOS0Pu0JMjhEfU2rER
-QQoYAmk1mmJGDW1DVv90VUb2RokpF6QuzgIjfJUi7R7JLPcahBvfJRa8gytC33OP
-Nr733zR5NP06b3LMdjjUyiYyf0cyZG9Qxra8aN2kAlT/mHZe+v9m4piHrJ1b+j73
-pyZPNa9w5AXl942fV5DbERRpXtP1kc3bO776All8X7ARy5GaHpHmvmEE1ooDhicS
-iSvEm5c/BvgTBijXqsXk/SkIoFiLrGQ4wkTjNpeTsX25ghZc1W5gHrcDY7QtdDLz
-RotNg5klu2XZR5mB7hFPUoXwGhwYc5l1mf05/2tEkVs
--> E>o)tKn-grease T9%P;\g
-y6At0SwlBQ5jKI7Rj9ceRCqW3gH+b+7K0rLp0w
---- ABiFxl1ZHUSZJPkagpG0QNgvWeWrJsBtCvDImCQHULQ
-a$���t/�\�h���PD߸A��y�]��p��F#H�M%�g�3p)^��c~]���PK��4:���,c�F��5�Ɖ�
\ No newline at end of file
+chQyiXGW3eND86nYKKZVX3Tr3MKVYJXoQccbYn5yGEmXw17U67z2YgbgXcKJGszE
+FiOKe6fWCbrnCi/GkktM+bbnbJtfCOFK/J2VlVQrHScibel0z4+yd0aeH02EVHla
+34vcv2Tdi09BVn5Me2Gh94/CKgzAiIIHmvDfYFsBZNQOalAbn0PvpHFJcVnf2DsR
+bVgOKL8l4mHz/gihI5cCr5snz3ClhHv/aFbTR2QpHPKAfz5aRi0pe9phpqv9TDb9
+3taeIDZ2dIVpASyqIBxzxzep6liJrupldmQQGpzleKpRfqPWrM5BAmMHr6/LiP24
+caHaP7SOVTr1s1wo4Qh8x97LrXYe2AEmJogteoLJddYYgqYhJuoCS62dDbyry32D
+3BHJTcxl2OsgFDP9Q9uABhwNExdu9z7ohbvyOwZ3ZkgEbpFOKPAOExKK0FV6C5R3
+nKox0yPZGIsTP0wjjyWlZAwUkNIj1m5gXL6l3h4930EnPZFe7vg+lfC/4v2V21pE
+l5U1a+LqBzOk7qCgVgtbAZZEIvK8s0kZYLmPmtMyjIm/mnl6yxY80Kwf6oTlb6KN
+bFopzuBfmCZk3hVzkrVDmpxpWTcFclSG7H/R+1SSibHOL0RcLuULhrVHd4qOPYrQ
+I4jDt3nmUKU1si1IhOQe20NKG3DokMGDQk3balKIMfU
+-> ssh-ed25519 cakP9w zXYz3ME+JJqwpWGFlnHzTxNTvpGMXAZB00rrh0MN1wc
+tgNVf1JJWPkU7TxYcakGE+omp1fNqwXVzyQBpPAdVCU
+-> Sq|yWUT-grease N>}A9
+TvMfldFuvLXmFvEmgZTd8zXY2iH9Sw
+--- jyypo7T4RplBaZ94/suJgMliWbt4tQNMhrDUv/YMaYE
+� �S=�8���Ƹk�C��U܎�2e�X}$G-o؞C�l=��Q
��_����r)�d�yH�iǐ[*a�� R��
+X
\ No newline at end of file
diff --git a/secrets/hosting.de-api.key b/secrets/hosting.de-api.key
deleted file mode 100644
index 32c936ba..00000000
--- a/secrets/hosting.de-api.key
+++ /dev/null
@@ -1,20 +0,0 @@
-age-encryption.org/v1
--> ssh-rsa kFDS0A
-MLbUT2OZ5uLq2uC4GdBNhQqrN8BjF3FibWT5NpfcL+ryr5wI1HfHnTINQR1SfcP6
-e7YF2+lJXiI+Clp+V3/eG5mDMXo358lr1usQPo3AJp0L/F+ZXuYgXIYgp/H6CpX7
-ztVM3BavlwvKibiFzpJVESIQW/aMp+fotTG5BBCzQ9P5ejpRCyBnw023VXG4bul6
-kSBbjaclmXAB/kErB/CBrQX8khYzy/sPWMeyKfNpQNRebwHfwifSKtwvl9CrII0S
-6UAK6oKhi+5heqCtn0t2ToY+Jo9ccMjf1tKuQkUkT9gxJqalYakK9Z/Cn1YjteS1
-/QBE+pVNJYtqeND2kWoh7GDgHMN3RpSOZTTfLYWMatfwdZn78y5Qnri6GxKMMpcH
-HJjFR3/u08sa5Z6QJN5ajMCze5QEVCfkbP7OUvdD77JagoR2TGphJXHWuHBBjNT0
-67GnaVjtjBSkPc2wHaB9jXCLcpkYtx2JwvcYIBmyzu+uw3dVXekT54dXMckW04B9
-2A+zH35yNX7cG1BdAaqXsj0q8XHLi+ZyyZBB/OSXFaz07JI8Uo7V17MU6N+yFCbn
-UeIh82gingQU1+OBRSi1Qbee76RqRGOB9oJywxWYoj0tfCb5j+CW0UH18rKRCy1p
-nbyIY2mp1pVMVnkv+UH5HDJZYTVt6H8HllKZcqy8tUQ
--> ssh-ed25519 cakP9w r7YM3I761Ly8mdPE5Aue4piOtU2WuBCX/ZkuODcC11E
-+FGBvDNQiChuuYWGzo9lKiFGWtkGpd+h+zbi0fjR610
--> f(eo)$--grease = zT<uk K? Ijd3$!v
-H/OGi9ibCTdNA59VlE4PWHH0sxeAehnSHPboQdGqc+mRBWhmyhuN0flH0lSc+Psq
-NM0a5Cwz6j3FYrQDi2H20oFCLCaHNm4UDkzMhhL/0UYvgQ
---- OBqMSFnHs3uuRccjWbid3GxwdVDy+5rbWohAFal4HGM
-���]y�=�0��Y҆���jQ�Z�Ӏ^���B��-$'mą�֍ݵ��:R�/M{^�ƬDdzlFGo]�`����D��
\ No newline at end of file
diff --git a/secrets/keycloak-database-password.age b/secrets/keycloak-database-password.age
index 4520312c..c2e173a8 100644
Binary files a/secrets/keycloak-database-password.age and b/secrets/keycloak-database-password.age differ
diff --git a/secrets/mailman-core-secrets.age b/secrets/mailman-core-secrets.age
index b5675c23..7947b084 100644
Binary files a/secrets/mailman-core-secrets.age and b/secrets/mailman-core-secrets.age differ
diff --git a/secrets/mailman-db-secrets.age b/secrets/mailman-db-secrets.age
index 9a8581be..43583dfc 100644
Binary files a/secrets/mailman-db-secrets.age and b/secrets/mailman-db-secrets.age differ
diff --git a/secrets/mailman-web-secrets.age b/secrets/mailman-web-secrets.age
index a3157552..1306822b 100644
Binary files a/secrets/mailman-web-secrets.age and b/secrets/mailman-web-secrets.age differ
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 303427b6..37607b93 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -3,16 +3,20 @@ let
   b12f-bbcom = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmXpOU6vzQiVSSYCoxHYv7wDxC63Qg3dxlAMR6AOzwIABCU5PFFNcO0NWYms/YR7MOViorl+19LCLRABar9JgHU1n+uqxKV6eGph3OPeMp5sN8LAh7C9N+TZj8iJzBxQ3ch+Z/LdmLRwYNJ7KSUI+gwGK6xRS3+z1022Y4P0G0sx7IeCBl4lealQEIIF10ZOfjUdBcLQar7XTc5AxyGKnHCerXHRtccCoadLQujk0AvPXbv3Ma4JwX9X++AnCWRWakqS5UInu2tGuZ/6Hrjd2a9AKWjTaBVDcbYqCvY4XVuMj2/A2bCceFBaoi41apybSk26FSFTU4qiEUNQ6lxeOwG4+1NCXyHe2bGI4VyoxinDYa8vLLzXIRfTRA0qoGfCweXNeWPf0jMqASkUKaSOH5Ot7O5ps34r0j9pWzavDid8QeKJPyhxKuF1a5G4iBEZ0O9vuti60dPSjJPci9oTxbune2/jb7Sa0yO06DtLFJ2ncr5f70s/BDxKk4XIwQLy+KsvzlQEGdY8yA6xv28bOGxL3sQ0HE2pDTsvIbAisVOKzdJeolStL9MM5W8Hg0r/KkGj2bg0TfoRp1xHV9hjKkvJrsQ6okaPvNFeZq0HXzPhWMOVQ+/46z80uaQ1ByRLr3FTwuWJ7F/73ndfxiq6bDE4z2Ji0vOjeWJm6HCxTdGw==";
   teutat3s-dumpyourvms = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHcU6KPy4b1MQXd6EJhcYwbJu7E+0IrBZF/IP6T7gbMf teutat3s@dumpyourvms";
   flora-6 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGP1InpTBN4AlF/4V8HHumAMLJzeO8DpzjUv9Co/+J09 root@pub-solar-infra-vm-1";
+  nougat-2-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINELr5Bvr15GqCHevg9QP8oYFgmaRUUHcPFf4MZho9gI root@nougat-2";
 
   allKeys = [
     flora-6
     teutat3s-dumpyourvms
     b12f-bbcom
+    nougat-2-host
   ];
+
   deployKeys = [
     flora-6
     teutat3s-dumpyourvms
     b12f-bbcom
+    nougat-2-host
   ];
 in {
   "gitea-database-password.age".publicKeys = deployKeys;