diff --git a/.gitignore b/.gitignore
index 3a59d1b3..8cd3e0b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,3 @@ Dockerfile.cross
 tmp
 
 config/local-setup/**/*.env
-local
\ No newline at end of file
diff --git a/charts/dns-operator/templates/manifests.yaml b/charts/dns-operator/templates/manifests.yaml
index a5d720e8..6695d4e2 100644
--- a/charts/dns-operator/templates/manifests.yaml
+++ b/charts/dns-operator/templates/manifests.yaml
@@ -1,21 +1,10 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: dns-operator
-    app.kubernetes.io/instance: system
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/name: namespace
-    app.kubernetes.io/part-of: dns-operator
-    control-plane: dns-operator-controller-manager
-  name: dns-operator-system
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
+  labels:
+    app.kubernetes.io/managed-by: helm
   name: dnsrecords.kuadrant.io
 spec:
   group: kuadrant.io
@@ -537,11 +526,11 @@ metadata:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: dns-operator
     app.kubernetes.io/instance: controller-manager-sa
-    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/managed-by: helm
     app.kubernetes.io/name: serviceaccount
     app.kubernetes.io/part-of: dns-operator
   name: dns-operator-controller-manager
-  namespace: dns-operator-system
+  namespace: '{{ .Release.Namespace }}'
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -550,11 +539,11 @@ metadata:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: dns-operator
     app.kubernetes.io/instance: leader-election-role
-    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/managed-by: helm
     app.kubernetes.io/name: role
     app.kubernetes.io/part-of: dns-operator
   name: dns-operator-leader-election-role
-  namespace: dns-operator-system
+  namespace: '{{ .Release.Namespace }}'
 rules:
 - apiGroups:
   - ""
@@ -591,6 +580,8 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  labels:
+    app.kubernetes.io/managed-by: helm
   name: dns-operator-manager-role
 rules:
 - apiGroups:
@@ -635,11 +626,11 @@ metadata:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: dns-operator
     app.kubernetes.io/instance: leader-election-rolebinding
-    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/managed-by: helm
     app.kubernetes.io/name: rolebinding
     app.kubernetes.io/part-of: dns-operator
   name: dns-operator-leader-election-rolebinding
-  namespace: dns-operator-system
+  namespace: '{{ .Release.Namespace }}'
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -647,7 +638,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: dns-operator-controller-manager
-  namespace: dns-operator-system
+  namespace: '{{ .Release.Namespace }}'
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -656,7 +647,7 @@ metadata:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: dns-operator
     app.kubernetes.io/instance: manager-rolebinding
-    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/managed-by: helm
     app.kubernetes.io/name: clusterrolebinding
     app.kubernetes.io/part-of: dns-operator
   name: dns-operator-manager-rolebinding
@@ -667,15 +658,16 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: dns-operator-controller-manager
-  namespace: dns-operator-system
+  namespace: '{{ .Release.Namespace }}'
 ---
 apiVersion: v1
 kind: Service
 metadata:
   labels:
+    app.kubernetes.io/managed-by: helm
     control-plane: dns-operator-controller-manager
   name: dns-operator-controller-manager-metrics-service
-  namespace: dns-operator-system
+  namespace: '{{ .Release.Namespace }}'
 spec:
   ports:
   - name: metrics
@@ -691,12 +683,12 @@ metadata:
     app.kubernetes.io/component: manager
     app.kubernetes.io/created-by: dns-operator
     app.kubernetes.io/instance: controller-manager
-    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/managed-by: helm
     app.kubernetes.io/name: deployment
     app.kubernetes.io/part-of: dns-operator
     control-plane: dns-operator-controller-manager
   name: dns-operator-controller-manager
-  namespace: dns-operator-system
+  namespace: '{{ .Release.Namespace }}'
 spec:
   replicas: 1
   selector:
@@ -707,6 +699,7 @@ spec:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
+        app.kubernetes.io/managed-by: helm
         control-plane: dns-operator-controller-manager
     spec:
       containers:
diff --git a/config/helm/kustomization.yaml b/config/helm/kustomization.yaml
index ecbcca00..4c439052 100644
--- a/config/helm/kustomization.yaml
+++ b/config/helm/kustomization.yaml
@@ -1,2 +1,20 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: "{{ .Release.Namespace }}"
+
+labels:
+  - pairs:
+      app.kubernetes.io/managed-by: helm
+    includeTemplates: true
+
 resources:
 - ../default
+
+patches:
+- patch: |-
+    $patch: delete
+    apiVersion: v1
+    kind: Namespace
+    metadata:
+      name: dns-operator-system
diff --git a/make/kind.mk b/make/kind.mk
index 424623ee..88c0e3a6 100644
--- a/make/kind.mk
+++ b/make/kind.mk
@@ -16,7 +16,7 @@ kind-delete-cluster: kind ## Delete the "kuadrant-dns-local" kind cluster.
 
 .PHONY: kind-delete-all-clusters
 kind-delete-all-clusters: kind ## Delete the all "kuadrant-dns-local*" kind clusters.
-	- $(KIND) get clusters | grep $(KIND_CLUSTER_NAME_PREFIX) | xargs -I % sh -c "kind delete cluster --name %"
+	- $(KIND) get clusters | grep $(KIND_CLUSTER_NAME_PREFIX) | xargs -I % sh -c "$(KIND) delete cluster --name %"
 
 .PHONY: kind-load-image
 kind-load-image: kind ## Load image to "kuadrant-dns-local" kind cluster.