diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index ce76450..5c6c99b 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -13,12 +13,8 @@ RUN export DEBIAN_FRONTEND='noninteractive' && \
     echo '   security = user' >>/etc/samba/smb.conf && \
     echo '   create mask = 0664' >>/etc/samba/smb.conf && \
     echo '   force create mode = 0664' >>/etc/samba/smb.conf && \
-    echo '   security mask = 0664' >>/etc/samba/smb.conf && \
-    echo '   force security mode = 0664' >>/etc/samba/smb.conf && \
     echo '   directory mask = 0775' >>/etc/samba/smb.conf && \
     echo '   force directory mode = 0775' >>/etc/samba/smb.conf && \
-    echo '   directory security mask = 0775' >>/etc/samba/smb.conf && \
-    echo '   force directory security mode = 0775' >>/etc/samba/smb.conf && \
     echo '   force user = smbuser' >>/etc/samba/smb.conf && \
     echo '   force group = users' >>/etc/samba/smb.conf && \
     echo '   load printers = no' >>/etc/samba/smb.conf && \
@@ -35,4 +31,4 @@ VOLUME ["/etc/samba"]
 
 EXPOSE 137/udp 138/udp 139 445
 
-ENTRYPOINT ["samba.sh"]
+ENTRYPOINT ["samba.sh"]
\ No newline at end of file
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
new file mode 100644
index 0000000..04fcf22
--- /dev/null
+++ b/Dockerfile.armhf
@@ -0,0 +1,34 @@
+FROM armhf/debian:stretch
+MAINTAINER David Personette <dperson@gmail.com>
+
+# Install samba
+RUN export DEBIAN_FRONTEND='noninteractive' && \
+    apt-get update -qq && \
+    apt-get install -qqy --no-install-recommends procps samba \
+                $(apt-get -s dist-upgrade|awk '/^Inst.*ecurity/ {print $2}') &&\
+    useradd -c 'Samba User' -d /tmp -M -r smbuser && \
+    sed -i 's|^\(   log file = \).*|\1/dev/stdout|' /etc/samba/smb.conf && \
+    sed -i 's|^\(   unix password sync = \).*|\1no|' /etc/samba/smb.conf && \
+    sed -i '/Share Definitions/,$d' /etc/samba/smb.conf && \
+    echo '   security = user' >>/etc/samba/smb.conf && \
+    echo '   create mask = 0664' >>/etc/samba/smb.conf && \
+    echo '   force create mode = 0664' >>/etc/samba/smb.conf && \
+    echo '   directory mask = 0775' >>/etc/samba/smb.conf && \
+    echo '   force directory mode = 0775' >>/etc/samba/smb.conf && \
+    echo '   force user = smbuser' >>/etc/samba/smb.conf && \
+    echo '   force group = users' >>/etc/samba/smb.conf && \
+    echo '   load printers = no' >>/etc/samba/smb.conf && \
+    echo '   printing = bsd' >>/etc/samba/smb.conf && \
+    echo '   printcap name = /dev/null' >>/etc/samba/smb.conf && \
+    echo '   disable spoolss = yes' >>/etc/samba/smb.conf && \
+    echo '   socket options = TCP_NODELAY' >>/etc/samba/smb.conf && \
+    echo '' >>/etc/samba/smb.conf && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/*
+COPY samba.sh /usr/bin/
+
+VOLUME ["/etc/samba"]
+
+EXPOSE 137/udp 138/udp 139 445
+
+ENTRYPOINT ["samba.sh"]
\ No newline at end of file