diff --git a/tasks.py b/tasks.py
index e5d9dd5..62155ae 100644
--- a/tasks.py
+++ b/tasks.py
@@ -19,7 +19,10 @@ import pickle
 
 
 app = Celery('tasks', broker=flaskapp.config['CELERY_BROKER'],
-             task_serializer='pickle')
+             task_serializer='pickle',
+             task_soft_time_limit=600,
+             task_time_limit=1200,
+             )
 app.conf.task_queues = (
         Queue('default', routing_key='celery'),
         Queue('high_prio', routing_key='high'),