diff --git a/xos-core/Chart.yaml b/xos-core/Chart.yaml
index 6571bd5..e645188 100644
--- a/xos-core/Chart.yaml
+++ b/xos-core/Chart.yaml
@@ -17,7 +17,7 @@
 description: XOS - An Extensible Cloud Operating System
 icon: https://guide.opencord.org/logos/xos.svg
 
-version: 2.1.21
+version: 2.2.0
 
 # appVersion is of the xos-core and xos-chameleon containers.
 # xos-tosca and xos-api-tester are versioned in values.yaml
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
diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index 8703014..6cdb1b2 100644
--- a/xos-core/values.yaml
+++ b/xos-core/values.yaml
@@ -46,6 +46,8 @@
 xos_chameleonNodePort: 30006
 xos_toscaNodePort: 30007
 xos_prometheusNodePort: 30009
+xos_core_gRPCSecureNodePort: 30010
+xos_core_gRPCInsecureNodePort: 30011
 
 # XOS Admin username/password
 xosAdminUser: 'admin@opencord.org'