diff --git a/services/samba/home-pc.nix b/services/samba/home-pc.nix
index 56a1448..b7224e5 100644
--- a/services/samba/home-pc.nix
+++ b/services/samba/home-pc.nix
@@ -15,7 +15,10 @@
       "x-systemd.mount-timeout=5s"
 
       "uid=1000"
+      "gid=100"
       "credentials=${config.age.secrets.samba.path}"
+
+      "nobrl"
     ];
   };
 }
diff --git a/services/samba/home-server.nix b/services/samba/home-server.nix
index 14a38d7..65c6a49 100644
--- a/services/samba/home-server.nix
+++ b/services/samba/home-server.nix
@@ -4,6 +4,11 @@
   # Use `smbpasswd -a <user>` to set passwords
   # age.secrets.samba.file = ../../secrets/samba.age;
 
+  users.users.samba = {
+    isSystemUser = true;
+    group = "media";
+  };
+
   services.samba = {
     enable = true;
     openFirewall = true;
@@ -19,9 +24,10 @@
         public = "no";
         browseable = "yes";
         writeable = "yes";
-        "create mask" = "0644";
-        "directory mask" = "0755";
-        "force user" = "felschr";
+        "valid users" = "felschr";
+        "create mask" = "0664";
+        "directory mask" = "0775";
+        "force user" = "samba";
         "force group" = "media";
       };
     };