diff --git a/personal/radex/demo-next/prod.jsonnet b/personal/radex/demo-next/prod.jsonnet
index 5710030..d829eef 100644
--- a/personal/radex/demo-next/prod.jsonnet
+++ b/personal/radex/demo-next/prod.jsonnet
@@ -10,9 +10,9 @@
         domain: "demo-next.hs.radex.io",
     },
 
-    ns: kube.Namespace("personal-radex"),
+    local ns = kube.Namespace("personal-radex"),
 
-    deployment: top.ns.Contain(kube.Deployment(cfg.name)) {
+    deployment: ns.Contain(kube.Deployment(cfg.name)) {
         spec+: {
             replicas: 1,
             template+: {
@@ -43,15 +43,15 @@
         },
     },
 
-    data: top.ns.Contain(kube.PersistentVolumeClaim("data")) {
+    data: ns.Contain(kube.PersistentVolumeClaim("data")) {
         storage:: "1Gi",
         storageClass:: "waw-hdd-redundant-3",
     },
-    service: top.ns.Contain(kube.Service(cfg.name)) {
+    service: ns.Contain(kube.Service(cfg.name)) {
         target:: top.deployment,
     },
 
-    ingress: top.ns.Contain(kube.SimpleIngress(cfg.name)) {
+    ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
         hosts:: [cfg.domain],
         target_service:: top.service,
     },
diff --git a/personal/radex/demo/prod.jsonnet b/personal/radex/demo/prod.jsonnet
index df8dd28..fbc4d03 100644
--- a/personal/radex/demo/prod.jsonnet
+++ b/personal/radex/demo/prod.jsonnet
@@ -10,9 +10,9 @@
         domain: "demo.hs.radex.io",
     },
 
-    ns: kube.Namespace("personal-radex"),
+    local ns = kube.Namespace("personal-radex"),
 
-    deployment: top.ns.Contain(kube.Deployment(cfg.name)) {
+    deployment: ns.Contain(kube.Deployment(cfg.name)) {
         spec+: {
             replicas: 3,
             template+: {
@@ -34,11 +34,11 @@
         },
     },
 
-    service: top.ns.Contain(kube.Service(cfg.name)) {
+    service: ns.Contain(kube.Service(cfg.name)) {
         target:: top.deployment,
     },
 
-    ingress: top.ns.Contain(kube.SimpleIngress(cfg.name)) {
+    ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
         hosts:: [cfg.domain],
         target_service:: top.service,
     },
diff --git a/personal/radex/wordpress/prod.jsonnet b/personal/radex/wordpress/prod.jsonnet
index 47e71e7..d8aca0b 100644
--- a/personal/radex/wordpress/prod.jsonnet
+++ b/personal/radex/wordpress/prod.jsonnet
@@ -18,9 +18,9 @@
         wordpress: { secretKeyRef: { name: cfg.name, key: 'wordpress_password' } },
     },
 
-    ns: kube.Namespace(cfg.namespace),
+    local ns = kube.Namespace(cfg.namespace),
 
-    deployment: top.ns.Contain(kube.Deployment(cfg.name)) {
+    deployment: ns.Contain(kube.Deployment(cfg.name)) {
         spec+: {
             replicas: 1,
             template+: {
@@ -50,11 +50,11 @@
         },
     },
 
-    service: top.ns.Contain(kube.Service(cfg.name)) {
+    service: ns.Contain(kube.Service(cfg.name)) {
         target:: top.deployment,
     },
 
-    ingress: top.ns.Contain(kube.SimpleIngress(cfg.name)) {
+    ingress: ns.Contain(kube.SimpleIngress(cfg.name)) {
         hosts:: [cfg.domain],
         target_service:: top.service,
     },
@@ -62,12 +62,12 @@
     mysql: {
         local mysql = self,
 
-        volume: top.ns.Contain(kube.PersistentVolumeClaim("wordpress-mysql")) {
+        volume: ns.Contain(kube.PersistentVolumeClaim("wordpress-mysql")) {
             storage:: cfg.storageSize,
             storageClass:: cfg.storageClassName,
         },
 
-        deployment: top.ns.Contain(kube.Deployment("wordpress-mysql")) {
+        deployment: ns.Contain(kube.Deployment("wordpress-mysql")) {
             spec+: {
                 replicas: 1,
                 template+: {
@@ -100,7 +100,7 @@
             }
         },
 
-        service: top.ns.Contain(kube.Service("wordpress-mysql")) {
+        service: ns.Contain(kube.Service("wordpress-mysql")) {
             target:: mysql.deployment,
         },
     },
