diff --git a/services/swh-deposit/entrypoint.sh b/services/swh-deposit/entrypoint.sh
index 41e3b32..78e9204 100755
--- a/services/swh-deposit/entrypoint.sh
+++ b/services/swh-deposit/entrypoint.sh
@@ -1,33 +1,35 @@
 #!/bin/bash
 
 set -ex
 
 source /srv/softwareheritage/utils/pyutils.sh
 setup_pip
 
 source /srv/softwareheritage/utils/pgsql.sh
 setup_pgsql
 
 if [ "$1" = 'shell' ] ; then
     exec bash -i
 else
 
     wait_pgsql
 
     echo "Migrating db"
     django-admin migrate --settings=swh.deposit.settings.production
 
     swh-deposit admin user exists test || \
         swh-deposit admin user create \
                     --username test \
                     --password test \
                     --provider-url https://softwareheritage.org \
                     --domain softwareheritage.org
 
     echo "starting swh-deposit server"
     exec gunicorn --bind 0.0.0.0:5006 \
                   --reload \
+                  --threads 2 \
+                  --workers 2 \
                   --log-level DEBUG \
                   --timeout 3600 \
                   swh.deposit.wsgi
 fi
diff --git a/services/swh-indexer-storage/entrypoint.sh b/services/swh-indexer-storage/entrypoint.sh
index c775d65..0eec97f 100755
--- a/services/swh-indexer-storage/entrypoint.sh
+++ b/services/swh-indexer-storage/entrypoint.sh
@@ -1,30 +1,32 @@
 #!/bin/bash
 
 set -e
 
 source /srv/softwareheritage/utils/pyutils.sh
 setup_pip
 
 source /srv/softwareheritage/utils/pgsql.sh
 setup_pgsql
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
 
     wait_pgsql
 
     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 \
+         --threads 2 \
+         --workers 2 \
          --log-level DEBUG \
          --timeout 3600 \
          swh.indexer.storage.api.wsgi
     ;;
 esac
diff --git a/services/swh-objstorage/entrypoint.sh b/services/swh-objstorage/entrypoint.sh
index a0ef87b..12161f8 100755
--- a/services/swh-objstorage/entrypoint.sh
+++ b/services/swh-objstorage/entrypoint.sh
@@ -1,22 +1,24 @@
 #!/bin/bash
 
 set -e
 
 source /srv/softwareheritage/utils/pyutils.sh
 setup_pip
 
 echo Installed Python packages:
 pip list
 
 if [ "$1" = 'shell' ] ; then
-	exec bash -i
+    exec bash -i
 else
-	echo Starting the swh-objstorage API server
+    echo Starting the swh-objstorage API server
   exec gunicorn --bind 0.0.0.0:5003 \
        --worker-class aiohttp.worker.GunicornWebWorker \
        --log-level DEBUG \
+       --threads 4 \
+       --workers 2 \
        --reload \
        --timeout 3600 \
        swh.objstorage.api.wsgi
 
 fi
diff --git a/services/swh-scheduler-api/entrypoint.sh b/services/swh-scheduler-api/entrypoint.sh
index e023451..f8e618f 100755
--- a/services/swh-scheduler-api/entrypoint.sh
+++ b/services/swh-scheduler-api/entrypoint.sh
@@ -1,32 +1,34 @@
 #!/bin/bash
 
 set -e
 
 source /srv/softwareheritage/utils/pyutils.sh
 setup_pip
 
 source /srv/softwareheritage/utils/pgsql.sh
 setup_pgsql
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     "swh-scheduler")
         exec $@
         ;;
     *)
         wait_pgsql
 
         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 \
+             --threads 2 \
+             --workers 2 \
              --reload \
              --timeout 3600 \
              swh.scheduler.api.wsgi
 
 esac
diff --git a/services/swh-storage/entrypoint.sh b/services/swh-storage/entrypoint.sh
index bd69924..5457702 100755
--- a/services/swh-storage/entrypoint.sh
+++ b/services/swh-storage/entrypoint.sh
@@ -1,29 +1,31 @@
 #!/bin/bash
 
 set -e
 
 source /srv/softwareheritage/utils/pyutils.sh
 setup_pip
 
 source /srv/softwareheritage/utils/pgsql.sh
 setup_pgsql
 
 case "$1" in
     "shell")
       exec bash -i
       ;;
     *)
       wait_pgsql
 
       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 \
+           --threads 4 \
+           --workers 2 \
            --log-level DEBUG \
            --timeout 3600 \
            swh.storage.api.wsgi
       ;;
 esac
diff --git a/services/swh-web/entrypoint.sh b/services/swh-web/entrypoint.sh
index ddd6ad7..44f5cd3 100755
--- a/services/swh-web/entrypoint.sh
+++ b/services/swh-web/entrypoint.sh
@@ -1,23 +1,25 @@
 #!/bin/bash
 
 set -e
 
 source /srv/softwareheritage/utils/pyutils.sh
 setup_pip
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
      *)
         echo "Migrating db using ${DJANGO_SETTINGS_MODULE}"
         django-admin migrate --settings=${DJANGO_SETTINGS_MODULE}
 
         echo "Creating admin user"
         echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', 'admin@swh-web.org', 'admin')" | python3 -m swh.web.manage shell || true
 
         echo "starting the swh-web server"
         exec gunicorn --bind 0.0.0.0:5004 \
+             --threads 2 \
+             --workers 2 \
              --timeout 3600 \
              swh.web.wsgi
 esac