diff --git a/metadata/service/aggregator/cluster.yml b/metadata/service/aggregator/cluster.yml
deleted file mode 100644
index e95243e..0000000
--- a/metadata/service/aggregator/cluster.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-applications:
-- heka
-classes:
-- service.heka.support
-parameters:
-  _param:
-    aggregator_poolsize: 100
-  heka:
-    aggregator:
-      automatic_starting: false
-      enabled: true
-      influxdb_time_precision: ms
-      poolsize: ${_param:aggregator_poolsize}
diff --git a/metadata/service/aggregator/single.yml b/metadata/service/aggregator/single.yml
deleted file mode 100644
index 159e5bd..0000000
--- a/metadata/service/aggregator/single.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-applications:
-- heka
-classes:
-- service.heka.support
-parameters:
-  _param:
-    aggregator_poolsize: 100
-    nagios_host_dimension_key: nagios_host
-  heka:
-    aggregator:
-      automatic_starting: true
-      enabled: true
-      influxdb_time_precision: ms
-      poolsize: ${_param:aggregator_poolsize}
-      nagios_host_dimension_key: ${_param:nagios_host_dimension_key}
diff --git a/metadata/service/ceilometer_collector/single.yml b/metadata/service/ceilometer_collector/single.yml
deleted file mode 100644
index bfc6e75..0000000
--- a/metadata/service/ceilometer_collector/single.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-applications:
-- heka
-classes:
-- service.heka.support
-parameters:
-  heka:
-    ceilometer_collector:
-      enabled: true
diff --git a/metadata/service/log_collector/single.yml b/metadata/service/log_collector/single.yml
deleted file mode 100644
index 5160c35..0000000
--- a/metadata/service/log_collector/single.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-applications:
-- heka
-classes:
-- service.heka.support
-parameters:
-  _param:
-    log_collector_poolsize: 100
-  heka:
-    log_collector:
-      enabled: true
-      poolsize: ${_param:log_collector_poolsize}
diff --git a/metadata/service/metric_collector/single.yml b/metadata/service/metric_collector/single.yml
deleted file mode 100644
index 2e4a442..0000000
--- a/metadata/service/metric_collector/single.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-applications:
-- heka
-classes:
-- service.heka.support
-parameters:
-  _param:
-    metric_collector_poolsize: 100
-    nagios_host_dimension_key: nagios_host
-  heka:
-    metric_collector:
-      enabled: true
-      influxdb_time_precision: ms
-      poolsize: ${_param:metric_collector_poolsize}
-      nagios_host_dimension_key: ${_param:nagios_host_dimension_key}
diff --git a/metadata/service/remote_collector/cluster.yml b/metadata/service/remote_collector/cluster.yml
deleted file mode 100644
index 9e60e86..0000000
--- a/metadata/service/remote_collector/cluster.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-applications:
-- heka
-classes:
-- service.heka.support
-parameters:
-  _param:
-    remote_collector_poolsize: 100
-  heka:
-    remote_collector:
-      automatic_starting: false
-      enabled: true
-      influxdb_time_precision: ms
-      poolsize: ${_param:remote_collector_poolsize}
diff --git a/metadata/service/remote_collector/single.yml b/metadata/service/remote_collector/single.yml
deleted file mode 100644
index 8533ad2..0000000
--- a/metadata/service/remote_collector/single.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-applications:
-- heka
-classes:
-- service.heka.support
-parameters:
-  _param:
-    remote_collector_poolsize: 100
-  heka:
-    remote_collector:
-      automatic_starting: true
-      enabled: true
-      influxdb_time_precision: ms
-      poolsize: ${_param:remote_collector_poolsize}
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 8af2cd5..8041310 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -2,9 +2,9 @@
   heka:
     _support:
       collectd:
-        enabled: true
+        enabled: false
       heka:
-        enabled: true
+        enabled: false
       sensu:
         enabled: false
       sphinx: