diff --git a/DEVELOPER_SETUP.md b/DEVELOPER_SETUP.md
index 4f5d2a5f3..819d8871a 100644
--- a/DEVELOPER_SETUP.md
+++ b/DEVELOPER_SETUP.md
@@ -27,7 +27,6 @@ cp env.template .env
 
 ```dotenv
 ROMM_BASE_PATH=/app/romm
-GUNICORN_WORKERS=4
 DEV_MODE=true
 ```
 
diff --git a/docker/init_scripts/init b/docker/init_scripts/init
index e7044a080..427f62fbf 100755
--- a/docker/init_scripts/init
+++ b/docker/init_scripts/init
@@ -104,12 +104,12 @@ start_bin_gunicorn() {
 		--pid=/tmp/gunicorn.pid \
 		--forwarded-allow-ips="*" \
 		--worker-class uvicorn_worker.UvicornWorker \
-		--workers "${GUNICORN_WORKERS:-1}" \
-		--timeout "${GUNICORN_TIMEOUT:-300}" \
-		--keep-alive "${GUNICORN_KEEPALIVE:-2}" \
-		--max-requests "${GUNICORN_MAX_REQUESTS:-1000}" \
-		--max-requests-jitter "${GUNICORN_MAX_REQUESTS_JITTER:-100}" \
-		--worker-connections "${GUNICORN_WORKER_CONNECTIONS:-1000}" \
+		--workers "${WEB_SERVER_CONCURRENCY:-1}" \
+		--timeout "${WEB_SERVER_TIMEOUT:-300}" \
+		--keep-alive "${WEB_SERVER_KEEPALIVE:-2}" \
+		--max-requests "${WEB_SERVER_MAX_REQUESTS:-1000}" \
+		--max-requests-jitter "${WEB_SERVER_MAX_REQUESTS_JITTER:-100}" \
+		--worker-connections "${WEB_SERVER_WORKER_CONNECTIONS:-1000}" \
 		--error-logfile - \
 		--log-config /etc/gunicorn/logging.conf \
 		main:app &
diff --git a/env.template b/env.template
index 1bf97f697..2282ab3e2 100644
--- a/env.template
+++ b/env.template
@@ -91,11 +91,11 @@ YOUTUBE_BASE_URL=https://www.youtube.com
 # Logging
 LOGLEVEL=DEBUG
 
-# Gunicorn (optional)
+# Web server (optional)
 # Workers -> (2 × CPU cores) + 1
-GUNICORN_WORKERS=2
-GUNICORN_TIMEOUT=300
-GUNICORN_KEEPALIVE=2
-GUNICORN_MAX_REQUESTS=1000
-GUNICORN_MAX_REQUESTS_JITTER=100
-GUNICORN_WORKER_CONNECTIONS=1000
+WEB_SERVER_CONCURRENCY=2
+WEB_SERVER_TIMEOUT=300
+WEB_SERVER_KEEPALIVE=2
+WEB_SERVER_MAX_REQUESTS=1000
+WEB_SERVER_MAX_REQUESTS_JITTER=100
+WEB_SERVER_WORKER_CONNECTIONS=1000