diff --git a/metadata/service/client/init.yml b/metadata/service/client/init.yml
new file mode 100644
index 0000000..cb05254
--- /dev/null
+++ b/metadata/service/client/init.yml
@@ -0,0 +1,8 @@
+applications:
+- postgresql
+classes:
+- service.postgresql.client.support
+parameters:
+  postgresql:
+    client:
+      enabled: true
diff --git a/metadata/service/client/support.yml b/metadata/service/client/support.yml
new file mode 100644
index 0000000..191dce6
--- /dev/null
+++ b/metadata/service/client/support.yml
@@ -0,0 +1,13 @@
+parameters:
+  postgresql:
+    _support:
+      backupninja:
+        enabled: false
+      collectd:
+        enabled: false
+      heka:
+        enabled: false
+      sensu:
+        enabled: false
+      sphinx:
+        enabled: true
diff --git a/metadata/service/server/local.yml b/metadata/service/server/local.yml
index e66ab6e..3487c11 100644
--- a/metadata/service/server/local.yml
+++ b/metadata/service/server/local.yml
@@ -1,7 +1,7 @@
 applications:
 - postgresql
 classes:
-- service.postgresql.support
+- service.postgresql.server.support
 parameters:
   postgresql:
     server:
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 2cf1984..15c28bb 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -1,7 +1,7 @@
 applications:
 - postgresql
 classes:
-- service.postgresql.support
+- service.postgresql.server.support
 parameters:
   postgresql:
     server:
diff --git a/metadata/service/support.yml b/metadata/service/server/support.yml
similarity index 100%
rename from metadata/service/support.yml
rename to metadata/service/server/support.yml