diff --git a/.deploy/docker/entrypoint.sh b/.deploy/docker/entrypoint.sh
index 1d9f989056..239ef08fe4 100755
--- a/.deploy/docker/entrypoint.sh
+++ b/.deploy/docker/entrypoint.sh
@@ -23,6 +23,15 @@ chmod -R 775 $FIREFLY_PATH/storage
 chown -R www-data:www-data -R $FIREFLY_PATH/app
 chmod -R 775 $FIREFLY_PATH/app
 
+chown -R www-data:www-data -R $FIREFLY_PATH/framework
+chmod -R 775 $FIREFLY_PATH/framework
+
+chown -R www-data:www-data -R $FIREFLY_PATH/logs
+chmod -R 775 $FIREFLY_PATH/logs
+
+chown -R www-data:www-data -R $FIREFLY_PATH/upload
+chmod -R 775 $FIREFLY_PATH/upload
+
 # remove any lingering files that may break upgrades:
 rm -f $FIREFLY_PATH/storage/logs/laravel.log
 
@@ -36,6 +45,5 @@ php artisan firefly:verify
 php artisan passport:install
 php artisan cache:clear
 
-
 php artisan firefly:instructions install
 exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf --nodaemon
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index adbe63bd93..a87317ed64 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -87,11 +87,8 @@ RUN echo "en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nit_IT.UTF-8 U
 # copy Apache config to correct spot.
 COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
 
-# Enable apache mod rewrite..
-RUN a2enmod rewrite
-
-# Enable apache mod ssl..
-RUN a2enmod ssl
+# Enable apache mod rewrite and mod ssl..
+RUN a2enmod rewrite && a2enmod ssl
 
 # Create volumes
 VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload