diff --git a/metadata/service/support.yml b/metadata/service/support.yml
new file mode 100644
index 0000000..0629f75
--- /dev/null
+++ b/metadata/service/support.yml
@@ -0,0 +1,9 @@
+parameters:
+  linux:
+    _support:
+      collectd:
+        enabled: true
+      heka:
+        enabled: false
+      sensu:
+        enabled: true
diff --git a/metadata/service/system/init.yml b/metadata/service/system/init.yml
index 2c3d614..2c4cc9c 100644
--- a/metadata/service/system/init.yml
+++ b/metadata/service/system/init.yml
@@ -1,18 +1,11 @@
 applications:
 - linux
+classes:
+- service.linux.support
 parameters:
   linux:
     system:
       enabled: true
-      logging:
-        heka:
-          enabled: false
-      metering:
-        collectd:
-          enabled: true
-      monitoring:
-        sensu:
-          enabled: true
       user:
         root:
           enabled: true