diff --git a/Dockerfile b/Dockerfile
index 8c979147244edb188b13ff27d8f8a9a02d393bf8..1616c6d42727e33ec4dae22ba3d6a9bdd13b8259 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,17 +23,22 @@ ENV PHP_EXTENSION_APCU=0 \
     PHP_EXTENSION_PDO_MYSQL=0 \
     PHP_EXTENSION_IGBINARY=0 \
     PHP_EXTENSION_REDIS=0 \
-    PHP_EXTENSION_SOAP=0 \
-    APP_ENV=prod \
+    PHP_EXTENSION_SOAP=0
+
+# |--------------------------------------------------------------------------
+# | Enable production config files
+# |--------------------------------------------------------------------------
+ENV APP_ENV=prod \
     TEMPLATE_PHP_INI=production \
     PHP_INI_ERROR_REPORTING=0
 
+# |--------------------------------------------------------------------------
+# | Run Apache as www-data for more security
+# |--------------------------------------------------------------------------
+ENV APACHE_RUN_USER=www-data \
+    APACHE_RUN_GROUP=www-data
 
 # |--------------------------------------------------------------------------
 # | Add php files of website
 # |--------------------------------------------------------------------------
-COPY ./public /var/www/html
-
-# Change back Apache user and group to www-data
-ENV APACHE_RUN_USER=www-data \
-    APACHE_RUN_GROUP=www-data
\ No newline at end of file
+COPY ./public /var/www/html
\ No newline at end of file