diff --git a/heka/remote_collector/cluster.yml b/heka/remote_collector/cluster.yml
index 13dffe0..3da60c1 100644
--- a/heka/remote_collector/cluster.yml
+++ b/heka/remote_collector/cluster.yml
@@ -1,5 +1,6 @@
 classes:
 - service.heka.remote_collector.cluster
+- system.heka.server
 parameters:
   heka:
     remote_collector:
diff --git a/heka/remote_collector/single.yml b/heka/remote_collector/single.yml
index 7f8037c..9511fd6 100644
--- a/heka/remote_collector/single.yml
+++ b/heka/remote_collector/single.yml
@@ -1,5 +1,6 @@
 classes:
 - service.heka.remote_collector.single
+- system.heka.server
 parameters:
   heka:
     remote_collector: