diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index e45e957..2c38a5f 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -17,6 +17,7 @@
 kind: Deployment
 metadata:
   name: voltha-ofagent
+  namespace: {{ .Release.Namespace }}
   {{- if or (hasKey .Values "extra_deployment_labels") (hasKey .Values "ofagent_deployment_labels") }}
   labels:
     {{- if hasKey .Values "extra_deployment_labels" }}
@@ -34,8 +35,10 @@
   replicas: {{ .Values.replicas.ofagent }}
   template:
     metadata:
+      namespace: {{ .Release.Namespace }}
       labels:
         app: ofagent
+        release: {{ .Release.Name }}
         app.kubernetes.io/name: "open-flow-agent"
         app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
         app.kubernetes.io/component: "integration"
@@ -74,8 +77,8 @@
         {{- range .Values.services.controller }}
         - "--controller={{ .service }}:{{ .port }}"
         {{- end }}
-        - "--voltha=voltha-api.{{ .Release.Namespace }}.svc.cluster.local:55555"
-        - "--kv_store_host=voltha-etcd-cluster-client.{{ .Release.Namespace }}.svc.cluster.local"
+        - "--voltha=voltha-api.{{ .Release.Namespace }}.svc:55555"
+        - "--kv_store_host=etcd.{{ .Release.Namespace }}.svc"
         - "--kv_store_port=2379"
         - "--kv_store_type=etcd"
         - "--kv_store_request_timeout=60s"