diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
index 515427de74..f3918303b6 100644
--- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
@@ -175,6 +175,9 @@ factory.addStep(ShellCommand(command=["runtask",
                                         Interpolate('%(prop:taskname)s.yml')],
                              descriptionDone=[Interpolate('%(prop:taskname)s on %(prop:item)s')],
                              name='runtask',
+{% if deployment_type in ['dev'] %}
+                             timeout=2400,
+{% endif %}
                              logfiles={'taskotron.log': {'filename': '/var/log/taskotron/taskotron.log', }}))