diff --git a/.env.docker b/.env.docker
index 6da4c14359..e9d78a6f5f 100644
--- a/.env.docker
+++ b/.env.docker
@@ -3,10 +3,10 @@
 APP_ENV=${FF_APP_ENV}
 
 # Set to true if you want to see debug information in error screens.
-APP_DEBUG=false
+APP_DEBUG=${APP_DEBUG}
 
 # This should be your email address
-SITE_OWNER=mail@example.com
+SITE_OWNER=${SITE_OWNER}
 
 # The encryption key for your database and sessions. Keep this very secure.
 # If you generate a new one all existing data must be considered LOST.
@@ -29,13 +29,13 @@ DB_PASSWORD=${FF_DB_PASSWORD}
 # 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
 # Several other options exist. You can use 'single' for one big fat error log (not recommended).
 # Also available are 'syslog' and 'errorlog' which will log to the system itself.
-APP_LOG=daily
+APP_LOG=syslog
 
 # Log level. You can set this from least severe to most severe:
 # debug, info, notice, warning, error, critical, alert, emergency
 # If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
 # nothing will get logged, ever.
-APP_LOG_LEVEL=warning
+APP_LOG_LEVEL=info
 
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
@@ -47,23 +47,23 @@ COOKIE_DOMAIN=
 COOKIE_SECURE=false
 
 # If you want Firefly III to mail you, update these settings
-MAIL_DRIVER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_FROM=changeme@example.com
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
+MAIL_DRIVER=${MAIL_DRIVER}
+MAIL_HOST=${MAIL_HOST}
+MAIL_PORT=${MAIL_PORT}
+MAIL_FROM=${MAIL_FROM}
+MAIL_USERNAME=${MAIL_USERNAME}
+MAIL_PASSWORD=${MAIL_PASSWORD}
+MAIL_ENCRYPTION=${MAIL_ENCRYPTION}
 
 # Firefly III can send you the following messages
 SEND_REGISTRATION_MAIL=true
-SEND_ERROR_MESSAGE=true
+SEND_ERROR_MESSAGE=false
 
 # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
-MAPBOX_API_KEY=
+MAPBOX_API_KEY=${MAPBOX_API_KEY}
 
 # If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
-ANALYTICS_ID=
+ANALYTICS_ID=${ANALYTICS_ID}
 
 # Most parts of the database are encrypted by default, but you can turn this off if you want to.
 # This makes it easier to migrate your database. Not that some fields will never be decrypted.