diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 99f89564a6..57ed13d9cf 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -27,7 +27,7 @@ else
         --workers 1 \
         --worker-class gthread \
         --threads 20 \
-        --timeout 60 \
+        --timeout ${GUNICORN_TIMEOUT:-60} \
         --limit-request-line 0 \
         --limit-request-field_size 0 \
         "${FLASK_APP}"
diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
index 1fdee9162a..6541002167 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -48,6 +48,8 @@ envFromSecret: '{{ template "superset.fullname" . }}-env'
 ## Extra environment variables that will be passed into pods
 ##
 extraEnv: {}
+  # Extend timeout to allow long running queries.
+  # GUNICORN_TIMEOUT: 300
 
 ## Extra environment variables to pass as secrets
 ##
@@ -76,6 +78,9 @@ extraSecrets: {}
 # A dictionary of overrides to append at the end of superset_config.py - the name does not matter
 # WARNING: the order is not guaranteed
 configOverrides: {}
+  #  extend_timeout: |
+  #    # Extend timeout to allow long running queries.
+  #    SUPERSET_WEBSERVER_TIMEOUT = ...
   # enable_oauth: |
   #   from flask_appbuilder.security.manager import AUTH_DB
   #   AUTH_TYPE = AUTH_OAUTH
@@ -121,6 +126,10 @@ ingress:
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+    ## Extend timeout to allow long running queries.
+    # nginx.ingress.kubernetes.io/proxy-connect-timeout: "300"
+    # nginx.ingress.kubernetes.io/proxy-read-timeout: "300"
+    # nginx.ingress.kubernetes.io/proxy-send-timeout: "300"
   path: /
   hosts:
     - chart-example.local