diff --git a/5g-control-plane/templates/deployment-amf.yaml b/5g-control-plane/templates/deployment-amf.yaml
index 3855b63..a43e695 100644
--- a/5g-control-plane/templates/deployment-amf.yaml
+++ b/5g-control-plane/templates/deployment-amf.yaml
@@ -32,14 +32,6 @@
       imagePullSecrets:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
-      initContainers:
-      - name: wait-nrf-module
-        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        command: ['sh', '-c', 'until nslookup nrf; do echo waiting for nrf; sleep 4; done;']
-    {{- if .Values.config.coreDump.enabled }}
-{{ tuple "amf" . | include "5g-control-plane.coredump_init" | indent 6 }}
-    {{- end }}
       containers:
       - name: amf
         image: {{ .Values.images.repository }}{{ .Values.images.tags.amf }}
@@ -51,6 +43,9 @@
         stdin: true
         tty: true
         command: [ {{ .Values.config.imagePath }}/script/amf-run.sh ]
+        command: [ "/bin/bash", "-c" ]
+        args:
+        - "cat {{ .Values.config.imagePath }}/config/amfcfg.conf && GOTRACEBACK=crash {{ .Values.config.imagePath }}/amf/amf -amfcfg {{ .Values.config.imagePath }}/config/amfcfg.conf"
         env:
         - name: GRPC_GO_LOG_VERBOSITY_LEVEL
           value: {{ .Values.config.grpc.golog_verbosity | quote }}