diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix
index 66e9200..906e808 100644
--- a/nixos/hosts/wheatley/configuration.nix
+++ b/nixos/hosts/wheatley/configuration.nix
@@ -6,11 +6,7 @@
   config,
   modulesPath,
   ...
-}: let
-  davfsconf = pkgs.writeText "davfs.conf" ''
-    secrets ${config.sops.secrets."webdav-secret".path}
-  '';
-in {
+}: {
   imports = [
     # inputs.nixos-hardware.nixosModules.raspberry-pi-4
     (modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
@@ -76,21 +72,27 @@ in {
     prowlarr.enable = true;
   };
 
-  sops.secrets."webdav-secret".mode = "0600";
-  sops.secrets."webdav-secret".owner = config.users.users.root.name;
-
-  services.davfs2.enable = true;
-  services.autofs = {
-    enable = true;
-    autoMaster = let
-      mapConf = pkgs.writeText "auto" ''
-        nextcloud -fstype=davfs,conf=${davfsconf},uid=jellyfinmediaplayer,gid=jellyfinmediaplayer :https\:nextcloud.gladtherescake.eu/remote.php/dav/files/GLaDTheresCake
-      '';
-    in ''
-      /home/jellyfinmediaplayer/ file:${mapConf}
-    '';
+  sops.secrets."webdav-secret" = {
+    mode = "0600";
+    owner = config.users.users.root.name;
+    path = "/etc/davfs2/secrets";
   };
 
+  systemd.mounts = [
+    {
+      enable = true;
+      description = "Webdav mount point";
+      after = ["network-online.target"];
+      wants = ["network-online.target"];
+
+      what = "https://gladtherescake.eu/remote.php/dav/files/GLaDTheresCake";
+      where = "/home/jellyfinmediaplayer/nextcloud";
+      options = "uid=1003,gid=1003,file_mode=0664,dir_mode=2775";
+      type = "davfs";
+      mountConfig.TimeoutSec = 15;
+    }
+  ];
+
   #uses port 8096
   services.jellyfin.enable = true;
   users.groups.jellyfinmediaplayer = {};