diff --git a/docker-compose.yml b/docker-compose.yml
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -164,11 +164,6 @@
   swh-web:
     build: ./dockerfiles/swh-web
     image: swh/web
-    command:
-      - runserver
-      - --verbosity 3
-      - --insecure
-      - 0.0.0.0:5004
 
     ports:
       - 5004:5004
@@ -178,10 +173,11 @@
       - swh-idx-storage
     environment:
       VERBOSITY: 3
-      #DJANGO_SETTINGS_MODULE: djangosettings
+      # DJANGO_SETTINGS_MODULE: djangosettings
+      SWH_CONFIG_FILENAME: /web.yml
       PYTHONPATH: /tmp/swh
     volumes:
-      - "./conf/web.yml:/etc/softwareheritage/web/web.yml:ro"
+      - "./conf/web.yml:/web.yml:ro"
       - "./conf/djangosettings.py:/tmp/swh/djangosettings.py"
 
   swh-deposit-db:
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
@@ -11,5 +11,3 @@
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
-
-EXPOSE 5002
diff --git a/dockerfiles/swh-web/Dockerfile b/dockerfiles/swh-web/Dockerfile
--- a/dockerfiles/swh-web/Dockerfile
+++ b/dockerfiles/swh-web/Dockerfile
@@ -8,6 +8,7 @@
 
 RUN pip install swh-web
 RUN pip install psycopg2-binary  # to make pip silent
+RUN pip install gunicorn
 RUN python3 -m swh.web.manage migrate
 
 COPY entrypoint.sh /
diff --git a/dockerfiles/swh-web/entrypoint.sh b/dockerfiles/swh-web/entrypoint.sh
--- a/dockerfiles/swh-web/entrypoint.sh
+++ b/dockerfiles/swh-web/entrypoint.sh
@@ -18,8 +18,7 @@
     "shell")
         exec bash -i
         ;;
-	*)
-		echo "starting the swh-web server"
-		exec python3 -m swh.web.manage $@
-		;;
+     *)
+        echo "starting the swh-web server"
+        exec gunicorn -b 0.0.0.0:5004 swh.web.wsgi
 esac