diff --git a/xos-core/templates/core-service.yaml b/xos-core/templates/core-grpc-service.yaml
similarity index 87%
rename from xos-core/templates/core-service.yaml
rename to xos-core/templates/core-grpc-service.yaml
index 4e3a3b9..3d7e8dc 100644
--- a/xos-core/templates/core-service.yaml
+++ b/xos-core/templates/core-grpc-service.yaml
@@ -20,15 +20,18 @@
   labels:
     {{- include "xos-core.release_labels" . | indent 4 }}
 spec:
-  type: ClusterIP
+  type: NodePort
   selector:
     app: "xos-core"
   ports:
     - port: 50051
-      name: secure
       targetPort: 50051
+      name: secure
+      nodePort: {{ .Values.xos_core_gRPCSecureNodePort }}
       protocol: TCP
     - port: 50055
-      name: insecure
       targetPort: 50055
+      name: insecure
+      nodePort: {{ .Values.xos_core_gRPCInsecureNodePort }}
       protocol: TCP
+
diff --git a/xos-core/templates/core-service-nodeport.yaml b/xos-core/templates/core-prometheus-service.yaml
similarity index 100%
rename from xos-core/templates/core-service-nodeport.yaml
rename to xos-core/templates/core-prometheus-service.yaml