diff --git a/hosts b/hosts
index 712c7a2..67116de 100644
--- a/hosts
+++ b/hosts
@@ -1,55 +1,104 @@
 test-machines:
   hosts:
     vlorentz-desktop:
       ansible_host: vlorentz-desktop.internal.softwareheritage.org
       ansible_user: vlorentz-cassandra
       cassandra_data_root: /srv/softwareheritage/cassandra-test-0
       cassandra_max_heap_size: 8G
       cassandra_heap_newsize: 1000M
       listen_address: 128.93.66.190
       swh_storage_ports: [12301, 12302, 12303, 12304]
     ardumont-desktop:
       ansible_host: ardumont-desktop.internal.softwareheritage.org
       ansible_user: vlorentz-cassandra
       cassandra_data_root: /data
       cassandra_max_heap_size: 8G
       cassandra_heap_newsize: 400M
       listen_address: 128.93.66.187
       swh_storage_ports: [12301, 12302, 12303, 12304]
     ddouard-desktop:
       ansible_host: ddouard-desktop.internal.softwareheritage.org
       ansible_user: vlorentz
       cassandra_data_root: /data/vlorentz
       cassandra_max_heap_size: 8G
       cassandra_heap_newsize: 400M
       listen_address: 128.93.66.191
       swh_storage_ports: [12301, 12302, 12303, 12304]
     seirl-desktop:
       ansible_host: grandpalais.internal.softwareheritage.org
       ansible_user: vlorentz
       cassandra_data_root: /mnt/cassandra-test-0
       cassandra_max_heap_size: 8G
       cassandra_heap_newsize: 400M
       listen_address: 128.93.64.42
       swh_storage_ports: [12301, 12302, 12303, 12304]
     ftigeot-desktop:
       ansible_host: petitpalais.internal.softwareheritage.org
       ansible_user: vlorentz
       seed_address: 128.93.66.190
       swh_storage_ports: [12301, 12302, 12303, 12304]
     odroidn2-02:
       ansible_host: odroidn2-02
       ansible_user: vlorentz
       seed_address: 128.93.66.190
       swh_storage_ports: [12301, 12302, 12303, 12304]
 
+azure-machines:
+  vars:
+    ansible_user: vlorentz
+  hosts:
+    cassandra01:
+      ansible_host: cassandra01.euwest.azure.internal.softwareheritage.org
+    cassandra02:
+      ansible_host: cassandra02.euwest.azure.internal.softwareheritage.org
+    cassandra03:
+      ansible_host: cassandra03.euwest.azure.internal.softwareheritage.org
+    cassandra04:
+      ansible_host: cassandra04.euwest.azure.internal.softwareheritage.org
+    cassandra05:
+      ansible_host: cassandra05.euwest.azure.internal.softwareheritage.org
+    cassandra06:
+      ansible_host: cassandra06.euwest.azure.internal.softwareheritage.org
+    cassandra-replay01:
+      ansible_host: cassandra-replay01.euwest.azure.internal.softwareheritage.org
+    cassandra-replay02:
+      ansible_host: cassandra-replay02.euwest.azure.internal.softwareheritage.org
+    cassandra-replay03:
+      ansible_host: cassandra-replay03.euwest.azure.internal.softwareheritage.org
+    cassandra-replay04:
+      ansible_host: cassandra-replay04.euwest.azure.internal.softwareheritage.org
+
 cassandra-servers:
+  vars:
+    swh_storage_ports: [12301, 12302, 12303, 12304]
+    listen_address: "{{ansible_host}}"
   hosts:
-    vlorentz-desktop: {}
-    ardumont-desktop: {}
-    ddouard-desktop: {}
-    seirl-desktop: {}
+    cassandra01: {}
+    cassandra02: {}
+    cassandra03: {}
+    cassandra04: {}
+    cassandra05: {}
+    cassandra06: {}
+#  hosts:
+#    vlorentz-desktop: {}
+#    ardumont-desktop: {}
+#    ddouard-desktop: {}
+#    seirl-desktop: {}
 
 cassandra-clients:
   children:
-    test-machines
+    cassandra-servers
+  vars:
+    swh_storage_ports: [12301, 12302, 12303, 12304, 12305, 12306, 12307, 12308]
+    seed_addresses:
+    - cassandra01.euwest.azure.internal.softwareheritage.org
+    - cassandra02.euwest.azure.internal.softwareheritage.org
+    - cassandra03.euwest.azure.internal.softwareheritage.org
+    - cassandra04.euwest.azure.internal.softwareheritage.org
+    - cassandra05.euwest.azure.internal.softwareheritage.org
+    - cassandra06.euwest.azure.internal.softwareheritage.org
+  hosts:
+    cassandra-replay01: {}
+    cassandra-replay02: {}
+    cassandra-replay03: {}
+    cassandra-replay04: {}
diff --git a/playbooks/templates/storage_cassandra.yml b/playbooks/templates/storage_cassandra.yml
index acc5392..7c3c930 100644
--- a/playbooks/templates/storage_cassandra.yml
+++ b/playbooks/templates/storage_cassandra.yml
@@ -1,10 +1,10 @@
 storage:
   cls: cassandra
   args:
     hosts:
-    - {% if seed_address is defined %}{{seed_address}}{% else %}{{listen_address}}{% endif %}
+    - {% if seed_addresses is defined %}{{seed_addresses}}{% else %}{{listen_address}}{% endif %}
 
     keyspace: swh_test
     objstorage:
       cls: memory
       args: {}