diff --git a/site/roles/manifests/base.pp b/site/roles/manifests/base.pp
index d6a7fa2..371974f 100644
--- a/site/roles/manifests/base.pp
+++ b/site/roles/manifests/base.pp
@@ -1,6 +1,11 @@
 # a role to deploy the base system
 # work in progress
 class roles::base {
-  include profiles::defaults
-  include profiles::base
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+  }
 }
diff --git a/site/roles/manifests/infra/cobbler/server.pp b/site/roles/manifests/infra/cobbler/server.pp
index 0c515d3..5ffd2a6 100644
--- a/site/roles/manifests/infra/cobbler/server.pp
+++ b/site/roles/manifests/infra/cobbler/server.pp
@@ -1,7 +1,11 @@
 # cobbler server profile
 class roles::infra::cobbler::server {
-  include profiles::defaults
-  include profiles::base
-  include profiles::base::datavol
-  include profiles::cobbler::init
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::base
+    include profiles::base::datavol
+    include profiles::cobbler::init
+  }
 }
diff --git a/site/roles/manifests/infra/db/redis.pp b/site/roles/manifests/infra/db/redis.pp
index fda1b3a..af3bfce 100644
--- a/site/roles/manifests/infra/db/redis.pp
+++ b/site/roles/manifests/infra/db/redis.pp
@@ -1,6 +1,10 @@
-
 # a role to deploy a redis node
 class roles::infra::db::redis {
-  include profiles::defaults
-  include profiles::base
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+  }
 }
diff --git a/site/roles/manifests/infra/dhcp/server.pp b/site/roles/manifests/infra/dhcp/server.pp
index 86a3606..1a27e17 100644
--- a/site/roles/manifests/infra/dhcp/server.pp
+++ b/site/roles/manifests/infra/dhcp/server.pp
@@ -1,6 +1,11 @@
 # dhcp server profile
 class roles::infra::dhcp::server {
-  include profiles::defaults
-  include profiles::base
-  include profiles::dhcp::server
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+    include profiles::dhcp::server
+  }
 }
diff --git a/site/roles/manifests/infra/dns/master.pp b/site/roles/manifests/infra/dns/master.pp
index e5d50de..fbf5192 100644
--- a/site/roles/manifests/infra/dns/master.pp
+++ b/site/roles/manifests/infra/dns/master.pp
@@ -2,7 +2,12 @@
 # defines a dns server with master-only zones
 #
 class roles::infra::dns::master {
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
     include profiles::defaults
     include profiles::base
     include profiles::dns::master
+  }
 }
diff --git a/site/roles/manifests/infra/dns/resolver.pp b/site/roles/manifests/infra/dns/resolver.pp
index 606ca9f..3277cad 100644
--- a/site/roles/manifests/infra/dns/resolver.pp
+++ b/site/roles/manifests/infra/dns/resolver.pp
@@ -2,7 +2,12 @@
 # defines a dns server with forward-only zones
 #
 class roles::infra::dns::resolver {
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
     include profiles::defaults
     include profiles::base
     include profiles::dns::resolver
+  }
 }
diff --git a/site/roles/manifests/infra/halb/haproxy.pp b/site/roles/manifests/infra/halb/haproxy.pp
index 6b128b4..87a2d41 100644
--- a/site/roles/manifests/infra/halb/haproxy.pp
+++ b/site/roles/manifests/infra/halb/haproxy.pp
@@ -1,6 +1,11 @@
 # a role to deploy a haproxy node
 class roles::infra::halb::haproxy {
-  include profiles::defaults
-  include profiles::base
-  include profiles::haproxy::server
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+    include profiles::haproxy::server
+  }
 }
diff --git a/site/roles/manifests/infra/metrics/grafana.pp b/site/roles/manifests/infra/metrics/grafana.pp
index db6f757..2f99f8d 100644
--- a/site/roles/manifests/infra/metrics/grafana.pp
+++ b/site/roles/manifests/infra/metrics/grafana.pp
@@ -1,5 +1,10 @@
 # a role to deploy a grafana service
 class roles::infra::metrics::grafana {
-  include profiles::defaults
-  include profiles::base
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+  }
 }
diff --git a/site/roles/manifests/infra/metrics/prometheus.pp b/site/roles/manifests/infra/metrics/prometheus.pp
index d3dd8ea..1b2ee1c 100644
--- a/site/roles/manifests/infra/metrics/prometheus.pp
+++ b/site/roles/manifests/infra/metrics/prometheus.pp
@@ -1,7 +1,12 @@
 # a role to deploy a prometheus server
 class roles::infra::metrics::prometheus {
-  include profiles::defaults
-  include profiles::base
-  include profiles::base::datavol
-  include profiles::metrics::server
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+    include profiles::base::datavol
+    include profiles::metrics::server
+  }
 }
diff --git a/site/roles/manifests/infra/ntp/server.pp b/site/roles/manifests/infra/ntp/server.pp
index cfc685d..4ff34f3 100644
--- a/site/roles/manifests/infra/ntp/server.pp
+++ b/site/roles/manifests/infra/ntp/server.pp
@@ -1,6 +1,11 @@
 # a role to deploy a ntp server
 class roles::infra::ntp::server {
-  include profiles::defaults
-  include profiles::base
-  include profiles::ntp::server
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+    include profiles::ntp::server
+  }
 }
diff --git a/site/roles/manifests/infra/ovirt/engine.pp b/site/roles/manifests/infra/ovirt/engine.pp
index f437516..1e998f3 100644
--- a/site/roles/manifests/infra/ovirt/engine.pp
+++ b/site/roles/manifests/infra/ovirt/engine.pp
@@ -1,5 +1,10 @@
 # role to manage ovirt management engine nodes
 class roles::infra::ovirt::engine {
-  include profiles::defaults
-  include profiles::base
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+  }
 }
diff --git a/site/roles/manifests/infra/ovirt/node.pp b/site/roles/manifests/infra/ovirt/node.pp
index 5182092..026a25f 100644
--- a/site/roles/manifests/infra/ovirt/node.pp
+++ b/site/roles/manifests/infra/ovirt/node.pp
@@ -1,6 +1,11 @@
 # role to manage ovirt hypervisor nodes
 class roles::infra::ovirt::node {
-  include profiles::defaults
-  include profiles::base
-  include profiles::ovirt::node
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+    include profiles::ovirt::node
+  }
 }
diff --git a/site/roles/manifests/infra/proxmox/node.pp b/site/roles/manifests/infra/proxmox/node.pp
index 62bc14f..ccf41b6 100644
--- a/site/roles/manifests/infra/proxmox/node.pp
+++ b/site/roles/manifests/infra/proxmox/node.pp
@@ -1,6 +1,11 @@
 # manage the installation of a proxmox node
 class roles::infra::proxmox::node {
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
     include profiles::defaults
     include profiles::base
     include profiles::proxmox::init
+  }
 }
diff --git a/site/roles/manifests/infra/puppet/master.pp b/site/roles/manifests/infra/puppet/master.pp
index 01e8877..c29ab7a 100644
--- a/site/roles/manifests/infra/puppet/master.pp
+++ b/site/roles/manifests/infra/puppet/master.pp
@@ -1,7 +1,12 @@
 # a role to deploy the puppetmaster
 # work in progress
 class roles::infra::puppet::master {
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
     include profiles::defaults
     include profiles::base
     include profiles::puppet::puppetmaster
   }
+}
diff --git a/site/roles/manifests/infra/puppetboard/server.pp b/site/roles/manifests/infra/puppetboard/server.pp
index 4742810..e2d772d 100644
--- a/site/roles/manifests/infra/puppetboard/server.pp
+++ b/site/roles/manifests/infra/puppetboard/server.pp
@@ -1,6 +1,11 @@
 # a role to deploy the puppetboard
 class roles::infra::puppetboard::server {
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
     include profiles::defaults
     include profiles::base
     include profiles::puppet::puppetboard
   }
+}
diff --git a/site/roles/manifests/infra/puppetdb/api.pp b/site/roles/manifests/infra/puppetdb/api.pp
index 65bee4c..7d50c47 100644
--- a/site/roles/manifests/infra/puppetdb/api.pp
+++ b/site/roles/manifests/infra/puppetdb/api.pp
@@ -1,6 +1,11 @@
 # a role to deploy the puppetdb api service
 class roles::infra::puppetdb::api {
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
     include profiles::defaults
     include profiles::base
     include profiles::puppet::puppetdb_api
   }
+}
diff --git a/site/roles/manifests/infra/puppetdb/sql.pp b/site/roles/manifests/infra/puppetdb/sql.pp
index 97ebc96..7f13859 100644
--- a/site/roles/manifests/infra/puppetdb/sql.pp
+++ b/site/roles/manifests/infra/puppetdb/sql.pp
@@ -1,6 +1,11 @@
 # a role to deploy the puppetdb postgresql service
 class roles::infra::puppetdb::sql {
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
     include profiles::defaults
     include profiles::base
     include profiles::puppet::puppetdb_sql
   }
+}
diff --git a/site/roles/manifests/infra/reposync/syncer.pp b/site/roles/manifests/infra/reposync/syncer.pp
index 8c5a613..9c41fe3 100644
--- a/site/roles/manifests/infra/reposync/syncer.pp
+++ b/site/roles/manifests/infra/reposync/syncer.pp
@@ -1,7 +1,12 @@
 # a role to deploy a packagerepo
 class roles::infra::reposync::syncer {
-  include profiles::defaults
-  include profiles::base
-  include profiles::base::datavol
-  include profiles::reposync::syncer
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+    include profiles::base::datavol
+    include profiles::reposync::syncer
+  }
 }
diff --git a/site/roles/manifests/infra/sql/galera.pp b/site/roles/manifests/infra/sql/galera.pp
index 207aed6..2628f81 100644
--- a/site/roles/manifests/infra/sql/galera.pp
+++ b/site/roles/manifests/infra/sql/galera.pp
@@ -1,10 +1,15 @@
 # a role to deploy a mariadb galera node
 class roles::infra::sql::galera {
-  include profiles::defaults
-  include profiles::base
-  include profiles::base::datavol
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+    include profiles::base::datavol
 
-  if $facts['enc_role'] == 'roles::infra::sql::galera' {
-    include profiles::sql::galera_member
+    if $facts['enc_role'] == 'roles::infra::sql::galera' {
+      include profiles::sql::galera_member
+    }
   }
 }
diff --git a/site/roles/manifests/infra/storage/consul.pp b/site/roles/manifests/infra/storage/consul.pp
index e47a108..143b167 100644
--- a/site/roles/manifests/infra/storage/consul.pp
+++ b/site/roles/manifests/infra/storage/consul.pp
@@ -1,8 +1,12 @@
-
 # a role to deploy a consul node
 class roles::infra::storage::consul {
-  include profiles::defaults
-  include profiles::base
-  include profiles::base::datavol
-  include profiles::consul::server
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+    include profiles::base::datavol
+    include profiles::consul::server
+  }
 }
diff --git a/site/roles/manifests/infra/storage/edgecache.pp b/site/roles/manifests/infra/storage/edgecache.pp
index 4ed8bf7..7d9d655 100644
--- a/site/roles/manifests/infra/storage/edgecache.pp
+++ b/site/roles/manifests/infra/storage/edgecache.pp
@@ -1,7 +1,12 @@
 # a role to deploy an edgecache
 class roles::infra::storage::edgecache {
-  include profiles::defaults
-  include profiles::base
-  include profiles::base::datavol
-  include profiles::edgecache::init
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+    include profiles::base::datavol
+    include profiles::edgecache::init
+  }
 }
diff --git a/site/roles/manifests/infra/storage/minio.pp b/site/roles/manifests/infra/storage/minio.pp
index 72411e8..d436e8e 100644
--- a/site/roles/manifests/infra/storage/minio.pp
+++ b/site/roles/manifests/infra/storage/minio.pp
@@ -1,6 +1,11 @@
 # a role to deploy a minio node
 class roles::infra::storage::minio {
-  include profiles::defaults
-  include profiles::base
-  include profiles::minio::server
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+    include profiles::minio::server
+  }
 }
diff --git a/site/roles/manifests/infra/storage/vault.pp b/site/roles/manifests/infra/storage/vault.pp
index fce67af..9e11b14 100644
--- a/site/roles/manifests/infra/storage/vault.pp
+++ b/site/roles/manifests/infra/storage/vault.pp
@@ -1,7 +1,12 @@
 # a role to deploy a vault node
 class roles::infra::storage::vault {
-  include profiles::defaults
-  include profiles::base
-  include profiles::base::datavol
-  include profiles::vault::server
+  if $facts['firstrun'] {
+    include profiles::defaults
+    include profiles::firstrun::init
+  }else{
+    include profiles::defaults
+    include profiles::base
+    include profiles::base::datavol
+    include profiles::vault::server
+  }
 }