diff --git a/inventory/hosts.yml b/inventory/hosts.yml
index 39290ca..8514443 100644
--- a/inventory/hosts.yml
+++ b/inventory/hosts.yml
@@ -10,24 +10,12 @@ all:
       ansible_host: 192.168.50.3
     home-assistant:
       ansible_host: 192.168.60.100
-    laptop.lan:
-      ansible_host: 192.168.50.29
-    prusa:
-      ansible_host: 192.168.50.6
-    node-01.lan:
-      ansible_host: 192.168.50.101
-    node-02.lan:
-      ansible_host: 192.168.50.102
-    node-03.lan:
-      ansible_host: 192.168.50.103
-    node-04.lan:
-      ansible_host: 192.168.50.104
-    node-05.lan:
-      ansible_host: 192.168.50.105
-    uatu.lan:
+    uatu:
       ansible_host: 192.168.50.106
-    node-x86.lan:
-      ansible_host: 192.168.50.186
+    dymo:
+      ansible_host: 192.168.50.109
+    node-cluster:
+      ansible_host: 192.168.50.151
     remote_server:
       ansible_host:
       ansible_become_password:
@@ -35,14 +23,10 @@ all:
   children:
     raspberry:
       hosts:
-        node-01.lan:
-        node-02.lan:
-        node-03.lan:
-        node-04.lan:
-        node-05.lan:
+        dymo:
+        uatu:
     lan:
       hosts:
-        router:
         bender:
         home-assistant:
         prusa:
@@ -50,8 +34,10 @@ all:
       children:
         docker_cluster:
           hosts:
-            node-01.lan:
-            node-02.lan:
-            node-03.lan:
-            node-04.lan:
-            node-05.lan:
+            node-cluster:
+    ubuntu:
+      hosts:
+        uatu:
+    debian:
+      hosts:
+        dymo:
diff --git a/main.yml b/main.yml
index dfe3e87..3839ad9 100644
--- a/main.yml
+++ b/main.yml
@@ -1,10 +1,4 @@
 ---
-- hosts: prusa
-  roles:
-    - ssh
-    - octoprint
-    - ubuntu
-
 - hosts: docker_cluster
   roles:
     - node_explorer
@@ -12,14 +6,6 @@
     - docker-cluster
     - ubuntu
 
-#- hosts: raspberry
-#  roles:
-#    - i2c-clock
-
-#- hosts: router.lan
-#  roles:
-#    - router
-
 - hosts: remote_server
   roles:
     - docker
@@ -33,7 +19,7 @@
     - duplicity
     - node_explorer
 
-
-- hosts: laptop.lan
+- hosts: dymo
   roles:
-    - node_explorer
+    - ssh
+    - cups-server
diff --git a/prusa.yml b/prusa.yml
deleted file mode 100644
index d04e61c..0000000
--- a/prusa.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- hosts: prusa.lan
-  roles:
-#    - ssh
-    - octoprint
-#    - ubuntu