diff --git a/nem-monitoring/Chart.yaml b/nem-monitoring/Chart.yaml
index 1d508f8..36c69c0 100644
--- a/nem-monitoring/Chart.yaml
+++ b/nem-monitoring/Chart.yaml
@@ -15,4 +15,4 @@
 
 name: nem-monitoring
 description: Time Series Storage and Dashboard for SEBA
-version: 1.0.6-dev
+version: 1.0.7-dev
diff --git a/nem-monitoring/templates/importer-deployment.yaml b/nem-monitoring/templates/importer-deployment.yaml
index 0e7703b..0744c4f 100644
--- a/nem-monitoring/templates/importer-deployment.yaml
+++ b/nem-monitoring/templates/importer-deployment.yaml
@@ -20,7 +20,7 @@
   labels:
     release: {{ .Release.Name }}
 spec:
-  replicas: {{ .Values.device_management_replicas }}
+  replicas: {{ .Values.nem_device_management_replicas }}
   template:
     metadata:
       labels:
@@ -35,3 +35,13 @@
             - containerPort: 8080
               port: 8080
               protocol: TCP
+            - containerPort: 50051
+              port: 50051
+              protocol: TCP
+          env:
+          - name: DEVICE_MANAGEMENT_DESTIP
+            valueFrom:
+              fieldRef:
+                fieldPath: status.hostIP
+          - name: DEVICE_MANAGEMENT_DESTPORT
+            value: "{{ .Values.nem_device_management_httpPort }}"
diff --git a/nem-monitoring/templates/importer-service.yaml b/nem-monitoring/templates/importer-service.yaml
new file mode 100644
index 0000000..183b02b
--- /dev/null
+++ b/nem-monitoring/templates/importer-service.yaml
@@ -0,0 +1,34 @@
+---
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: device-management
+  labels:
+    release: {{ .Release.Name }}
+spec:
+  type: NodePort
+  ports:
+    - port: 8080
+      targetPort: 8080
+      nodePort: {{ .Values.nem_device_management_httpPort }}
+      protocol: TCP
+    - port: 50051
+      targetPort: 50051
+      nodePort: {{ .Values.nem_device_management_grpcPort }}
+      protocol: TCP
+  selector:
+    app: "device-management"
diff --git a/nem-monitoring/values.yaml b/nem-monitoring/values.yaml
index 8c93263..2e90f6e 100644
--- a/nem-monitoring/values.yaml
+++ b/nem-monitoring/values.yaml
@@ -29,8 +29,9 @@
 
 nem_voltha_kpi_exporter_nodePort: 31080
 nem_voltha_kpi_exporter_replicas: 2
-device_management_replicas: 1
-
+nem_device_management_grpcPort: 31085
+nem_device_management_httpPort: 30180
+nem_device_management_replicas: 1
 args:
   voltha_kpi_broker: cord-kafka:9092