diff --git a/core/installer/values-tmpl/headscale.yaml b/core/installer/values-tmpl/headscale.yaml
index 82e8712..807ed63 100644
--- a/core/installer/values-tmpl/headscale.yaml
+++ b/core/installer/values-tmpl/headscale.yaml
@@ -2,7 +2,7 @@
 kind: HelmRelease
 metadata:
   name: headscale
-  namespace: {{ .Values.NamespacePrefix }}app-headscale
+  namespace: {{ .Global.NamespacePrefix }}app-headscale
 spec:
   chart:
     spec:
@@ -10,7 +10,7 @@
       sourceRef:
         kind: GitRepository
         name: pcloud
-        namespace: {{ .Values.Id }}
+        namespace: {{ .Global.Id }}
   interval: 1m0s
   values:
     image:
@@ -20,5 +20,5 @@
     storage:
       size: 5Gi
     ingressClassName: pcloud-ingress-public
-    certificateIssuer: lekva-public
-    domain: {{ .Values.Domain }}
+    certificateIssuer: {{ .Global.Id }}-public
+    domain: {{ .Values.Subdomain }}.{{ .Global.Doman }}