diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 2360ab68..fbe314d6 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -8,9 +8,6 @@
       domain: sunet.se
    sunet::rsyslog:
 
-'^kvm.+-.+-\d+\.komreg\.net$':
-   eid::kvmhost:
-
 jmp.komreg.net:
    konsulter:
    sunet_iaas_cloud:
@@ -21,7 +18,7 @@ jmp.komreg.net:
    autoupdate:
 
 kvmfe-fre-3.komreg.net:
-   eid::kvm_vms:
+   eid::kvmhost:
       vms:
          fe-fre-3.komreg.net:
             mac: '52:54:20:01:00:01'
diff --git a/global/overlay/etc/puppet/modules/eid/manifests/kvm_vms.pp b/global/overlay/etc/puppet/modules/eid/manifests/kvm_vms.pp
deleted file mode 100644
index f5f4aa8b..00000000
--- a/global/overlay/etc/puppet/modules/eid/manifests/kvm_vms.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class eid::kvm_vms(
-   Hash $vms
-) {
-  create_resources('eid::cloudimage', $vms)
-}
diff --git a/global/overlay/etc/puppet/modules/eid/manifests/kvmhost.pp b/global/overlay/etc/puppet/modules/eid/manifests/kvmhost.pp
index c3f72bcd..f233cbc5 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/kvmhost.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/kvmhost.pp
@@ -1,6 +1,7 @@
 class eid::kvmhost(
-  $proxy_server = hiera('eid_proxy_server'),
-  $no_proxy     = hiera('eid_no_proxy'),
+  String $proxy_server = hiera('eid_proxy_server'),
+  String $no_proxy     = hiera('eid_no_proxy'),
+  Hash   $vms          = [],
 ) {
   file {
     '/etc/cosmos-manual-reboot':
@@ -37,4 +38,6 @@ class eid::kvmhost(
       line     => '8021q',
       ;
   }
+
+  create_resources('eduid::cloudimage', $vms)
 }