diff --git a/packages/apps/tenant/templates/etcd.yaml b/packages/apps/tenant/templates/etcd.yaml
index 7e68b4a6..88d716dd 100644
--- a/packages/apps/tenant/templates/etcd.yaml
+++ b/packages/apps/tenant/templates/etcd.yaml
@@ -20,38 +20,4 @@ spec:
       version: 1.0.0
   interval: 1m0s
   timeout: 5m0s
----
-apiVersion: kamaji.clastix.io/v1alpha1
-kind: DataStore
-metadata:
-  name: {{ include "tenant.name" . }}
-spec:
-  driver: etcd
-  endpoints:
-  - etcd-0.etcd.{{ include "tenant.name" . }}.svc:2379
-  - etcd-1.etcd.{{ include "tenant.name" . }}.svc:2379
-  - etcd-2.etcd.{{ include "tenant.name" . }}.svc:2379
-  tlsConfig:
-    certificateAuthority:
-      certificate:
-        secretReference:
-          keyPath: ca.crt
-          name: etcd-certs
-          namespace: tenant-test2
-      privateKey:
-        secretReference:
-          keyPath: ca.key
-          name: etcd-certs
-          namespace: tenant-test2
-    clientCertificate:
-      certificate:
-        secretReference:
-          keyPath: tls.crt
-          name: etcd-client-certs
-          namespace: tenant-test2
-      privateKey:
-        secretReference:
-          keyPath: tls.key
-          name: etcd-client-certs
-          namespace: tenant-test2
 {{- end }}
diff --git a/packages/apps/tenant/values.schema.json b/packages/apps/tenant/values.schema.json
new file mode 100644
index 00000000..f2c7958a
--- /dev/null
+++ b/packages/apps/tenant/values.schema.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "type": "object",
+  "properties": {
+    "ownEtcd": {
+      "type": "boolean",
+      "title": "Deploy own Etcd cluster",
+      "form": true
+    },
+    "ownMonitoring": {
+      "type": "boolean",
+      "title": "Deploy own Monitoring Stack",
+      "form": true
+    },
+    "ownIngress": {
+      "type": "boolean",
+      "title": "Deploy own Ingress Controller",
+      "form": true
+    }
+  }
+}
diff --git a/packages/apps/tenant/values.yaml b/packages/apps/tenant/values.yaml
index 73527f11..3f1354e2 100644
--- a/packages/apps/tenant/values.yaml
+++ b/packages/apps/tenant/values.yaml
@@ -1,6 +1,3 @@
 ownEtcd: false
 ownMonitoring: false
 ownIngress: false
-
-#domain: example.org
-#storageClass: linstor-lvm
diff --git a/packages/core/installer/images/installer.json b/packages/core/installer/images/installer.json
index 3a3a1a8c..b50b6894 100644
--- a/packages/core/installer/images/installer.json
+++ b/packages/core/installer/images/installer.json
@@ -1,14 +1,14 @@
 {
-  "containerimage.config.digest": "sha256:47b38f7635fe957c8b92c9ea9734768f8b54f9e95a1ff753473838499e94cb81",
+  "containerimage.config.digest": "sha256:77ea033186d5c168113ca21b92d9f1c7ee38c1aab3e99356ec7e79ba2dda96bb",
   "containerimage.descriptor": {
     "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
-    "digest": "sha256:94870fe592228a8fba4dac882a43851b37551c68ebcbb1d1d3953e84a11e0d09",
+    "digest": "sha256:99b5902ce02fb7f65b49375b2c599c2868c6d789c746ea2327cb46d17bb2d09c",
     "size": 2074,
     "platform": {
       "architecture": "amd64",
       "os": "linux"
     }
   },
-  "containerimage.digest": "sha256:94870fe592228a8fba4dac882a43851b37551c68ebcbb1d1d3953e84a11e0d09",
+  "containerimage.digest": "sha256:99b5902ce02fb7f65b49375b2c599c2868c6d789c746ea2327cb46d17bb2d09c",
   "image.name": "ghcr.io/aenix-io/cozystack/installer:latest"
 }
\ No newline at end of file
diff --git a/packages/core/platform/templates/apps.yaml b/packages/core/platform/templates/apps.yaml
index ccf2e293..ec9c72e9 100644
--- a/packages/core/platform/templates/apps.yaml
+++ b/packages/core/platform/templates/apps.yaml
@@ -2,8 +2,10 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: tenant-root
+  name: root
   namespace: tenant-root
+  labels:
+    cozystack.io/ui: "true"
 spec:
   interval: 1m
   releaseName: root
diff --git a/packages/core/platform/templates/helmreleases.yaml b/packages/core/platform/templates/helmreleases.yaml
index ea4cde49..f1267e61 100644
--- a/packages/core/platform/templates/helmreleases.yaml
+++ b/packages/core/platform/templates/helmreleases.yaml
@@ -533,32 +533,6 @@ spec:
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
-metadata:
-  name: ingress-nginx
-  namespace: cozy-ingress-nginx
-  labels:
-    cozystack.io/repository: system
-spec:
-  interval: 1m
-  releaseName: ingress-nginx
-  chart:
-    spec:
-      chart: cozy-ingress-nginx
-      reconcileStrategy: Revision
-      sourceRef:
-        kind: HelmRepository
-        name: cozystack-system
-        namespace: cozy-system
-  dependsOn:
-  - name: cilium
-    namespace: cozy-cilium
-  - name: kubeovn
-    namespace: cozy-kubeovn
-  - name: cert-manager
-    namespace: cozy-cert-manager
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
 metadata:
   name: kubeapps
   namespace: cozy-kubeapps
diff --git a/packages/extra/etcd/templates/datastore.yaml b/packages/extra/etcd/templates/datastore.yaml
new file mode 100644
index 00000000..7ca01e67
--- /dev/null
+++ b/packages/extra/etcd/templates/datastore.yaml
@@ -0,0 +1,33 @@
+apiVersion: kamaji.clastix.io/v1alpha1
+kind: DataStore
+metadata:
+  name: {{ .Release.Namespace }}
+spec:
+  driver: etcd
+  endpoints:
+  - etcd-0.etcd.{{ .Release.Namespace }}.svc:2379
+  - etcd-1.etcd.{{ .Release.Namespace }}.svc:2379
+  - etcd-2.etcd.{{ .Release.Namespace }}.svc:2379
+  tlsConfig:
+    certificateAuthority:
+      certificate:
+        secretReference:
+          keyPath: ca.crt
+          name: etcd-certs
+          namespace: {{ .Release.Namespace }}
+      privateKey:
+        secretReference:
+          keyPath: ca.key
+          name: etcd-certs
+          namespace: {{ .Release.Namespace }}
+    clientCertificate:
+      certificate:
+        secretReference:
+          keyPath: tls.crt
+          name: etcd-client-certs
+          namespace: {{ .Release.Namespace }}
+      privateKey:
+        secretReference:
+          keyPath: tls.key
+          name: etcd-client-certs
+          namespace: {{ .Release.Namespace }}
diff --git a/packages/extra/etcd/values.yaml b/packages/extra/etcd/values.yaml
deleted file mode 100644
index 1690bf11..00000000
--- a/packages/extra/etcd/values.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-kamaji-etcd:
-  datastore:
-    enabled: true