diff --git a/master.yml b/master.yml
index 27dcdd74be..4c5b154aef 100644
--- a/master.yml
+++ b/master.yml
@@ -99,10 +99,12 @@
 - include: /srv/web/infra/ansible/playbooks/groups/summershum.yml
 - include: /srv/web/infra/ansible/playbooks/groups/sundries.yml
 - include: /srv/web/infra/ansible/playbooks/groups/tagger.yml
+- include: /srv/web/infra/ansible/playbooks/groups/taskotron-client-hosts.yml
 - include: /srv/web/infra/ansible/playbooks/groups/taskotron-prod.yml
 - include: /srv/web/infra/ansible/playbooks/groups/taskotron-prod-clients.yml
 - include: /srv/web/infra/ansible/playbooks/groups/taskotron-dev.yml
-- include: /srv/web/infra/ansible/playbooks/groups/taskotron-dev-clients.yml
+# taskotron-dev-clients is being replaced with taskotron-client-hosts, can be removed soon. 2015-11-16 - tflink
+#- include: /srv/web/infra/ansible/playbooks/groups/taskotron-dev-clients.yml
 - include: /srv/web/infra/ansible/playbooks/groups/taskotron-stg.yml
 - include: /srv/web/infra/ansible/playbooks/groups/taskotron-stg-clients.yml
 - include: /srv/web/infra/ansible/playbooks/groups/torrent.yml