diff --git a/tasks/create-instances.yml b/tasks/create-instances.yml
index 28f30b5..71d02c9 100644
--- a/tasks/create-instances.yml
+++ b/tasks/create-instances.yml
@@ -1,249 +1,247 @@
 ---
 # Create instances
 - name: Create jump
   tags: conf-lbs
   os_server:
     state: present
     security_groups: all
     name: "c4science-jump0{{ item }}"
     image: "{{ image_id }}"
     key_name: "{{ keypair_name }}"
     wait: yes
     floating_ips:
         - "{{ external_ip }}"
     nics:
       - net-id: "{{ private_net}}"
     flavor: "{{ flavor_id_small }}"
     meta:
       hostname: "c4science-jump0{{ item }}"
       group: ansible
   register: openstackjump
   with_items:
       - 0
 
 - add_host:
     name: "{{ openstackjump.results[item].openstack.public_v4 }}"
     private_ip: "{{ openstackjump.results[item].openstack.private_v4 }}"
     host_name: "c4science-jump0{{ item }}"
     groupname: lbs
   tags: conf-lbs
   with_items:
       - 0
 
 - name: Create App
   tags: conf-app
   os_server:
     state: present
     security_groups: all
     name: "c4science-app0{{ item }}"
     image: "{{ image_id }}"
     key_name: "{{ keypair_name }}"
     wait: yes
     auto_ip: no
     nics:
       - net-id: "{{ private_net }}"
     flavor: "{{ flavor_id_medium }}"
     meta:
       hostname: "c4science-app0{{ item }}"
       group: ansible
     scheduler_hints:
         group: "{{ app_affinity.id }}"
   register: "openstackapp"
   with_items:
       - 0
       - 1
 
 - add_host:
     name: "{{ openstackapp.results[item].openstack.private_v4 }}"
     private_ip: "{{ openstackapp.results[item].openstack.private_v4 }}"
     host_name: "c4science-app0{{ item }}"
     groupname: app
   tags: conf-app
   with_items:
       - 0
       - 1
 
 - name: Create App Daemons
   tags: conf-phd
   os_server:
     state: present
     security_groups: all
     name: "c4science-phd0{{ item }}"
     image: "{{ image_id }}"
     key_name: "{{ keypair_name }}"
     wait: yes
     auto_ip: no
     nics:
       - net-id: "{{ private_net}}"
     flavor: "{{ flavor_id_large }}"
     meta:
       hostname: "c4science-phd0{{ item }}"
       group: ansible
     scheduler_hints:
         group: "{{ phd_affinity.id }}"
   register: "openstackphd"
   with_items:
       - 0
       - 1
 
 - add_host:
     name: "{{ openstackphd.results[item].openstack.private_v4 }}"
     private_ip: "{{ openstackphd.results[item].openstack.private_v4 }}"
     host_name: "c4science-phd0{{ item }}"
     groupname: phd
   tags: conf-phd
   with_items:
       - 0
       - 1
 
 - name: Create Db
   tags: conf-dbs
   os_server:
     state: present
     security_groups: all
     name: "c4science-db0{{ item }}"
     image: "{{ image_id }}"
     key_name: "{{ keypair_name }}"
     wait: yes
     auto_ip: no
     nics:
       - net-id: "{{ private_net }}"
     flavor: "{{ flavor_id_medium }}"
     meta:
       hostname: "c4science-db0{{ item }}"
       group: ansible
     scheduler_hints:
         group: "{{ dbs_affinity.id }}"
   register: openstackdb
   with_items:
       - 0
       - 1
-      - 2
 
 - add_host:
     name: "{{ openstackdb.results[item].openstack.private_v4 }}"
     private_ip: "{{ openstackdb.results[item].openstack.private_v4 }}"
     host_name: "c4science-db0{{ item }}"
     groupname: dbs
   tags: conf-dbs
   with_items:
       - 0
       - 1
-      - 2
 
 - name: Create Monitoring instance
   tags: conf-monit
   os_server:
     state: present
     security_groups: all
     name: c4science-monit
     image: "{{ image_id }}"
     key_name: "{{ keypair_name }}"
     wait: yes
     auto_ip: no
     nics:
       - net-id: "{{ private_net }}"
     flavor: "{{ flavor_id_small }}"
     meta:
       hostname: c4science-monit
       group: ansible
   register: openstackmonit
 
 - add_host:
     name: "{{ openstackmonit.openstack.private_v4 }}"
     private_ip: "{{ openstackmonit.openstack.private_v4 }}"
     host_name: "c4science-monit"
     groupname: monit
   tags: conf-monit
 
 - name: Create Jenkins master
   tags: jenkins
   os_server:
     state: present
     security_groups: all
     name: "c4science-ci0{{ item }}"
     image: "{{ image_id_coreos }}"
     key_name: "{{ keypair_name }}"
     wait: yes
     auto_ip: no
     nics:
       - net-id: "{{ private_net }}"
     flavor: "{{ flavor_id_small }}"
     meta:
       hostname: "c4science-ci0{{ item }}"
       group: ansible
   register: openstackci
   with_items:
       - 0
 
 - add_host:
     name: "{{ openstackci.results[item].openstack.private_v4 }}"
     private_ip: "{{ openstackci.results[item].openstack.private_v4 }}"
     host_name: "c4science-ci0{{ item }}"
     groupname: ci
   tags: jenkins
   with_items:
       - 0
 
 - name: Create Jenkins slaves
   tags: conf-ci-slave
   os_server:
     state: present
     security_groups: all
     name: "c4science-ci-slave0{{ item }}"
     image: "{{ image_id_coreos }}"
     key_name: "{{ keypair_name }}"
     wait: yes
     auto_ip: no
     nics:
       - net-id: "{{ private_net }}"
     flavor: "{{ flavor_id_medium }}"
     meta:
       hostname: "c4science-ci-slave0{{ item }}"
       group: ansible
   register: openstackcislave
   with_items:
       - 0
 
 - add_host:
     name: "{{ openstackcislave.results[item].openstack.private_v4 }}"
     private_ip: "{{ openstackcislave.results[item].openstack.private_v4 }}"
     host_name: "c4science-ci-slave0{{ item }}"
     groupname: ci-slave
   tags: conf-ci-slave
   with_items:
       - 0
 
 #- name: Create backup instance
 #  tags: conf-backup
 #  os_server:
 #    state: present
 #    region_name: "{{ region_back }}"
 #    security_groups: all
 #    name: c4science-backup
 #    image: "{{ image_id_backup }}"
 #    key_name: "{{ keypair_name }}"
 #    wait: yes
 #    floating_ips:
 #        - "{{ backup_ip }}"
 #    nics:
 #      - net-id: "{{ private_net_backup}}"
 #    flavor: "{{ flavor_id_small_backup }}"
 #    meta:
 #      hostname: c4science-backup
 #      group: ansible
 #  register: openstackbackup
 #
 #- add_host:
 #  tags: conf-backup
 #    name: "{{ openstackbackup.openstack.public_v4 }}"
 #    private_ip: "{{ openstackbackup.openstack.private_v4 }}"
 #    host_name: "c4science-backup"
 #    groupname: backup
 
 - add_host:
     name: "{{ backup_ip }}"
     private_ip: "{{ backup_ip }}"
     host_name: "c4science-backup"
     groupname: backup
   tags: conf-backup