diff --git a/.vagrant-puppet/modules/icingaweb2/manifests/config/module.pp b/.vagrant-puppet/modules/icingaweb2/manifests/config/module.pp
index fe5b6c0cc..69e5abd6b 100644
--- a/.vagrant-puppet/modules/icingaweb2/manifests/config/module.pp
+++ b/.vagrant-puppet/modules/icingaweb2/manifests/config/module.pp
@@ -1,6 +1,25 @@
-define icingaweb2::config::module ($source, $module = 'monitoring', $replace = true) {
-  icingaweb2::config::general { "modules/${module}/${name}":
-    source  => $source,
-    replace => $replace,
+define icingaweb2::config::module (
+  $module,
+  $source,
+  $config  = hiera('icingaweb2::config'),
+  $replace = true
+) {
+  include icingaweb2::config
+
+  if ! defined(File["${config}/modules/${module}"]) {
+    file { "${config}/modules/${module}":
+      ensure  => directory,
+      owner   => 'root',
+      group   => 'icingaweb',
+      mode    => '2770',
+    }
+  }
+
+  file { "${config}/modules/${module}/${name}.ini":
+     source  => "${source}/modules/${module}/${name}.ini",
+     owner   => 'root',
+     group   => 'icingaweb',
+     mode    => 0660,
+     replace => $replace,
   }
 }