diff --git a/modules/system/homelab/docs.nix b/modules/system/homelab/docs.nix
index fad718c..2d9ff74 100644
--- a/modules/system/homelab/docs.nix
+++ b/modules/system/homelab/docs.nix
@@ -3,6 +3,10 @@
   sandbox = "docs-sandbox.${homelab.domain}";
   data-dir = "/mnt/data/apps/cryptpad";
 in {
+  systemd.tmpfiles.rules = [
+    "d ${data-dir} 0750 cryptpad cryptpad -"
+  ];
+
   services.cryptpad = {
     enable = true;
     settings = {
@@ -12,12 +16,16 @@ in {
       httpSafeOrigin = "https://${sandbox}";
       blockDailyCheck = true;
       disableIntegratedEviction = true;
+      archivePath = "${data-dir}/archive";
+      pinPath = "${data-dir}/pins";
+      taskPath = "${data-dir}/tasks";
+      blockPath = "${data-dir}/block";
+      blobPath = "${data-dir}/blob";
+      blobStagingPath = "${data-dir}/blobstage";
+      decreePath = "${data-dir}/decrees";
+      logPath = "${data-dir}/logs";
     };
   };
-  
-  fileSystems."/var/lib/cryptpad" = {
-    device = "/mnt/data/apps/cryptpad";
-    dependsOn = [ "/mnt/data" ]; 
-    options = [ "bind" "nofail" ];
-  };
+
+  systemd.services.cryptpad.serviceConfig.ReadWritePaths = [ data-dir ];
 }
diff --git a/modules/system/homelab/pass.nix b/modules/system/homelab/pass.nix
index 86a4707..028f99d 100644
--- a/modules/system/homelab/pass.nix
+++ b/modules/system/homelab/pass.nix
@@ -5,15 +5,10 @@
     backupDir = "/mnt/data/apps/vaultwarden/backups";
     environmentFile = "/mnt/data/apps/vaultwarden/.env";
     config = {
+      DATA_FOLDER = "/mnt/data/apps/vaultwarden/data";
       ROCKET_PORT = 8060;
       ROCKET_ADDRESS = "127.0.0.1";
       ROCKET_LOG = "critical";
     };
   };
-  
-  fileSystems."/var/lib/vaultwarden" = {
-    device = "/mnt/data/apps/vaultwarden/data";
-    dependsOn = [ "/mnt/data" ];
-    options = [ "bind" "nofail" ];
-  };
 }
\ No newline at end of file