diff --git a/omec/5g-control-plane/Chart.yaml b/omec/5g-control-plane/Chart.yaml
index e569f4d..945b2cd 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.8
+version: 0.2.9
 
 dependencies:
   - name: mongodb
diff --git a/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl
index 820b6cb..52a47d8 100644
--- a/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl
@@ -13,7 +13,6 @@
 cd /free5gc
 cp /tmp/config/* config/
 
-cat config/free5GC.conf
 cat config/ausfcfg.conf
 
 ./ausf/ausf -ausfcfg config/ausfcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_nrf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_nrf-run.sh.tpl
index d3205ea..fcce2ac 100644
--- a/omec/5g-control-plane/templates/bin/_nrf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_nrf-run.sh.tpl
@@ -14,7 +14,6 @@
 cp /tmp/config/* config/
 sed -i "s/POD_IP/${POD_IP}/g" config/nrfcfg.conf
 
-cat config/free5GC.conf
 cat config/nrfcfg.conf
 
 ./nrf/nrf -nrfcfg config/nrfcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl
index 57f6613..1a7b680 100644
--- a/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl
@@ -13,7 +13,6 @@
 cd /free5gc
 cp /tmp/config/* config/
 
-cat config/free5GC.conf
 cat config/nssfcfg.conf
 
 ./nssf/nssf -nssfcfg config/nssfcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl
index a758c44..63deb77 100644
--- a/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl
@@ -13,7 +13,6 @@
 cd /free5gc
 cp /tmp/config/* config/
 
-cat config/free5GC.conf
 cat config/pcfcfg.conf
 
 ./pcf/pcf -pcfcfg config/pcfcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_smf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_smf-run.sh.tpl
index 9d5bcf6..bdad8fb 100644
--- a/omec/5g-control-plane/templates/bin/_smf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_smf-run.sh.tpl
@@ -14,7 +14,6 @@
 cp /tmp/config/* config/
 sed -i "s/POD_IP/${POD_IP}/g" config/smfcfg.conf
 
-cat config/free5GC.conf
 cat config/smfcfg.conf
 cat config/uerouting.conf
 
diff --git a/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl b/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl
index 382cae4..3d26271 100644
--- a/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl
@@ -13,7 +13,6 @@
 cd /free5gc
 cp /tmp/config/* config/
 
-cat config/free5GC.conf
 cat config/udmcfg.conf
 
 ./udm/udm -udmcfg config/udmcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl b/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl
index 6610900..c9a66b4 100644
--- a/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl
@@ -13,7 +13,6 @@
 cd /free5gc
 cp /tmp/config/* config/
 
-cat config/free5GC.conf
 cat config/udrcfg.conf
 
 ./udr/udr -udrcfg config/udrcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_webui-run.sh.tpl b/omec/5g-control-plane/templates/bin/_webui-run.sh.tpl
index 2be21a3..4704133 100644
--- a/omec/5g-control-plane/templates/bin/_webui-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_webui-run.sh.tpl
@@ -13,7 +13,6 @@
 cd /free5gc
 cp /tmp/config/* config/
 
-cat config/free5GC.conf
 cat config/webuicfg.conf
 
 ./webconsole/webconsole -webuicfg config/webuicfg.conf
diff --git a/omec/5g-control-plane/templates/configmap-amf.yaml b/omec/5g-control-plane/templates/configmap-amf.yaml
index 7c37da5..5747fed 100644
--- a/omec/5g-control-plane/templates/configmap-amf.yaml
+++ b/omec/5g-control-plane/templates/configmap-amf.yaml
@@ -14,6 +14,10 @@
 {{- $_ := .Values.config.amf.sbi.port | set $sbi "port" -}}
 {{- end }}
 
+{{- if not (hasKey $amfcfg "logger") -}}
+{{- $_ := .Values.config.logger | set $amfcfg "logger" -}}
+{{- end }}
+
 {{- end }}
 
 
diff --git a/omec/5g-control-plane/templates/configmap-ausf.yaml b/omec/5g-control-plane/templates/configmap-ausf.yaml
index 27a3bbc..2a8a2b1 100644
--- a/omec/5g-control-plane/templates/configmap-ausf.yaml
+++ b/omec/5g-control-plane/templates/configmap-ausf.yaml
@@ -10,6 +10,11 @@
 {{- $ausfcfg := index .Values.config.ausf.cfgFiles "ausfcfg.conf" }}
 {{- $sbi := index $ausfcfg.configuration "sbi" }}
 
+{{- if not (hasKey $ausfcfg "logger") -}}
+{{- $_ := .Values.config.logger | set $ausfcfg "logger" -}}
+{{- end }}
+
+
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.ausf.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-common.yaml b/omec/5g-control-plane/templates/configmap-common.yaml
deleted file mode 100644
index 6697b08..0000000
--- a/omec/5g-control-plane/templates/configmap-common.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- if not .Values.config.useExistingConfigMap -}}
-{{- $config := index .Values.config.commonCfgFiles "free5GC.conf" }}
-{{- if not (hasKey $config "db_uri") -}}
-{{- $_ := printf "%s/%s" .Values.config.mongodb.url .Values.config.mongodb.name | set $config "db_uri" -}}
-{{- end }}
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: common
-  labels:
-{{ tuple "common" . | include "5g-control-plane.metadata_labels" | indent 4 }}
-data:
-{{- range $key, $value := .Values.config.commonCfgFiles }}
-  {{ $key }}: |-
-{{ toYaml $value | indent 4 }}
-{{- end }}
-{{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-nrf.yaml b/omec/5g-control-plane/templates/configmap-nrf.yaml
index 04ac1e1..d93d739 100644
--- a/omec/5g-control-plane/templates/configmap-nrf.yaml
+++ b/omec/5g-control-plane/templates/configmap-nrf.yaml
@@ -14,13 +14,19 @@
 {{- if not (hasKey $config "MongoDBName") -}}
 {{- $_ := .Values.config.mongodb.name | set $config "MongoDBName" -}}
 {{- end }}
+
 {{- if not (hasKey $config "MongoDBUrl") -}}
 {{- $_ := .Values.config.mongodb.url | set $config "MongoDBUrl" -}}
 {{- end }}
+
 {{- if not (hasKey $config "DefaultServiceIP") -}}
 {{- $_ := "POD_IP" | set $config "DefaultServiceIP" -}}
 {{- end }}
 
+{{- if not (hasKey $nrfcfg "logger") -}}
+{{- $_ := .Values.config.logger | set $nrfcfg "logger" -}}
+{{- end }}
+
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.nrf.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-nssf.yaml b/omec/5g-control-plane/templates/configmap-nssf.yaml
index 0d9bebb..f6a8808 100644
--- a/omec/5g-control-plane/templates/configmap-nssf.yaml
+++ b/omec/5g-control-plane/templates/configmap-nssf.yaml
@@ -10,6 +10,10 @@
 {{- $nssfcfg := index .Values.config.nssf.cfgFiles "nssfcfg.conf" }}
 {{- $sbi := index $nssfcfg.configuration "sbi" }}
 
+{{- if not (hasKey $nssfcfg "logger") -}}
+{{- $_ := .Values.config.logger | set $nssfcfg "logger" -}}
+{{- end }}
+
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.nssf.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-pcf.yaml b/omec/5g-control-plane/templates/configmap-pcf.yaml
index df584d9..0e3a7a3 100644
--- a/omec/5g-control-plane/templates/configmap-pcf.yaml
+++ b/omec/5g-control-plane/templates/configmap-pcf.yaml
@@ -10,6 +10,10 @@
 {{- $pcfcfg := index .Values.config.pcf.cfgFiles "pcfcfg.conf" }}
 {{- $sbi := index $pcfcfg.configuration "sbi" }}
 
+{{- if not (hasKey $pcfcfg "logger") -}}
+{{- $_ := .Values.config.logger | set $pcfcfg "logger" -}}
+{{- end }}
+
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.pcf.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-smf.yaml b/omec/5g-control-plane/templates/configmap-smf.yaml
index 87f1243..502fa06 100644
--- a/omec/5g-control-plane/templates/configmap-smf.yaml
+++ b/omec/5g-control-plane/templates/configmap-smf.yaml
@@ -13,6 +13,9 @@
 {{- if not (hasKey $smfcfg.configuration "pfcp") -}}
 {{- $_ := dict "addr" "POD_IP" | set $smfcfg.configuration "pfcp" -}}
 {{- end }}
+{{- if not (hasKey $smfcfg "logger") -}}
+{{- $_ := .Values.config.logger | set $smfcfg "logger" -}}
+{{- end }}
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.smf.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-udm.yaml b/omec/5g-control-plane/templates/configmap-udm.yaml
index 5a15d72..79f98c6 100644
--- a/omec/5g-control-plane/templates/configmap-udm.yaml
+++ b/omec/5g-control-plane/templates/configmap-udm.yaml
@@ -10,6 +10,10 @@
 {{- $udmcfg := index .Values.config.udm.cfgFiles "udmcfg.conf" }}
 {{- $sbi := index $udmcfg.configuration "sbi" }}
 
+{{- if not (hasKey $udmcfg "logger") -}}
+{{- $_ := .Values.config.logger | set $udmcfg "logger" -}}
+{{- end }}
+
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.udm.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-udr.yaml b/omec/5g-control-plane/templates/configmap-udr.yaml
index e17957d..8bbac77 100644
--- a/omec/5g-control-plane/templates/configmap-udr.yaml
+++ b/omec/5g-control-plane/templates/configmap-udr.yaml
@@ -15,6 +15,10 @@
 {{- $_ := dict "name" .Values.config.mongodb.name "url" .Values.config.mongodb.url | set $config "mongodb" -}}
 {{- end }}
 
+{{- if not (hasKey $udrcfg "logger") -}}
+{{- $_ := .Values.config.logger | set $udrcfg "logger" -}}
+{{- end }}
+
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.udr.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-webui.yaml b/omec/5g-control-plane/templates/configmap-webui.yaml
index f4581c3..9a63728 100644
--- a/omec/5g-control-plane/templates/configmap-webui.yaml
+++ b/omec/5g-control-plane/templates/configmap-webui.yaml
@@ -9,9 +9,16 @@
 {{- if not .Values.config.useExistingConfigMap -}}
 {{- $webuicfg := index .Values.config.webui.cfgFiles "webuicfg.conf" }}
 {{- $config := index $webuicfg "configuration" }}
+
+{{- if not (hasKey $webuicfg "logger") -}}
+{{- $_ := .Values.config.logger | set $webuicfg "logger" -}}
+{{- end }}
+
+
 {{- if not (hasKey $config "mongodb") -}}
 {{- $_ := dict "name" .Values.config.mongodb.name "url" .Values.config.mongodb.url | set $config "mongodb" -}}
 {{- end }}
+
 {{- end }}
 
 ---
diff --git a/omec/5g-control-plane/templates/deployment-amf.yaml b/omec/5g-control-plane/templates/deployment-amf.yaml
index 994e85f..cfd8137 100644
--- a/omec/5g-control-plane/templates/deployment-amf.yaml
+++ b/omec/5g-control-plane/templates/deployment-amf.yaml
@@ -67,8 +67,6 @@
           subPath: amf-run.sh
         - name: amf-config
           mountPath: /free5gc/config
-        - name: common-config
-          mountPath: /free5gc/common
       {{- if .Values.config.coreDump.enabled }}
         - name: coredump
           mountPath: /tmp/coredump
@@ -78,10 +76,6 @@
         configMap:
           name: amf
           defaultMode: 493
-      - name: common-config
-        configMap:
-          name: common
-          defaultMode: 493 
       - name: amf-config
         configMap:
           name: amf
diff --git a/omec/5g-control-plane/templates/deployment-ausf.yaml b/omec/5g-control-plane/templates/deployment-ausf.yaml
index f27c0fb..efd957e 100644
--- a/omec/5g-control-plane/templates/deployment-ausf.yaml
+++ b/omec/5g-control-plane/templates/deployment-ausf.yaml
@@ -69,9 +69,6 @@
           subPath: ausf-run.sh
         - name: config-dir
           mountPath: /free5gc/config
-        - name: common-config
-          mountPath: /tmp/config/free5GC.conf
-          subPath: free5GC.conf
         - name: nf-config
           mountPath: /tmp/config/ausfcfg.conf
           subPath: ausfcfg.conf
@@ -84,10 +81,6 @@
         configMap:
           name: ausf
           defaultMode: 493
-      - name: common-config
-        configMap:
-          name: common
-          defaultMode: 493 
       - name: nf-config
         configMap:
           name: ausf
diff --git a/omec/5g-control-plane/templates/deployment-nrf.yaml b/omec/5g-control-plane/templates/deployment-nrf.yaml
index 738e1e0..3c14d58 100644
--- a/omec/5g-control-plane/templates/deployment-nrf.yaml
+++ b/omec/5g-control-plane/templates/deployment-nrf.yaml
@@ -65,9 +65,6 @@
           subPath: nrf-run.sh
         - name: config-dir
           mountPath: /free5gc/config
-        - name: common-config
-          mountPath: /tmp/config/free5GC.conf
-          subPath: free5GC.conf
         - name: nf-config
           mountPath: /tmp/config/nrfcfg.conf
           subPath: nrfcfg.conf
@@ -80,10 +77,6 @@
         configMap:
           name: nrf
           defaultMode: 493
-      - name: common-config
-        configMap:
-          name: common
-          defaultMode: 493 
       - name: nf-config
         configMap:
           name: nrf
diff --git a/omec/5g-control-plane/templates/deployment-nssf.yaml b/omec/5g-control-plane/templates/deployment-nssf.yaml
index f404f1a..19a9cbb 100644
--- a/omec/5g-control-plane/templates/deployment-nssf.yaml
+++ b/omec/5g-control-plane/templates/deployment-nssf.yaml
@@ -67,9 +67,6 @@
           subPath: nssf-run.sh
         - name: config-dir
           mountPath: /free5gc/config
-        - name: common-config
-          mountPath: /tmp/config/free5GC.conf
-          subPath: free5GC.conf
         - name: nf-config
           mountPath: /tmp/config/nssfcfg.conf
           subPath: nssfcfg.conf
@@ -82,10 +79,6 @@
         configMap:
           name: nssf
           defaultMode: 493
-      - name: common-config
-        configMap:
-          name: common
-          defaultMode: 493 
       - name: nf-config
         configMap:
           name: nssf
diff --git a/omec/5g-control-plane/templates/deployment-pcf.yaml b/omec/5g-control-plane/templates/deployment-pcf.yaml
index 65c63a0..92d6fce 100644
--- a/omec/5g-control-plane/templates/deployment-pcf.yaml
+++ b/omec/5g-control-plane/templates/deployment-pcf.yaml
@@ -67,9 +67,6 @@
           subPath: pcf-run.sh
         - name: config-dir
           mountPath: /free5gc/config
-        - name: common-config
-          mountPath: /tmp/config/free5GC.conf
-          subPath: free5GC.conf
         - name: nf-config
           mountPath: /tmp/config/pcfcfg.conf
           subPath: pcfcfg.conf
@@ -82,10 +79,6 @@
         configMap:
           name: pcf
           defaultMode: 493
-      - name: common-config
-        configMap:
-          name: common
-          defaultMode: 493 
       - name: nf-config
         configMap:
           name: pcf
diff --git a/omec/5g-control-plane/templates/deployment-smf.yaml b/omec/5g-control-plane/templates/deployment-smf.yaml
index 81b2acf..030d1f2 100644
--- a/omec/5g-control-plane/templates/deployment-smf.yaml
+++ b/omec/5g-control-plane/templates/deployment-smf.yaml
@@ -69,9 +69,6 @@
           subPath: smf-run.sh
         - name: config-dir
           mountPath: /free5gc/config
-        - name: common-config
-          mountPath: /tmp/config/free5GC.conf
-          subPath: free5GC.conf
         - name: nf-config
           mountPath: /tmp/config/uerouting.conf
           subPath: uerouting.conf
@@ -87,10 +84,6 @@
         configMap:
           name: smf
           defaultMode: 493
-      - name: common-config
-        configMap:
-          name: common
-          defaultMode: 493 
       - name: nf-config
         configMap:
           name: smf
diff --git a/omec/5g-control-plane/templates/deployment-udm.yaml b/omec/5g-control-plane/templates/deployment-udm.yaml
index 1107ea1..a762125 100644
--- a/omec/5g-control-plane/templates/deployment-udm.yaml
+++ b/omec/5g-control-plane/templates/deployment-udm.yaml
@@ -71,9 +71,6 @@
           subPath: udm-run.sh
         - name: config-dir
           mountPath: /free5gc/config
-        - name: common-config
-          mountPath: /tmp/config/free5GC.conf
-          subPath: free5GC.conf
         - name: nf-config
           mountPath: /tmp/config/udmcfg.conf
           subPath: udmcfg.conf
@@ -86,10 +83,6 @@
         configMap:
           name: udm
           defaultMode: 493
-      - name: common-config
-        configMap:
-          name: common
-          defaultMode: 493 
       - name: nf-config
         configMap:
           name: udm
diff --git a/omec/5g-control-plane/templates/deployment-udr.yaml b/omec/5g-control-plane/templates/deployment-udr.yaml
index 0d55e37..2cdde55 100644
--- a/omec/5g-control-plane/templates/deployment-udr.yaml
+++ b/omec/5g-control-plane/templates/deployment-udr.yaml
@@ -67,9 +67,6 @@
           subPath: udr-run.sh
         - name: config-dir
           mountPath: /free5gc/config
-        - name: common-config
-          mountPath: /tmp/config/free5GC.conf
-          subPath: free5GC.conf
         - name: nf-config
           mountPath: /tmp/config/udrcfg.conf
           subPath: udrcfg.conf
@@ -82,10 +79,6 @@
         configMap:
           name: udr
           defaultMode: 493
-      - name: common-config
-        configMap:
-          name: common
-          defaultMode: 493 
       - name: nf-config
         configMap:
           name: udr
diff --git a/omec/5g-control-plane/templates/deployment-webui.yaml b/omec/5g-control-plane/templates/deployment-webui.yaml
index 6c554ec..508838e 100644
--- a/omec/5g-control-plane/templates/deployment-webui.yaml
+++ b/omec/5g-control-plane/templates/deployment-webui.yaml
@@ -61,9 +61,6 @@
           subPath: webui-run.sh
         - name: config-dir
           mountPath: /free5gc/config
-        - name: common-config
-          mountPath: /tmp/config/free5GC.conf
-          subPath: free5GC.conf
         - name: nf-config
           mountPath: /tmp/config/webuicfg.conf
           subPath: webuicfg.conf
@@ -76,10 +73,6 @@
         configMap:
           name: webui
           defaultMode: 493
-      - name: common-config
-        configMap:
-          name: common
-          defaultMode: 493 
       - name: nf-config
         configMap:
           name: webui
diff --git a/omec/5g-control-plane/values.yaml b/omec/5g-control-plane/values.yaml
index f980885..e5e44b3 100644
--- a/omec/5g-control-plane/values.yaml
+++ b/omec/5g-control-plane/values.yaml
@@ -107,78 +107,76 @@
   mongodb:
     name: free5gc
     url: mongodb://mongodb
-  commonCfgFiles:
-    free5GC.conf:
-      logger:
-        # network function
-        AMF:
-          debugLevel: info
-          ReportCaller: false
-        SMF:
-          debugLevel: info
-          ReportCaller: false
-        UDR:
-          debugLevel: info
-          ReportCaller: false
-        UDM:
-          debugLevel: info
-          ReportCaller: false
-        NRF:
-          debugLevel: info
-          ReportCaller: false
-        PCF:
-          debugLevel: info
-          ReportCaller: false
-        AUSF:
-          debugLevel: info
-          ReportCaller: false
-        N3IWF:
-          debugLevel: info
-          ReportCaller: false
-      # library
-        NAS:
-          debugLevel: info
-          ReportCaller: false
-        FSM:
-          debugLevel: info
-          ReportCaller: false
-        NGAP:
-          debugLevel: info
-          ReportCaller: false
-        NamfComm:
-          debugLevel: info
-          ReportCaller: false
-        NamfEventExposure:
-          debugLevel: info
-          ReportCaller: false
-        NsmfPDUSession:
-          debugLevel: info
-          ReportCaller: false
-        NudrDataRepository:
-          debugLevel: info
-          ReportCaller: false
-        OpenApi:
-          debugLevel: info
-          ReportCaller: false
-        Aper:
-          debugLevel: info
-          ReportCaller: false
-        CommonConsumerTest:
-          debugLevel: info
-          ReportCaller: false
-        PFCP:
-          debugLevel: info
-          ReportCaller: false
-        MongoDBLibrary:
-          debugLevel: info
-          ReportCaller: false
-        PathUtil:
-          debugLevel: info
-          ReportCaller: false
-      # webui
-        WEBUI:
-          debugLevel: info
-          ReportCaller: false
+  logger:
+    # network function
+    AMF:
+      debugLevel: info
+      ReportCaller: false
+    SMF:
+      debugLevel: info
+      ReportCaller: false
+    UDR:
+      debugLevel: info
+      ReportCaller: false
+    UDM:
+      debugLevel: info
+      ReportCaller: false
+    NRF:
+      debugLevel: info
+      ReportCaller: false
+    PCF:
+      debugLevel: info
+      ReportCaller: false
+    AUSF:
+      debugLevel: info
+      ReportCaller: false
+    N3IWF:
+      debugLevel: info
+      ReportCaller: false
+  # library
+    NAS:
+      debugLevel: info
+      ReportCaller: false
+    FSM:
+      debugLevel: info
+      ReportCaller: false
+    NGAP:
+      debugLevel: info
+      ReportCaller: false
+    NamfComm:
+      debugLevel: info
+      ReportCaller: false
+    NamfEventExposure:
+      debugLevel: info
+      ReportCaller: false
+    NsmfPDUSession:
+      debugLevel: info
+      ReportCaller: false
+    NudrDataRepository:
+      debugLevel: info
+      ReportCaller: false
+    OpenApi:
+      debugLevel: info
+      ReportCaller: false
+    Aper:
+      debugLevel: info
+      ReportCaller: false
+    CommonConsumerTest:
+      debugLevel: info
+      ReportCaller: false
+    PFCP:
+      debugLevel: info
+      ReportCaller: false
+    MongoDBLibrary:
+      debugLevel: info
+      ReportCaller: false
+    PathUtil:
+      debugLevel: info
+      ReportCaller: false
+  # webui
+    WEBUI:
+      debugLevel: info
+      ReportCaller: false
   webui:
     deploy: true
     podAnnotations:
@@ -393,28 +391,6 @@
         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"