diff --git a/cms/settings.py b/cms/settings.py
index 7945215..dc18647 100644
--- a/cms/settings.py
+++ b/cms/settings.py
@@ -418,6 +418,7 @@ CELERY_TASK_SERIALIZER = "json"
 CELERY_RESULT_SERIALIZER = "json"
 CELERY_TIMEZONE = TIME_ZONE
 CELERY_SOFT_TIME_LIMIT = 2 * 60 * 60
+CELERY_SHORT_SOFT_TIME_LIMIT = 60 * 30
 CELERY_WORKER_PREFETCH_MULTIPLIER = 1
 CELERYD_PREFETCH_MULTIPLIER = 1
 
diff --git a/deploy/docker/supervisord/supervisord-celery_short.conf b/deploy/docker/supervisord/supervisord-celery_short.conf
index f7827ea..708cec7 100644
--- a/deploy/docker/supervisord/supervisord-celery_short.conf
+++ b/deploy/docker/supervisord/supervisord-celery_short.conf
@@ -9,4 +9,4 @@ user=www-data
 directory=/home/mediacms.io/mediacms
 priority=400
 startinorder=true
-command=/home/mediacms.io/bin/celery multi start short1 short2 --pidfile=/var/run/mediacms/%%n.pid --loglevel=INFO --logfile=/home/mediacms.io/mediacms/logs/celery_short.log --soft-time-limit=300 -c10 -Q short_tasks
+command=/home/mediacms.io/bin/celery multi start short1 short2 --pidfile=/var/run/mediacms/%%n.pid --loglevel=INFO --logfile=/home/mediacms.io/mediacms/logs/celery_short.log -c10 -Q short_tasks
diff --git a/files/tasks.py b/files/tasks.py
index aee5b67..ce9a0b1 100644
--- a/files/tasks.py
+++ b/files/tasks.py
@@ -48,7 +48,7 @@ ERRORS_LIST = [
 ]
 
 
-@task(name="chunkize_media", bind=True, queue="short_tasks", soft_time_limit=60 * 30)
+@task(name="chunkize_media", bind=True, queue="short_tasks", soft_time_limit=settings.CELERY_SHORT_SOFT_TIME_LIMIT)
 def chunkize_media(self, friendly_token, profiles, force=True):
     """Break media in chunks and start encoding tasks"""