diff --git a/main_servers.yml b/main_servers.yml
index 83b1818..78d9e5b 100644
--- a/main_servers.yml
+++ b/main_servers.yml
@@ -1,203 +1,204 @@
 ---
 - name: Configure Jump Server
   hosts: lbs 
   tags: conf-lbs
   vars_files:
     - "{{ var }}"
   vars:
      nagios_nrpe_server_allowed_hosts: "{{ groups['monit'][0] }},127.0.0.1"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
       - role: ganglia-gmond
       - role: nrpe
         tags: [ 'common', 'conf-monit' ]
       - role: postfix
         postfix_mynetworks: [ "{{ ip_range }}" ]
         enable_postfix_relayhost: false
       - role: letsencrypt
         when: env != "test"
       - role: haproxy
       - role: jump
   handlers:
     - include: handlers/main.yml
 
 #- name: Configure keepalived for jump
 #  hosts: c4science-jump00
 #  roles:
 #      - role: keepalived
 #        keepalived_shared_ip: "{{ external_ip }}"
 #        keepalived_role: "master"
 
 #- name: Configure keepalived for jump2
 #  hosts: c4science-jump01
 #  roles:
 #      - role: keepalived
 #        keepalived_shared_ip: "{{ external_ip }}"
 #        keepalived_role: "slave"
 
 - name: Configure Monitoring Server
   hosts: monit
   tags: conf-monit
   vars_files:
     - "{{ var }}"
   vars:
      nagios_nrpe_server_allowed_hosts: "{{ groups['monit'][0] }},127.0.0.1"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
       - role: nrpe
         tags: [ 'common', 'conf-monit' ]
       - role: postfix
         postfix_relayhost: "[{{ hostvars['127.0.0.1']['openstackjump'].results[0]['openstack']['private_v4'] }}]"
       - role: logcheck
       - role: rsyslog
       - { role: apache, apache_config: placeholder.conf }
       - role: nagios
       - role: ganglia-gmond
       - role: ganglia-gmetad
   tasks:
       - include: roles/galera/tasks/install.yml
         yum_repo: roles/galera/files/yum.repo
       - service: name=mysql enabled=false state=stopped
   handlers:
     - include: handlers/main.yml
 
 - name: Configure Databases
   hosts: dbs
   tags: conf-dbs
   vars_files:
     - "{{ var }}"
   vars:
      nagios_nrpe_server_allowed_hosts: "{{ groups['monit'][0] }},127.0.0.1"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
       - role: nrpe
         tags: [ 'common', 'conf-monit' ]
       - role: postfix
         postfix_relayhost: "[{{ hostvars['127.0.0.1']['openstackjump'].results[0]['openstack']['private_v4'] }}]"
       - role: ganglia-gmond
       - role: galera
   handlers:
     - include: handlers/main.yml
 
 - name: Configure App
   hosts: app
   tags: conf-app
   vars_files:
     - "{{ var }}"
   vars:
      nagios_nrpe_server_allowed_hosts: "{{ groups['monit'][0] }},127.0.0.1"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
       - role: nrpe
         tags: [ 'common', 'conf-monit' ]
       - role: postfix
         postfix_relayhost: "[{{ hostvars['127.0.0.1']['openstackjump'].results[0]['openstack']['private_v4'] }}]"
       - role: ganglia-gmond
       - { role: apache, apache_config: phabricator.conf }
       - role: glusterfs
         tags: gluster
       - role: phabricator
       - role: shibboleth
   handlers:
     - include: handlers/main.yml
 
 - name: Configure App Daemons
   hosts: phd
   tags: conf-phd
   vars_files:
     - "{{ var }}"
   vars:
      nagios_nrpe_server_allowed_hosts: "{{ groups['monit'][0] }},127.0.0.1"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
       - role: nrpe
         tags: [ 'common', 'conf-monit' ]
       - role: postfix
         postfix_relayhost: "[{{ hostvars['127.0.0.1']['openstackjump'].results[0]['openstack']['private_v4'] }}]"
       - role: ganglia-gmond
       - role: glusterfs
         tags: gluster
   tasks:
       - include: roles/phabricator/tasks/packages.yml
       - include: roles/phabricator/tasks/users.yml
       - include: roles/phabricator/tasks/glusterfs.yml
       - include: roles/phabricator/tasks/install.yml myconfig=roles/phabricator/templates/phabricator_myconfig.conf.php
       #- include: roles/phabricator/tasks/customize.yml
       - include: roles/phabricator/tasks/daemons.yml
         phd_init: roles/phabricator/templates/phabricator_phd_init
         phd_main: roles/phabricator/templates/phd-main
+        phd_slave: roles/phabricator/templates/phd-slave
   handlers:
     - include: handlers/main.yml
 
 - name: Configure Jenkins master
   hosts: ci
   vars_files:
     - "{{ var }}"
   vars:
      nagios_nrpe_server_allowed_hosts: "{{ groups['monit'][0] }},127.0.0.1"
   user: centos
   sudo: yes
   roles:
       - role: common
         tags: [ 'common' ]
       - role: swap/roles/swap
         tags: [ 'common' ]
       - role: nrpe
         tags: [ 'common', 'conf-monit' ]
       - role: postfix
         postfix_relayhost: "[{{ hostvars['127.0.0.1']['openstackjump'].results[0]['openstack']['private_v4'] }}]"
       - role: ganglia-gmond
       - role: ci
         tags: [ 'jenkins' ]
       - role: jenkins
         plugins:
           - 'preSCMbuildstep'
           - 'git'
           - 'build-token-root'
           - 'phabricator-plugin'
           - 'docker-plugin'
           - 'build-monitor-plugin'
           - 'job-restrictions'
           - 'project-stats-plugin'
           - 'cluster-stats'
           - 'embeddable-build-status'
         prefix: '/build'
         email:
           smtp_host: 'localhost'
           smtp_ssl: 'false'
           default_email_suffix: "@{{ domain }}"
 
 #- name: Configure Jenkins slave
 #  hosts: ci-slave
 #  tags: conf-ci-slave
 #  vars_files:
 #    - "{{ var }}"
 #  user: core
 #  sudo: yes
 #  roles:
 #    - role: docker
diff --git a/roles/phabricator/tasks/daemons.yml b/roles/phabricator/tasks/daemons.yml
index c02de76..f4cf55f 100644
--- a/roles/phabricator/tasks/daemons.yml
+++ b/roles/phabricator/tasks/daemons.yml
@@ -1,14 +1,18 @@
 ---
 - 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_phd_init b/roles/phabricator/templates/phabricator_phd_init
index 03045dc..aa00a9e 100644
--- a/roles/phabricator/templates/phabricator_phd_init
+++ b/roles/phabricator/templates/phabricator_phd_init
@@ -1,19 +1,19 @@
 [Unit]
 Description=PHD Phabricator
 After=remote-fs.target
 Before=nginx.service
 
 [Service]
 Type=oneshot
-{% if inventory_hostname == groups.app[0] %}
+{% if inventory_hostname == groups.phd[0] %}
 ExecStart={{ phabricator_path }}phabricator/bin/phd-main
 {% else %}
 ExecStart={{ phabricator_path }}phabricator/bin/phd-slave
 {% endif %}
 ExecStop={{ phabricator_path }}phabricator/bin/phd stop
 User={{ phd_user }}
 Group={{ phd_user }}
 RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target