diff --git a/piknik/Dockerfile b/piknik/Dockerfile
index a8e5bd4..e3084b0 100644
--- a/piknik/Dockerfile
+++ b/piknik/Dockerfile
@@ -2,20 +2,21 @@
 # Dockerfile for piknik
 #
 
-FROM alpine
-MAINTAINER kev <norely@easypi.pro>
+FROM alpine:3
+MAINTAINER EasyPi Software Foundation
 
-ENV PIKNIK_VERSION 0.9.1
-ENV PIKNIK_FILE piknik-linux_x86_64-${PIKNIK_VERSION}.tar.gz
-ENV PIKNIK_URL https://github.com/jedisct1/piknik/releases/download/${PIKNIK_VERSION}/${PIKNIK_FILE}
+ENV PIKNIK_VERSION=0.10.1
+ENV PIKNIK_FILE=piknik-linux_x86_64-${PIKNIK_VERSION}.tar.gz
+ENV PIKNIK_URL=https://github.com/jedisct1/piknik/releases/download/${PIKNIK_VERSION}/${PIKNIK_FILE}
 
 RUN set -xe \
     && apk add --no-cache curl libc6-compat tar \
     && curl -sSL ${PIKNIK_URL} | tar xz -C /usr/local/bin --strip 1 linux-x86_64/piknik \
+    && mkdir -p /etc/piknik \
     && ln -s /lib /lib64 \
     && apk del curl tar
 
 EXPOSE 8075
 
 ENTRYPOINT ["piknik"]
-CMD ["-config", "/etc/piknik.toml", "-server"]
+CMD ["-config", "/etc/piknik/piknik.toml", "-server"]
diff --git a/piknik/README.md b/piknik/README.md
index 9aedf70..f79eee0 100644
--- a/piknik/README.md
+++ b/piknik/README.md
@@ -11,16 +11,17 @@ piknik:
   ports:
     - "8075:8075"
   volumes:
-    - ./piknik.toml:/etc/piknik.toml
-  restart: always
+    - ./data:/etc/piknik
+  restart: unless-stopped
 ```
 
 ## Server Setup
 
 ```bash
-$ touch piknik.toml
-$ docker-compose run --rm piknik -genkeys > piknik.toml
-$ vim piknik.toml
+$ mkdir -p data
+$ touch data/piknik.toml
+$ docker-compose run --rm piknik -genkeys > data/piknik.toml
+$ vim data/piknik.toml
 $ docker-compose up -d
 ```
 
diff --git a/piknik/piknik.toml b/piknik/data/piknik.toml
similarity index 100%
rename from piknik/piknik.toml
rename to piknik/data/piknik.toml
diff --git a/piknik/docker-compose.yml b/piknik/docker-compose.yml
index f9826bf..f65223d 100644
--- a/piknik/docker-compose.yml
+++ b/piknik/docker-compose.yml
@@ -3,5 +3,5 @@ piknik:
   ports:
     - "8075:8075"
   volumes:
-    - ./piknik.toml:/etc/piknik.toml
-  restart: always
+    - ./data:/etc/piknik
+  restart: unless-stopped