diff --git a/core/installer/values-tmpl/appmanager.cue b/core/installer/values-tmpl/appmanager.cue
index dbf60e7..fc405a6 100644
--- a/core/installer/values-tmpl/appmanager.cue
+++ b/core/installer/values-tmpl/appmanager.cue
@@ -7,6 +7,9 @@
 	sshPrivateKey: string
 }
 
+name: "app-manager"
+namespace: "appmanager"
+
 images: {
 	appmanager: {
 		repository: "giolekva"
diff --git a/core/installer/values-tmpl/cert-manager.cue b/core/installer/values-tmpl/cert-manager.cue
index dbecd50..7f4f55a 100644
--- a/core/installer/values-tmpl/cert-manager.cue
+++ b/core/installer/values-tmpl/cert-manager.cue
@@ -1,5 +1,8 @@
 input: {}
 
+name: "cert-manager"
+namespace: "cert-manager"
+
 images: {
 	certManager: {
 		registry: "quay.io"
diff --git a/core/installer/values-tmpl/certificate-issuer-private.cue b/core/installer/values-tmpl/certificate-issuer-private.cue
index 4243f2c..ca4c7c2 100644
--- a/core/installer/values-tmpl/certificate-issuer-private.cue
+++ b/core/installer/values-tmpl/certificate-issuer-private.cue
@@ -5,6 +5,7 @@
 	}
 }
 
+name: "certificate-issuer-private"
 namespace: "ingress-private"
 
 images: {}
diff --git a/core/installer/values-tmpl/certificate-issuer-public.cue b/core/installer/values-tmpl/certificate-issuer-public.cue
index 5e4fbeb..33be2a9 100644
--- a/core/installer/values-tmpl/certificate-issuer-public.cue
+++ b/core/installer/values-tmpl/certificate-issuer-public.cue
@@ -2,6 +2,7 @@
 
 images: {}
 
+name: "certificate-issuer-public"
 namespace: "ingress-private"
 
 charts: {
diff --git a/core/installer/values-tmpl/config-repo.cue b/core/installer/values-tmpl/config-repo.cue
index 8c64eb1..8d6a52f 100644
--- a/core/installer/values-tmpl/config-repo.cue
+++ b/core/installer/values-tmpl/config-repo.cue
@@ -4,6 +4,7 @@
 	adminKey: string
 }
 
+name: "config-repo"
 namespace: "config-repo"
 
 images: {
diff --git a/core/installer/values-tmpl/core-auth.cue b/core/installer/values-tmpl/core-auth.cue
index 9bb43e5..fae3120 100644
--- a/core/installer/values-tmpl/core-auth.cue
+++ b/core/installer/values-tmpl/core-auth.cue
@@ -2,6 +2,7 @@
 	subdomain: string
 }
 
+name: "core-auth"
 namespace: "core-auth"
 
 _userSchema: ###"""
diff --git a/core/installer/values-tmpl/csi-driver-smb.cue b/core/installer/values-tmpl/csi-driver-smb.cue
index ef0f530..6d93bbf 100644
--- a/core/installer/values-tmpl/csi-driver-smb.cue
+++ b/core/installer/values-tmpl/csi-driver-smb.cue
@@ -1,5 +1,8 @@
 input: {}
 
+name: "csi-driver-smb"
+namespace: "csi-driver-smb"
+
 _baseImage: {
 	registry: "registry.k8s.io"
 	repository: "sig-storage"
diff --git a/core/installer/values-tmpl/dns-zone-manager.cue b/core/installer/values-tmpl/dns-zone-manager.cue
index 4d977d0..0fc66bf 100644
--- a/core/installer/values-tmpl/dns-zone-manager.cue
+++ b/core/installer/values-tmpl/dns-zone-manager.cue
@@ -7,6 +7,9 @@
 	}
 }
 
+name: "dns-zone-manager"
+namespace: "dns-zone-manager"
+
 images: {
 	dnsZoneController: {
 		repository: "giolekva"
diff --git a/core/installer/values-tmpl/env-manager.cue b/core/installer/values-tmpl/env-manager.cue
index e34c546..b93d918 100644
--- a/core/installer/values-tmpl/env-manager.cue
+++ b/core/installer/values-tmpl/env-manager.cue
@@ -9,6 +9,9 @@
 	sshPrivateKey: string
 }
 
+name: "env-manager"
+namespace: "env-manager"
+
 images: {
 	envManager: {
 		repository: "giolekva"
diff --git a/core/installer/values-tmpl/fluxcd-reconciler.cue b/core/installer/values-tmpl/fluxcd-reconciler.cue
index 8c90648..ebb6c4d 100644
--- a/core/installer/values-tmpl/fluxcd-reconciler.cue
+++ b/core/installer/values-tmpl/fluxcd-reconciler.cue
@@ -1,5 +1,8 @@
 input: {}
 
+name: "fluxcd-reconciler"
+namespace: "fluxcd-reconciler"
+
 images: {
 	fluxcdReconciler: {
 		repository: "giolekva"
diff --git a/core/installer/values-tmpl/headscale-controller.cue b/core/installer/values-tmpl/headscale-controller.cue
index 8a9756b..86570ed 100644
--- a/core/installer/values-tmpl/headscale-controller.cue
+++ b/core/installer/values-tmpl/headscale-controller.cue
@@ -1,5 +1,8 @@
 input: {}
 
+name: "headscale-controller"
+namespace: "core-headscale"
+
 images: {
 	headscaleController: {
 		repository: "giolekva"
diff --git a/core/installer/values-tmpl/headscale.cue b/core/installer/values-tmpl/headscale.cue
index fc2e441..5cfec3c 100644
--- a/core/installer/values-tmpl/headscale.cue
+++ b/core/installer/values-tmpl/headscale.cue
@@ -2,6 +2,7 @@
 	subdomain: string
 }
 
+name: "headscale"
 namespace: "app-headscale"
 
 images: {
diff --git a/core/installer/values-tmpl/ingress-public.cue b/core/installer/values-tmpl/ingress-public.cue
index 1717762..e723342 100644
--- a/core/installer/values-tmpl/ingress-public.cue
+++ b/core/installer/values-tmpl/ingress-public.cue
@@ -1,5 +1,8 @@
 input: {}
 
+name: "ingress-public"
+namespace: "ingress-public"
+
 images: {
 	ingressNginx: {
 		registry: "registry.k8s.io"
diff --git a/core/installer/values-tmpl/metallb-ipaddresspool.cue b/core/installer/values-tmpl/metallb-ipaddresspool.cue
index 8fbded7..603b4b3 100644
--- a/core/installer/values-tmpl/metallb-ipaddresspool.cue
+++ b/core/installer/values-tmpl/metallb-ipaddresspool.cue
@@ -6,6 +6,7 @@
 	namespace: string
 }
 
+name: "metallb-ipaddresspool"
 namespace: "metallb-ipaddresspool"
 
 images: {}
diff --git a/core/installer/values-tmpl/private-network.cue b/core/installer/values-tmpl/private-network.cue
index 8b62fe2..2438c25 100644
--- a/core/installer/values-tmpl/private-network.cue
+++ b/core/installer/values-tmpl/private-network.cue
@@ -6,6 +6,7 @@
 	}
 }
 
+name: "private-network"
 namespace: "ingress-private"
 
 images: {
diff --git a/core/installer/values-tmpl/resource-renderer-controller.cue b/core/installer/values-tmpl/resource-renderer-controller.cue
index b65a0ea..e596ba3 100644
--- a/core/installer/values-tmpl/resource-renderer-controller.cue
+++ b/core/installer/values-tmpl/resource-renderer-controller.cue
@@ -1,5 +1,8 @@
 input: {}
 
+name: "resource-renderer-controller"
+namespace: "rr-controller"
+
 images: {
 	resourceRenderer: {
 		repository: "giolekva"
diff --git a/core/installer/values-tmpl/welcome.cue b/core/installer/values-tmpl/welcome.cue
index 2da8f67..255cc20 100644
--- a/core/installer/values-tmpl/welcome.cue
+++ b/core/installer/values-tmpl/welcome.cue
@@ -8,6 +8,9 @@
 	createAccountAddr: string
 }
 
+name: "welcome"
+namespace: "app-welcome"
+
 images: {
 	welcome: {
 		repository: "giolekva"