diff --git a/class/defaults.yml b/class/defaults.yml
index eb654f1..8269b6a 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -13,8 +13,8 @@ parameters:
     db3_port: 3306
     service_user: maxscale
     monitor_user: maxscale
-    service_pwd: ?{vaultkv:${customer:name}/${cluster:name}/${_instance}/service_pwd}
-    monitor_pwd: ?{vaultkv:${customer:name}/${cluster:name}/${_instance}/monitor_pwd}
+    service_pwd: ?{vaultkv:${cluster:tenant}/${cluster:name}/${_instance}/service_pwd}
+    monitor_pwd: ?{vaultkv:${cluster:tenant}/${cluster:name}/${_instance}/monitor_pwd}
     replicas: 2
     affinity: {}
     images:
diff --git a/docs/modules/ROOT/pages/references/parameters.adoc b/docs/modules/ROOT/pages/references/parameters.adoc
index e1615a1..ea6ceda 100644
--- a/docs/modules/ROOT/pages/references/parameters.adoc
+++ b/docs/modules/ROOT/pages/references/parameters.adoc
@@ -82,13 +82,13 @@ default:: `maxscale`
 
 [horizontal]
 type:: string
-default:: `?{vaultkv:${customer:name}/${cluster:name}/maxscale/service_pwd}`
+default:: `?{vaultkv:${cluster:tenant}/${cluster:name}/maxscale/service_pwd}`
 
 == `monitor_pwd`
 
 [horizontal]
 type:: string
-default:: `?{vaultkv:${customer:name}/${cluster:name}/maxscale/monitor_pwd}`
+default:: `?{vaultkv:${cluster:tenant}/${cluster:name}/maxscale/monitor_pwd}`
 
 = Pod Affinity Parameters
 
diff --git a/tests/affinity.yml b/tests/affinity.yml
index a7898f7..a2d70dd 100644
--- a/tests/affinity.yml
+++ b/tests/affinity.yml
@@ -27,8 +27,8 @@ parameters:
     db3_port: 3307
     service_user: maxscale-testservice
     monitor_user: maxscale-testmonitor
-    service_pwd: ?{vaultkv:${customer:name}/${cluster:name}/${_instance}/service_pwd}
-    monitor_pwd: ?{vaultkv:${customer:name}/${cluster:name}/${_instance}/monitor_pwd}
+    service_pwd: ?{vaultkv:${cluster:tenant}/${cluster:name}/${_instance}/service_pwd}
+    monitor_pwd: ?{vaultkv:${cluster:tenant}/${cluster:name}/${_instance}/monitor_pwd}
     resources:
       limits:
         memory: 512Mi
diff --git a/tests/defaults.yml b/tests/defaults.yml
index bb0a595..842cb98 100644
--- a/tests/defaults.yml
+++ b/tests/defaults.yml
@@ -18,8 +18,8 @@ parameters:
     db3_port: 3307
     service_user: maxscale-testservice
     monitor_user: maxscale-testmonitor
-    service_pwd: ?{vaultkv:${customer:name}/${cluster:name}/${_instance}/service_pwd}
-    monitor_pwd: ?{vaultkv:${customer:name}/${cluster:name}/${_instance}/monitor_pwd}
+    service_pwd: ?{vaultkv:${cluster:tenant}/${cluster:name}/${_instance}/service_pwd}
+    monitor_pwd: ?{vaultkv:${cluster:tenant}/${cluster:name}/${_instance}/monitor_pwd}
     resources:
       limits:
         memory: 512Mi