diff --git a/docker-compose.yml b/docker-compose.yml
index ebecc246..c0e5d60c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,7 +45,7 @@ services:
     build: .
     restart: always
     command: >
-      sh -c "poetry run celery -A evibes worker --loglevel=info --concurrency=4 --autoscale=4,2 --max-tasks-per-child=100 --max-memory-per-child=512000 --soft-time-limit=7200 --time-limit=10800"
+      sh -c "poetry run celery -A evibes worker --loglevel=info --concurrency=4 --autoscale=4,2 --max-tasks-per-child=100 --max-memory-per-child=512000 --soft-time-limit=10800 --time-limit=21600"
     volumes:
       - .:/app
     env_file:
diff --git a/evibes/celery.py b/evibes/celery.py
index 2d21e8ce..d0479561 100644
--- a/evibes/celery.py
+++ b/evibes/celery.py
@@ -29,8 +29,8 @@ app.conf.update(
     task_reject_on_worker_lost=True,
     worker_prefetch_multiplier=1,
     worker_max_tasks_per_child=100,
-    task_soft_time_limit=7200,
-    task_time_limit=10800,
+    task_soft_time_limit=10800,
+    task_time_limit=21600,
 )
 
 app.config_from_object("django.conf:settings", namespace="CELERY")