diff --git a/dockerfiles/swh-deposit/entrypoint.sh b/dockerfiles/swh-deposit/entrypoint.sh
index 41f027c..1f936a9 100755
--- a/dockerfiles/swh-deposit/entrypoint.sh
+++ b/dockerfiles/swh-deposit/entrypoint.sh
@@ -1,40 +1,41 @@
 #!/bin/bash
 
 set -ex
 
 if [[ -d /src ]] ; then
     pwd
     for src_repo in /src/swh-* ; do
         pushd $src_repo
         echo "Installing ${src_repo}"
         pip install -e .
         popd
     done
 fi
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
 [swh-deposit]
 host=${PGHOST}
 port=5432
 dbname=${POSTGRES_DB}
 user=${PGUSER}
 EOF
 
 chmod 0600 ~/.pgpass
 
 if [ "$1" = 'shell' ] ; then
     exec bash -i
 else
     echo "Waiting for postgresql to start"
     until psql postgresql:///?service=swh-deposit -c "select 1" > /dev/null 2> /dev/null; do sleep 0.1; done
 
     echo "Migrating db"
     django-admin migrate --settings=swh.deposit.settings.production
 
     echo "starting swh-deposit server"
     exec gunicorn --bind 0.0.0.0:5006 \
                   --reload \
                   --log-level DEBUG \
+                  --timeout 3600 \
                   swh.deposit.wsgi
 fi
diff --git a/dockerfiles/swh-indexer-storage/entrypoint.sh b/dockerfiles/swh-indexer-storage/entrypoint.sh
index 86ec1d5..95b58a2 100755
--- a/dockerfiles/swh-indexer-storage/entrypoint.sh
+++ b/dockerfiles/swh-indexer-storage/entrypoint.sh
@@ -1,49 +1,50 @@
 #!/bin/bash
 
 set -e
 export PATH=${HOME}/.local/bin:${PATH}
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         echo "WARNING: $srcrepo will NOT be pip installed in dev mode"
         echo "         due to permission limitations."
         pip install --user .
         popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
 [swh-indexer]
 dbname=${POSTGRES_DB}
 host=${PGHOST}
 port=5432
 user=${PGUSER}
 EOF
 
 chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
 
     echo Waiting for postgresql to start
     until psql postgresql:///?service=swh-indexer -c "select 1" 2>&1 > /dev/null; do sleep 0.1; done
 
     echo Setup the database
     PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init indexer \
           --db-name ${POSTGRES_DB}
 
     echo Starting the swh-indexer-storage API server
     exec gunicorn --bind 0.0.0.0:5007 \
          --reload \
          --log-level DEBUG \
+         --timeout 3600 \
          swh.indexer.storage.api.wsgi
     ;;
 esac
diff --git a/dockerfiles/swh-objstorage/entrypoint.sh b/dockerfiles/swh-objstorage/entrypoint.sh
index 4b3b931..182afe6 100755
--- a/dockerfiles/swh-objstorage/entrypoint.sh
+++ b/dockerfiles/swh-objstorage/entrypoint.sh
@@ -1,29 +1,30 @@
 #!/bin/bash
 
 set -e
 
 echo Step 1
 if [[ -d /src ]] ; then
 	echo Yes
 	for srcrepo in /src/swh-* ; do
 		echo installing $srcrepo
 		pushd $srcrepo
 		pip install -e .
 		popd
 	done
 fi
 
 echo Installed Python packages:
 pip list
 
 if [ "$1" = 'shell' ] ; then
 	exec bash -i
 else
 	echo Starting the swh-objstorage API server
-        exec gunicorn --bind 0.0.0.0:5003 \
-           --worker-class aiohttp.worker.GunicornWebWorker \
-           --log-level DEBUG \
-           --reload \
-           swh.objstorage.api.wsgi
+  exec gunicorn --bind 0.0.0.0:5003 \
+       --worker-class aiohttp.worker.GunicornWebWorker \
+       --log-level DEBUG \
+       --reload \
+       --timeout 3600 \
+       swh.objstorage.api.wsgi
 
 fi
diff --git a/dockerfiles/swh-scheduler-api/entrypoint.sh b/dockerfiles/swh-scheduler-api/entrypoint.sh
index a597c8e..9a3c0de 100755
--- a/dockerfiles/swh-scheduler-api/entrypoint.sh
+++ b/dockerfiles/swh-scheduler-api/entrypoint.sh
@@ -1,48 +1,49 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         pip install -e .
         popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
 [swh-scheduler]
 dbname=${POSTGRES_DB}
 host=${PGHOST}
 port=5432
 user=${PGUSER}
 EOF
 
 chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     "swh-scheduler")
         exec $@
         ;;
     *)
         echo Waiting for postgresql to start
         until psql postgresql:///?service=swh-scheduler -c "select 1" 2>&1 > /dev/null; do sleep 0.1; done
 
         echo Setup the swh-scheduler API database
         PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init scheduler \
                   --db-name ${POSTGRES_DB}
 
         echo Starting the swh-scheduler API server
         exec gunicorn --bind 0.0.0.0:5008 \
-           --log-level DEBUG \
-           --reload \
-           swh.scheduler.api.wsgi
+             --log-level DEBUG \
+             --reload \
+             --timeout 3600 \
+             swh.scheduler.api.wsgi
 
 esac
diff --git a/dockerfiles/swh-storage/entrypoint.sh b/dockerfiles/swh-storage/entrypoint.sh
index 0a7a304..90db8df 100755
--- a/dockerfiles/swh-storage/entrypoint.sh
+++ b/dockerfiles/swh-storage/entrypoint.sh
@@ -1,45 +1,46 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
       pushd $srcrepo
       pip install -e .
       popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
 [swh]
 dbname=${POSTGRES_DB}
 host=${PGHOST}
 port=5432
 user=${PGUSER}
 EOF
 
 chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
       exec bash -i
       ;;
     *)
       echo Waiting for postgresql to start
       until psql postgresql:///?service=swh -c "select 1" > /dev/null 2> /dev/null; do sleep 0.1; done
 
       echo Setup the database
       PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init storage \
           --db-name ${POSTGRES_DB}
 
       echo Starting the swh-storage API server
       exec gunicorn --bind 0.0.0.0:5002 \
            --reload \
            --log-level DEBUG \
+           --timeout 3600 \
            swh.storage.api.wsgi
       ;;
 esac
diff --git a/dockerfiles/swh-web/entrypoint.sh b/dockerfiles/swh-web/entrypoint.sh
index dd70424..4b3ba18 100755
--- a/dockerfiles/swh-web/entrypoint.sh
+++ b/dockerfiles/swh-web/entrypoint.sh
@@ -1,24 +1,26 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         echo installing $srcrepo
         pip install -e .
         popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
      *)
         echo "starting the swh-web server"
-        exec gunicorn -b 0.0.0.0:5004 swh.web.wsgi
+        exec gunicorn --bind 0.0.0.0:5004 \
+             --timeout 3600 \
+             swh.web.wsgi
 esac