diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index 363ad4c..79d7fb6 100644
--- a/5g-control-plane/Chart.yaml
+++ b/5g-control-plane/Chart.yaml
@@ -8,7 +8,7 @@
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.7.4
+version: 0.7.5
 
 dependencies:
   - name: mongodb
diff --git a/5g-control-plane/templates/configmap-amf.yaml b/5g-control-plane/templates/configmap-amf.yaml
index 6ebacf7..887bcf0 100644
--- a/5g-control-plane/templates/configmap-amf.yaml
+++ b/5g-control-plane/templates/configmap-amf.yaml
@@ -22,6 +22,10 @@
 {{- $_ := .Values.config.amf.sctp_grpc.port | set $amfcfg.configuration "sctpGrpcPort" -}}
 {{- end }}
 
+{{- if not (hasKey $amfcfg "mongodb") -}}
+{{- $_ := dict "name" .Values.config.mongodb.name "url" .Values.config.mongodb.url | set $amfcfg "mongodb" -}}
+{{- end }}
+
 {{- if not (hasKey $amfcfg "logger") -}}
 {{- $_ := .Values.config.logger | set $amfcfg "logger" -}}
 {{- end }}
diff --git a/5g-control-plane/templates/configmap-nrf.yaml b/5g-control-plane/templates/configmap-nrf.yaml
index 8cf3fae..5af01f1 100644
--- a/5g-control-plane/templates/configmap-nrf.yaml
+++ b/5g-control-plane/templates/configmap-nrf.yaml
@@ -11,6 +11,10 @@
 {{- $config := index $nrfcfg "configuration" }}
 {{- $sbi := index $config "sbi" }}
 
+{{- if not (hasKey $config "mongodb") -}}
+{{- $_ := dict "name" .Values.config.mongodb.name "url" .Values.config.mongodb.url | set $config "mongodb" -}}
+{{- end }}
+
 {{- if not (hasKey $config "MongoDBName") -}}
 {{- $_ := .Values.config.mongodb.name | set $config "MongoDBName" -}}
 {{- end }}
diff --git a/5g-control-plane/templates/configmap-smf.yaml b/5g-control-plane/templates/configmap-smf.yaml
index 2a24a4a..a5ff8cf 100644
--- a/5g-control-plane/templates/configmap-smf.yaml
+++ b/5g-control-plane/templates/configmap-smf.yaml
@@ -10,6 +10,10 @@
 {{- $smfcfg := index .Values.config.smf.cfgFiles "smfcfg.conf" }}
 {{- $sbi := index $smfcfg.configuration "sbi" }}
 
+{{- if not (hasKey $smfcfg "mongodb") -}}
+{{- $_ := dict "name" .Values.config.mongodb.name "url" .Values.config.mongodb.url | set $smfcfg "mongodb" -}}
+{{- end }}
+
 {{- if not (hasKey $smfcfg "logger") -}}
 {{- $_ := .Values.config.logger | set $smfcfg "logger" -}}
 {{- end }}
diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
index 2cc12e0..6104705 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -6,7 +6,7 @@
   repository: "" #default docker hub
   tags:
     init: omecproject/pod-init:1.0.0
-    amf: omecproject/5gc-amf:master-439afd0
+    amf: omecproject/5gc-amf:master-c250161
     nrf: omecproject/5gc-nrf:master-a431afa
     smf: omecproject/5gc-smf:master-b73f587
     ausf: omecproject/5gc-ausf:master-1bfd38d
@@ -14,7 +14,7 @@
     pcf: omecproject/5gc-pcf:master-0e90976
     udr: omecproject/5gc-udr:master-c9c04fe
     udm: omecproject/5gc-udm:master-5992f3f
-    webui: omecproject/5gc-webui:master-87adbcc
+    webui: omecproject/5gc-webui:master-fec9bfc
     sctplb: omecproject/sctplb:master-538dad6
     metricfunc: metricfunc:0.0.1-dev-local0
   pullPolicy: IfNotPresent
diff --git a/5g-ran-sim/Chart.yaml b/5g-ran-sim/Chart.yaml
index e69d59a..063f1ee 100644
--- a/5g-ran-sim/Chart.yaml
+++ b/5g-ran-sim/Chart.yaml
@@ -8,4 +8,4 @@
 name: 5g-ran-sim
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.5.3
+version: 0.5.4
diff --git a/5g-ran-sim/values.yaml b/5g-ran-sim/values.yaml
index bf53aa9..68f73a0 100644
--- a/5g-ran-sim/values.yaml
+++ b/5g-ran-sim/values.yaml
@@ -6,7 +6,7 @@
   repository: "" #default docker hub
   tags:
     init: omecproject/pod-init:1.0.0
-    gnbsim: omecproject/5gc-gnbsim:main-238bdee
+    gnbsim: omecproject/5gc-gnbsim:main-d2e5b8c
   pullPolicy: IfNotPresent
 
 nodeSelectors: