diff --git a/omec/5g-control-plane/Chart.yaml b/omec/5g-control-plane/Chart.yaml
index 9e94cd7..dc877fb 100644
--- a/omec/5g-control-plane/Chart.yaml
+++ b/omec/5g-control-plane/Chart.yaml
@@ -8,7 +8,7 @@
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.2.15
+version: 0.2.16
 
 dependencies:
   - name: mongodb
diff --git a/omec/5g-control-plane/templates/configmap-pcf.yaml b/omec/5g-control-plane/templates/configmap-pcf.yaml
index 0e3a7a3..dcb9bfe 100644
--- a/omec/5g-control-plane/templates/configmap-pcf.yaml
+++ b/omec/5g-control-plane/templates/configmap-pcf.yaml
@@ -9,6 +9,7 @@
 {{- if not .Values.config.useExistingConfigMap -}}
 {{- $pcfcfg := index .Values.config.pcf.cfgFiles "pcfcfg.conf" }}
 {{- $sbi := index $pcfcfg.configuration "sbi" }}
+{{- $config := index $pcfcfg "configuration" }}
 
 {{- if not (hasKey $pcfcfg "logger") -}}
 {{- $_ := .Values.config.logger | set $pcfcfg "logger" -}}
@@ -17,6 +18,10 @@
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.pcf.sbi.port | set $sbi "port" -}}
 {{- end }}
+
+{{- if not (hasKey $config "mongodb") -}}
+{{- $_ := dict "name" .Values.config.mongodb.name "url" .Values.config.mongodb.url | set $config "mongodb" -}}
+{{- end }}
 {{- end }}
 
 ---
diff --git a/omec/5g-control-plane/values.yaml b/omec/5g-control-plane/values.yaml
index 2ade82b..0bcc19a 100644
--- a/omec/5g-control-plane/values.yaml
+++ b/omec/5g-control-plane/values.yaml
@@ -304,9 +304,6 @@
           version: 1.0.0
           description: PCF initial local configuration
         configuration:
-          mongodb:       # the mongodb connected by this PCF
-            name: free5gc                  # name of the mongodb
-            url: mongodb://mongodb-arbiter-headless:27017 # a valid URL of the mongodb
           pcfName: PCF
           nrfUri: http://nrf:29510
           sbi: