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
diff --git a/5g-ran-sim/Chart.yaml b/5g-ran-sim/Chart.yaml
index 64d1cba..30f3186 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.5
+version: 0.5.6
diff --git a/5g-ran-sim/templates/configmap-gnbsim.yaml b/5g-ran-sim/templates/configmap-gnbsim.yaml
index 32daa76..b85fb06 100644
--- a/5g-ran-sim/templates/configmap-gnbsim.yaml
+++ b/5g-ran-sim/templates/configmap-gnbsim.yaml
@@ -10,6 +10,10 @@
 {{- $gnbconf := index .Values.config.gnbsim.yamlCfgFiles "gnb.conf" }}
 {{- $configuration := index $gnbconf "configuration" }}
 
+{{- if not (hasKey $configuration "httpServer") -}}
+{{- $_ := dict "enable" .Values.config.gnbsim.httpServer.enable "ipAddr" .Values.config.gnbsim.httpServer.ipAddr "port" .Values.config.gnbsim.httpServer.port | set $configuration "httpServer" -}}
+{{- end }}
+
 {{- if not (hasKey $configuration "singleInterface") -}}
 {{- $_ := .Values.config.gnbsim.singleInterface | set $configuration "singleInterface" -}}
 {{- end }}
diff --git a/5g-ran-sim/templates/service-gnbsim.yaml b/5g-ran-sim/templates/service-gnbsim.yaml
index 4f3e2b8..65974e0 100644
--- a/5g-ran-sim/templates/service-gnbsim.yaml
+++ b/5g-ran-sim/templates/service-gnbsim.yaml
@@ -13,13 +13,16 @@
   labels:
 {{ tuple "gnbsim" . | include "5g-ransim-plane.metadata_labels" | indent 4 }}
 spec:
-  type: ClusterIP
+  type: {{ .Values.config.gnbsim.serviceType }}
   selector:
 {{ tuple "gnbsim" . | include "5g-ransim-plane.metadata_labels" | indent 4 }}
   ports:
   - name: ngapp
     port: {{ .Values.config.gnbsim.ngapp.port }}
     protocol: SCTP
+  - name: http-api
+    port: {{ .Values.config.gnbsim.httpServer.port }}
+    protocol: TCP
 {{- if .Values.config.gnbsim.profile.enable }}
   - name: profile-http
     port: {{ .Values.config.gnbsim.profile.port }}
diff --git a/5g-ran-sim/values.yaml b/5g-ran-sim/values.yaml
index 68f73a0..94aeb08 100644
--- a/5g-ran-sim/values.yaml
+++ b/5g-ran-sim/values.yaml
@@ -33,6 +33,7 @@
     path: /tmp/coredump
   gnbsim:
     deploy: true
+    serviceType: ClusterIP
     singleInterface: false
     networkTopo:
       - upfAddr: "192.168.252.3/32"
@@ -45,6 +46,10 @@
     iface: data # master in macvlan or device in host-device
     gnb:
       ip: 192.168.251.5/24 #user plane IP at gnb if 2 separate interface provided
+    httpServer:
+      enable: true
+      ipAddr: "POD_IP"
+      port: 6000
     profile:
       enable: true
       port: 5000