diff --git a/hosts/sora/services/davfs.nix b/hosts/sora/services/davfs.nix
deleted file mode 100644
index 14c1d20..0000000
--- a/hosts/sora/services/davfs.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = [pkgs.davfs2];
-  users.users.davfs2 = {
-    group = "davfs2";
-    isSystemUser = true;
-  };
-  users.groups.davfs2 = {};
-  sops.secrets.davfs2 = {
-    owner = "root";
-    group = "root";
-    mode = "0600";
-    path = "/etc/davfs2/secrets";
-  };
-
-  fileSystems."/var/lib/mounted" = {
-    device = "https://u384391.your-storagebox.de";
-    fsType = "davfs";
-    options = ["rw,file_mode=0660,dir_mode=0755" "0" "0"];
-  };
-}
diff --git a/hosts/sora/services/default.nix b/hosts/sora/services/default.nix
index f751df5..3396275 100644
--- a/hosts/sora/services/default.nix
+++ b/hosts/sora/services/default.nix
@@ -6,7 +6,6 @@
     ./ntfy-sh.nix
     ./tailscale.nix
     ./attic.nix
-    ./minio.nix
     ./factorio.nix
     # ./minecraft.nix
     # ./foundryvtt.nix
diff --git a/hosts/sora/services/minio.nix b/hosts/sora/services/minio.nix
deleted file mode 100644
index 341f8ff..0000000
--- a/hosts/sora/services/minio.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [
-    ./davfs.nix
-  ];
-  environment.systemPackages = [pkgs.minio-client];
-  sops.secrets.minio = {
-    owner = "minio";
-    group = "minio";
-    mode = "0600";
-    restartUnits = ["minio.service"];
-  };
-  services.minio = {
-    enable = true;
-    region = "us-east-1";
-    consoleAddress = "100.104.42.96:9006";
-    listenAddress = "100.104.42.96:9005";
-    rootCredentialsFile = config.sops.secrets.minio.path;
-    dataDir = ["/var/lib/mounted/minio/data"];
-    configDir = "/var/lib/mounted/minio/config";
-  };
-}
diff --git a/hosts/sora/services/neko.nix b/hosts/sora/services/neko.nix
deleted file mode 100644
index 89a2ee1..0000000
--- a/hosts/sora/services/neko.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-_: {
-  sops.secrets.neko-admin = {};
-  networking.firewall.allowedTCPPorts = [8085];
-  networking.firewall.allowedUDPPorts = [52000 52100];
-  virtualisation.oci-containers.containers.neko = {
-    image = "m1k1o/neko:firefox";
-    ports = [
-      "8085:8080"
-      "52000-52100:52000-52100/udp"
-    ];
-    environment = {
-      NEKO_SCREEN = "1600x900@60";
-      NEKO_PASSWORD = "forsen";
-      NEKO_EPR = "52000-52100";
-      NEKO_NAT1TO1 = "5.161.102.107";
-      NEKO_CONTROL_PROTECTION = "true";
-      NEKO_VIDEO_CODEC = "vp8";
-    };
-    environmentFiles = [
-      /run/secrets/neko-admin
-    ];
-  };
-}
diff --git a/hosts/sora/services/tailscale.nix b/hosts/sora/services/tailscale.nix
index a4cbe46..f2add0b 100644
--- a/hosts/sora/services/tailscale.nix
+++ b/hosts/sora/services/tailscale.nix
@@ -4,7 +4,9 @@
   pkgs,
   ...
 }: {
-  sops.secrets.tsauth-sora = {};
+  sops.secrets.tsauth-sora = {
+    sopsFile = ../../../secrets/tailscale/secrets.yaml;
+  };
   environment.systemPackages = [pkgs.jq pkgs.tailscale];
   services.tailscale = {
     useRoutingFeatures = lib.mkDefault "server"; # important to make it a server, it sets sysctl for ip forwarding without intervention and reboot