diff --git a/hosts.yml b/hosts.yml
index c911a03..c9be0df 100644
--- a/hosts.yml
+++ b/hosts.yml
@@ -86,9 +86,12 @@ datacenter:
         ansible_winrm_kerberos_delegation: true
     mqtt_srv:
       children:
-        amd:
+        servers:
           hosts:
             192.168.77.4:
+            omv.home.lan:
+            rack.home.lan:
+            m-server.home.lan:
           vars:
             ansible_user: root
             ansible_password: l4c1j4yd33Du5lo
@@ -96,123 +99,45 @@ datacenter:
             ansible_ssh_pass: l4c1j4yd33Du5lo
             ansible_become_user: root
             ansible_become_password: l4c1j4yd33Du5lo
-
-        omv:
-          hosts:
-            192.168.77.189:
-          vars:
-            ansible_user: root
-            ansible_password: lacijaydee
-            ansible_ssh_user: root
-            ansible_ssh_pass: lacijaydee
-            ansible_become_user: root
-            ansible_become_password: lacijaydee
-        rack.home.lan:
-          hosts:
-            rack.home.lan:
-          vars:
-            ansible_user: jd
-            ansible_password: q
-            ansible_ssh_user: jd
-            ansible_ssh_pass: q
-            become_method: su
-            ansible_become_user: root
-            ansible_become_password: q
-        router:
-          hosts:
-            192.168.77.1
-          vars:
-            ansible_python_interpreter: /opt/bin/python
-            ansible_user: admin
-            ansible_pass: l4c1!j4yd33?Du5lo
-            ansible_ssh_user: admin
-            ansible_ssh_pass: l4c1!j4yd33?Du5lo
-        nas.home.lan:
-          hosts:
-            nas.home.lan:
-          vars:
-            ansible_ssh_user: admin
-            ansible_ssh_pass: l4c1!j4yd33?Du5lo
-            become_method: su
-            become_user: admin
-            # ansible_user: admin
-            # ansible_pass: l4c1!j4yd33?Du5lo1
-            ansible_python_interpreter: /share/ZFS530_DATA/.qpkg/QPython312/bin/python3
-        morefine.home.lan:
+        nas:
+          nas.home.lan:
+            hosts:
+              nas.home.lan:
+              
+            vars:
+              ansible_ssh_user: admin
+              ansible_ssh_pass: l4c1!j4yd33?Du5lo
+              become_method: su
+              become_user: admin
+              # ansible_user: admin
+              # ansible_pass: l4c1!j4yd33?Du5lo1
+              ansible_python_interpreter: /share/ZFS530_DATA/.qpkg/QPython312/bin/python3
+        desktop:
           hosts:
             morefine.home.lan:
           vars:
-            jaydee_install_mqtt_srv: true
-            ansible_python_interpreter: auto_silent
-            ansible_ssh_user: jd
-            ansible_ssh_pass: q
-            ansible_password: q
-            ansible_become_user: root
-            ansible_become_password: q
-        m-server.home.lan:
-          hosts:
-            m-server.home.lan:
-          vars:
-            jaydee_install_mqtt_srv: true
-            ansible_python_interpreter: auto_silent
-            ansible_ssh_user: jd
-            ansible_ssh_pass: q
-            ansible_password: q
-            ansible_become_user: root
-            ansible_become_password: q
-            
-        ryzen:
-          hosts:
-            192.168.77.15:
-          vars:
-            ansible_python_interpreter: auto_silent
+            ansible_user: root
+            ansible_password: l4c1j4yd33Du5lo
             ansible_ssh_user: root
-            ansible_ssh_pass: lacijaydee
-            ansible_password: lacijaydee
+            ansible_ssh_pass: l4c1j4yd33Du5lo
             ansible_become_user: root
-            ansible_become_password: lacijaydee
+            ansible_become_password: l4c1j4yd33Du5lo      
 
     containers:
       children:
-        router:
+        servers:
           hosts:
-            192.168.77.1
-          vars:
-            ansible_python_interpreter: /opt/bin/python
-            ansible_user: admin
-            ansible_pass: l4c1!j4yd33?Du5lo
-            ansible_ssh_user: admin
-            ansible_ssh_pass: l4c1!j4yd33?Du5lo
-        # raspberry:
-        #   hosts:
-        #     192.168.77.246
-        #   vars:
-        #     ansible_python_interpreter: /usr/bin/python
-        #     ansible_ssh_user: jd
-        #     ansible_ssh_pass: q
-        #     ansible_become_user: root
-        #     ansible_become_password: l4c1j4yd33Du5lo
-        rpi5.home.lan:
-          hosts:
-            192.168.77.238
+            rpi5.home.lan:
+            m-server.hoe.lan:
+            fog.home.lan:
+            zabbix.home.lan:
           vars:
             ansible_python_interpreter: /usr/bin/python
             ansible_ssh_user: jd
             ansible_ssh_pass: q
             ansible_become_user: root
             ansible_become_password: l4c1j4yd33Du5lo
-        m-server.home.lan:
-          hosts:
-            m-server.home.lan:
-          vars:
-            jaydee_install_mqtt_srv: true
-            ansible_python_interpreter: auto_silent
-            ansible_ssh_user: jd
-            ansible_ssh_pass: q
-            ansible_password: q
-            ansible_become_user: root
-            ansible_become_password: q
-        nas.home.lan:
+        nas:
           hosts:
             nas.home.lan:
           vars:
@@ -223,19 +148,3 @@ datacenter:
             # ansible_user: admin
             # ansible_pass: l4c1!j4yd33?Du5lo1
             ansible_python_interpreter: /share/ZFS530_DATA/.qpkg/QPython312/bin/python3
-        fog.home.lan:
-          hosts:
-            fog.home.lan:
-          vars:
-            ansible_ssh_user: jd
-            ansible_ssh_pass: q
-            ansible_become_user: root
-            ansible_become_password: q
-        zabbix.home.lan:
-          hosts:
-            zabbix.home.lan:
-          vars:
-            ansible_ssh_user: jd
-            ansible_ssh_pass: q
-            ansible_become_user: root
-            ansible_become_password: q
\ No newline at end of file