diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 31cdb2d5..0e632533 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -87,9 +87,10 @@ classes:
     sunetops: null
   kvmfe-fre-3.komreg.net:
     common: null
-    eid::cloudimage:
-      fe-fre-3.komreg.net: {cpus: '4', description: eid fre frontend, mac: '52:54:20:01:00:01',
-        memory: '4096'}
+    eid::kvm_vms:
+      vms:
+        fe-fre-3.komreg.net: {cpus: '4', description: eid fre frontend, mac: '52:54:20:01:00:01',
+          memory: '4096'}
     eid::kvmhost: null
     entropyclient: null
     infra_ca_rp: null
@@ -250,7 +251,7 @@ members:
     kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
     kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net,
     nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net]
-  eid::cloudimage: [kvmfe-fre-3.komreg.net]
+  eid::kvm_vms: [kvmfe-fre-3.komreg.net]
   eid::kvmhost: [kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
     kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
     kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net]