diff --git a/hosts/modules/networking.nix b/hosts/modules/networking.nix
index 30dd7b5..d80f42e 100644
--- a/hosts/modules/networking.nix
+++ b/hosts/modules/networking.nix
@@ -12,17 +12,6 @@
         networkmanager.enable = true;
         firewall.enable = true;
       };
-
-      services = {
-        tailscale = {
-          enable = true;
-          extraUpFlags = [ "--operator=user" ];
-        };
-        openssh = {
-          enable = true;
-          settings.PermitRootLogin = "no";
-        };
-      };
     }
 
     # Server specific configuration
diff --git a/hosts/modules/services.nix b/hosts/modules/services.nix
index b957a97..85939f7 100644
--- a/hosts/modules/services.nix
+++ b/hosts/modules/services.nix
@@ -10,6 +10,14 @@
     # Common configuration
     {
       services = {
+        tailscale = {
+          enable = true;
+          extraUpFlags = [ "--operator=user" ];
+        };
+        openssh = {
+          enable = true;
+          settings.PermitRootLogin = "no";
+        };
         fwupd.enable = true;
         fstrim.enable = true;
       };
diff --git a/secrets/nextcloud-adminpass.age b/secrets/nextcloud-adminpass.age
deleted file mode 100644
index 4adb2b1..0000000
--- a/secrets/nextcloud-adminpass.age
+++ /dev/null
@@ -1,13 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 hi+lKA KUVC7m5ch8uuseBHHPCspWWdSAs+3YK+LvBL7h14UT8
-8h5Tu47UJ/6wJZaEjB0KhUKZ8yw3FgwWv9Dem4ivgVI
--> ssh-ed25519 SP9f6A IDnNmcjBKTiNWnBPw7mAuycOfzvj1bGi30OLi/mN+AA
-xE9drPCFvOi8v74zqUuCOc9DOFnzfwFfoa0O84JHonA
--> ssh-ed25519 8YSAiw vWnYElIL2jh/LmxZKFFGE/8H1o+bOnGsGxQ3UZ02FE8
-c6e/c1a1cUa6FPDaUYHeY50WB5E1cq398AgwVs421EA
--> ssh-ed25519 3Chb7w iDSXb9BYJ/2EUJx77Uch3eFYukxTD5nHbdU+iTBWXkk
-QBrCOSmjKeX0giQxYGMHinOeTrDs9ZGmdjThxEvyXn0
--> ssh-ed25519 J6tVTA tZ5yMoYaLdgs0WoaRju3h+zfKSCrYoYO7aDcmnNta3s
-seYPrbd8PmVZJKSltp4qI7i137be01ydWhkdOPP7Zzw
---- LElLg1Mrmw0iExirSvb6KWSA8bugbVggM2RwZSWlWGM
-]��͠l�0����dN�n�ݾ05���7��8qƈK�ƌ�_#̓a�gXDC:L�6̾R�魧�
\ No newline at end of file
diff --git a/secrets/nextcloud-secrets.json.age b/secrets/nextcloud-secrets.json.age
deleted file mode 100644
index 3860d4e..0000000
--- a/secrets/nextcloud-secrets.json.age
+++ /dev/null
@@ -1,13 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 hi+lKA dt/gmE1ljEV6eiU4cyqy+v49mtjlm/qnkV3D5OCbUFI
-LkRedLe6Qf8J5MeH+DNVmeuFyHHjDeYyrjoyzPmqZyI
--> ssh-ed25519 SP9f6A rossSD9Dk/BE9ujDcJY/CdVu5Pm5mLyKBFLpBERu+g0
-g6bnR5N9eC50gbd48rijisF6WLYBtoDi4CSLPBkfiw0
--> ssh-ed25519 8YSAiw s+i/kWBUvnSEDN93MCO9QSIXnQi02zT+vdBVB8rbAV4
-n4mWFllh8dCW8DVP9R/m6KIuprZnLRbGQ/wjFmhEZx8
--> ssh-ed25519 3Chb7w c0WkS3MPTAmcHTKMsfoL2mZKF9rJ/oU48noL00UEAjc
-AL0b7xrfd9Ll4v/o0dLkic+YsKBiQxyFFKggXsQfM04
--> ssh-ed25519 J6tVTA ZM+AOwYRTovNJnwe2wdUm9KU6Lj44rgBvthwHSFwDng
-DJweE//ogMciRmy0GTj8zDRzItRtlfTkBynRSBDr3ks
---- dNCLx3d9i125QQqdsQVnwdN9QMLU+MWx2KjYFKFv5lU
-��{�
�6EjrT���g�+���I����?���*
xu'�$�>U4��QBDĠ"SI�q�A|��v5�x�Jd��HھI6��$�'�7�(�q{���[��.��I*P����<Ĭ��/�_|y�x͙�p*��x��X
\ No newline at end of file
diff --git a/secrets/paperless.age b/secrets/paperless.age
deleted file mode 100644
index 01199b7..0000000
--- a/secrets/paperless.age
+++ /dev/null
@@ -1,13 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 hi+lKA 3Oayrcg8bbzLNyuFqv8J0W9IJXL9SttFfU9yyysoD2Y
-Uoxk9Ns1TwreeCyJ/7Euyqn57DY1spd6j3oZDqL65X0
--> ssh-ed25519 SP9f6A FInq9erSMD008Le4Va/28fAPXnTLSWioYWsTBlkJg2k
-SG9fEh+eLnUHcC36PHZbkD+pQVRX4RLJj1vxMeSKdNk
--> ssh-ed25519 8YSAiw hOqCc9a6K7RAwD1CY7uQ4se4mynx0z4AmoNhxmWJtQg
-j+MYuftCyA7RDlzUciTxFyd/Esqzxpcm+ccKu4NNrmU
--> ssh-ed25519 3Chb7w oCX+CYB+fobvBy/5EcUJMxzwkwA+gQOY2tq17Ui68nw
-B1feop9p1RDBXCyBCxIMZyd++QM2dnDrU12m6rwz5/4
--> ssh-ed25519 J6tVTA PXVULNtK26OEKApHzOM2o6odRQNa9KbzjmAh2xgkHk4
-GLSEROgoiNVIVUhSpZWlg6q62GJHXRNsi1t7OwRw5MM
---- ddMx67t9wQFDJUlwFCDPvsUAR/JRUNweS28Erojuw8A
-5��/��d}+�cZ�M���{�-jo��(�U����Y{�oa|˨~���4�xPހ
\ No newline at end of file
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 6feadc4..88edf82 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,5 +1,5 @@
 let
-  io-user = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKcwF1yuWEfYGScNocEbs0AmGxyTIzGc4/IhpU587SJE";
+  io-user = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO3Y0PVpGfJHonqDS7qoCFhqzUvqGq9I9sax+F9e/5cs";
   io-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCIrKJk5zWzWEHvLMPMK8T3PyeBjsCsqzxPN+OrXfhA";
   io = [
     io-user
@@ -7,7 +7,7 @@ let
   ];
 
   rotterdam-user = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA1v3+q3EaruiiStWjubEJWvtejam/r41uoOpCdwJtLL";
-  rotterdam-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK7zAxgU8LNi5/O5XgoOcLKjbNMmO2S7jAuCI9Nr/V4v";
+  rotterdam-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjXcqQqlu03x2VVTdWOyxtKRszXAKX0AxTkGvF1oeJL";
   rotterdam = [
     rotterdam-user
     rotterdam-host
@@ -21,8 +21,5 @@ let
   all-hosts = desktops ++ servers;
 in
 {
-  "nextcloud-secrets.json.age".publicKeys = all-hosts;
-  "nextcloud-adminpass.age".publicKeys = all-hosts;
   "cloudflare.age".publicKeys = all-hosts;
-  "paperless.age".publicKeys = all-hosts;
 }