diff --git a/5g-ran-sim/Chart.yaml b/5g-ran-sim/Chart.yaml
index 83259f8..c07417d 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.7
+version: 0.5.8
diff --git a/5g-ran-sim/templates/configmap-gnbsim.yaml b/5g-ran-sim/templates/configmap-gnbsim.yaml
index b85fb06..75e0755 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 "goProfile") -}}
+{{- $_ := dict "enable" .Values.config.gnbsim.goProfile.enable "port" .Values.config.gnbsim.goProfile.port | set $configuration "goProfile" -}}
+{{- end }}
+
 {{- 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 }}
diff --git a/5g-ran-sim/templates/service-gnbsim.yaml b/5g-ran-sim/templates/service-gnbsim.yaml
index 65974e0..8e74f0f 100644
--- a/5g-ran-sim/templates/service-gnbsim.yaml
+++ b/5g-ran-sim/templates/service-gnbsim.yaml
@@ -23,9 +23,9 @@
   - name: http-api
     port: {{ .Values.config.gnbsim.httpServer.port }}
     protocol: TCP
-{{- if .Values.config.gnbsim.profile.enable }}
+{{- if .Values.config.gnbsim.goProfile.enable }}
   - name: profile-http
-    port: {{ .Values.config.gnbsim.profile.port }}
+    port: {{ .Values.config.gnbsim.goProfile.port }}
     protocol: TCP
 {{- end }}
 {{- end }}
diff --git a/5g-ran-sim/templates/statefulset-gnbsim.yaml b/5g-ran-sim/templates/statefulset-gnbsim.yaml
index f003d64..7b4e371 100644
--- a/5g-ran-sim/templates/statefulset-gnbsim.yaml
+++ b/5g-ran-sim/templates/statefulset-gnbsim.yaml
@@ -47,8 +47,12 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-    {{- if .Values.config.coreDump.enabled }}
       initContainers:
+      - name: wait-amf-module
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
+        command: ['sh', '-c', 'until nslookup amf; do echo waiting for nrf; sleep 4; done;']
+    {{- if .Values.config.coreDump.enabled }}
     {{ tuple "gnbsim" . | include "5g-ransim-plane.coredump_init" | indent 6 }}
     {{- end }}
       containers:
diff --git a/5g-ran-sim/values.yaml b/5g-ran-sim/values.yaml
index 9ab30da..9de4ca3 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-d2e5b8c
+    gnbsim: omecproject/5gc-gnbsim:main-cd26209
   pullPolicy: IfNotPresent
 
 nodeSelectors:
@@ -50,7 +50,7 @@
       enable: false
       ipAddr: "POD_IP"
       port: 6000
-    profile:
+    goProfile:
       enable: true
       port: 5000
     ngapp: