diff --git a/Dockerfile b/Dockerfile
index 23649a7..61e28b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,9 @@ LABEL comanage_registry_src_url=${COMANAGE_REGISTRY_SRC_URL}
 ARG COMANAGE_REGISTRY_DIR
 ENV COMANAGE_REGISTRY_DIR=${COMANAGE_REGISTRY_DIR:-/srv/comanage-registry}
 
+ARG CACHEDIR
+ENV CACHEDIR=${CACHEDIR:-${COMANAGE_REGISTRY_DIR}/app/tmp/cache}
+
 RUN yum -y update && yum -y install \
         busybox \
         && yum clean -y all
@@ -23,12 +26,13 @@ RUN mkdir -p "${COMANAGE_REGISTRY_DIR}" \
         && wget -O comanage.tar.gz ${COMANAGE_REGISTRY_SRC_URL} \
         && tar -zxf comanage.tar.gz -C ${COMANAGE_REGISTRY_DIR} --strip-components=1 \
         && rm -f comanage.tar.gz \
+        #  Setup the tmp directory
         && rm -rf ${COMANAGE_REGISTRY_DIR}/app/tmp \
         && cp -r ${COMANAGE_REGISTRY_DIR}/app/tmp.dist ${COMANAGE_REGISTRY_DIR}/app/tmp \
         && chown -R apache:apache ${COMANAGE_REGISTRY_DIR}/app/tmp \
-        && cd ${COMANAGE_REGISTRY_DIR}/local \
-        && ln -s ${COMANAGE_REGISTRY_DIR}/app/tmp tmp \
-        && chown -h apache:apache ${COMANAGE_REGISTRY_DIR}/local/tmp \
+        # Setup the webroot directory. The permissions and the symbolic link under the appache root directory
+        && chown -h apache:apache ${COMANAGE_REGISTRY_DIR}/app/webroot \
+        && chown -h apache:apache ${COMANAGE_REGISTRY_DIR}/local/webroot \
         && cd /var/www/html \
         && ln -s ${COMANAGE_REGISTRY_DIR}/app/webroot registry