diff --git a/samba/Dockerfile b/samba/Dockerfile
index f325018..2219c1e 100644
--- a/samba/Dockerfile
+++ b/samba/Dockerfile
@@ -5,11 +5,9 @@
 FROM alpine
 MAINTAINER kev <noreply@easypi.info>
 
-RUN set -xe \
-    && apk add -U samba-common-tools samba-server \
-    && rm -rf /var/cache/apk/*
+RUN apk add --no-cache samba-common-tools samba-server \
 
-COPY smb.conf /etc/samba/
+COPY ./data/smb.conf /etc/samba/
 
 VOLUME /etc/samba \
        /var/lib/samba
diff --git a/samba/README.md b/samba/README.md
index 90a9fb6..79d8982 100644
--- a/samba/README.md
+++ b/samba/README.md
@@ -8,12 +8,12 @@ Linux and Unix.
 
 ## docker-compose.yml
 
-```
+```yaml
 samba:
   image: vimagick/samba
   volumes:
-#   - ./smb.conf:/etc/samba/smb.conf
-    - /mnt/usb:/share
+    - ./data/smb.conf:/etc/samba/smb.conf
+    - ./share:/share
   net: host
   tty: yes
   restart: always
diff --git a/samba/arm/Dockerfile b/samba/arm/Dockerfile
index aa5b70e..b508b75 100644
--- a/samba/arm/Dockerfile
+++ b/samba/arm/Dockerfile
@@ -5,11 +5,9 @@
 FROM easypi/alpine-arm
 MAINTAINER EasyPi Software Foundation
 
-RUN set -xe \
-    && apk add -U samba-common-tools samba-server \
-    && rm -rf /var/cache/apk/*
+RUN apk add --no-cache samba-common-tools samba-server \
 
-COPY smb.conf /etc/samba/
+COPY ./data/smb.conf /etc/samba/
 
 VOLUME /etc/samba \
        /var/lib/samba
diff --git a/samba/arm/smb.conf b/samba/arm/data/smb.conf
similarity index 100%
rename from samba/arm/smb.conf
rename to samba/arm/data/smb.conf
diff --git a/samba/arm/smb.conf.sample b/samba/arm/data/smb.conf.sample
similarity index 100%
rename from samba/arm/smb.conf.sample
rename to samba/arm/data/smb.conf.sample
diff --git a/samba/arm/docker-compose.yml b/samba/arm/docker-compose.yml
index 7bdf8c7..4f8bb82 100644
--- a/samba/arm/docker-compose.yml
+++ b/samba/arm/docker-compose.yml
@@ -1,7 +1,7 @@
 samba:
   image: easypi/samba-arm
   volumes:
-#   - ./smb.conf:/etc/samba/smb.conf
+    - ./data/smb.conf:/etc/samba/smb.conf
     - /mnt/usb:/share
   net: host
   tty: yes
diff --git a/samba/smb.conf b/samba/data/smb.conf
similarity index 100%
rename from samba/smb.conf
rename to samba/data/smb.conf
diff --git a/samba/docker-compose.yml b/samba/docker-compose.yml
index 0d112e6..9b26290 100644
--- a/samba/docker-compose.yml
+++ b/samba/docker-compose.yml
@@ -1,7 +1,7 @@
 samba:
   image: vimagick/samba
   volumes:
-#   - ./smb.conf:/etc/samba/smb.conf
+    - ./data/smb.conf:/etc/samba/smb.conf
     - ./share:/share
   net: host
   tty: yes