diff --git a/omec/omec-control-plane/Chart.yaml b/omec/omec-control-plane/Chart.yaml
index 84ccf9c..607c202 100644
--- a/omec/omec-control-plane/Chart.yaml
+++ b/omec/omec-control-plane/Chart.yaml
@@ -10,4 +10,4 @@
 name: omec-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.6.3
+version: 0.6.4
diff --git a/omec/omec-control-plane/templates/configmap-hss.yaml b/omec/omec-control-plane/templates/configmap-hss.yaml
index 8e9c06a..098827c 100644
--- a/omec/omec-control-plane/templates/configmap-hss.yaml
+++ b/omec/omec-control-plane/templates/configmap-hss.yaml
@@ -23,6 +23,9 @@
 {{- if not (hasKey $hssJsonHss "casssrv") -}}
 {{- $_ := .Values.cassandra.fullnameOverride | set $hssJsonHss "casssrv" -}}
 {{- end }}
+{{- if not (hasKey $hssJsonHss "restport") -}}
+{{- $_ := .Values.config.hss.configPort.port | set $hssJsonHss "restport" -}}
+{{- end }}
 ---
 apiVersion: v1
 kind: ConfigMap
diff --git a/omec/omec-control-plane/templates/service-hss.yaml b/omec/omec-control-plane/templates/service-hss.yaml
index dea1e7a..0339d1a 100644
--- a/omec/omec-control-plane/templates/service-hss.yaml
+++ b/omec/omec-control-plane/templates/service-hss.yaml
@@ -19,6 +19,9 @@
   - name: s6a
     port: 3868
     protocol: TCP
+  - name: config-port
+    port: {{ .Values.config.hss.configPort.port }}
+    protocol: TCP
   - name: prometheus-exporter
     port: {{ .Values.config.hss.prometheus.port }}
     protocol: TCP
@@ -37,7 +40,10 @@
   - name: s6a
     port: 3868
     protocol: TCP
-{{- if .Values.config.hss.s6a.nodePort.enabled }}
+  - name: config-port
+    port: {{ .Values.config.hss.configPort.port }}
+    protocol: TCP
+{{- if or .Values.config.hss.s6a.nodePort.enabled .Values.config.hss.configPort.nodePort.enabled}}
 ---
 apiVersion: v1
 kind: Service
@@ -56,9 +62,16 @@
       protocol: TCP
       nodePort: {{ .Values.config.hss.prometheus.nodePort.port }}
   {{- end }}
-  - name: s6a
-    port: 3868
-    protocol: TCP
-    nodePort: {{ .Values.config.hss.s6a.nodePort.port }}
+    - name: s6a
+      port: 3868
+      protocol: TCP
+      nodePort: {{ .Values.config.hss.s6a.nodePort.port }}
+  {{- if .Values.config.hss.configPort.nodePort.enabled }}
+    - name: config-port
+      port: {{ .Values.config.hss.configPort.port }}
+      protocol: TCP
+      nodePort: {{ .Values.config.hss.configPort.nodePort.port }}
+  {{- end }}
+
 {{- end }}
 {{- end }}
diff --git a/omec/omec-control-plane/templates/service-pcrf.yaml b/omec/omec-control-plane/templates/service-pcrf.yaml
index d423cd9..2c9b897 100644
--- a/omec/omec-control-plane/templates/service-pcrf.yaml
+++ b/omec/omec-control-plane/templates/service-pcrf.yaml
@@ -37,6 +37,10 @@
   - name: gx
     port: 3868
     protocol: TCP
+  - name: prometheus-exporter
+    port: {{ .Values.config.pcrf.prometheus.port }}
+    protocol: TCP
+
 ---
 {{- if or (.Values.config.pcrf.prometheus.nodePort.enabled) (.Values.config.pcrf.gx.nodePort.enabled) }}
 apiVersion: v1
diff --git a/omec/omec-control-plane/values.yaml b/omec/omec-control-plane/values.yaml
index 70742fe..34148e5 100644
--- a/omec/omec-control-plane/values.yaml
+++ b/omec/omec-control-plane/values.yaml
@@ -194,6 +194,11 @@
       nodePort:
         enabled: false
         port: 33868
+    configPort:
+      port: 8080
+      nodePort:
+        enabled: false
+        port: 30081
     prometheus:
       port: 9089
       nodePort:
@@ -241,7 +246,8 @@
         hss:
           gtwhost: "*"
           gtwport: 9080
-          restport: 9081
+          #restport will be set by configmap
+          #restport: ""
           ossport: 9082
           # casssrv will be set to cassandra in the same cluster if unset
           #casssrv: ""