diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 0881ff8..eed15cf 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -16,7 +16,7 @@ ENV COMPOSER_CACHE_DIR=${COMPOSER_HOME}/cache
 
 # Setup composer user and required directories
 RUN addgroup -g 10001 composer && \
-    adduser -D -u 10001 -G composer -s /bin/sh -h /build composer
+    adduser -D -u 10001 -G composer -s /bin/sh -h /build composer && \
     mkdir -p ${COMPOSER_CACHE_DIR}/files && \
     mkdir -p ${COMPOSER_CACHE_DIR}/repo && \
     mkdir -p ${COMPOSER_CACHE_DIR}/vcs && \
diff --git a/Dockerfile.alpine-php5 b/Dockerfile.alpine-php5
index 9255c00..8529735 100644
--- a/Dockerfile.alpine-php5
+++ b/Dockerfile.alpine-php5
@@ -14,12 +14,10 @@ WORKDIR /tmp
 ENV COMPOSER_HOME=/usr/local/share/composer
 ENV COMPOSER_CACHE_DIR=${COMPOSER_HOME}/cache
 
-# Setup composer user
+# Setup composer user and required directories
 RUN addgroup -g 10001 composer && \
-    adduser -D -u 10001 -G composer -s /bin/sh -h /build composer
-
-# CREATE CACHES DIR FOR COMPOSER
-RUN mkdir -p ${COMPOSER_CACHE_DIR}/files && \
+    adduser -D -u 10001 -G composer -s /bin/sh -h /build composer && \
+    mkdir -p ${COMPOSER_CACHE_DIR}/files && \
     mkdir -p ${COMPOSER_CACHE_DIR}/repo && \
     mkdir -p ${COMPOSER_CACHE_DIR}/vcs && \
     chown -R composer:composer ${COMPOSER_CACHE_DIR}
diff --git a/Dockerfile.alpine-php7 b/Dockerfile.alpine-php7
index 641c582..3ccf187 100644
--- a/Dockerfile.alpine-php7
+++ b/Dockerfile.alpine-php7
@@ -14,12 +14,10 @@ WORKDIR /tmp
 ENV COMPOSER_HOME=/usr/local/share/composer
 ENV COMPOSER_CACHE_DIR=${COMPOSER_HOME}/cache
 
-# Setup composer user
+# Setup composer user and required directories
 RUN addgroup -g 10001 composer && \
-    adduser -D -u 10001 -G composer -s /bin/sh -h /build composer
-
-# CREATE CACHES DIR FOR COMPOSER
-RUN mkdir -p ${COMPOSER_CACHE_DIR}/files && \
+    adduser -D -u 10001 -G composer -s /bin/sh -h /build composer && \
+    mkdir -p ${COMPOSER_CACHE_DIR}/files && \
     mkdir -p ${COMPOSER_CACHE_DIR}/repo && \
     mkdir -p ${COMPOSER_CACHE_DIR}/vcs && \
     chown -R composer:composer ${COMPOSER_CACHE_DIR}