diff --git a/docker-compose.yml b/docker-compose.yml
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -159,6 +159,12 @@
   swh-web:
     build: ./dockerfiles/swh-web
     image: swh/web
+    command:
+      - runserver
+      - --verbosity 3
+      - --insecure
+      - 0.0.0.0:5004
+
     ports:
       - 5004:5004
     depends_on:
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
@@ -14,16 +14,12 @@
 echo Installed Python packages:
 pip list
 
-if [ "$1" = 'shell' ] ; then
-    exec bash -i
-else
-    echo "starting the swh-web server"
-    # options:
-    # --verbosity to have sensible output
-    # --insecure to serve the static css/js
-    # 0.0.0.0 so that we can actually reach the service.
-    exec python3 -m swh.web.manage runserver \
-         --verbosity 3 \
-         --insecure \
-         0.0.0.0:5004
-fi
+case "$1" in
+    "shell")
+        exec bash -i
+        ;;
+	*)
+		echo "starting the swh-web server"
+		exec python3 -m swh.web.manage $@
+		;;
+esac