diff --git a/gunicorn.conf.py b/gunicorn.conf.py
index 8a5a9a986432b9d1232943229a7b666451b28df2..ea417af999926554389a3e45efa91f28dcfc527b 100644
--- a/gunicorn.conf.py
+++ b/gunicorn.conf.py
@@ -9,7 +9,6 @@ workers = 8
 max_requests = 10
 max_requests_jitter = 3
 worker_class = 'sync'
-timeout = 120
 
 # logging
 accesslog = '-'
diff --git a/run-httpd.sh b/run-httpd.sh
index 851eacc31e329f0c80bc8425a67266def03d400a..648650bf476daee3c1f03e00f678ff2e0fe89e13 100755
--- a/run-httpd.sh
+++ b/run-httpd.sh
@@ -2,6 +2,7 @@
 
 
 DEBUG=${DEBUG:="false"}
+WORKER_TIMEOUT=${WORKER_TIMEOUT:=120}
 
 
 if [[ "$DEBUG" = true ]] ; then
@@ -9,5 +10,5 @@ if [[ "$DEBUG" = true ]] ; then
     python3 /var/www/pvs/dev/pvs_instance/manage.py runserver 0.0.0.0:80
 else
     echo "Running gunicorn"
-    exec gunicorn --config /opt/core/gunicorn.conf.py pvs_instance.wsgi:application 2>&1
+    exec gunicorn --config /opt/core/gunicorn.conf.py pvs_instance.wsgi:application --timeout "${WORKER_TIMEOUT}" 2>&1
 fi