diff --git a/nodes/draco.kosmos.org.json b/nodes/draco.kosmos.org.json
index a98bf05..0a933ae 100644
--- a/nodes/draco.kosmos.org.json
+++ b/nodes/draco.kosmos.org.json
@@ -83,10 +83,9 @@
     }
   },
   "run_list": [
-    "recipe[kosmos-base]",
+    "role[base]",
+    "role[kvm_host]",
     "recipe[kosmos_encfs]",
-    "recipe[kosmos_kvm::host]",
-    "recipe[kosmos_kvm::backup]",
     "recipe[kosmos-ejabberd::firewall]",
     "recipe[kosmos-ipfs::firewall_swarm]",
     "recipe[kosmos-bitcoin::firewall]",
@@ -94,4 +93,4 @@
     "role[openresty_proxy]",
     "recipe[sockethub::firewall]"
   ]
-}
\ No newline at end of file
+}
diff --git a/nodes/fornax.kosmos.org.json b/nodes/fornax.kosmos.org.json
index d8d9133..f648554 100644
--- a/nodes/fornax.kosmos.org.json
+++ b/nodes/fornax.kosmos.org.json
@@ -99,10 +99,9 @@
     }
   },
   "run_list": [
-    "recipe[kosmos-base]",
-    "recipe[kosmos_kvm::host]",
-    "recipe[kosmos_kvm::backup]",
+    "role[base]",
+    "role[kvm_host]",
     "role[nginx_proxy]",
     "role[zerotier_controller]"
   ]
-}
\ No newline at end of file
+}
diff --git a/roles/kvm_host.rb b/roles/kvm_host.rb
new file mode 100644
index 0000000..227607b
--- /dev/null
+++ b/roles/kvm_host.rb
@@ -0,0 +1,6 @@
+name "kvm_host"
+
+run_list %w(
+  kosmos_kvm::host
+  kosmos_kvm::backup
+)