diff --git a/.env-dist b/.env-dist
index daca58ec3ff..3d38e57838e 100644
--- a/.env-dist
+++ b/.env-dist
@@ -65,9 +65,6 @@ BYTES_DB_URI=postgresql://${BYTES_DB_USER}:${BYTES_DB_PASSWORD}@postgres:5432/${
 # --- Octopoes --- #
 # See `octopoes/octopoes/config/settings.py`
 
-# Number of Celery workers (for the Octopoes API worker) that need to be started
-CELERY_WORKER_CONCURRENCY=${CELERY_WORKER_CONCURRENCY:-4}
-
 # --- Mula --- #
 # See `mula/scheduler/config/settings.py`
 
diff --git a/octopoes/octopoes/config/celery.py b/octopoes/octopoes/config/celery.py
index b9894771081..b47a011f6d2 100644
--- a/octopoes/octopoes/config/celery.py
+++ b/octopoes/octopoes/config/celery.py
@@ -14,3 +14,5 @@
 result_accept_content = ["application/json", "application/x-python-serialize"]
 
 task_queues = (Queue(QUEUE_NAME_OCTOPOES),)
+
+worker_concurrency = settings.workers
diff --git a/octopoes/octopoes/config/settings.py b/octopoes/octopoes/config/settings.py
index 16fce6969b6..5f6e9df343d 100644
--- a/octopoes/octopoes/config/settings.py
+++ b/octopoes/octopoes/config/settings.py
@@ -70,6 +70,8 @@ class Settings(BaseSettings):
 
     outgoing_request_timeout: int = Field(30, description="Timeout for outgoing HTTP requests")
 
+    workers: int = Field(4, description="Number of Octopoes Celery workers")
+
     model_config = SettingsConfigDict(env_prefix="OCTOPOES_")
 
     @classmethod