diff --git a/deploy/chart/devfile-registry/templates/configmap.yaml b/deploy/chart/devfile-registry/templates/configmap.yaml
index c7385ea0c..3ec966362 100644
--- a/deploy/chart/devfile-registry/templates/configmap.yaml
+++ b/deploy/chart/devfile-registry/templates/configmap.yaml
@@ -17,6 +17,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "devfileregistry.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "devfileregistry.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
diff --git a/deploy/chart/devfile-registry/templates/deployment.yaml b/deploy/chart/devfile-registry/templates/deployment.yaml
index ecf1ce365..be6a6759a 100644
--- a/deploy/chart/devfile-registry/templates/deployment.yaml
+++ b/deploy/chart/devfile-registry/templates/deployment.yaml
@@ -22,6 +22,7 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   name: {{ template "devfileregistry.fullname" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   revisionHistoryLimit: 2
diff --git a/deploy/chart/devfile-registry/templates/ingress.yaml b/deploy/chart/devfile-registry/templates/ingress.yaml
index a42df4475..ade9ec0cf 100644
--- a/deploy/chart/devfile-registry/templates/ingress.yaml
+++ b/deploy/chart/devfile-registry/templates/ingress.yaml
@@ -17,6 +17,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "devfileregistry.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "devfileregistry.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
diff --git a/deploy/chart/devfile-registry/templates/pvc.yaml b/deploy/chart/devfile-registry/templates/pvc.yaml
index c45ba4230..87014cea2 100644
--- a/deploy/chart/devfile-registry/templates/pvc.yaml
+++ b/deploy/chart/devfile-registry/templates/pvc.yaml
@@ -18,6 +18,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ template "devfileregistry.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "devfileregistry.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
diff --git a/deploy/chart/devfile-registry/templates/route.yaml b/deploy/chart/devfile-registry/templates/route.yaml
index 32aaaebe9..6b0260de7 100644
--- a/deploy/chart/devfile-registry/templates/route.yaml
+++ b/deploy/chart/devfile-registry/templates/route.yaml
@@ -19,6 +19,7 @@ metadata:
   labels:
     app: {{ template "devfileregistry.name" . }}
   name: {{ template "devfileregistry.fullname" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   to:
     kind: Service
diff --git a/deploy/chart/devfile-registry/templates/service.yaml b/deploy/chart/devfile-registry/templates/service.yaml
index f20ba3b47..876d7fac5 100644
--- a/deploy/chart/devfile-registry/templates/service.yaml
+++ b/deploy/chart/devfile-registry/templates/service.yaml
@@ -22,6 +22,7 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   name: {{ template "devfileregistry.fullname" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
     - name: http