diff --git a/omec/omec-control-plane/templates/bin/_pcrf-run.sh.tpl b/omec/omec-control-plane/templates/bin/_pcrf-run.sh.tpl
index 72050cd..7be50a6 100644
--- a/omec/omec-control-plane/templates/bin/_pcrf-run.sh.tpl
+++ b/omec/omec-control-plane/templates/bin/_pcrf-run.sh.tpl
@@ -15,7 +15,7 @@
 #TODO - Need to remove logs directory
 mkdir -p $CONF_DIR $LOGS_DIR
 
-cp /etc/pcrf/conf/{acl.conf,pcrf.json,pcrf.conf,oss.json} $CONF_DIR
+cp /etc/pcrf/conf/{acl.conf,pcrf.json,pcrf.conf,oss.json,subscriber_mapping.json} $CONF_DIR
 cat $CONF_DIR/{pcrf.json,pcrf.conf}
 
 cd $CONF_DIR
diff --git a/omec/omec-control-plane/templates/configmap-pcrf.yaml b/omec/omec-control-plane/templates/configmap-pcrf.yaml
index dff2095..d5ad7cc 100644
--- a/omec/omec-control-plane/templates/configmap-pcrf.yaml
+++ b/omec/omec-control-plane/templates/configmap-pcrf.yaml
@@ -24,6 +24,9 @@
 {{- if not (hasKey $pcrfJsonHss "casssrv") -}}
 {{- $_ := .Values.cassandra.fullnameOverride | set $pcrfJsonHss "casssrv" -}}
 {{- end }}
+{{- if not (hasKey $pcrfJsonHss "restport") -}}
+{{- $_ := .Values.config.pcrf.configPort.port | set $pcrfJsonHss "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 0339d1a..371b363 100644
--- a/omec/omec-control-plane/templates/service-hss.yaml
+++ b/omec/omec-control-plane/templates/service-hss.yaml
@@ -72,6 +72,5 @@
       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 2c9b897..116f930 100644
--- a/omec/omec-control-plane/templates/service-pcrf.yaml
+++ b/omec/omec-control-plane/templates/service-pcrf.yaml
@@ -22,6 +22,9 @@
   - name: prometheus-exporter
     port: {{ .Values.config.pcrf.prometheus.port }}
     protocol: TCP
+  - name: config-port
+    port: {{ .Values.config.pcrf.configPort.port }}
+    protocol: TCP
 ---
 apiVersion: v1
 kind: Service
@@ -40,9 +43,11 @@
   - name: prometheus-exporter
     port: {{ .Values.config.pcrf.prometheus.port }}
     protocol: TCP
-
----
+  - name: config-port
+    port: {{ .Values.config.pcrf.configPort.port }}
+    protocol: TCP
 {{- if or (.Values.config.pcrf.prometheus.nodePort.enabled) (.Values.config.pcrf.gx.nodePort.enabled) }}
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -66,5 +71,11 @@
     protocol: TCP
     nodePort: {{ .Values.config.pcrf.gx.nodePort.port }}
   {{- end }}
+  {{- if .Values.config.pcrf.configPort.nodePort.enabled }}
+    - name: config-port
+      port: {{ .Values.config.pcrf.configPort.port }}
+      protocol: TCP
+      nodePort: {{ .Values.config.pcrf.configPort.nodePort.port }}
+  {{- end }}
 {{- end }}
 {{- end }}