diff --git a/docker-compose-non-dev.yml b/docker-compose-non-dev.yml
index 94c2ac576dd9b..e7ed56a278b80 100644
--- a/docker-compose-non-dev.yml
+++ b/docker-compose-non-dev.yml
@@ -44,6 +44,8 @@ services:
     env_file: docker/.env-non-dev
     image: *superset-image
     container_name: superset_app
+    command: ["/app/docker/docker-bootstrap.sh", "app-gunicorn"]
+    user: "root"
     restart: unless-stopped
     ports:
       - 8088:8088
diff --git a/docker/docker-bootstrap.sh b/docker/docker-bootstrap.sh
index ca7cd203bdabf..b934640efb0c0 100755
--- a/docker/docker-bootstrap.sh
+++ b/docker/docker-bootstrap.sh
@@ -45,4 +45,7 @@ elif [[ "${1}" == "beat" ]]; then
 elif [[ "${1}" == "app" ]]; then
   echo "Starting web app..."
   flask run -p 8088 --with-threads --reload --debugger --host=0.0.0.0
+elif [[ "${1}" == "app-gunicorn" ]]; then
+  echo "Starting web app..."
+  /app/docker/docker-entrypoint.sh
 fi