diff --git a/docker/.env b/docker/.env
index 619c7d8760..a2e9faeacd 100644
--- a/docker/.env
+++ b/docker/.env
@@ -39,7 +39,7 @@ PYTHONPATH=/app/pythonpath:/app/docker/pythonpath_dev
 REDIS_HOST=redis
 REDIS_PORT=6379
 
-SUPERSET_ENV=development
+FLASK_DEBUG=true
 SUPERSET_ENV=development
 SUPERSET_LOAD_EXAMPLES=yes
 CYPRESS_CONFIG=false
diff --git a/docker/.env-non-dev b/docker/.env-non-dev
index cf4764221c..1d071af6a2 100644
--- a/docker/.env-non-dev
+++ b/docker/.env-non-dev
@@ -39,7 +39,6 @@ PYTHONPATH=/app/pythonpath:/app/docker/pythonpath_dev
 REDIS_HOST=redis
 REDIS_PORT=6379
 
-SUPERSET_ENV=production
 SUPERSET_ENV=production
 SUPERSET_LOAD_EXAMPLES=yes
 SUPERSET_SECRET_KEY=TEST_NON_DEV_SECRET
diff --git a/docker/docker-bootstrap.sh b/docker/docker-bootstrap.sh
index ad6ee57616..2f86342714 100755
--- a/docker/docker-bootstrap.sh
+++ b/docker/docker-bootstrap.sh
@@ -46,7 +46,7 @@ case "${1}" in
     celery --app=superset.tasks.celery_app:app beat --pidfile /tmp/celerybeat.pid -l INFO -s "${SUPERSET_HOME}"/celerybeat-schedule
     ;;
   app)
-    echo "Starting web app..."
+    echo "Starting web app (using development server)..."
     flask run -p 8088 --with-threads --reload --debugger --host=0.0.0.0
     ;;
   app-gunicorn)