diff --git a/DEVELOPER.md b/DEVELOPER.md
index 75b32da0..c5704282 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -28,7 +28,7 @@
 
 1. Start stateful services (RabbitMQ, Redis, Grafana with mounted plugin folder)
 ```bash
-docker-compose -f developer-docker-compose.yml up -d
+docker-compose -f docker-compose-developer.yml up -d
 ```
 
 2. Prepare a python environment:
@@ -119,7 +119,7 @@ host IP from inside the container by running:
 ```bash
 /sbin/ip route|awk '/default/ { print $3 }'
 
-# Alternatively add host.docker.internal as an extra_host for grafana in developer-docker-compose.yml
+# Alternatively add host.docker.internal as an extra_host for grafana in docker-compose-developer.yml
 extra_hosts:
   - "host.docker.internal:host-gateway"
 
diff --git a/deploy/docker-compose/README.md b/deploy/docker-compose/README.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/developer-docker-compose.yml b/docker-compose-developer.yml
similarity index 100%
rename from developer-docker-compose.yml
rename to docker-compose-developer.yml
diff --git a/deploy/docker-compose/docker-compose.yml b/docker-compose.yml
similarity index 93%
rename from deploy/docker-compose/docker-compose.yml
rename to docker-compose.yml
index a07bb72e..c15cef14 100644
--- a/deploy/docker-compose/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,6 +22,8 @@ services:
       MYSQL_PORT: 3306
       REDIS_URI: redis://redis:6379/0
       DJANGO_SETTINGS_MODULE: settings.hobby
+      OSS: "True"
+      CELERY_WORKER_QUEUE: "default,critical,long,slack,telegram,webhook,retry,celery"
     depends_on:
       mysql:
         condition: service_healthy
@@ -51,7 +53,8 @@ services:
       MYSQL_PORT: 3306
       REDIS_URI: redis://redis:6379/0
       DJANGO_SETTINGS_MODULE: settings.hobby
-      CELERY_WORKER_QUEUE: "celery"
+      OSS: "True"
+      CELERY_WORKER_QUEUE: "default,critical,long,slack,telegram,webhook,retry,celery"
       CELERY_WORKER_CONCURRENCY: "1"
       CELERY_WORKER_MAX_TASKS_PER_CHILD: "100"
       CELERY_WORKER_SHUTDOWN_INTERVAL: "65m"
@@ -84,6 +87,8 @@ services:
       MYSQL_PORT: 3306
       REDIS_URI: redis://redis:6379/0
       DJANGO_SETTINGS_MODULE: settings.hobby
+      OSS: "True"
+      CELERY_WORKER_QUEUE: "default,critical,long,slack,telegram,webhook,retry,celery"
     depends_on:
       mysql:
         condition: service_healthy