diff --git a/charts/keep/templates/backend-hpa.yaml b/charts/keep/templates/backend-hpa.yaml
index 51ac053..18e4f66 100644
--- a/charts/keep/templates/backend-hpa.yaml
+++ b/charts/keep/templates/backend-hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "keep.fullname" . }}-backend
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: backend
diff --git a/charts/keep/templates/backend-provision.yaml b/charts/keep/templates/backend-provision.yaml
index f797faa..b53281b 100644
--- a/charts/keep/templates/backend-provision.yaml
+++ b/charts/keep/templates/backend-provision.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "keep.fullname" . }}-providers
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: backend
@@ -19,6 +20,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "keep.fullname" . }}-workflows
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: backend
diff --git a/charts/keep/templates/backend-route.yaml b/charts/keep/templates/backend-route.yaml
index 1d5ceb5..03d823d 100644
--- a/charts/keep/templates/backend-route.yaml
+++ b/charts/keep/templates/backend-route.yaml
@@ -4,6 +4,7 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   name: {{ $fullName }}
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: backend
diff --git a/charts/keep/templates/backend-service.yaml b/charts/keep/templates/backend-service.yaml
index 40380b0..ee9f231 100644
--- a/charts/keep/templates/backend-service.yaml
+++ b/charts/keep/templates/backend-service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "keep.fullname" . }}-backend
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: backend
diff --git a/charts/keep/templates/backend.yaml b/charts/keep/templates/backend.yaml
index 64ed6b3..fa59c17 100644
--- a/charts/keep/templates/backend.yaml
+++ b/charts/keep/templates/backend.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "keep.fullname" . }}-backend
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: backend
diff --git a/charts/keep/templates/db-cleanup-cronjob.yaml b/charts/keep/templates/db-cleanup-cronjob.yaml
index 6286fe5..548a2c6 100644
--- a/charts/keep/templates/db-cleanup-cronjob.yaml
+++ b/charts/keep/templates/db-cleanup-cronjob.yaml
@@ -3,6 +3,7 @@ apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: {{ include "keep.fullname" . }}-db-cleanup
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: database
diff --git a/charts/keep/templates/db-configmap.yaml b/charts/keep/templates/db-configmap.yaml
index ae02716..f63365f 100644
--- a/charts/keep/templates/db-configmap.yaml
+++ b/charts/keep/templates/db-configmap.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "keep.fullname" . }}-mysql-config
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: database
diff --git a/charts/keep/templates/db-pvc.yaml b/charts/keep/templates/db-pvc.yaml
index 8e20f7f..ec588f7 100644
--- a/charts/keep/templates/db-pvc.yaml
+++ b/charts/keep/templates/db-pvc.yaml
@@ -6,6 +6,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ $pvcName }}
+  namespace: {{ include "keep.namespace" . }}
   annotations:
     {{- if .Values.database.pvc.retain }}
     helm.sh/resource-policy: keep
diff --git a/charts/keep/templates/db-service.yaml b/charts/keep/templates/db-service.yaml
index 62b053e..edb3c3c 100644
--- a/charts/keep/templates/db-service.yaml
+++ b/charts/keep/templates/db-service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "keep.name" . }}-database
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: database
diff --git a/charts/keep/templates/db.yaml b/charts/keep/templates/db.yaml
index 360abf8..bbcda5f 100644
--- a/charts/keep/templates/db.yaml
+++ b/charts/keep/templates/db.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "keep.fullname" . }}-database
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: database
diff --git a/charts/keep/templates/delete-secret-job.yaml b/charts/keep/templates/delete-secret-job.yaml
index 7567fe5..5e0a1d2 100644
--- a/charts/keep/templates/delete-secret-job.yaml
+++ b/charts/keep/templates/delete-secret-job.yaml
@@ -2,6 +2,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: delete-keep-secrets
+  namespace: {{ include "keep.namespace" . }}
   annotations:
     "helm.sh/hook": pre-delete
     "helm.sh/hook-delete-policy": "hook-succeeded,hook-failed"
diff --git a/charts/keep/templates/frontend-hpa.yaml b/charts/keep/templates/frontend-hpa.yaml
index 9abc611..f8a98e1 100644
--- a/charts/keep/templates/frontend-hpa.yaml
+++ b/charts/keep/templates/frontend-hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "keep.fullname" . }}-frontend
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: frontend
diff --git a/charts/keep/templates/frontend-route.yaml b/charts/keep/templates/frontend-route.yaml
index a384dba..e1e4478 100644
--- a/charts/keep/templates/frontend-route.yaml
+++ b/charts/keep/templates/frontend-route.yaml
@@ -4,6 +4,7 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   name: {{ $fullName }}
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: frontend
diff --git a/charts/keep/templates/frontend-service.yaml b/charts/keep/templates/frontend-service.yaml
index a545e9e..e567d83 100644
--- a/charts/keep/templates/frontend-service.yaml
+++ b/charts/keep/templates/frontend-service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "keep.fullname" . }}-frontend
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: frontend
diff --git a/charts/keep/templates/frontend.yaml b/charts/keep/templates/frontend.yaml
index a0c6f7f..6c8ac7c 100644
--- a/charts/keep/templates/frontend.yaml
+++ b/charts/keep/templates/frontend.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "keep.fullname" . }}-frontend
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: frontend
diff --git a/charts/keep/templates/gke/backend-gke-healthcheck-config.yaml b/charts/keep/templates/gke/backend-gke-healthcheck-config.yaml
index 2f7f671..b20b444 100644
--- a/charts/keep/templates/gke/backend-gke-healthcheck-config.yaml
+++ b/charts/keep/templates/gke/backend-gke-healthcheck-config.yaml
@@ -3,7 +3,7 @@ apiVersion: cloud.google.com/v1
 kind: BackendConfig
 metadata:
   name: {{ include "keep.fullname" . }}-backend-backendconfig
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "keep.namespace" . }}
 spec:
   healthCheck:
     checkIntervalSec: {{ .Values.frontend.backendConfig.healthCheck.checkIntervalSec }}
diff --git a/charts/keep/templates/gke/frontend-gke-healthcheck-config.yaml b/charts/keep/templates/gke/frontend-gke-healthcheck-config.yaml
index ec81149..9faa264 100644
--- a/charts/keep/templates/gke/frontend-gke-healthcheck-config.yaml
+++ b/charts/keep/templates/gke/frontend-gke-healthcheck-config.yaml
@@ -3,7 +3,7 @@ apiVersion: cloud.google.com/v1
 kind: BackendConfig
 metadata:
   name: {{ include "keep.fullname" . }}-frontend-backendconfig
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "keep.namespace" . }}
 spec:
   healthCheck:
     checkIntervalSec: {{ .Values.frontend.backendConfig.healthCheck.checkIntervalSec }}
diff --git a/charts/keep/templates/ingress-haproxy.yaml b/charts/keep/templates/ingress-haproxy.yaml
index 68a2758..275a46f 100644
--- a/charts/keep/templates/ingress-haproxy.yaml
+++ b/charts/keep/templates/ingress-haproxy.yaml
@@ -4,6 +4,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}-ingress
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: networking
diff --git a/charts/keep/templates/ingress-nginx.yaml b/charts/keep/templates/ingress-nginx.yaml
index 65aa7a5..481beff 100644
--- a/charts/keep/templates/ingress-nginx.yaml
+++ b/charts/keep/templates/ingress-nginx.yaml
@@ -4,6 +4,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}-ingress
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: networking
diff --git a/charts/keep/templates/ingress-traefik-middleware.yaml b/charts/keep/templates/ingress-traefik-middleware.yaml
index 72a9c66..e6f8e0e 100644
--- a/charts/keep/templates/ingress-traefik-middleware.yaml
+++ b/charts/keep/templates/ingress-traefik-middleware.yaml
@@ -3,7 +3,7 @@ apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: strip-prefix
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: networking
diff --git a/charts/keep/templates/ingress-traefik.yaml b/charts/keep/templates/ingress-traefik.yaml
index 55bd031..8e8e865 100644
--- a/charts/keep/templates/ingress-traefik.yaml
+++ b/charts/keep/templates/ingress-traefik.yaml
@@ -4,6 +4,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}-ingress
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: networking
diff --git a/charts/keep/templates/serviceaccount.yaml b/charts/keep/templates/serviceaccount.yaml
index f7c3d34..9fd433f 100644
--- a/charts/keep/templates/serviceaccount.yaml
+++ b/charts/keep/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "keep.serviceAccountName" . }}
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: rbac
diff --git a/charts/keep/templates/websocket-hpa.yaml b/charts/keep/templates/websocket-hpa.yaml
index 3f6ffeb..2afc2ff 100644
--- a/charts/keep/templates/websocket-hpa.yaml
+++ b/charts/keep/templates/websocket-hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "keep.fullname" . }}-websocket
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: websocket
diff --git a/charts/keep/templates/websocket-route.yaml b/charts/keep/templates/websocket-route.yaml
index b7d6b2f..0e71c70 100644
--- a/charts/keep/templates/websocket-route.yaml
+++ b/charts/keep/templates/websocket-route.yaml
@@ -4,6 +4,7 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   name: {{ $fullName }}-websocket
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: websocket
diff --git a/charts/keep/templates/websocket-server-service.yaml b/charts/keep/templates/websocket-server-service.yaml
index 1671fc3..762b32c 100644
--- a/charts/keep/templates/websocket-server-service.yaml
+++ b/charts/keep/templates/websocket-server-service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "keep.fullname" . }}-websocket
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: websocket
diff --git a/charts/keep/templates/websocket-server.yaml b/charts/keep/templates/websocket-server.yaml
index 1448ab7..6854ad3 100644
--- a/charts/keep/templates/websocket-server.yaml
+++ b/charts/keep/templates/websocket-server.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "keep.fullname" . }}-websocket
+  namespace: {{ include "keep.namespace" . }}
   labels:
     {{- include "keep.labels" . | nindent 4 }}
     app.kubernetes.io/component: websocket