diff --git a/voltha-go-controller/templates/service.yaml b/voltha-go-controller/templates/service.yaml
index 97a1172..7c2adb3 100644
--- a/voltha-go-controller/templates/service.yaml
+++ b/voltha-go-controller/templates/service.yaml
@@ -15,10 +15,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-    name: "{{ .Chart.Name }}"
-    release: {{ .Release.Name }}
-  name: "{{ .Chart.Name }}"
+  name: "{{ tpl .Values.voltha_go_controller.endpoints.address . }}"
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
   - name: of