diff --git a/en1.yml b/en1.yml
index b46edf1..7ac7da9 100644
--- a/en1.yml
+++ b/en1.yml
@@ -4,125 +4,57 @@ all:
     ansible_user: ansible
     ansible_python_interpreter: /opt/ansible/bin/python
     omni_ansible_venv: /opt/ansible
-    omni_protected_users: ["root", "ansible"]
-    omni_domain: net.enp.one
+    update: false
+    clean: false
+
+    omni_host_swarm_controller: jupiter
+    omni_host_webproxy: jupiter
+
   children:
-    network:
-      hosts:
-        router:
-          ansible_host: en1-core.net.enp.one
-          ansible_network_os: edgeos
-          ansible_connection: network_cli
-          description: EN1 Core Gateway
-          targets: ["admin", "network"]
     servers:
+      children:
+        virtualization: {}
+    virtualization:
       vars:
-        omni_os:
-          name: centos
-          version_major: "8"
+        omni_local_hosts:
+          - hostname: jupiter.svr.local
+            ip: 192.168.42.10
+          - hostname: remus.svr.local
+            ip: 192.168.42.20
+          - hostname: romulus.svr.local
+            ip: 192.168.42.30
       hosts:
         jupiter:
           ansible_host: jupiter.net.enp.one
           omni_description: EN1 System Control Server
-          omni_local_targets: ["core", "network"]
           omni_docker_swarm_iface: eno2
           omni_networking:
             eno1:
               dhcp: true
+              dhcp_address: 10.42.101.10/42
             eno2:
               dhcp: false
               addresses: ["192.168.42.10/24"]
-        remus:
-          ansible_host: remus.net.enp.one
-          omni_description: EN1 Hypervisor/Datastore
-          omni_local_targets: ["core", "vms"]
-          omni_docker_swarm_iface: eno2
-          omni_networking:
-            eno1:
-              dhcp: true
-            eno2:
-              dhcp: false
-              addresses: ["192.168.42.20/24"]
-        romulus:
-          ansible_host: romulus.net.enp.one
-          omni_description: EN1 Hypervisor/Datastore
-          omni_local_targets: ["core", "vms"]
-          omni_docker_swarm_iface: eno2
-          omni_networking:
-            eno1:
-              dhcp: true
-            eno2:
-              dhcp: false
-              addresses: ["192.168.42.20/24"]
-#         novis:
-#           ansible_host: novis.tre2.local
-#           description: EN1 Backup Storage
-#           local_targets: ["core", "datastore"]
-#       children:
-#         vms:
-#           vars:
-#             disable_sudo_password: true
-#             required_os: centos_8
-#           hosts:
-#             gitea:
-#               ansible_host: vm-host-gitea.net.enp.one
-#               description: "Application Host: Gitea VCS"
-#               local_targets: ["admin", "vcs"]
-#               networking:
-#                 eth0:
-#                   dhcp: true
-#             plex:
-#               ansible_host: vm-host-plex.net.enp.one
-#               description: "Application Host: Plex Media Server"
-#               local_targets: ["admin", "plx"]
-#               networking:
-#                 eth0:
-#                   dhcp: true
-#             bitwarden:
-#               ansible_host: vm-host-bitwarden.net.enp.one
-#               description: "Application Host: Bitwarden Password Manager"
-#               local_targets: ["admin", "ssv"]
-#               networking:
-#                 eth0:
-#                   dhcp: true
-#             nextcloud:
-#               ansible_host: vm-host-nextcloud.net.enp.one
-#               description: "Application Host: Nextcloud Web Storage"
-#               local_targets: ["admin", "cfs"]
-#               networking:
-#                 eth0:
-#                   dhcp: true
-#     workstations:
-#       vars:
-#         enable_gui: true
-#         enable_ssh: false
-#         enable_networkd: false
-#       hosts:
-#         omega:
-#           ansible_host: localhost
-#           description: Last
-#           required_os: centos_7
-#           local_targets: ["admin", "recovery"]
-#         vigil-nox:
-#           ansible_host: localhost
-#           required_os: fedora_31
-#           description: Watchman
-#           local_targets: ["admin", "desktop"]
-#         serico-nox:
-#           ansible_host: localhost
-#           description: Silk
-#           required_os: fedora_31
-#           local_targets: ["admin", "desktop"]
-#         inerro:
-#           ansible_host: localhost
-#           description: Wanderer
-#           required_os: fedora_31
-#           local_targets: ["admin", "desktop"]
-# network:
-#   hosts:
-#     router:
-#       ansible_host: router.net.enp.one
-#       ansible_network_os: edgeos
-#       ansible_connection: network_cli
-#       description: EN1 Core Gateway
-#       targets: ["admin", "network"]
+      children:
+        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"]
+            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"]