diff --git a/Dockerfile b/Dockerfile
index af9278ab345d5fa42ee10929e43ecc238153844e..bbe4bd223a57965c632a127e0de08cbd4dd901d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -96,7 +96,8 @@ ENV FUNKWHALE_HOSTNAME=yourdomain.funkwhale \
 	NGINX_MAX_BODY_SIZE=100M \
 	STATIC_ROOT=/app/api/staticfiles \
 	FUNKWHALE_SPA_HTML_ROOT=/app/front/dist/index.html \
-	FUNKWHALE_WEB_WORKERS=1
+	FUNKWHALE_WEB_WORKERS=1 \
+	CELERYD_CONCURRENCY=0
 #
 # Entrypoint
 #
diff --git a/root/etc/services.d/celery-worker/run b/root/etc/services.d/celery-worker/run
index 83ba5a270742c95c2fc733ff1e1dee98a6ca7243..e11b140ad04e3a8e47c2e30e506bae7034d7a7a2 100644
--- a/root/etc/services.d/celery-worker/run
+++ b/root/etc/services.d/celery-worker/run
@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv sh
 cd /app/api
-exec s6-setuidgid funkwhale celery -f /var/log/funkwhale/celery-worker.log -A funkwhale_api.taskapp worker
+exec s6-setuidgid funkwhale celery -f /var/log/funkwhale/celery-worker.log -A funkwhale_api.taskapp worker --concurrency=$CELERYD_CONCURRENCY