diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index 3dfb922..699afce 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -17,6 +17,7 @@
 kind: Deployment
 metadata:
   name: voltha-rw-core
+  namespace: {{ .Release.Namespace }}
   {{- if or (hasKey .Values "extra_deployment_labels") (hasKey .Values "rw_core_deployment_labels") }}
   labels:
     {{- if hasKey .Values "extra_deployment_labels" }}
@@ -32,10 +33,16 @@
   {{- end }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: rw-core
+      release: {{ .Release.Name }}
   template:
     metadata:
+      namespace: {{ .Release.Namespace }}
       labels:
         app: rw-core
+        release: {{ .Release.Name }}
         app.kubernetes.io/name: "read-write-core"
         app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
         app.kubernetes.io/component: "core"