Index: tools/gformat.py
===================================================================
--- tools/gformat.py	(revision 13277)
+++ tools/gformat.py	(revision 13278)
@@ -1810,5 +1810,5 @@
 
 define service {
-        use                   wleiden-service
+        use                   wleiden-service,service-pnp
         hostgroup_name        srv_hybrid
         service_description   HTTP
@@ -1869,5 +1869,5 @@
         print '''\
 define host {
-        use                   wleiden-node
+        use                   wleiden-node,host-pnp
         contact_groups        admins  
         host_name             %(autogen_fqdn)s