diff --git a/Dockerfile b/Dockerfile
index caf96ea..b3630be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,10 +31,27 @@ RUN apk --no-cache --no-progress upgrade && \
     echo '   disable spoolss = yes' >>$file && \
     echo '   socket options = TCP_NODELAY' >>$file && \
     echo '   strict locking = no' >>$file && \
-    echo '   vfs objects = recycle' >>$file && \
+    echo '   vfs objects = acl_xattr fruit recycle' >>$file && \
     echo '   recycle:keeptree = yes' >>$file && \
     echo '   recycle:versions = yes' >>$file && \
-    echo '   min protocol = SMB2' >>$file && \
+    echo '' >>$file && \
+    echo '   # Security' >>$file && \
+    echo '   client ipc max protocol = default' >>$file && \
+    echo '   client max protocol = default' >>$file && \
+    echo '   server max protocol = SMB3' >>$file && \
+    echo '   client ipc min protocol = default' >>$file && \
+    echo '   client min protocol = CORE' >>$file && \
+    echo '   server min protocol = SMB2' >>$file && \
+    echo '' >>$file && \
+    echo '   # Time Machine' >>$file && \
+    echo '   durable handles = yes' >>$file && \
+    echo '   kernel oplocks = no' >>$file && \
+    echo '   kernel share modes = no' >>$file && \
+    echo '   posix locking = no' >>$file && \
+    echo '   fruit:aapl = yes' >>$file && \
+    echo '   fruit:advertise_fullsync = true' >>$file && \
+    echo '   fruit:time machine = yes' >>$file && \
+    echo '   smb2 leases = yes' >>$file && \
     echo '' >>$file && \
     rm -rf /tmp/*
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 59d061f..e73ca32 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -32,10 +32,27 @@ RUN apk --no-cache --no-progress upgrade && \
     echo '   disable spoolss = yes' >>$file && \
     echo '   socket options = TCP_NODELAY' >>$file && \
     echo '   strict locking = no' >>$file && \
-    echo '   vfs objects = recycle' >>$file && \
+    echo '   vfs objects = acl_xattr fruit recycle' >>$file && \
     echo '   recycle:keeptree = yes' >>$file && \
     echo '   recycle:versions = yes' >>$file && \
-    echo '   min protocol = SMB2' >>$file && \
+    echo '' >>$file && \
+    echo '   # Security' >>$file && \
+    echo '   client ipc max protocol = default' >>$file && \
+    echo '   client max protocol = default' >>$file && \
+    echo '   server max protocol = SMB3' >>$file && \
+    echo '   client ipc min protocol = default' >>$file && \
+    echo '   client min protocol = CORE' >>$file && \
+    echo '   server min protocol = SMB2' >>$file && \
+    echo '' >>$file && \
+    echo '   # Time Machine' >>$file && \
+    echo '   durable handles = yes' >>$file && \
+    echo '   kernel oplocks = no' >>$file && \
+    echo '   kernel share modes = no' >>$file && \
+    echo '   posix locking = no' >>$file && \
+    echo '   fruit:aapl = yes' >>$file && \
+    echo '   fruit:advertise_fullsync = true' >>$file && \
+    echo '   fruit:time machine = yes' >>$file && \
+    echo '   smb2 leases = yes' >>$file && \
     echo '' >>$file && \
     rm -rf /tmp/*
 RUN ["cross-build-end"]
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 9f4b061..2b6b850 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -32,10 +32,27 @@ RUN apk --no-cache --no-progress upgrade && \
     echo '   disable spoolss = yes' >>$file && \
     echo '   socket options = TCP_NODELAY' >>$file && \
     echo '   strict locking = no' >>$file && \
-    echo '   vfs objects = recycle' >>$file && \
+    echo '   vfs objects = acl_xattr fruit recycle' >>$file && \
     echo '   recycle:keeptree = yes' >>$file && \
     echo '   recycle:versions = yes' >>$file && \
-    echo '   min protocol = SMB2' >>$file && \
+    echo '' >>$file && \
+    echo '   # Security' >>$file && \
+    echo '   client ipc max protocol = default' >>$file && \
+    echo '   client max protocol = default' >>$file && \
+    echo '   server max protocol = SMB3' >>$file && \
+    echo '   client ipc min protocol = default' >>$file && \
+    echo '   client min protocol = CORE' >>$file && \
+    echo '   server min protocol = SMB2' >>$file && \
+    echo '' >>$file && \
+    echo '   # Time Machine' >>$file && \
+    echo '   durable handles = yes' >>$file && \
+    echo '   kernel oplocks = no' >>$file && \
+    echo '   kernel share modes = no' >>$file && \
+    echo '   posix locking = no' >>$file && \
+    echo '   fruit:aapl = yes' >>$file && \
+    echo '   fruit:advertise_fullsync = true' >>$file && \
+    echo '   fruit:time machine = yes' >>$file && \
+    echo '   smb2 leases = yes' >>$file && \
     echo '' >>$file && \
     rm -rf /tmp/*
 RUN ["cross-build-end"]
diff --git a/_etc_avahi_services_samba.service b/_etc_avahi_services_samba.service
new file mode 100644
index 0000000..39fcc44
--- /dev/null
+++ b/_etc_avahi_services_samba.service
@@ -0,0 +1,14 @@
+<?xml version="1.0" standalone='no'?>
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+ <name replace-wildcards="yes">%h</name>
+ <service>
+   <type>_adisk._tcp</type>
+   <txt-record>sys=waMa=0,adVF=0x100</txt-record>
+   <txt-record>dk0=adVN=Time Capsule,adVF=0x82</txt-record>
+ </service>
+  <service>
+    <type>_smb._tcp</type>
+    <port>445</port>
+  </service>
+</service-group>
\ No newline at end of file