diff --git a/inventories/client_template/hosts.yml b/inventories/client_template/hosts.yml
index 0ea3c31..d46f22f 100644
--- a/inventories/client_template/hosts.yml
+++ b/inventories/client_template/hosts.yml
@@ -12,6 +12,31 @@ all:
     change_freeze: false
 
   children:
+    # --- NETWORK LAYER ---
+    firewalls:
+      children:
+        opnsense:
+          hosts:
+            client-fw-01:
+              ansible_host: "{{ lookup('env', 'FW_HOST') }}"
+        pfsense:
+          hosts:
+            client-fw-01:
+              ansible_host: "{{ lookup('env', 'FW_HOST') }}"
+
+    # --- INFRASTRUCTURE ---
+    hypervisors:
+      children:
+        proxmox:
+          hosts:
+            client-pv-01:
+              ansible_host: "{{ lookup('env', 'PV_HOST') }}"
+        xcp:
+          hosts:
+            client-xcp-01:
+              ansible_host: "{{ lookup('env', 'XCP_HOST') }}"
+                  
+    # --- WORKSTATIONS/SERVERS ---
     linux_hosts:
       hosts: {}
       vars:
@@ -28,13 +53,3 @@ all:
         ansible_winrm_server_cert_validation: validate
         ansible_port: 5986
   
-    firewalls:
-      children:
-        opnsense:
-          hosts:
-            client-fw-01:
-              ansible_host: "{{ lookup('env', 'FW_HOST') }}"
-        pfsense:
-          hosts:
-            client-fw-01:
-              ansible_host: "{{ lookup('env', 'FW_HOST') }}"
\ No newline at end of file