diff --git a/manifests/site.pp b/manifests/site.pp
index 8c05262..f7556d9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,6 +1,12 @@
-$admin=hiera('ortiche-admin')
+# Main manifest, contains default definition
+# Setup is configured to be masterless and nameless [0]
+# By now configuration is hiera-based [1], but it could be fact-driven
+# [0] http://www.vmdoh.com/blog/why-you-should-be-using-nodeless-masterless-puppet
+# [1] https://docs.puppetlabs.com/hiera/1/puppet.html#assigning-classes-to-nodes-with-hiera-hierainclude
+
+$admin=hiera('host-admin',"root@$::fqdn")
 notify{"This node is mantained by ${::admin}": }
 
 node default {
-  hiera_include('ortiche-roles')
+  hiera_include('host-roles')
 }