diff --git a/charts/kuadrant-operator/templates/manifests.yaml b/charts/kuadrant-operator/templates/manifests.yaml
index 36a5a8921..7fe175fb9 100644
--- a/charts/kuadrant-operator/templates/manifests.yaml
+++ b/charts/kuadrant-operator/templates/manifests.yaml
@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     app: kuadrant
+    app.kubernetes.io/managed-by: helm
     gateway.networking.k8s.io/policy: inherited
   name: authpolicies.kuadrant.io
 spec:
@@ -13206,6 +13207,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     app: kuadrant
+    app.kubernetes.io/managed-by: helm
     gateway.networking.k8s.io/policy: direct
   name: dnspolicies.kuadrant.io
 spec:
@@ -13758,6 +13760,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     app: kuadrant
+    app.kubernetes.io/managed-by: helm
   name: kuadrants.kuadrant.io
 spec:
   group: kuadrant.io
@@ -13899,6 +13902,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     app: kuadrant
+    app.kubernetes.io/managed-by: helm
     gateway.networking.k8s.io/policy: inherited
   name: ratelimitpolicies.kuadrant.io
 spec:
@@ -14388,6 +14392,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     app: kuadrant
+    app.kubernetes.io/managed-by: helm
     gateway.networking.k8s.io/policy: direct
   name: tlspolicies.kuadrant.io
 spec:
@@ -14751,6 +14756,7 @@ kind: ServiceAccount
 metadata:
   labels:
     app: kuadrant
+    app.kubernetes.io/managed-by: helm
   name: kuadrant-operator-controller-manager
   namespace: '{{ .Release.Namespace }}'
 ---
@@ -14759,6 +14765,7 @@ kind: Role
 metadata:
   labels:
     app: kuadrant
+    app.kubernetes.io/managed-by: helm
   name: kuadrant-operator-leader-election-role
   namespace: '{{ .Release.Namespace }}'
 rules:
@@ -14799,6 +14806,7 @@ kind: ClusterRole
 metadata:
   labels:
     app: kuadrant
+    app.kubernetes.io/managed-by: helm
   name: kuadrant-operator-manager-role
 rules:
 - apiGroups:
@@ -15283,6 +15291,7 @@ kind: RoleBinding
 metadata:
   labels:
     app: kuadrant
+    app.kubernetes.io/managed-by: helm
   name: kuadrant-operator-leader-election-rolebinding
   namespace: '{{ .Release.Namespace }}'
 roleRef:
@@ -15299,6 +15308,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app: kuadrant
+    app.kubernetes.io/managed-by: helm
   name: kuadrant-operator-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -15314,6 +15324,7 @@ kind: Service
 metadata:
   labels:
     app: kuadrant
+    app.kubernetes.io/managed-by: helm
     control-plane: controller-manager
   name: kuadrant-operator-metrics
   namespace: '{{ .Release.Namespace }}'
@@ -15331,6 +15342,7 @@ kind: Deployment
 metadata:
   labels:
     app: kuadrant
+    app.kubernetes.io/managed-by: helm
     control-plane: controller-manager
   name: kuadrant-operator-controller-manager
   namespace: '{{ .Release.Namespace }}'
@@ -15344,6 +15356,7 @@ spec:
     metadata:
       labels:
         app: kuadrant
+        app.kubernetes.io/managed-by: helm
         control-plane: controller-manager
     spec:
       containers:
diff --git a/config/deploy/kustomization.yaml b/config/deploy/kustomization.yaml
index 3d693df43..e28931fe8 100644
--- a/config/deploy/kustomization.yaml
+++ b/config/deploy/kustomization.yaml
@@ -1,6 +1,5 @@
 namespace: kuadrant-system
 
 resources:
-  - namespace.yaml
   - ../default
   - ../dependencies
diff --git a/config/deploy/namespace.yaml b/config/deploy/namespace.yaml
deleted file mode 100644
index 8b55c3cd8..000000000
--- a/config/deploy/namespace.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    control-plane: controller-manager
-  name: system
diff --git a/config/helm/kustomization.yaml b/config/helm/kustomization.yaml
index 17983b846..f594c257c 100644
--- a/config/helm/kustomization.yaml
+++ b/config/helm/kustomization.yaml
@@ -2,5 +2,19 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: "{{ .Release.Namespace }}"
+
+labels:
+  - pairs:
+      app.kubernetes.io/managed-by: helm
+    includeTemplates: true
+
 resources:
-  - ../default
+- ../default
+
+patches:
+- patch: |-
+    $patch: delete
+    apiVersion: v1
+    kind: Namespace
+    metadata:
+      name: kuadrant-system
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 0177aaec2..1ee1e9b6a 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -1,3 +1,9 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    control-plane: controller-manager
+  name: system
 ---
 apiVersion: apps/v1
 kind: Deployment