diff --git a/metadata/service/agent/cluster.yml b/metadata/service/agent/cluster.yml
index ff0ad92..d1a1444 100644
--- a/metadata/service/agent/cluster.yml
+++ b/metadata/service/agent/cluster.yml
@@ -1,5 +1,7 @@
 applications:
 - ceilometer
+classes:
+- service.ceilometer.support
 parameters:
   ceilometer:
     agent:
diff --git a/metadata/service/agent/single.yml b/metadata/service/agent/single.yml
index 20d05de..c2781ad 100644
--- a/metadata/service/agent/single.yml
+++ b/metadata/service/agent/single.yml
@@ -1,5 +1,7 @@
 applications:
 - ceilometer
+classes:
+- service.ceilometer.support
 parameters:
   ceilometer:
     agent:
diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index fd526a9..6f250c8 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -1,5 +1,7 @@
 applications:
 - ceilometer
+classes:
+- service.ceilometer.support
 parameters:
   ceilometer:
     server:
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 8186ff5..d69f366 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -1,5 +1,7 @@
 applications:
 - ceilometer
+classes:
+- service.ceilometer.support
 parameters:
   ceilometer:
     server:
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index c5f7517..dd2c37d 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -6,6 +6,6 @@
       heka:
         enabled: false
       sensu:
-        enabled: true
+        enabled: false
       sphinx:
         enabled: true