diff --git a/networking/docker-compose.yaml b/networking/docker-compose.yaml
index c935a45..3a84086 100644
--- a/networking/docker-compose.yaml
+++ b/networking/docker-compose.yaml
@@ -102,11 +102,15 @@ services:
     environment:
       NFS_DIR: /nfs-share
       NFS_DOMAIN: 192.168.178.0/24
-      NFS_OPTION: rw,sync,no_subtree_check,nohide,no_root_squash
+      NFS_OPTION: rw,sync,no_subtree_check,nohide,no_root_squash,fsid=0
     volumes:
       - /media/backup:/nfs-share
     restart: unless-stopped
 
+  # Exec into container at first start
+  # and create the user and the samba password:
+  #   adduser USER
+  #   smbpasswd -a USER
   samba:
     image: gists/samba-server
     container_name: samba
@@ -119,6 +123,8 @@ services:
       - "139:139/tcp"
       - "445:445/tcp"
     environment:
+      PUID: 1000
+      GUID: 1000
       TZ: Europe/Berlin
       PASSWORD: lmaa,dw.
     restart: unless-stopped