diff --git a/tasks/create-volumes.yml b/tasks/create-volumes.yml
index 49ca3c8..1c8a0cd 100644
--- a/tasks/create-volumes.yml
+++ b/tasks/create-volumes.yml
@@ -1,97 +1,74 @@
 ---
-# Create volumes
 
-- name: get dbs list
-  tags: conf-dbs
+# Repository
+- name: get phd list
+  tags: conf-fs
   os_server_facts:
-    server: c4science-db*
-
-- name: Wait for the instance to be created
-  tags: conf-dbs
-  pause: seconds=10
+    server: c4science-phd*
 
-- name: Create dbs volume
-  tags: conf-dbs
+- name: Create fs volume
+  tags: conf-fs
   os_volume:
     state: present
-    size: 100
-    display_name: "{{ item.name }}-data"
+    size: 700
+    display_name: "{{ item.name }}-repo"
     wait: yes
   with_items: "{{ openstack_servers }}"
 
 - name: Wait for the volume to be created
-  tags: conf-dbs
+  tags: conf-fs
   pause: seconds=5
 
-- name: Attach dbs volume
-  tags: conf-dbs
+- name: Attach fs volume
+  tags: conf-fs
   os_server_volume:
     state: present
     server: "{{ item.name }}"
-    volume: "{{ item.name }}-data"
+    volume: "{{ item.name }}-repo"
     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 fs list
-  tags: conf-fs
-  os_server_facts:
-    server: c4science-fs*
-
-- name: Create fs volume
+# Files
+- name: Create files volume
   tags: conf-fs
   os_volume:
     state: present
-    size: 100
-    display_name: "{{ item.name }}-repo"
+    size: 300
+    display_name: "c4science-phd0-files"
     wait: yes
-  with_items: "{{ openstack_servers }}"
+
+- name: Wait for the volume to be created
+  tags: conf-fs
+  pause: seconds=5
 
 - name: Attach fs volume
   tags: conf-fs
   os_server_volume:
     state: present
-    server: "{{ item.name }}"
-    volume: "{{ item.name }}-repo"
+    server: "c4science-phd00"
+    volume: "c4science-phd00-repo"
     device: /dev/vdb
-  with_items: "{{ openstack_servers }}"
 
 # CI slaves host
 - name: get ci-slave list
   tags: conf-ci-slave
   os_server_facts:
     server: c4science-ci-slave*
 
 - name: Create ci-slave volume
   tags: conf-ci-slave
   os_volume:
     state: present
     size: 100
     display_name: "{{ item.name }}-ci-slave"
     wait: yes
   with_items: "{{ openstack_servers }}"
 
 - name: Attach ci-slave volume
   tags: conf-ci-slave
   os_server_volume:
     state: present
     server: "{{ item.name }}"
     volume: "{{ item.name }}-ci-slave"
     device: /dev/vdb
   with_items: "{{ openstack_servers }}"