--- a/modules/taskcluster_worker/templates/taskcluster-worker.yml.erb
+++ b/modules/taskcluster_worker/templates/taskcluster-worker.yml.erb
@@ -18,19 +18,27 @@ config:
   plugins:
     disabled: []
     artifacts: {}
     livelog: {}
     success: {}
     reboot:
       maxLifeCycle: '96 hours'
       allowTaskReboots: true
+    # tasks can never take more than 96 hours (but typically are limited by their own maxRunTime)
     maxruntime:
       maxRunTime: '96 hours'
       perTaskLimit: allow
+    #  if any step takes more than 30 min we shutdown, except the running step
+    #  which is limited by maxruntime (doesn't work - https://github.com/taskcluster/taskcluster-worker/issues/271)
+    # watchdog: {}
+    logprefix:
+      hostname: <%= scope.lookupvar('::fqdn') %>
+      workerType: <%= @taskcluster_worker_type %>
+      workerGroup:  <%= @taskcluster_worker_group %>
     env:
       extra:
 <% if @operatingsystem == 'Darwin' -%>
         PATH: "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
         # we probably don't need the remainder
         TMPDIR: {$env: TMPDIR}
         SHELL: '/bin/bash'
         LANG: 'en_US.UTF-8'