diff --git a/.env.sample b/.env.sample
index d7ae437..e1b566a 100644
--- a/.env.sample
+++ b/.env.sample
@@ -27,7 +27,7 @@ DB_PORT=5432
 REDIS_CACHE_HOST=fetcher_redis_cache
 REDIS_CACHE_PORT=6379
 REDIS_CELERY_HOST=fetcher_redis_celery
-REDIS_CELERY_PORT=6380
+REDIS_CELERY_PORT=6379
 
 # Job timeout: 30 min
 JOB_DEFAULT_TIMEOUT=1800
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 56f217e..a4bca3d 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -57,14 +57,14 @@ services:
       file: docker-compose-base.yml
       service: fetcher_redis_cache
     ports:
-      - 6379:6379
+      - 6379
 
   fetcher_redis_celery:
     extends:
       file: docker-compose-base.yml
       service: fetcher_redis_celery
     ports:
-      - 6380:6379
+      - 6379
 
   fetcher_flower:
     extends:
diff --git a/docker-compose.yml b/docker-compose.yml
index b2db30e..6f13f1d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,14 +52,14 @@ services:
       file: docker-compose-base.yml
       service: fetcher_redis_cache
     ports:
-      - 6379:6379
+      - 6379
 
   fetcher_redis_celery:
     extends:
       file: docker-compose-base.yml
       service: fetcher_redis_celery
     ports:
-      - 6380:6379
+      - 6379
 
   fetcher_flower:
     extends: