diff --git a/core/installer/values-tmpl/rpuppy.jsonschema b/core/installer/values-tmpl/rpuppy.jsonschema
index 36619aa..5fa2fed 100644
--- a/core/installer/values-tmpl/rpuppy.jsonschema
+++ b/core/installer/values-tmpl/rpuppy.jsonschema
@@ -1,6 +1,16 @@
 {
+  "definitions": {
+    "network": {
+      "type": "object",
+      "properties": {
+        "name": { "type": "string" },
+        "domain": { "type": "string" }
+      }
+    }
+  },
   "type": "object",
   "properties": {
+    "Network": { "$ref": "#/definitions/network" },
     "Subdomain": { "type": "string", "default": "woof" }
   },
   "additionalProperties": false
diff --git a/core/installer/values-tmpl/rpuppy.md b/core/installer/values-tmpl/rpuppy.md
index a7d4177..2633167 100644
--- a/core/installer/values-tmpl/rpuppy.md
+++ b/core/installer/values-tmpl/rpuppy.md
@@ -1 +1 @@
-rpuppy application will be installed on public network and be accessible to any user on https://{{ .Values.Subdomain }}.{{ .Global.Domain }}
+rpuppy application will be installed on public network and be accessible to any user on https://{{ .Values.Subdomain }}.{{ .Values.Network.Domain }}
diff --git a/core/installer/values-tmpl/rpuppy.yaml b/core/installer/values-tmpl/rpuppy.yaml
index 69d1dad..10fac11 100644
--- a/core/installer/values-tmpl/rpuppy.yaml
+++ b/core/installer/values-tmpl/rpuppy.yaml
@@ -1,33 +1,9 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: namespaces-rpuppy
-  namespace: {{ .Global.Id }}
-spec:
-  chart:
-    spec:
-      chart: charts/namespaces
-      sourceRef:
-        kind: GitRepository
-        name: pcloud
-        namespace: {{ .Global.Id }}
-  interval: 1m0s
-  values:
-    pcloudInstanceId: {{ .Global.Id }}
-    namespacePrefix: {{ .Global.NamespacePrefix }}
-    namespaces:
-    - app-rpuppy
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
   name: rpuppy
-  namespace: {{ .Global.Id }}
+  namespace: {{ .Release.Namespace }}
 spec:
-  targetNamespace: {{ .Global.NamespacePrefix }}app-rpuppy
-  dependsOn:
-    - name: namespaces-rpuppy
-      namespace: {{ .Global.Id }}
   chart:
     spec:
       chart: charts/rpuppy
@@ -37,6 +13,6 @@
         namespace: {{ .Global.Id }}
   interval: 1m0s
   values:
-    ingressClassName: pcloud-ingress-public
-    certificateIssuer: {{ .Global.Id }}-public
-    domain: {{ .Values.Subdomain }}.{{ .Global.Domain }}
+    ingressClassName: {{ .Values.Network.IngressClass }}
+    certificateIssuer: {{ .Values.Network.CertificateIssuer }}
+    domain: {{ .Values.Subdomain }}.{{ .Values.Network.Domain }}