diff --git a/hosts/manatee/configuration.nix b/hosts/manatee/configuration.nix
index e979561..711e323 100644
--- a/hosts/manatee/configuration.nix
+++ b/hosts/manatee/configuration.nix
@@ -16,7 +16,10 @@
   users.users.alex = {
     isNormalUser = true;
     description = "alex";
-    extraGroups = [ "wheel" ];
+    extraGroups = [
+      "wheel"
+      "storage"
+    ];
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/hosts/manatee/disk-config.nix b/hosts/manatee/disk-config.nix
index 8be3500..d7fffe1 100644
--- a/hosts/manatee/disk-config.nix
+++ b/hosts/manatee/disk-config.nix
@@ -3,6 +3,25 @@
   imports = [ inputs.disko.nixosModules.disko ];
 
   config = {
+    users.groups.storage = { };
+    users.users.storage = {
+      isSystemUser = true;
+      description = "storage";
+      group = "storage";
+    };
+
+    systemd.tmpfiles.settings = {
+      "10-media-public" = {
+        "/mnt/media/public" = {
+          d = {
+            user = "storage";
+            group = "storage";
+            mode = "0775";
+          };
+        };
+      };
+    };
+
     networking.hostId = "0a9474e7"; # Required by ZFS
     disko.devices = {
       disk = {