diff --git a/Dockerfile b/Dockerfile
index 5b2862ac32..088c2d50d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,10 +46,7 @@ COPY . $FIREFLY_PATH
 
 RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage
 
-RUN composer install --prefer-dist --no-dev --no-scripts
-RUN composer dump-autoload
-RUN php artisan firefly:instructions install
-RUN php artisan optimize
+RUN composer install --prefer-dist --no-dev --no-scripts && cat .env.docker | envsubst > .env && composer dump-autoload && php artisan firefly:instructions install && php artisan optimize
 
 EXPOSE 80
 
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 2d7d479bfb..933e3c1536 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-cat .env.docker | envsubst > .env
+# cat .env.docker | envsubst > .env
 
 exec apache2-foreground