diff --git a/Makefile.local b/Makefile.local
index c7aff3c..29dc2ad 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,20 +1,24 @@
 .PHONY: run-dev
 run-dev:
-	export SWH_CONFIG_FILENAME=config/dev.yml; uvicorn swh.graphql.server:make_app_from_configfile --reload
+	export SWH_CONFIG_FILENAME=config/dev.yml; uvicorn swh.graphql.server:make_app_from_configfile --reload --factory
 
 .PHONY: run-dev-stable
 run-dev-stable:
-	export SWH_CONFIG_FILENAME=config/dev.yml; uvicorn swh.graphql.server:make_app_from_configfile
+	export SWH_CONFIG_FILENAME=config/dev.yml; uvicorn swh.graphql.server:make_app_from_configfile --factory
+
+.PHONY: run-wsgi
+run-wsgi:
+	export SWH_CONFIG_FILENAME=config/staging.yml; gunicorn --workers=2 'swh.graphql.server:make_app_from_configfile()'
 
 .PHONY: run-dev-docker
 run-dev-docker:
 	docker-compose -f docker-compose.yml -f docker-compose-dev.yml up --build
 
-.PHONY: run-staging
-run-staging:
+.PHONY: run-wsgi-docker
+run-wsgi-docker:
 	docker-compose -f docker-compose.yml -f docker-compose-staging.yml up --build
 
 .PHONY: update-desktop6
 update-desktop6:
 	git pull origin master
 	docker-compose -f docker-compose.yml -f docker-compose-staging.yml restart
diff --git a/config/staging.yml b/config/staging.yml
index c5b7437..10a0133 100644
--- a/config/staging.yml
+++ b/config/staging.yml
@@ -1,7 +1,7 @@
 storage:
   cls: remote
   url: http://webapp.internal.staging.swh.network:5002
 
 debug: yes
 
-server-type: asgi
+server-type: wsgi
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index bb3f571..0a6cf4b 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -1,7 +1,7 @@
 version: "3.4"
 
 services:
   app:
     environment:
       - SWH_CONFIG_FILENAME=config/dev.yml
-    command: uvicorn swh.graphql.server:make_app_from_configfile --host 0.0.0.0 --port 8000 --reload
+    command: uvicorn swh.graphql.server:make_app_from_configfile --host 0.0.0.0 --port 8000 --reload --factory
diff --git a/docker-compose-staging.yml b/docker-compose-staging.yml
index d6c2b04..3dd8637 100644
--- a/docker-compose-staging.yml
+++ b/docker-compose-staging.yml
@@ -1,8 +1,8 @@
 version: "3.4"
 
 services:
   app:
     dns: 192.168.100.29
     environment:
       - SWH_CONFIG_FILENAME=config/staging.yml
-    command: uvicorn swh.graphql.server:make_app_from_configfile --host 0.0.0.0 --port 8000 --reload
+    command: gunicorn --bind=0.0.0.0:8000 --workers=2 'swh.graphql.server:make_app_from_configfile()'