diff --git a/en1.yml b/en1.yml
index 7ac7da9..1e39d1e 100644
--- a/en1.yml
+++ b/en1.yml
@@ -11,10 +11,8 @@ all:
     omni_host_webproxy: jupiter
 
   children:
+
     servers:
-      children:
-        virtualization: {}
-    virtualization:
       vars:
         omni_local_hosts:
           - hostname: jupiter.svr.local
@@ -27,7 +25,6 @@ all:
         jupiter:
           ansible_host: jupiter.net.enp.one
           omni_description: EN1 System Control Server
-          omni_docker_swarm_iface: eno2
           omni_networking:
             eno1:
               dhcp: true
@@ -35,26 +32,57 @@ all:
             eno2:
               dhcp: false
               addresses: ["192.168.42.10/24"]
+        remus:
+          ansible_host: remus.net.enp.one
+          omni_description: EN1 Hypervisor/Datastore
+          omni_networking:
+            eno1:
+              dhcp: true
+              dhcp_address: 10.42.101.20/24
+            eno2:
+              dhcp: false
+              addresses: ["192.168.42.20/24"]
+        romulus:
+          ansible_host: romulus.net.enp.one
+          omni_description: EN1 Hypervisor/Datastore
+          omni_networking:
+            eno1:
+              dhcp: true
+              dhcp_address: 10.42.101.30/24
+            eno2:
+              dhcp: false
+              addresses: ["192.168.42.30/24"]
       children:
-        worker:
+        virtualization: {}
+        datastore: {}
+
+    virtualization:
+      hosts:
+        jupiter:
+          omni_docker_swarm_iface: eno2
+      children:
+        virtualization_worker:
           hosts:
             remus:
-              ansible_host: remus.net.enp.one
-              omni_description: EN1 Hypervisor/Datastore
-              omni_networking:
-                eno1:
-                  dhcp: true
-                  dhcp_address: 10.42.101.20/24
-                eno2:
-                  dhcp: false
-                  addresses: ["192.168.42.20/24"]
+              omni_docker_swarm_iface: eno2
             romulus:
-              ansible_host: romulus.net.enp.one
-              omni_description: EN1 Hypervisor/Datastore
-              omni_networking:
-                eno1:
-                  dhcp: true
-                  dhcp_address: 10.42.101.30/24
-                eno2:
-                  dhcp: false
-                  addresses: ["192.168.42.30/24"]
+              omni_docker_swarm_iface: eno2
+
+    datastore:
+      children:
+        datastore_arbiter:
+          hosts:
+            jupiter:
+              omni_gluster_brick:
+                mount: /mnt/brick0
+                fs: xfs
+        datastore_block:
+          hosts:
+            remus:
+              omni_gluster_brick:
+                mount: /mnt/brick0
+                fs: xfs
+            romulus:
+              omni_gluster_brick:
+                mount: /mnt/brick0
+                fs: xfs