diff --git a/omec/5g-control-plane/Chart.yaml b/omec/5g-control-plane/Chart.yaml
index 670557c..b63e196 100644
--- a/omec/5g-control-plane/Chart.yaml
+++ b/omec/5g-control-plane/Chart.yaml
@@ -8,7 +8,7 @@
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.2.4
+version: 0.2.5
 
 dependencies:
   - name: mongodb
diff --git a/omec/5g-control-plane/templates/bin/_amf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_amf-run.sh.tpl
index 6cb6dd7..4c66172 100644
--- a/omec/5g-control-plane/templates/bin/_amf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_amf-run.sh.tpl
@@ -10,10 +10,6 @@
 cp /free5gc/amf/amf /tmp/coredump/
 {{- end }}
 
-cd /free5gc
-cp /tmp/config/* config/
+cat /free5gc/config/amfcfg.conf
 
-cat config/free5GC.conf
-cat config/amfcfg.conf
-
-./amf/amf -amfcfg config/amfcfg.conf
+./free5gc/amf/amf -amfcfg /free5gc/config/amfcfg.conf
diff --git a/omec/5g-control-plane/templates/deployment-amf.yaml b/omec/5g-control-plane/templates/deployment-amf.yaml
index e800c05..994e85f 100644
--- a/omec/5g-control-plane/templates/deployment-amf.yaml
+++ b/omec/5g-control-plane/templates/deployment-amf.yaml
@@ -65,14 +65,10 @@
         - name: run-script
           mountPath: /free5gc/script/amf-run.sh
           subPath: amf-run.sh
-        - name: config-dir
+        - name: amf-config
           mountPath: /free5gc/config
         - name: common-config
-          mountPath: /tmp/config/free5GC.conf
-          subPath: free5GC.conf
-        - name: nf-config
-          mountPath: /tmp/config/amfcfg.conf
-          subPath: amfcfg.conf
+          mountPath: /free5gc/common
       {{- if .Values.config.coreDump.enabled }}
         - name: coredump
           mountPath: /tmp/coredump
@@ -86,12 +82,10 @@
         configMap:
           name: common
           defaultMode: 493 
-      - name: nf-config
+      - name: amf-config
         configMap:
           name: amf
           defaultMode: 493
-      - name: config-dir
-        emptyDir: {}
     {{- if .Values.config.coreDump.enabled }}
       - name: host-rootfs
         hostPath:
diff --git a/omec/5g-control-plane/values.yaml b/omec/5g-control-plane/values.yaml
index 34b9cf5..1825a09 100644
--- a/omec/5g-control-plane/values.yaml
+++ b/omec/5g-control-plane/values.yaml
@@ -383,6 +383,28 @@
         info:
           version: 1.0.0
           description: AMF initial local configuration
+        logger:
+          AMF:
+            debugLevel: info
+            ReportCaller: false
+          NAS:
+            debugLevel: info
+            ReportCaller: false
+          FSM:
+            debugLevel: info
+            ReportCaller: false
+          NGAP:
+            debugLevel: info
+            ReportCaller: false
+          Aper:
+            debugLevel: info
+            ReportCaller: false
+          PathUtil:
+            debugLevel: info
+            ReportCaller: false
+          OpenApi:
+            debugLevel: info
+            ReportCaller: false
         configuration:
           ngapIpList:
             - "0.0.0.0"