diff --git a/roles/phabricator/tasks/daemons.yml b/roles/phabricator/tasks/daemons.yml
index f4cf55f..e1b8684 100644
--- a/roles/phabricator/tasks/daemons.yml
+++ b/roles/phabricator/tasks/daemons.yml
@@ -1,18 +1,10 @@
 ---
-- name: PHD main service
-  template: src={{ phd_main }} dest="{{ phabricator_path }}phabricator/bin/phd-main" mode=0755
-  notify: restart phd
-
-- name: PHD slave service
-  template: src={{ phd_slave }} dest="{{ phabricator_path }}phabricator/bin/phd-slave" mode=0755
-  notify: restart phd
-
 - name: PHD systemd service for phabricator
   template:
     src: "{{ phd_init }}"
     dest: /usr/lib/systemd/system/phd.service
     mode: 0644
 
 - name: Start PHD
   service: name=phd state=started enabled=true
 
diff --git a/roles/phabricator/templates/phabricator_myconfig.conf.php b/roles/phabricator/templates/phabricator_myconfig.conf.php
index 9a38cf3..52ca5fe 100644
--- a/roles/phabricator/templates/phabricator_myconfig.conf.php
+++ b/roles/phabricator/templates/phabricator_myconfig.conf.php
@@ -1,64 +1,64 @@
 <?php
 return array(
   'phabricator.base-uri'            => '{{ http_scheme }}{{ domain }}/',
   'phabricator.timezone'            => 'Europe/Berlin',
   'phabricator.serious-business'    => true,
   'phabricator.show-prototypes'     => true,
   'phabricator.developer-mode'      => {{ developer_mode }},
   'phabricator.allowed-uris'        => array(
       '{{ http_scheme }}{{ domain }}/',
       '{{ http_scheme }}{{ external_ip }}/'
   ),
 
 
   'phd.log-directory'       => '/var/log/phabricator',
-  'phd.taskmasters'         => 50,
+  'phd.taskmasters'         => 20,
   'phd.user'                => '{{ phd_user }}',
 
   'security.strict-transport-security'  => true,
   'security.require-https'              => true,
   'security.alternate-file-domain'      => '{{ file_domain }}',
   'darkconsole.enabled'                 => false,
   
   'policy.allow-public'             => true,
   'auth.require-approval'           => false,
   'auth.require-email-verification' => false,
 
   'cluster.addresses'       => array(
     {% for host in groups['app'] %}
         "{{ hostvars[host]['inventory_hostname'] }}/32",
     {% endfor %}
   ),
 
   'diffusion.ssh-user'          => '{{ vcs_user }}',
   'diffusion.ssh-port'          => {{ vcs_port }},
   'diffusion.allow-http-auth'   => true,
 
   'mysql.host'              => "{{ hostvars['127.0.0.1']['openstackjump'].results[0]['openstack']['private_v4'] }}",
   'mysql.pass'              => '{{ mysql_app_pass }}',
   'mysql.user'              => '{{ mysql_app_user }}',
 
   //'amazon-s3.access-key'    => '{{ s3_access_key }}',
   //'amazon-s3.secret-key'    => '{{ s3_secret_key }}',
   //'amazon-s3.endpoint'      => '{{ s3_endpoint }}',
   //'amazon-s3.region'        => '{{ s3_region }}',
   //'storage.s3.bucket'       => '{{ s3_bucket }}',
   'storage.local-disk.path'  => '{{ repositories_path }}files',
   'files.enable-imagemagick' => true,
 
   #'auth.email-domains'              => [
   #  {% for domain in phabricator_domains %}
   #      "{{ domain }}",
   #  {% endfor %}
   #],
   'pygments.enabled'                => true,
   'environment.append-paths'        => array(
       "/usr/libexec/git-core",
       "/bin",
       "/usr/bin",
       "/usr/local/bin"
   ),
 
   'metamta.default-address' => 'phabricator@{{ domain }}',
   'metamta.domain'          => '{{ domain }}',
 );
diff --git a/roles/phabricator/templates/phabricator_phd_init b/roles/phabricator/templates/phabricator_phd_init
index aa00a9e..9bb78a7 100644
--- a/roles/phabricator/templates/phabricator_phd_init
+++ b/roles/phabricator/templates/phabricator_phd_init
@@ -1,19 +1,15 @@
 [Unit]
 Description=PHD Phabricator
 After=remote-fs.target
 Before=nginx.service
 
 [Service]
 Type=oneshot
-{% if inventory_hostname == groups.phd[0] %}
-ExecStart={{ phabricator_path }}phabricator/bin/phd-main
-{% else %}
-ExecStart={{ phabricator_path }}phabricator/bin/phd-slave
-{% endif %}
+ExecStart={{ phabricator_path }}phabricator/bin/phd start
 ExecStop={{ phabricator_path }}phabricator/bin/phd stop
 User={{ phd_user }}
 Group={{ phd_user }}
 RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target
diff --git a/roles/phabricator/templates/phd-main b/roles/phabricator/templates/phd-main
deleted file mode 100644
index f823c26..0000000
--- a/roles/phabricator/templates/phd-main
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-{{ phabricator_path }}phabricator/bin/phd launch PhabricatorRepositoryPullLocalDaemon
-{{ phabricator_path }}phabricator/bin/phd launch PhabricatorTriggerDaemon
-{{ phabricator_path }}phabricator/bin/phd launch 30 PhabricatorTaskmasterDaemon
diff --git a/roles/phabricator/templates/phd-slave b/roles/phabricator/templates/phd-slave
deleted file mode 100644
index 4cb0077..0000000
--- a/roles/phabricator/templates/phd-slave
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-{{ phabricator_path }}phabricator/bin/phd launch PhabricatorRepositoryPullLocalDaemon -- --no-discovery
-{{ phabricator_path }}phabricator/bin/phd launch 5 PhabricatorTaskmasterDaemon