diff --git a/Dockerfile b/Dockerfile
index 39bd77c..f4c649d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,13 +8,12 @@ ENV BAMBOO_VERSION  6.7.1
 # Install Atlassian Bamboo and helper tools and setup initial home
 # directory structure.
 RUN set -x \
+    && mkdir -p               "${BAMBOO_HOME}/lib" "${BAMBOO_INSTALL}" \
     && addgroup -S bamboo \
     && adduser -S -h "${BAMBOO_HOME}" bamboo bamboo \
     && apk add --no-cache curl xmlstarlet git openssh bash ttf-dejavu libc6-compat tzdata \
-    && mkdir -p               "${BAMBOO_HOME}/lib" \
     && chmod -R 700           "${BAMBOO_HOME}" \
     && chown -R bamboo:bamboo "${BAMBOO_HOME}" \
-    && mkdir -p               "${BAMBOO_INSTALL}" \
     && curl -Ls               "https://www.atlassian.com/software/bamboo/downloads/binary/atlassian-bamboo-${BAMBOO_VERSION}.tar.gz" | tar -zx --directory  "${BAMBOO_INSTALL}" --strip-components=1 --no-same-owner \
     && curl -Ls                "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.40.tar.gz" | tar -xz --directory "${BAMBOO_INSTALL}/lib" --strip-components=1 --no-same-owner "mysql-connector-java-5.1.40/mysql-connector-java-5.1.40-bin.jar" \
     && chmod -R 700           "${BAMBOO_INSTALL}" \