diff --git a/classes/cluster/drivetrain-ha-oss/oss/client.yml b/classes/cluster/drivetrain-ha-oss/oss/client.yml
index dc99d6e..9239169 100644
--- a/classes/cluster/drivetrain-ha-oss/oss/client.yml
+++ b/classes/cluster/drivetrain-ha-oss/oss/client.yml
@@ -29,11 +29,12 @@
 
   # PostgreSQL
   - system.postgresql.client.pushkin
-  - system.postgresql.client.rundeck
+  - system.postgresql.client.pushkin.security_monkey
+  - system.postgresql.client.pushkin.janitor_monkey
+  - system.postgresql.client.pushkin.sfdc
+  - system.postgresql.client.pushkin.alertmanager
   - system.postgresql.client.security_monkey
-  - system.postgresql.client.janitor_monkey
-  - system.postgresql.client.sfdc
-  - system.postgresql.client.alertmanager
+  - system.postgresql.client.rundeck
 
   # Elasticsearch
   - system.elasticsearch.client