diff --git a/ejabberd-base/Dockerfile b/ejabberd-base/Dockerfile
index 7d6a6cb..7d362d4 100644
--- a/ejabberd-base/Dockerfile
+++ b/ejabberd-base/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.6
 MAINTAINER ProcessOne <contact@process-one.net>
 
-ENV REFRESHED_AT=2017-07-16 \
+ENV REFRESHED_AT=2017-09-18 \
     HOME=/home/p1 \
     TERM=xterm \
     LC_ALL=C.UTF-8 \
@@ -11,11 +11,7 @@ ENV REFRESHED_AT=2017-07-16 \
 
 # Create directory structure and user for ejabberd
 RUN addgroup p1 -g 9000 && adduser -s /bin/bash -D -G p1 p1 -u 9000 && \
-	#RUN groupadd -r p1 --gid=999 && useradd -r -g p1 --uid=999 p1 && \
-    mkdir -p ${HOME}/ejabberd \
-    && mkdir ${HOME}/cfg \
-    && mkdir ${HOME}/log \
-    && mkdir ${HOME}/db && \
+    mkdir -p ${HOME}/ejabberd ${HOME}/cfg ${HOME}/log ${HOME}/db && \
     chown -R p1:p1 ${HOME}
 
 ENV P1DATA=${HOME}/db \
@@ -24,13 +20,11 @@ ENV P1DATA=${HOME}/db \
 COPY ejabberd.yml ${HOME}/cfg/
 
 # TODO Make it possible to define which version of Alpine we would like to use.
-RUN echo \
-  && echo "http://nl.alpinelinux.org/alpine/v3.6/main" > /etc/apk/repositories \
-  && echo "http://nl.alpinelinux.org/alpine/v3.6/community" >> /etc/apk/repositories && \
-
-  apk upgrade --update musl && \
-  apk add bash su-exec libstdc++ ncurses-libs openssl expat yaml zlib sqlite && \
-  rm -rf /var/cache/apk/*
+RUN echo "http://nl.alpinelinux.org/alpine/v3.6/main" > /etc/apk/repositories && \
+    echo "http://nl.alpinelinux.org/alpine/v3.6/community" >> /etc/apk/repositories && \
+    apk upgrade --update musl && \
+    apk add bash su-exec libstdc++ ncurses-libs openssl expat yaml zlib sqlite && \
+    rm -rf /var/cache/apk/*
 
 EXPOSE 5222 5269 5280
 
diff --git a/ejabberd-base/build.sh b/ejabberd-base/build.sh
index 1fdc5d8..f4461f6 100755
--- a/ejabberd-base/build.sh
+++ b/ejabberd-base/build.sh
@@ -1,6 +1,6 @@
 #/bin/bash
 
-VERSION=17.07
+VERSION=17.08
 
 GREEN='\033[0;32m'
 NC='\033[0m' # No Color]]'
diff --git a/ejabberd-mix/Dockerfile b/ejabberd-mix/Dockerfile
index f512fce..b37f451 100644
--- a/ejabberd-mix/Dockerfile
+++ b/ejabberd-mix/Dockerfile
@@ -1,17 +1,14 @@
 FROM alpine:3.6
 MAINTAINER ProcessOne <contact@process-one.net>
 
-RUN echo \
-  && echo "http://nl.alpinelinux.org/alpine/v3.6/main" > /etc/apk/repositories \
-  && echo "http://nl.alpinelinux.org/alpine/v3.6/community" >> /etc/apk/repositories && \
-
-  # Install elixir from apk
-  apk upgrade --update musl && \
-  apk add build-base git zlib-dev openssl-dev yaml-dev expat-dev sqlite-dev \
-   elixir erlang-crypto erlang-eunit erlang-mnesia erlang-xmerl erlang-erts \
-   erlang-tools erlang-os-mon erlang-syntax-tools erlang-parsetools \
-   erlang-runtime-tools erlang-reltool && \
-  rm -rf /var/cache/apk/*
+RUN echo "http://nl.alpinelinux.org/alpine/v3.6/main" > /etc/apk/repositories && \
+    echo "http://nl.alpinelinux.org/alpine/v3.6/community" >> /etc/apk/repositories && \
+    apk upgrade --update musl && \
+    apk add build-base git zlib-dev openssl-dev yaml-dev expat-dev sqlite-dev \
+            elixir erlang-crypto erlang-eunit erlang-mnesia erlang-xmerl erlang-erts \
+            erlang-tools erlang-os-mon erlang-syntax-tools erlang-parsetools \
+            erlang-runtime-tools erlang-reltool && \
+    rm -rf /var/cache/apk/*
 
 
 # Install Hex+Rebar