diff --git a/.vagrant-puppet/modules/icinga2/manifests/config.pp b/.vagrant-puppet/modules/icinga2/manifests/config.pp
new file mode 100644
index 000000000..310dea1e7
--- /dev/null
+++ b/.vagrant-puppet/modules/icinga2/manifests/config.pp
@@ -0,0 +1,11 @@
+define icinga2::config ($source) {
+  include icinga2
+
+  $path = "/etc/icinga2/${name}.conf"
+  file { $path:
+    source  => "${source}${path}",
+    owner   => 'icinga',
+    group   => 'icinga',
+    require => Class['icinga2'],
+  }
+}
diff --git a/.vagrant-puppet/profiles/icinga2_dev/manifests/init.pp b/.vagrant-puppet/profiles/icinga2_dev/manifests/init.pp
index 611d0f116..5a34707e9 100644
--- a/.vagrant-puppet/profiles/icinga2_dev/manifests/init.pp
+++ b/.vagrant-puppet/profiles/icinga2_dev/manifests/init.pp
@@ -2,15 +2,8 @@ class icinga2_dev {
   include icinga2
   include icinga2_mysql
 
-  define icinga2_config {
-    $path = "/etc/icinga2/${name}.conf"
-    file { $path:
-      source  => "puppet:///modules/icinga2_dev${path}",
-      owner   => 'icinga',
-      group   => 'icinga',
-      require => Class['icinga2'],
-    }
+  icinga2::config { [
+    'conf.d/test-config', 'conf.d/commands', 'constants' ]:
+    source => 'puppet:///modules/icinga2_dev',
   }
-
-  icinga2_config { [ 'conf.d/test-config', 'conf.d/commands', 'constants' ]: }
 }