diff --git a/docker-compose.yml b/docker-compose.yml
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -151,6 +151,7 @@
       POSTGRES_DB: swh-idx-storage
       PGHOST: swh-idx-storage-db
       PGUSER: postgres
+      SWH_CONFIG_FILENAME: /indexer_storage.yml
     volumes:
       - "./conf/indexer_storage.yml:/indexer_storage.yml:ro"
 
diff --git a/dockerfiles/swh-indexer-storage/Dockerfile b/dockerfiles/swh-indexer-storage/Dockerfile
--- a/dockerfiles/swh-indexer-storage/Dockerfile
+++ b/dockerfiles/swh-indexer-storage/Dockerfile
@@ -6,7 +6,7 @@
     libsystemd-dev postgresql-client
 
 RUN pip install --upgrade pip setuptools wheel
-RUN pip install swh-indexer
+RUN pip install swh-indexer gunicorn
 
 COPY entrypoint.sh /
 
diff --git a/dockerfiles/swh-indexer-storage/entrypoint.sh b/dockerfiles/swh-indexer-storage/entrypoint.sh
--- a/dockerfiles/swh-indexer-storage/entrypoint.sh
+++ b/dockerfiles/swh-indexer-storage/entrypoint.sh
@@ -41,6 +41,9 @@
           --db-name ${POSTGRES_DB}
 
     echo Starting the swh-indexer-storage API server
-        exec python -m swh.indexer.storage.api.server /indexer_storage
+    exec gunicorn --bind 0.0.0.0:5007 \
+         --reload \
+         --log-level DEBUG \
+         swh.indexer.storage.api.wsgi
     ;;
 esac