diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index 3cea334..193fea0 100644
--- a/5g-control-plane/Chart.yaml
+++ b/5g-control-plane/Chart.yaml
@@ -10,7 +10,7 @@
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.7.11
+version: 0.7.12
 
 dependencies:
   - name: mongodb
diff --git a/5g-control-plane/templates/configmap-amf.yaml b/5g-control-plane/templates/configmap-amf.yaml
index 887bcf0..d741d05 100644
--- a/5g-control-plane/templates/configmap-amf.yaml
+++ b/5g-control-plane/templates/configmap-amf.yaml
@@ -22,8 +22,8 @@
 {{- $_ := .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" -}}
+{{- if not (hasKey $amfcfg.configuration "mongodb") -}}
+{{- $_ := dict "name" .Values.config.mongodb.name "url" .Values.config.mongodb.url | set $amfcfg.configuration "mongodb" -}}
 {{- end }}
 
 {{- if not (hasKey $amfcfg "logger") -}}
diff --git a/5g-control-plane/templates/configmap-smf.yaml b/5g-control-plane/templates/configmap-smf.yaml
index 8cf4c81..65fe2f5 100644
--- a/5g-control-plane/templates/configmap-smf.yaml
+++ b/5g-control-plane/templates/configmap-smf.yaml
@@ -11,8 +11,8 @@
 {{- $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" -}}
+{{- if not (hasKey $smfcfg.configuration "mongodb") -}}
+{{- $_ := dict "name" .Values.config.mongodb.name "url" .Values.config.mongodb.url | set $smfcfg.configuration "mongodb" -}}
 {{- end }}
 
 {{- if not (hasKey $smfcfg "logger") -}}
diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
index ae2186c..5f65c26 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -7,7 +7,7 @@
   repository: "" #default docker hub
   tags:
     init: omecproject/pod-init:1.0.0
-    amf: omecproject/5gc-amf:master-6766d15
+    amf: omecproject/5gc-amf:master-5a47e34
     nrf: omecproject/5gc-nrf:master-5200cf8
     smf: omecproject/5gc-smf:master-9498f2d
     ausf: omecproject/5gc-ausf:master-1890449