diff --git a/tasks/create-volumes.yml b/tasks/create-volumes.yml
index b468d98..944a196 100644
--- a/tasks/create-volumes.yml
+++ b/tasks/create-volumes.yml
@@ -1,60 +1,66 @@
 ---
 # Create volumes
 
 - name: get dbs list
   os_server_facts:
     server: c4science-db*
 
+- name: Wait for the instance to be created
+  pause: seconds=20
+
 - name: Create dbs volume
   os_volume:
     state: present
     size: 100
     display_name: "{{ item.human_id }}-data"
     wait: yes
   with_items: openstack_servers
 
+- name: Wait for the volume to be created
+  pause: seconds=20
+
 - name: Attach dbs volume
   os_server_volume:
     state: present
     server: "{{ item.human_id }}"
     volume: "{{ item.human_id }}-data"
     device: /dev/vdb
   with_items: openstack_servers
 
 #- name: Create backup volume
 #  os_volume:
 #    region_name: "{{ region_back }}"
 #    state: present
 #    size: 500
 #    display_name: backup-data
 #    wait: yes
 #
 #- name: Attach backup volume
 #  os_server_volume:
 #    region_name: "{{ region_back }}"
 #    state: present
 #    server: c4science-backup
 #    volume: backup-data
 #    device: /dev/vdb
 
 # GlusterFS
 - name: get app list
   os_server_facts:
     server: c4science-app*
 
 - name: Create app volume
   os_volume:
     state: present
     size: 100
     display_name: "{{ item.human_id }}-repo"
     wait: yes
   with_items: openstack_servers
 
 - name: Attach app volume
   os_server_volume:
     state: present
     server: "{{ item.human_id }}"
     volume: "{{ item.human_id }}-repo"
     device: /dev/vdb
   with_items: openstack_servers