diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 632f1db89..71975a7fe 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -338,3 +338,18 @@ jobs:
       - name: Verify generate command
         run: |
           make verify-go-mod
+
+  verify-helm-charts:
+    name: Verify helm charts
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go 1.22.x
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.x
+        id: go
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Run make verify-helm-charts
+        run: |
+          make verify-helm-charts
diff --git a/charts/kuadrant-operator/templates/manifests.yaml b/charts/kuadrant-operator/templates/manifests.yaml
index 148862d8f..09c5293cd 100644
--- a/charts/kuadrant-operator/templates/manifests.yaml
+++ b/charts/kuadrant-operator/templates/manifests.yaml
@@ -1,11 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    app: kuadrant
-    control-plane: controller-manager
-  name: kuadrant-system
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -15616,7 +15608,7 @@ metadata:
   labels:
     app: kuadrant
   name: kuadrant-operator-controller-manager
-  namespace: kuadrant-system
+  namespace: '{{ .Release.Namespace }}'
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -15624,7 +15616,7 @@ metadata:
   labels:
     app: kuadrant
   name: kuadrant-operator-leader-election-role
-  namespace: kuadrant-system
+  namespace: '{{ .Release.Namespace }}'
 rules:
 - apiGroups:
   - ""
@@ -15791,6 +15783,42 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - gateway.envoyproxy.io
+  resources:
+  - envoyextensionpolicies
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - gateway.envoyproxy.io
+  resources:
+  - envoypatchpolicies
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - gateway.envoyproxy.io
+  resources:
+  - securitypolicies
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - gateway.networking.k8s.io
   resources:
@@ -15842,6 +15870,18 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - referencegrants
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - install.istio.io
   resources:
@@ -16088,7 +16128,7 @@ metadata:
   labels:
     app: kuadrant
   name: kuadrant-operator-leader-election-rolebinding
-  namespace: kuadrant-system
+  namespace: '{{ .Release.Namespace }}'
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -16096,7 +16136,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: kuadrant-operator-controller-manager
-  namespace: kuadrant-system
+  namespace: '{{ .Release.Namespace }}'
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -16111,7 +16151,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: kuadrant-operator-controller-manager
-  namespace: kuadrant-system
+  namespace: '{{ .Release.Namespace }}'
 ---
 apiVersion: v1
 kind: Service
@@ -16120,7 +16160,7 @@ metadata:
     app: kuadrant
     control-plane: controller-manager
   name: kuadrant-operator-metrics
-  namespace: kuadrant-system
+  namespace: '{{ .Release.Namespace }}'
 spec:
   ports:
   - name: metrics
@@ -16137,7 +16177,7 @@ metadata:
     app: kuadrant
     control-plane: controller-manager
   name: kuadrant-operator-controller-manager
-  namespace: kuadrant-system
+  namespace: '{{ .Release.Namespace }}'
 spec:
   replicas: 1
   selector:
diff --git a/config/deploy/kustomization.yaml b/config/deploy/kustomization.yaml
index e28931fe8..3d693df43 100644
--- a/config/deploy/kustomization.yaml
+++ b/config/deploy/kustomization.yaml
@@ -1,5 +1,6 @@
 namespace: kuadrant-system
 
 resources:
+  - namespace.yaml
   - ../default
   - ../dependencies
diff --git a/config/deploy/namespace.yaml b/config/deploy/namespace.yaml
new file mode 100644
index 000000000..8b55c3cd8
--- /dev/null
+++ b/config/deploy/namespace.yaml
@@ -0,0 +1,6 @@
+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 77b036975..17983b846 100644
--- a/config/helm/kustomization.yaml
+++ b/config/helm/kustomization.yaml
@@ -1,4 +1,6 @@
-namespace: kuadrant-system
-
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: "{{ .Release.Namespace }}"
 resources:
   - ../default
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 017e5613c..8a89cf4f0 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -1,9 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    control-plane: controller-manager
-  name: system
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/make/verify.mk b/make/verify.mk
index 8ef35cec8..b152c3f97 100644
--- a/make/verify.mk
+++ b/make/verify.mk
@@ -25,3 +25,8 @@ verify-generate: generate ## Verify generate update.
 verify-go-mod: ## Verify go.mod matches source code
 	go mod tidy
 	git diff --exit-code ./go.mod
+
+.PHONY: verify-helm-charts
+verify-helm-charts: helm-build ## Verify helm charts update.
+	git diff --exit-code ./charts
+	[ -z "$$(git ls-files --other --exclude-standard --directory --no-empty-directory ./charts)" ]