diff --git a/app/matrix/lib/matrix-ng.libsonnet b/app/matrix/lib/matrix-ng.libsonnet
index 44e97a9..eb08935 100644
--- a/app/matrix/lib/matrix-ng.libsonnet
+++ b/app/matrix/lib/matrix-ng.libsonnet
@@ -245,10 +245,9 @@
 
     local ns = kube.Namespace(cfg.namespace),
 
-    postgres3: if cfg.postgres.enable then postgres {
+    postgres3: if cfg.postgres.enable then ns.Contain(postgres) {
         local psql = self,
         cfg+: {
-            namespace: cfg.namespace,
             appName: "synapse",
             database: "synapse",
             username: "synapse",
@@ -271,9 +270,8 @@
         },
     } else {},
 
-    redis: redis {
+    redis: ns.Contain(redis) {
         cfg+: {
-            namespace: cfg.namespace,
             appName: "synapse",
             storageClassName: cfg.storageClassName,
             password: { secretKeyRef: { name: "synapse", key: "redis_password" } },
diff --git a/app/matrix/lib/matrix.libsonnet b/app/matrix/lib/matrix.libsonnet
index c17a934..462a77d 100644
--- a/app/matrix/lib/matrix.libsonnet
+++ b/app/matrix/lib/matrix.libsonnet
@@ -82,9 +82,8 @@
 
     local ns = kube.Namespace(cfg.namespace),
 
-    postgres3: postgres {
+    postgres3: ns.Contain(postgres) {
         cfg+: {
-            namespace: cfg.namespace,
             appName: "synapse",
             database: "synapse",
             username: "synapse",