diff --git a/deploy/helm-chart/kubernetes-replicator/templates/_helpers.tpl b/deploy/helm-chart/kubernetes-replicator/templates/_helpers.tpl
index b28760a2..76f3cdec 100644
--- a/deploy/helm-chart/kubernetes-replicator/templates/_helpers.tpl
+++ b/deploy/helm-chart/kubernetes-replicator/templates/_helpers.tpl
@@ -31,6 +31,13 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Create namespace name using the value of the release object or custom override.
+*/}}
+{{- define "kubernetes-replicator.namespace" -}}
+{{- default .Release.Namespace .Values.namespaceOverride -}}
+{{- end -}}
+
 {{/*
 Common labels
 */}}
diff --git a/deploy/helm-chart/kubernetes-replicator/templates/deployment.yaml b/deploy/helm-chart/kubernetes-replicator/templates/deployment.yaml
index a2177821..2d760712 100644
--- a/deploy/helm-chart/kubernetes-replicator/templates/deployment.yaml
+++ b/deploy/helm-chart/kubernetes-replicator/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "kubernetes-replicator.fullname" . }}
+  namespace: {{ include "kubernetes-replicator.namespace" . }}
   labels:
     {{- include "kubernetes-replicator.labels" . | nindent 4 }}
     {{- if .Values.labels }}
diff --git a/deploy/helm-chart/kubernetes-replicator/templates/rbac.yaml b/deploy/helm-chart/kubernetes-replicator/templates/rbac.yaml
index 79f4693b..e94d02e6 100644
--- a/deploy/helm-chart/kubernetes-replicator/templates/rbac.yaml
+++ b/deploy/helm-chart/kubernetes-replicator/templates/rbac.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "kubernetes-replicator.serviceAccountName" . }}
+  namespace: {{ include "kubernetes-replicator.namespace" . }}
   labels:
     {{- include "kubernetes-replicator.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
@@ -71,5 +72,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "kubernetes-replicator.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace | quote }}
+    namespace: {{ include "kubernetes-replicator.namespace" . }}
 {{- end -}}
diff --git a/deploy/helm-chart/kubernetes-replicator/templates/verticalpodautoscaler.yaml b/deploy/helm-chart/kubernetes-replicator/templates/verticalpodautoscaler.yaml
index c021a0f1..bc45fb8f 100644
--- a/deploy/helm-chart/kubernetes-replicator/templates/verticalpodautoscaler.yaml
+++ b/deploy/helm-chart/kubernetes-replicator/templates/verticalpodautoscaler.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling.k8s.io/v1
 kind: VerticalPodAutoscaler
 metadata:
   name: {{ include "kubernetes-replicator.fullname" . }}
+  namespace: {{ include "kubernetes-replicator.namespace" . }}
   labels:
     {{- include "kubernetes-replicator.labels" . | nindent 4 }}
 spec:
diff --git a/deploy/helm-chart/kubernetes-replicator/values.yaml b/deploy/helm-chart/kubernetes-replicator/values.yaml
index 4f1e41cc..c0a671aa 100644
--- a/deploy/helm-chart/kubernetes-replicator/values.yaml
+++ b/deploy/helm-chart/kubernetes-replicator/values.yaml
@@ -5,6 +5,7 @@ image:
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
+namespaceOverride: ""
 grantClusterAdmin: false
 automountServiceAccountToken: true
 # args: