diff --git a/modules/cli/spotify.nix b/modules/cli/spotify.nix
index 524e2b3..ba68eb7 100644
--- a/modules/cli/spotify.nix
+++ b/modules/cli/spotify.nix
@@ -1,6 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
+  age.secrets.spotifyd = {
+    file = ../../secrets/spotifyd.age;
+    owner = "1000";
+  };
   home-manager.users.moritz = {
     home.packages = with pkgs; [ spotify-tui sptlrx ];
     services.spotifyd = {
diff --git a/modules/services/agenix.nix b/modules/services/agenix.nix
index d86ebc8..88da66a 100644
--- a/modules/services/agenix.nix
+++ b/modules/services/agenix.nix
@@ -7,24 +7,5 @@
       file = ../../secrets/nordvpn.age;
       owner = "1000";
     };
-    davfs = {
-      file = ../../secrets/davfs.age;
-      mode = "600";
-      path = "/etc/davfs2/secrets";
-    };
-    smbMoritz.file = ../../secrets/smbMoritz.age;
-    smbMedia.file = ../../secrets/smbMedia.age;
-    spotifyd = {
-      file = ../../secrets/spotifyd.age;
-      owner = "1000";
-    };
-    homeVPN = {
-      file = ../../secrets/home-vpn.age;
-      owner = "1000";
-    };
-    homeVPNPassword = {
-      file = ../../secrets/home-vpn-password.age;
-      owner = "1000";
-    };
   };
 }
diff --git a/modules/services/openvpn.nix b/modules/services/openvpn.nix
index 50745df..a7090d5 100644
--- a/modules/services/openvpn.nix
+++ b/modules/services/openvpn.nix
@@ -1,6 +1,16 @@
 { config, lib, pkgs, ... }:
 
 {
+  age.secrets = {
+    homeVPN = {
+      file = ../../secrets/home-vpn.age;
+      owner = "1000";
+    };
+    homeVPNPassword = {
+      file = ../../secrets/home-vpn-password.age;
+      owner = "1000";
+    };
+  };
   services.openvpn.servers = {
     homeVPN = {
       config = "config /run/agenix/homeVPN ";
diff --git a/secrets/davfs.age b/secrets/davfs.age
deleted file mode 100644
index 7e4b937..0000000
Binary files a/secrets/davfs.age and /dev/null differ
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 8b98914..70a7298 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -10,9 +10,6 @@ let
   hosts = [ nixos-laptop nixos-desktop ];
 in {
   "nordvpn.age".publicKeys = users ++ hosts;
-  "davfs.age".publicKeys = users ++ hosts;
-  "smbMoritz.age".publicKeys = users ++ hosts;
-  "smbMedia.age".publicKeys = users ++ hosts;
   "spotifyd.age".publicKeys = users ++ hosts;
   "email-desktop.age".publicKeys = users ++ hosts;
   "email-laptop.age".publicKeys = users ++ hosts;
diff --git a/secrets/smbMedia.age b/secrets/smbMedia.age
deleted file mode 100644
index 7e4624c..0000000
--- a/secrets/smbMedia.age
+++ /dev/null
@@ -1,12 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 ZYd7Zg ZSzrad3yohMhlM8+Tdr+LjTUqzxd7uXr6udffNjsYS4
-0WVNLdXmw0BX1L2Oa1f5h0/16KLZ9Tlw3XOj/50Jvrc
--> ssh-ed25519 wG6LYg T5TU592Q/oERkYzgj80V3DxU9E8LUIDVxJts09sBXwk
-ospPAH+10LCuhDDVk0d9m6ONwDRaQusv54P0DtRbzz8
--> ssh-ed25519 CjuqfA lOZt3LmXW0PKYELNl7WbUd3AoQte4YPnUvw6WEU9wW0
-X6q1zv9m9zCJWM6cYjagOOzA/ESVQRSEHvlnwRHJx7U
--> :>-grease
-ykOwD1jnYtkqqBx/YxyrUbr6AiQjzU7bug
---- FJNBXl9G9I7m9B1gBd56H6hGYTVmcxEnrNGRreU07OA
-�٧-�3���c=�P��UnS�E�
-��+��󴎄�Ůw=#��
��L?tŖ7�S�d��0�R���s�<����T���͘��i��Q��
\ No newline at end of file
diff --git a/secrets/smbMoritz.age b/secrets/smbMoritz.age
deleted file mode 100644
index efda958..0000000
Binary files a/secrets/smbMoritz.age and /dev/null differ