diff --git a/metadata/service/client.yml b/metadata/service/client.yml
index ac6c99d..1e92676 100644
--- a/metadata/service/client.yml
+++ b/metadata/service/client.yml
@@ -1,5 +1,7 @@
 applications:
 - docker
+classes:
+  - service.docker.support
 parameters:
   docker:
     client:
diff --git a/metadata/service/host/init.yml b/metadata/service/host/init.yml
index 7e8ef5f..c8a4f26 100644
--- a/metadata/service/host/init.yml
+++ b/metadata/service/host/init.yml
@@ -1,5 +1,7 @@
 applications:
 - docker
+classes:
+  - service.docker.support
 parameters:
   docker:
     host:
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index a366e44..a77821b 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