diff --git a/scripts/docker/.examples/nginx-proxy-self-signed-ssl/docker-compose.yml b/scripts/docker/.examples/nginx-proxy-self-signed-ssl/docker-compose.yml
index 551fa3352..e2772ba78 100644
--- a/scripts/docker/.examples/nginx-proxy-self-signed-ssl/docker-compose.yml
+++ b/scripts/docker/.examples/nginx-proxy-self-signed-ssl/docker-compose.yml
@@ -26,7 +26,6 @@ services:
     env_file: .env
     volumes:
       - data:/var/www/monica/storage
-      - www:/var/www/monica
     restart: always
     depends_on:
       - db
@@ -53,7 +52,6 @@ services:
     restart: always
     volumes:
       - data:/var/www/monica/storage
-      - www:/var/www/monica:ro
     command: cron.sh
     depends_on:
       - db
@@ -65,7 +63,6 @@ services:
     restart: always
     volumes:
       - data:/var/www/monica/storage
-      - www:/var/www/monica:ro
     command: queue.sh
     depends_on:
       - db
@@ -78,7 +75,6 @@ services:
       - VIRTUAL_HOST=monica.local
     volumes:
       - data:/var/www/monica/storage:ro
-      - www:/var/www/monica:ro
     depends_on:
       - app
     networks:
@@ -116,8 +112,6 @@ services:
 volumes:
   data:
     name: data
-  www:
-    name: www
   db:
     name: db
   certs:
diff --git a/scripts/docker/.examples/nginx-proxy-self-signed-ssl/web/Dockerfile b/scripts/docker/.examples/nginx-proxy-self-signed-ssl/web/Dockerfile
index 9e620aff0..3de42749d 100644
--- a/scripts/docker/.examples/nginx-proxy-self-signed-ssl/web/Dockerfile
+++ b/scripts/docker/.examples/nginx-proxy-self-signed-ssl/web/Dockerfile
@@ -1,3 +1,9 @@
+FROM monicahq/monicahq:fpm AS monica
+
 FROM nginx:alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
+
+# Copy content of monica image
+COPY --from=monica /var/www/monica /var/www/monica
+RUN ln -sf /var/www/monica/storage/app/public /var/www/monica/public/storage
diff --git a/scripts/docker/.examples/nginx-proxy/docker-compose.yml b/scripts/docker/.examples/nginx-proxy/docker-compose.yml
index 750a8d54c..f25cff064 100644
--- a/scripts/docker/.examples/nginx-proxy/docker-compose.yml
+++ b/scripts/docker/.examples/nginx-proxy/docker-compose.yml
@@ -25,7 +25,6 @@ services:
     env_file: .env
     volumes:
       - data:/var/www/monica/storage
-      - www:/var/www/monica
     restart: always
     depends_on:
       - db
@@ -52,7 +51,6 @@ services:
     restart: always
     volumes:
       - data:/var/www/monica/storage
-      - www:/var/www/monica:ro
     command: cron.sh
     depends_on:
       - db
@@ -64,7 +62,6 @@ services:
     restart: always
     volumes:
       - data:/var/www/monica/storage
-      - www:/var/www/monica:ro
     command: queue.sh
     depends_on:
       - db
@@ -79,7 +76,6 @@ services:
       - LETSENCRYPT_EMAIL=
     volumes:
       - data:/var/www/monica/storage:ro
-      - www:/var/www/monica:ro
     depends_on:
       - app
     networks:
@@ -118,8 +114,6 @@ services:
 volumes:
   data:
     name: data
-  www:
-    name: www
   mysql:
     name: mysql
   certs:
diff --git a/scripts/docker/.examples/nginx-proxy/web/Dockerfile b/scripts/docker/.examples/nginx-proxy/web/Dockerfile
index 9e620aff0..3de42749d 100644
--- a/scripts/docker/.examples/nginx-proxy/web/Dockerfile
+++ b/scripts/docker/.examples/nginx-proxy/web/Dockerfile
@@ -1,3 +1,9 @@
+FROM monicahq/monicahq:fpm AS monica
+
 FROM nginx:alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
+
+# Copy content of monica image
+COPY --from=monica /var/www/monica /var/www/monica
+RUN ln -sf /var/www/monica/storage/app/public /var/www/monica/public/storage
diff --git a/scripts/docker/.examples/supervisor/apache/app/Dockerfile b/scripts/docker/.examples/supervisor/apache/app/Dockerfile
index ae8d71b03..b96b60930 100644
--- a/scripts/docker/.examples/supervisor/apache/app/Dockerfile
+++ b/scripts/docker/.examples/supervisor/apache/app/Dockerfile
@@ -1,4 +1,4 @@
 FROM monicahq/monicahq:apache
 
 COPY supervisord.conf /etc/supervisord.conf
-CMD ["supervisord", "-c /etc/supervisord.conf"]
+CMD ["supervisord", "-c", "/etc/supervisord.conf"]
diff --git a/scripts/docker/.examples/supervisor/apache/docker-compose.yml b/scripts/docker/.examples/supervisor/apache/docker-compose.yml
index d64e5135a..f053c1eea 100644
--- a/scripts/docker/.examples/supervisor/apache/docker-compose.yml
+++ b/scripts/docker/.examples/supervisor/apache/docker-compose.yml
@@ -10,7 +10,6 @@ services:
       - 80:80
     volumes:
       - data:/var/www/monica/storage
-      - www:/var/www/monica
     restart: always
 
   db:
@@ -27,7 +26,5 @@ services:
 volumes:
   data:
     name: data
-  www:
-    name: www
   mysql:
     name: mysql
diff --git a/scripts/docker/.examples/supervisor/fpm/app/Dockerfile b/scripts/docker/.examples/supervisor/fpm/app/Dockerfile
index ed2cf81f3..3a6571a4b 100644
--- a/scripts/docker/.examples/supervisor/fpm/app/Dockerfile
+++ b/scripts/docker/.examples/supervisor/fpm/app/Dockerfile
@@ -1,4 +1,4 @@
 FROM monicahq/monicahq:fpm
 
 COPY supervisord.conf /etc/supervisord.conf
-CMD ["supervisord", "-c /etc/supervisord.conf"]
+CMD ["supervisord", "-c", "/etc/supervisord.conf"]
diff --git a/scripts/docker/.examples/supervisor/fpm/docker-compose.yml b/scripts/docker/.examples/supervisor/fpm/docker-compose.yml
index 3a6d76a99..6017cf749 100644
--- a/scripts/docker/.examples/supervisor/fpm/docker-compose.yml
+++ b/scripts/docker/.examples/supervisor/fpm/docker-compose.yml
@@ -8,7 +8,6 @@ services:
     env_file: .env
     volumes:
       - data:/var/www/monica/storage
-      - www:/var/www/monica
     restart: always
 
   web:
@@ -18,7 +17,6 @@ services:
       - 80:80
     volumes:
       - data:/var/www/monica/storage:ro
-      - www:/var/www/monica:ro
     depends_on:
       - app
 
@@ -36,7 +34,5 @@ services:
 volumes:
   data:
     name: data
-  www:
-    name: www
   mysql:
     name: mysql
diff --git a/scripts/docker/.examples/supervisor/fpm/web/Dockerfile b/scripts/docker/.examples/supervisor/fpm/web/Dockerfile
index 9e620aff0..3de42749d 100644
--- a/scripts/docker/.examples/supervisor/fpm/web/Dockerfile
+++ b/scripts/docker/.examples/supervisor/fpm/web/Dockerfile
@@ -1,3 +1,9 @@
+FROM monicahq/monicahq:fpm AS monica
+
 FROM nginx:alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
+
+# Copy content of monica image
+COPY --from=monica /var/www/monica /var/www/monica
+RUN ln -sf /var/www/monica/storage/app/public /var/www/monica/public/storage
diff --git a/scripts/docker/.examples/supervisor/php-apache/app/Dockerfile b/scripts/docker/.examples/supervisor/php-apache/app/Dockerfile
index 99f89c529..6ea49087e 100644
--- a/scripts/docker/.examples/supervisor/php-apache/app/Dockerfile
+++ b/scripts/docker/.examples/supervisor/php-apache/app/Dockerfile
@@ -1,4 +1,4 @@
 FROM monicahq/monicahq:php-apache
 
 COPY supervisord.conf /etc/supervisord.conf
-CMD ["supervisord", "-c /etc/supervisord.conf"]
+CMD ["supervisord", "-c", "/etc/supervisord.conf"]
diff --git a/scripts/docker/.examples/supervisor/php-apache/docker-compose.yml b/scripts/docker/.examples/supervisor/php-apache/docker-compose.yml
index d64e5135a..f053c1eea 100644
--- a/scripts/docker/.examples/supervisor/php-apache/docker-compose.yml
+++ b/scripts/docker/.examples/supervisor/php-apache/docker-compose.yml
@@ -10,7 +10,6 @@ services:
       - 80:80
     volumes:
       - data:/var/www/monica/storage
-      - www:/var/www/monica
     restart: always
 
   db:
@@ -27,7 +26,5 @@ services:
 volumes:
   data:
     name: data
-  www:
-    name: www
   mysql:
     name: mysql
diff --git a/scripts/docker/apache/Dockerfile b/scripts/docker/apache/Dockerfile
index 0f703fe13..3f0d20d45 100644
--- a/scripts/docker/apache/Dockerfile
+++ b/scripts/docker/apache/Dockerfile
@@ -15,10 +15,14 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.version=$VERSION \
       org.label-schema.schema-version="1.0"
 
-RUN apk update && apk upgrade
-RUN apk add --virtual .build-deps \
-        curl openssl bash
-RUN apk add supervisor netcat-openbsd rsync \
+RUN set -ex; \
+    \
+    apk update; \
+    apk upgrade; \
+    apk add --virtual .build-deps \
+        curl openssl bash \
+    ; \
+    apk add supervisor netcat-openbsd rsync \
         #- base
         php7 php7-intl php7-openssl php7-ctype \
         php7-zip php7-zlib php7-opcache \
@@ -54,11 +58,12 @@ RUN apk add supervisor netcat-openbsd rsync \
 
 # Create a user to own all the code and assets and give them a working
 # directory
-RUN mkdir -p /usr/src/monica; \
+RUN set -ex; \
+    \
+    mkdir -p /var/www/monica; \
     grep -q apache /etc/group || addgroup -S apache; \
-    adduser -D monica apache -h /usr/src/monica
-WORKDIR /usr/src/monica
-VOLUME /var/www/monica
+    adduser -D monica apache -h /var/www/monica
+WORKDIR /var/www/monica
 
 
 # Copy the local (outside Docker) source into the working directory,
@@ -82,7 +87,9 @@ COPY --chown=monica:monica public ./public
 COPY --chown=monica:monica resources ./resources
 COPY --chown=monica:monica routes ./routes
 
-RUN mkdir -p bootstrap/cache; \
+RUN set -ex; \
+    \
+    mkdir -p bootstrap/cache; \
     mkdir -p storage; \
     chown -R monica:apache bootstrap/cache storage; \
     chmod -R g+w bootstrap/cache storage
@@ -96,9 +103,11 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
 COPY scripts/docker/opcache.ini /usr/php7/conf.d/opcache.ini
 
 # Sentry
-RUN echo $VCS_REF > .sentry-release; \
+RUN set -ex; \
+    \
+    echo $VCS_REF > .sentry-release; \
     echo $COMMIT > .sentry-commit; \
-    mkdir -p /root/.local/bin && \
+    mkdir -p /root/.local/bin; \
     curl -sL https://sentry.io/get-cli/ | INSTALL_DIR=/root/.local/bin bash
 
 # Composer installation
@@ -107,30 +116,34 @@ RUN install-composer.sh
 
 # Install composer dependencies
 USER monica
-RUN composer global require hirak/prestissimo; \
+RUN set -ex; \
+    \
+    composer global require hirak/prestissimo; \
+    mkdir -p storage/framework/views; \
     composer install --no-interaction --no-suggest --no-progress --no-dev --ignore-platform-reqs; \
     composer global remove hirak/prestissimo; \
+    \
     composer clear-cache; \
     rm -rf .composer
 
 USER root
-WORKDIR /var/www/monica
 
 # Set crontab for schedules
-RUN set -ex && \
-	cd /etc/periodic/hourly/ && \
+RUN set -ex; \
+    \
+	cd /etc/periodic/hourly/; \
 	{ \
 		echo '#!/bin/sh'; \
 		echo '/usr/bin/php /var/www/monica/artisan schedule:run -v > /proc/1/fd/1 2> /proc/1/fd/2'; \
-	} | tee monica && \
+	} | tee monica; \
 	chmod a+x monica
 
 # Cleanup
-RUN apk del .build-deps && \
+RUN set -ex; \
+    \
+    apk del .build-deps; \
     rm -rf /var/cache/apk/*
 
-COPY scripts/docker/upgrade.exclude \
-    /usr/local/share/
 COPY scripts/docker/entrypoint.sh \
     scripts/docker/cron.sh \
     scripts/docker/queue.sh \
@@ -141,8 +154,8 @@ ENTRYPOINT ["entrypoint.sh"]
 RUN apk add apache2 php7-apache2
 COPY scripts/docker/apache2-foreground /usr/local/bin/
 COPY scripts/docker/000-default.conf /etc/apache2/conf.d/
-RUN echo 'LoadModule rewrite_module modules/mod_rewrite.so' > /etc/apache2/conf.d/rewrite.conf
-RUN echo 'ServerName "monica"' > /etc/apache2/conf.d/hostname.conf
+RUN echo 'LoadModule rewrite_module modules/mod_rewrite.so' > /etc/apache2/conf.d/rewrite.conf; \
+    echo 'ServerName "monica"' > /etc/apache2/conf.d/hostname.conf
 
 EXPOSE 80
 
diff --git a/scripts/docker/entrypoint.sh b/scripts/docker/entrypoint.sh
index 03cc26f4e..8addb7820 100755
--- a/scripts/docker/entrypoint.sh
+++ b/scripts/docker/entrypoint.sh
@@ -31,26 +31,9 @@ waitfordb() {
 
 if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm7" ]; then
 
-    MONICASRC=/usr/src/monica
     MONICADIR=/var/www/monica
     ARTISAN="php ${MONICADIR}/artisan"
 
-    # Update application sources
-    echo "Syncing sources..."
-    if [ "$(id -u)" = 0 ]; then
-        rsync_options="-rlDog --chown monica:monica"
-    else
-        rsync_options="-rlD"
-    fi
-    rsync $rsync_options --delete --exclude-from=/usr/local/share/upgrade.exclude $MONICASRC/ $MONICADIR/
-
-    for dir in storage; do
-        if [ ! -d "$MONICADIR/$dir" ] || directory_empty "$MONICADIR/$dir"; then
-            rsync $rsync_options --include "/$dir/" --exclude '/*' $MONICASRC/ $MONICADIR/
-        fi
-    done
-    echo "...done!"
-
     # Ensure storage directories are present
     STORAGE=${MONICADIR}/storage
     mkdir -p ${STORAGE}/logs
diff --git a/scripts/docker/fpm/Dockerfile b/scripts/docker/fpm/Dockerfile
index 2432136f8..99eb2ac0c 100644
--- a/scripts/docker/fpm/Dockerfile
+++ b/scripts/docker/fpm/Dockerfile
@@ -15,10 +15,14 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.version=$VERSION \
       org.label-schema.schema-version="1.0"
 
-RUN apk update && apk upgrade
-RUN apk add --virtual .build-deps \
-        curl openssl bash
-RUN apk add supervisor netcat-openbsd rsync \
+RUN set -ex; \
+    \
+    apk update; \
+    apk upgrade; \
+    apk add --virtual .build-deps \
+        curl openssl bash \
+    ; \
+    apk add supervisor netcat-openbsd rsync \
         #- base
         php7 php7-intl php7-openssl php7-ctype \
         php7-zip php7-zlib php7-opcache \
@@ -54,11 +58,12 @@ RUN apk add supervisor netcat-openbsd rsync \
 
 # Create a user to own all the code and assets and give them a working
 # directory
-RUN mkdir -p /usr/src/monica; \
+RUN set -ex; \
+    \
+    mkdir -p /var/www/monica; \
     grep -q apache /etc/group || addgroup -S apache; \
-    adduser -D monica apache -h /usr/src/monica
-WORKDIR /usr/src/monica
-VOLUME /var/www/monica
+    adduser -D monica apache -h /var/www/monica
+WORKDIR /var/www/monica
 
 
 # Copy the local (outside Docker) source into the working directory,
@@ -82,7 +87,9 @@ COPY --chown=monica:monica public ./public
 COPY --chown=monica:monica resources ./resources
 COPY --chown=monica:monica routes ./routes
 
-RUN mkdir -p bootstrap/cache; \
+RUN set -ex; \
+    \
+    mkdir -p bootstrap/cache; \
     mkdir -p storage; \
     chown -R monica:apache bootstrap/cache storage; \
     chmod -R g+w bootstrap/cache storage
@@ -95,42 +102,40 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
     PHP_OPCACHE_MAX_WASTED_PERCENTAGE="10"
 COPY scripts/docker/opcache.ini /usr/php7/conf.d/opcache.ini
 
-# Sentry
-RUN echo $VCS_REF > .sentry-release; \
-    echo $COMMIT > .sentry-commit; \
-    mkdir -p /root/.local/bin && \
-    curl -sL https://sentry.io/get-cli/ | INSTALL_DIR=/root/.local/bin bash
-
 # Composer installation
 COPY scripts/docker/install-composer.sh /usr/local/sbin/
 RUN install-composer.sh
 
 # Install composer dependencies
 USER monica
-RUN composer global require hirak/prestissimo; \
+RUN set -ex; \
+    \
+    composer global require hirak/prestissimo; \
+    mkdir -p storage/framework/views; \
     composer install --no-interaction --no-suggest --no-progress --no-dev --ignore-platform-reqs; \
     composer global remove hirak/prestissimo; \
+    \
     composer clear-cache; \
     rm -rf .composer
 
 USER root
-WORKDIR /var/www/monica
 
 # Set crontab for schedules
-RUN set -ex && \
-	cd /etc/periodic/hourly/ && \
+RUN set -ex; \
+    \
+	cd /etc/periodic/hourly/; \
 	{ \
 		echo '#!/bin/sh'; \
 		echo '/usr/bin/php /var/www/monica/artisan schedule:run -v > /proc/1/fd/1 2> /proc/1/fd/2'; \
-	} | tee monica && \
+	} | tee monica; \
 	chmod a+x monica
 
 # Cleanup
-RUN apk del .build-deps && \
+RUN set -ex; \
+    \
+    apk del .build-deps; \
     rm -rf /var/cache/apk/*
 
-COPY scripts/docker/upgrade.exclude \
-    /usr/local/share/
 COPY scripts/docker/entrypoint.sh \
     scripts/docker/cron.sh \
     scripts/docker/queue.sh \
@@ -139,8 +144,9 @@ ENTRYPOINT ["entrypoint.sh"]
 
 # FPM
 RUN apk add php7-fpm
-RUN set -ex && \
-	cd /etc/php7/php-fpm.d && \
+RUN set -ex; \
+    \
+	cd /etc/php7/php-fpm.d; \
 	{ \
 		echo '[global]'; \
 		echo 'error_log = /dev/stderr'; \
@@ -149,7 +155,8 @@ RUN set -ex && \
 		echo 'access.log = /dev/stdout'; \
 		echo 'catch_workers_output = yes'; \
         echo 'clear_env = no'; \
-	} | tee docker.conf && \
+	} | tee docker.conf; \
+    \
 	{ \
 		echo '[global]'; \
 		echo 'daemonize = no'; \
diff --git a/scripts/docker/php-apache/Dockerfile b/scripts/docker/php-apache/Dockerfile
index 1fe432215..bf5a30ad1 100644
--- a/scripts/docker/php-apache/Dockerfile
+++ b/scripts/docker/php-apache/Dockerfile
@@ -15,17 +15,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.version=$VERSION \
       org.label-schema.schema-version="1.0"
 
-RUN apt-get update && \
+RUN set -ex; \
+    \
+    apt-get update; \
     apt-get -y --no-install-recommends install \
       git cron netcat apt apt-transport-https \
       locales sudo openssh-client ca-certificates \
-      curl unzip zip tar bzip2 supervisor rsync && \
-    mkdir /var/log/supervisord /var/run/supervisord && \
+      curl unzip zip tar bzip2 supervisor rsync \
+    ; \
+    mkdir /var/log/supervisord /var/run/supervisord; \
     rm -rf /var/lib/apt/lists/*
 
 # Install common extensions
-RUN apt-get update && \
-    apt-get -y autoremove && \
+RUN set -ex; \
+    \
+    apt-get update; \
+    apt-get -y autoremove; \
     apt-get -y --no-install-recommends install \
                 libicu-dev \
                 zlib1g-dev \
@@ -35,9 +40,10 @@ RUN apt-get update && \
                 libfreetype6-dev \
                 libjpeg62-turbo-dev \
                 libgmp-dev \
-                libsodium-dev && \
-    docker-php-ext-configure intl && \
-    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
+                libsodium-dev \
+    ; \
+    docker-php-ext-configure intl; \
+    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/; \
     docker-php-ext-install -j$(nproc) \
                 intl \
                 zip \
@@ -51,7 +57,8 @@ RUN apt-get update && \
                 soap \
                 sodium \
                 mbstring \
-                opcache && \
+                opcache \
+    ; \
     apt-get -y remove \
                 icu-devtools \
                 libicu-dev \
@@ -62,21 +69,22 @@ RUN apt-get update && \
                 libfreetype6-dev \
                 libjpeg62-turbo-dev \
                 libgmp-dev \
-                libsodium-dev && \
-    apt-get -y clean && \
+                libsodium-dev; \
+    apt-get -y clean; \
     rm -rf /var/lib/apt/lists/*
 
 # Create a user to own all the code and assets and give them a working
 # directory
-RUN mkdir -p /usr/src/monica && \
-    addgroup --gid 1001 monica && \
-    adduser --uid 1001 --ingroup monica --home /usr/src/monica --shell /bin/bash --no-create-home monica && \
-    adduser monica www-data && \
-    chown -R monica:www-data /usr/src/monica && \
-    echo 'monica ALL=NOPASSWD: ALL' >> /etc/sudoers.d/50-monica && \
+RUN set -ex; \
+    \
+    mkdir -p /var/www/monica; \
+    addgroup --gid 1001 monica; \
+    adduser --uid 1001 --ingroup monica --home /var/www/monica --shell /bin/bash --no-create-home monica; \
+    adduser monica www-data; \
+    chown -R monica:www-data /var/www/monica; \
+    echo 'monica ALL=NOPASSWD: ALL' >> /etc/sudoers.d/50-monica; \
     echo 'Defaults    env_keep += "DEBIAN_FRONTEND"' >> /etc/sudoers.d/env_keep
-WORKDIR /usr/src/monica
-VOLUME /var/www/monica
+WORKDIR /var/www/monica
 
 
 # Copy the local (outside Docker) source into the working directory,
@@ -100,7 +108,9 @@ COPY --chown=monica:www-data public ./public
 COPY --chown=monica:www-data resources ./resources
 COPY --chown=monica:www-data routes ./routes
 
-RUN mkdir -p bootstrap/cache; \
+RUN set -ex; \
+    \
+    mkdir -p bootstrap/cache; \
     mkdir -p storage; \
     chown -R monica:www-data bootstrap/cache storage; \
     chmod -R g+w bootstrap/cache storage
@@ -114,9 +124,11 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
 COPY scripts/docker/opcache.ini /usr/local/etc/php/conf.d/opcache.ini
 
 # Sentry
-RUN echo $VCS_REF > .sentry-release; \
+RUN set -ex; \
+    \
+    echo $VCS_REF > .sentry-release; \
     echo $COMMIT > .sentry-commit; \
-    mkdir -p /root/.local/bin && \
+    mkdir -p /root/.local/bin; \
     curl -sL https://sentry.io/get-cli/ | INSTALL_DIR=/root/.local/bin bash
 
 # Composer installation
@@ -125,26 +137,28 @@ RUN install-composer.sh
 
 # Install composer dependencies
 USER monica
-RUN composer global require hirak/prestissimo; \
+RUN set -ex; \
+    \
+    composer global require hirak/prestissimo; \
+    mkdir -p storage/framework/views; \
     composer install --no-interaction --no-suggest --no-progress --no-dev --ignore-platform-reqs; \
     composer global remove hirak/prestissimo; \
+    \
     composer clear-cache; \
     rm -rf .composer
 
 USER root
-WORKDIR /var/www/monica
 
 # Set crontab for schedules
-RUN set -ex && \
-	cd /etc/cron.hourly && \
-	{ \
-		echo '#!/bin/sh'; \
-		echo '/usr/bin/php /var/www/monica/artisan schedule:run -v > /proc/1/fd/1 2> /proc/1/fd/2'; \
-	} | tee monica && \
-	chmod a+x monica
+RUN set -ex; \
+    \
+    cd /etc/cron.hourly; \
+    { \
+        echo '#!/bin/sh'; \
+        echo '/usr/bin/php /var/www/monica/artisan schedule:run -v > /proc/1/fd/1 2> /proc/1/fd/2'; \
+    } | tee monica; \
+    chmod a+x monica
 
-COPY scripts/docker/upgrade.exclude \
-    /usr/local/share/
 COPY scripts/docker/entrypoint.sh \
     scripts/docker/php-apache/cron.sh \
     scripts/docker/queue.sh \
@@ -154,9 +168,11 @@ ENTRYPOINT ["entrypoint.sh"]
 
 # Apache2
 COPY scripts/docker/000-default.conf /etc/apache2/sites-available/
-RUN echo 'ServerName "monica"' > /etc/apache2/conf-available/hostname.conf
-RUN a2enconf hostname
-RUN a2enmod rewrite cache headers
+RUN set -ex; \
+    \
+    echo 'ServerName "monica"' > /etc/apache2/conf-available/hostname.conf; \
+    a2enconf hostname; \
+    a2enmod rewrite cache headers
 
 EXPOSE 80
 
diff --git a/scripts/docker/upgrade.exclude b/scripts/docker/upgrade.exclude
deleted file mode 100644
index 87fc6324b..000000000
--- a/scripts/docker/upgrade.exclude
+++ /dev/null
@@ -1 +0,0 @@
-/storage/