diff --git a/app/inventory/prod.jsonnet b/app/inventory/prod.jsonnet
index 0389223..d54ba9d 100644
--- a/app/inventory/prod.jsonnet
+++ b/app/inventory/prod.jsonnet
@@ -66,9 +66,8 @@
     storageClass:: cfg.storageClassName,
   },
 
-  postgres: postgres {
+  postgres: ns.Contain(postgres) {
     cfg+: {
-      namespace: cfg.namespace,
       appName: cfg.name,
       storageClassName: cfg.storageClassName,
       version: '15.4',
diff --git a/app/mastodon/kube/mastodon.libsonnet b/app/mastodon/kube/mastodon.libsonnet
index 06c9fe1..6e2d0ee 100644
--- a/app/mastodon/kube/mastodon.libsonnet
+++ b/app/mastodon/kube/mastodon.libsonnet
@@ -118,10 +118,9 @@
 
     # there used to be a nonversioned postgres (10.4) here
     # at time of writing it exists in prod, scaled down to 0, to preserve the PVC
-    postgres: postgres {
+    postgres: ns.Contain(postgres) {
         cfg+: {
             version: "13.9",
-            namespace: cfg.namespace,
             appName: "mastodon",
             database: "mastodon",
             username: "mastodon",
@@ -133,9 +132,8 @@
         },
     },
 
-    redis: redis {
+    redis: ns.Contain(redis) {
         cfg+: {
-            namespace: cfg.namespace,
             appName: "mastodon",
             storageClassName: "waw-hdd-redundant-3",
             prefix: "waw3-",
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",
diff --git a/devtools/issues/redmine.libsonnet b/devtools/issues/redmine.libsonnet
index 6ffff5a..d4dc5e7 100644
--- a/devtools/issues/redmine.libsonnet
+++ b/devtools/issues/redmine.libsonnet
@@ -51,9 +51,8 @@
 
     local ns = kube.Namespace(cfg.namespace),
 
-    postgres: postgres {
+    postgres: ns.Contain(postgres) {
         cfg+: {
-            namespace: cfg.namespace,
             appName: "redmine",
             database: "redmine",
             username: "redmine",
diff --git a/hswaw/paperless/paperless.libsonnet b/hswaw/paperless/paperless.libsonnet
index 0572b1f..e0546b8 100644
--- a/hswaw/paperless/paperless.libsonnet
+++ b/hswaw/paperless/paperless.libsonnet
@@ -38,9 +38,8 @@
 
     local ns = kube.Namespace(cfg.namespace),
 
-    redis: redis {
+    redis: ns.Contain(redis) {
         cfg+: {
-            namespace: cfg.namespace,
             storageClassName: cfg.storageClassName,
             appName: "paperless",
             image: "redis:6.0",
@@ -48,9 +47,8 @@
         },
     },
 
-    postgres: postgres {
+    postgres: ns.Contain(postgres) {
         cfg+: {
-            namespace: cfg.namespace,
             appName: "paperless",
             database: "paperless",
             username: "paperless",
diff --git a/personal/noisersup/ferretdb.jsonnet b/personal/noisersup/ferretdb.jsonnet
index 8e3788f..a3b9944 100644
--- a/personal/noisersup/ferretdb.jsonnet
+++ b/personal/noisersup/ferretdb.jsonnet
@@ -38,9 +38,8 @@
     },
   },
 
-  postgres: postgres {
+  postgres: ns.Contain(postgres) {
     cfg+: {
-      namespace: cfg.namespace,
       appName: 'ferretdb-postgres',
       database: 'ferretdb',
       username: 'username',