diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 616f5372..9f25316e 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -21,12 +21,13 @@ jmp.komreg.net:
    autoupdate:
 
 kvmfe-fre-3.komreg.net:
-   eid::cloudimage:
-      fe-fre-3.komreg.net:
-         mac: '52:54:20:01:00:01'
-         description: 'eid fre frontend'
-         cpus: '4'
-         memory: '4096'
+   eid::kvm_vms:
+      vms:
+         fe-fre-3.komreg.net:
+            mac: '52:54:20:01:00:01'
+            description: 'eid fre frontend'
+            cpus: '4'
+            memory: '4096'
 
 nic.komreg.net:
    sunet_iaas_cloud:
diff --git a/global/overlay/etc/puppet/modules/eid/manifests/cloudimage.pp b/global/overlay/etc/puppet/modules/eid/manifests/cloudimage.pp
index 8c9f8db2..323c297f 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/cloudimage.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/cloudimage.pp
@@ -1,5 +1,5 @@
 # Wrapper with eid common settings for sunet::cloudimage
-class eid::cloudimage(
+define eid::cloudimage(
   String           $mac,
   String           $cpus        = '1',
   String           $memory      = '1024',
diff --git a/global/overlay/etc/puppet/modules/eid/manifests/kvm_vms.pp b/global/overlay/etc/puppet/modules/eid/manifests/kvm_vms.pp
new file mode 100644
index 00000000..f5f4aa8b
--- /dev/null
+++ b/global/overlay/etc/puppet/modules/eid/manifests/kvm_vms.pp
@@ -0,0 +1,5 @@
+class eid::kvm_vms(
+   Hash $vms
+) {
+  create_resources('eid::cloudimage', $vms)
+}