diff --git a/hosts/koi/configuration.nix b/hosts/koi/configuration.nix
index 36a1132..28c9faa 100755
--- a/hosts/koi/configuration.nix
+++ b/hosts/koi/configuration.nix
@@ -28,7 +28,7 @@
     ./containers/verdaccio
     ./containers/sharkey
     ./containers/pds
-    ./containers/navidrome
+    # ./containers/navidrome
     ./containers/conduwuit
     ./containers/zond
     ./containers/kanidm
diff --git a/hosts/koi/containers/memos/default.nix b/hosts/koi/containers/memos/default.nix
index 8a604d1..61d7650 100644
--- a/hosts/koi/containers/memos/default.nix
+++ b/hosts/koi/containers/memos/default.nix
@@ -14,10 +14,11 @@ in {
   services.postgresql.ensureDatabases = [ "memos" ];
   desu.postgresql.ensurePasswords.memos = "memos";
 
+  systemd.services.docker-memos.after = [ "postgresql.service" ];
   virtualisation.oci-containers.containers.memos = {
     image = "neosmemo/memos:0.22.5";
     volumes = [
-      "/srv/memos/data:/var/opt/memoss"
+      "/srv/memos/data:/var/opt/memos"
     ];
 
     environment = {
diff --git a/hosts/koi/containers/pds/default.nix b/hosts/koi/containers/pds/default.nix
index a6074c4..144fc3e 100644
--- a/hosts/koi/containers/pds/default.nix
+++ b/hosts/koi/containers/pds/default.nix
@@ -23,7 +23,7 @@ in {
     image = "ghcr.io/bluesky-social/pds:sha-b595125a28368fa52d12d3b6ca265c1bea06977f";
     volumes = [
       "/srv/bluesky-pds/data:/pds"
-      "/mnt/puffer/bluesky-pds:/blobstore"
+      "/srv/bluesky-pds/blobstore:/blobstore"
     ];
     environment = {
       PDS_HOSTNAME = "pds.stupid.fish";
@@ -46,8 +46,7 @@ in {
   };
 
   systemd.tmpfiles.rules = [
-    "d /mnt/puffer/bluesky-pds 0700 ${builtins.toString UID} ${builtins.toString UID} -"
-    "d /srv/bluesky-pds/data 0700 ${builtins.toString UID} ${builtins.toString UID} -"
+    "d /srv/bluesky-pds 0700 ${builtins.toString UID} ${builtins.toString UID} -"
   ];
 
   services.nginx.virtualHosts."pds.stupid.fish" = {
diff --git a/hosts/koi/containers/sharkey/default.nix b/hosts/koi/containers/sharkey/default.nix
index e9f660c..b0bb363 100644
--- a/hosts/koi/containers/sharkey/default.nix
+++ b/hosts/koi/containers/sharkey/default.nix
@@ -12,7 +12,6 @@ in {
   };
 
   systemd.tmpfiles.rules = [
-    "d /mnt/puffer/Sharkey 0777 root root -"
     "d /srv/Sharkey 0777 root root -"
   ];
 
@@ -55,7 +54,7 @@ in {
     dependsOn = [ "sharkey-redis" "sharkey-meili" ];
     image = "local/sharkey";
     volumes = [
-      "/mnt/puffer/Sharkey/files:/sharkey/files"
+      "/srv/Sharkey/files:/sharkey/files"
       "${context}/.config:/sharkey/.config:ro"
     ];
     environment = {
diff --git a/hosts/koi/hardware-configuration.nix b/hosts/koi/hardware-configuration.nix
index a5641de..f9417f0 100755
--- a/hosts/koi/hardware-configuration.nix
+++ b/hosts/koi/hardware-configuration.nix
@@ -1,16 +1,9 @@
 { config, abs, lib, pkgs, modulesPath, ... }@inputs:
 
-let
-  systemd = import (abs "lib/systemd.nix") inputs;
-in
 {
   imports =
     [
       (modulesPath + "/installer/scan/not-detected.nix")
-      (systemd.mkOneshot {
-        name = "puffer-spindown";
-        script = "${pkgs.hdparm}/bin/hdparm -S 120 /dev/disk/by-uuid/42d1c1e4-57c8-4249-b6e7-1233803b3798";
-      })
     ];
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "uas" "usb_storage" "sd_mod" "tpm_crb" ];
@@ -24,7 +17,7 @@ in
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/5DAC-EE9F";
+    device = "/dev/disk/by-path/pci-0000:01:00.0-nvme-1-part1";
     fsType = "vfat";
   };
 
@@ -37,12 +30,12 @@ in
   swapDevices =
     [{ device = "/dev/disk/by-uuid/c418bb69-15cf-4d47-b9a0-0cf7191551da"; }];
   boot.initrd.luks.devices.root = {
-    device = "/dev/disk/by-uuid/57d168a4-2bc6-4f6c-9cd6-d2d5c775de7d";
+    device = "/dev/disk/by-path/pci-0000:01:00.0-nvme-1-part2";
     preLVM = true;
     allowDiscards = true;
   };
   boot.initrd.luks.devices.puffer = {
-    device = "/dev/disk/by-uuid/42d1c1e4-57c8-4249-b6e7-1233803b3798";
+    device = "/dev/disk/by-path/pci-0000:04:00.3-usb-0:4:1.0-scsi-0:0:0:0-part1";
     preLVM = true;
     allowDiscards = true;
   };
diff --git a/secrets/sftpgo-env.age b/secrets/sftpgo-env.age
index 59d3ab8..06a18d4 100644
Binary files a/secrets/sftpgo-env.age and b/secrets/sftpgo-env.age differ
diff --git a/secrets/wakapi-env.age b/secrets/wakapi-env.age
new file mode 100644
index 0000000..36de9f6
--- /dev/null
+++ b/secrets/wakapi-env.age
@@ -0,0 +1,5 @@
+age-encryption.org/v1
+-> ssh-ed25519 sj88Xw 0dsWtTkNn9CqLCL8nBWocyI6IW2vmYqqAkMDA60p3Ug
+EW7SroMig6Eeu7fRFFKxW88DBQq5U0pauTdyVYqrKco
+--- aWUxVGpwYt8F8TFCTaRbHfItYrV4Izvps/9mssb6q2Q
+՟�c}
�F�A����4�݃cVrʧRgb��~,�w0ɤ1���%�|��ؑv�(������bw�L�N��Qb0@�#�LwE}R���**nc7|ua<����>t���5�2�][��������'j}��%
\ No newline at end of file