% git di
diff --git a/cfengine/inputs/cf.classes b/cfengine/inputs/cf.classes
index 8942bdb..4512e88 100644
--- a/cfengine/inputs/cf.classes
+++ b/cfengine/inputs/cf.classes
@@ -124,6 +124,9 @@ groups:
         location_qube
     )
 
+    # To reflect reality, service_puppermaster needs to be defined BEFORE
+    # vhost_puppetmaster
+    service_puppetmaster    = ( brambling skimmer )
     # web vhosts
     vhost_ads       = ( bittern )
     vhost_anon      = ( motmot )
@@ -179,7 +182,6 @@ groups:
     # classes
     service_goldserver      = ( type_goldserver )
     service_cfengine        = ( bellbird corvid )
-    service_puppetmaster    = ( brambling skimmer )
     service_puppet_client   = ( brambling pelican skimmer vulture )
     service_ssh             = ( any )
     service_ssh_hpn         = ( any )