diff --git a/omec/5g-control-plane/values.yaml b/omec/5g-control-plane/values.yaml
index 279d0b4..e2646fb 100644
--- a/omec/5g-control-plane/values.yaml
+++ b/omec/5g-control-plane/values.yaml
@@ -5,51 +5,20 @@
 images:
   tags:
     init: docker.io/omecproject/pod-init:1.0.0
-    amf:  docker.io/badhri85/5gc-amf:0.0.1-dev
-    nrf:  docker.io/badhri85/5gc-nrf:0.0.1-dev
-    smf:  docker.io/badhri85/5gc-smf:0.0.1-dev
-    ausf: docker.io/badhri85/5gc-ausf:0.0.1-dev
-    nssf: docker.io/badhri85/5gc-nssf:0.0.1-dev
-    pcf: docker.io/badhri85/5gc-pcf:0.0.1-dev
-    udr: docker.io/badhri85/5gc-udr:0.0.1-dev
-    udm: docker.io/badhri85/5gc-udm:0.0.1-dev
-    webui: docker.io/badhri85/5gc-webui:0.0.1-dev
+    amf: registry.aetherproject.org/omecproject/5gc-amf:onf-master-latest
+    nrf: registry.aetherproject.org/omecproject/5gc-nrf:onf-master-latest
+    smf: registry.aetherproject.org/omecproject/5gc-smf:onf-master-latest
+    ausf: registry.aetherproject.org/omecproject/5gc-ausf:onf-master-latest
+    nssf: registry.aetherproject.org/omecproject/5gc-nssf:onf-master-latest
+    pcf: registry.aetherproject.org/omecproject/5gc-pcf:onf-master-latest
+    udr: registry.aetherproject.org/omecproject/5gc-udr:onf-master-latest
+    udm: registry.aetherproject.org/omecproject/5gc-udm:onf-master-latest
+    webui: registry.aetherproject.org/omecproject/5gc-webui:onf-master-latest
   pullPolicy: IfNotPresent
-  credentials: {}
-  # If specified, use this credential to access the image
-  #   registry:
-  #   username:
-  #   password:
-
-nodeSelectors:
-  enabled: false
-  amf:
-    label: omec-cp
-    value: enabled
-  nrf:
-    label: omec-cp
-    value: enabled
-  smf:
-    label: omec-cp
-    value: enabled
-  ausf:
-    label: omec-cp
-    value: enabled
-  nssf:
-    label: omec-cp
-    value: enabled
-  pcf:
-    label: omec-cp
-    value: enabled
-  udm:
-    label: omec-cp
-    value: enabled
-  udr:
-    label: omec-cp
-    value: enabled
-  webui:
-    label: omec-cp
-    value: enabled
+  # Optionally specify an array of imagePullSecrets.
+  # Secrets must be manually created in the namespace.
+  pullSecrets:
+    - name: aether.registry
 
 resources:
   enabled: false
@@ -119,17 +88,87 @@
 
 mongodb:
   deploy: true
-  usePassword: false
+  fullnameOverride: mongodb
   persistence:
     enabled: false
-  fullnameOverride: 'onf-mongo'
-
+  auth:
+    enabled: false
+  serviceAccount:
+    create: false
+  #clusterDomain: cluster.local
+  #architecture: replicaset
+  #replicaCount: 3
 
 config:
-  clusterDomain: cluster.local
   coreDump:
     enabled: false
     path: /tmp/coredump
+  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
+      # webui
+        WEBUI:
+          debugLevel: info
+          ReportCaller: false
   webui:
     deploy: true
     podAnnotations:
@@ -144,79 +183,21 @@
       nodePort:
         enabled: false
         port: 35000
-    yamlCfgFiles:
-      free5GC.conf:
-        db_uri: mongodb://onf-mongo/free5GC
-        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
-        # webui
-          WEBUI:
-            debugLevel: info
-            ReportCaller: false
+    ingress:
+      enabled: false
+      hostname: free5gc.local
+      path: /
+      pathType: Prefix
+      # extraHosts:
+        # - host: free5gc.local
+        #   path: /
+    cfgFiles:
+      # https://github.com/free5gc/free5gc/blob/main/config/webuicfg.yaml
       webuicfg.conf:
         info:
           version: 1.0.0
           description: WebUI initial local configuration
-        configuration:
-          mongodb:
-            name: free5gc
-            url: mongodb://onf-mongo:27017
-
+        configuration: {}
   udm:
     deploy: true
     podAnnotations:
@@ -231,83 +212,14 @@
       nodePort:
         enabled: false
         port: 30074
-    yamlCfgFiles:
-      free5GC.conf:
-        db_uri: mongodb://onf-mongo/free5GC
-        #all logging levels
-        #panic
-        #fatal
-        #error
-        #warn
-        #info
-        #debug
-        #trace
-        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
-        # webui
-          WEBUI:
-            debugLevel: info
-            ReportCaller: false
+    cfgFiles:
+      # https://github.com/free5gc/free5gc/blob/main/config/udmcfg.yaml
       udmcfg.conf:
         info:
           version: 1.0.0
           description: UDM initial local configuration
         configuration:
+          nrfUri: http://nrf:29510
           serviceNameList:
             - nudm-sdm
             - nudm-uecm
@@ -316,32 +228,18 @@
             - nudm-pp
           sbi:
             scheme: http
-            registerIPv4: POD_IP # IP used to register to NRF
-            bindingIPv4: POD_IP  # IP used to bind the service
-            port: 29503
             tls:
               log: free5gc/udmsslkey.log
               pem: free5gc/support/TLS/udm.pem
               key: free5gc/support/TLS/udm.key
           udrclient:
             scheme: http
-            ipv4Addr: udr-headless
+            ipv4Addr: udr
             port: 29504
           nrfclient:
             scheme: http
-            ipv4Addr: nrf-headless
+            ipv4Addr: nrf
             port: 29510
-          nrfUri: http://nrf.free5gc.org:29510
-          # test data set from TS33501-f60 Annex C.4
-          # udmProfileAHNPublicKey: 5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650
-          # udmProfileAHNPrivateKey: c53c22208b61860b06c62e5406a7b330c2b577aa5558981510d128247d38bd1d
-          # udmProfileBHNPublicKey: 0472DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD15A7DED52FCBB097A4ED250E036C7B9C8C7004C4EEDC4F068CD7BF8D3F900E3B4
-          # udmProfileBHNPrivateKey: F1AB1074477EBCC7F554EA1C5FC368B1616730155E0041AC447D6301975FECDA
-          keys:
-            udmProfileAHNPublicKey: 5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650
-            udmProfileAHNPrivateKey: c53c22208b61860b06c62e5406a7b330c2b577aa5558981510d128247d38bd1d
-            udmProfileBHNPublicKey: 0472DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD15A7DED52FCBB097A4ED250E036C7B9C8C7004C4EEDC4F068CD7BF8D3F900E3B4
-            udmProfileBHNPrivateKey: F1AB1074477EBCC7F554EA1C5FC368B1616730155E0041AC447D6301975FECDA
   udr:
     deploy: true
     podAnnotations:
@@ -356,92 +254,16 @@
       nodePort:
         enabled: false
         port: 30074
-    yamlCfgFiles:
-      free5GC.conf:
-        db_uri: mongodb://onf-mongo/free5GC
-        #all logging levels
-        #panic
-        #fatal
-        #error
-        #warn
-        #info
-        #debug
-        #trace
-        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
-        # webui
-          WEBUI:
-            debugLevel: info
-            ReportCaller: false
+    cfgFiles:
+      # https://github.com/free5gc/free5gc/blob/main/config/udrcfg.yaml
       udrcfg.conf:
         info:
           version: 1.0.0
           description: UDR initial local configuration
         configuration:
+          nrfUri: http://nrf:29510
           sbi:
             scheme: http
-            registerIPv4: POD_IP # IP used to register to NRF
-            bindingIPv4: POD_IP  # IP used to bind the service
-            port: 29504
-          mongodb:
-            name: free5gc
-            url: mongodb://onf-mongo:27017
-          nrfUri: http://nrf.free5gc.org:29510
   pcf:
     deploy: true
     podAnnotations:
@@ -456,92 +278,18 @@
       nodePort:
         enabled: false
         port: 30077
-    yamlCfgFiles:
-      free5GC.conf:
-        db_uri: mongodb://onf-mongo/free5GC
-        #all logging levels
-        #panic
-        #fatal
-        #error
-        #warn
-        #info
-        #debug
-        #trace
-        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
-        # webui
-          WEBUI:
-            debugLevel: info
-            ReportCaller: false
+    cfgFiles:
+      # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
       pcfcfg.conf:
         info:
           version: 1.0.0
-          description: PCF initial local configuration 
+          description: PCF initial local configuration
         configuration:
           pcfName: PCF
+          nrfUri: http://nrf:29510
           sbi:
             scheme: http
-            registerIPv4: POD_IP # IP used to register to NRF
-            bindingIPv4: POD_IP  # IP used to bind the service
-            port: 29507
-          timeFormat: 2019-01-02 15:04:05
           defaultBdtRefId: BdtPolicyId-
-          nrfUri: http://nrf.free5gc.org:29510
           serviceList:
             - serviceName: npcf-am-policy-control
             - serviceName: npcf-smpolicycontrol
@@ -565,93 +313,20 @@
       nodePort:
         enabled: false
         port: 30081
-    yamlCfgFiles:
-      free5GC.conf:
-        db_uri: mongodb://onf-mongo/free5GC
-        #all logging levels
-        #panic
-        #fatal
-        #error
-        #warn
-        #info
-        #debug
-        #trace
-        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
-        # webui
-          WEBUI:
-            debugLevel: info
-            ReportCaller: false
+    cfgFiles:
+      # https://github.com/free5gc/free5gc/blob/main/config/nssfcfg.yaml
       nssfcfg.conf:
         info:
           version: 1.0.0
           description: NSSF initial local configuration
         configuration:
           nssfName: NSSF
+          nrfUri: http://nrf:29510
           sbi:
             scheme: http
-            registerIPv4: POD_IP # IP used to register to NRF
-            bindingIPv4: POD_IP  # IP used to bind the service
-            port: 29531
           serviceNameList:
             - nnssf-nsselection
             - nnssf-nssaiavailability
-          nrfUri: http://nrf.free5gc.org:29510
           supportedPlmnList:
             - mcc: 208
               mnc: 93
@@ -662,304 +337,13 @@
               supportedSnssaiList:
                 - sst: 1
                   sd: "010203"
-                - sst: 1
-                  sd: 112233
-                - sst: 1
-                  sd: 3
-                - sst: 2
-                  sd: 1
-                - sst: 2
-                  sd: 2
           nsiList:
             - snssai:
                 sst: 1
-              nsiInformationList:
-                - nrfId: http://nrf.free5gc.org:29510/nnrf-nfm/v1/nf-instances
-                  nsiId: 10
-            - snssai:
-                sst: 1
-                sd: 1
-              nsiInformationList:
-                - nrfId: http://nrf.free5gc.org:29510/nnrf-nfm/v1/nf-instances
-                  nsiId: 11
-            - snssai:
-                sst: 1
-                sd: 2
-              nsiInformationList:
-                - nrfId: http://nrf.free5gc.org:29510/nnrf-nfm/v1/nf-instances
-                  nsiId: 12
-                - nrfId: http://nrf.free5gc.org:29510/nnrf-nfm/v1/nf-instances
-                  nsiId: 12
-            - snssai:
-                sst: 1
-                sd: 3
-              nsiInformationList:
-                - nrfId: http://nrf.free5gc.org:29510/nnrf-nfm/v1/nf-instances
-                  nsiId: 13
-            - snssai:
-                sst: 2
-              nsiInformationList:
-                - nrfId: http://nrf.free5gc.org:29510/nnrf-nfm/v1/nf-instances
-                  nsiId: 20
-            - snssai:
-                sst: 2
-                sd: 1
-              nsiInformationList:
-                - nrfId: http://nrf.free5gc.org:29510/nnrf-nfm/v1/nf-instances
-                  nsiId: 21
-            - snssai:
-                sst: 1
                 sd: "010203"
               nsiInformationList:
-                - nrfId: http://nrf.free5gc.org:29510/nnrf-nfm/v1/nf-instances
+                - nrfId: http://nrf:29510/nnrf-nfm/v1/nf-instances
                   nsiId: 22
-          amfSetList:
-            - amfSetId: 1
-              amfList:
-                - ffa2e8d7-3275-49c7-8631-6af1df1d9d26
-                - 0e8831c3-6286-4689-ab27-1e2161e15cb1
-                - a1fba9ba-2e39-4e22-9c74-f749da571d0d
-              nrfAmfSet: http://nrf.free5gc.org:8081/nnrf-nfm/v1/nf-instances
-              supportedNssaiAvailabilityData:
-                - tai:
-                    plmnId:
-                      mcc: 466
-                      mnc: 92
-                    tac: 33456
-                  supportedSnssaiList:
-                    - sst: 1
-                      sd: 1
-                    - sst: 1
-                      sd: 2
-                    - sst: 2
-                      sd: 1
-                - tai:
-                    plmnId:
-                      mcc: 466
-                      mnc: 92
-                    tac: 33457
-                  supportedSnssaiList:
-                    - sst: 1
-                    - sst: 1
-                      sd: 1
-                    - sst: 1
-                      sd: 2
-            - amfSetId: 2
-              nrfAmfSet: http://nrf.free5gc.org:8084/nnrf-nfm/v1/nf-instances
-              supportedNssaiAvailabilityData:
-                - tai:
-                    plmnId:
-                      mcc: 466
-                      mnc: 92
-                    tac: 33456
-                  supportedSnssaiList:
-                    - sst: 1
-                    - sst: 1
-                      sd: 1
-                    - sst: 1
-                      sd: 3
-                    - sst: 2
-                      sd: 1
-                - tai:
-                    plmnId:
-                      mcc: 466
-                      mnc: 92
-                    tac: 33458
-                  supportedSnssaiList:
-                    - sst: 1
-                    - sst: 1
-                      sd: 1
-                    - sst: 2
-          amfList:
-            - nfId: 469de254-2fe5-4ca0-8381-af3f500af77c
-              supportedNssaiAvailabilityData:
-                - tai:
-                    plmnId:
-                      mcc: 466
-                      mnc: 92
-                    tac: 33456
-                  supportedSnssaiList:
-                    - sst: 1
-                    - sst: 1
-                      sd: 2
-                    - sst: 2
-                - tai:
-                    plmnId:
-                      mcc: 466
-                      mnc: 92
-                    tac: 33457
-                  supportedSnssaiList:
-                    - sst: 1
-                      sd: 1
-                    - sst: 1
-                      sd: 2
-            - nfId: fbe604a8-27b2-417e-bd7c-8a7be2691f8d
-              supportedNssaiAvailabilityData:
-                - tai:
-                    plmnId:
-                      mcc: 466
-                      mnc: 92
-                    tac: 33458
-                  supportedSnssaiList:
-                    - sst: 1
-                    - sst: 1
-                      sd: 1
-                    - sst: 1
-                      sd: 3
-                    - sst: 2
-                - tai:
-                    plmnId:
-                      mcc: 466
-                      mnc: 92
-                    tac: 33459
-                  supportedSnssaiList:
-                    - sst: 1
-                    - sst: 1
-                      sd: 1
-                    - sst: 2
-                    - sst: 2
-                      sd: 1
-            - nfId: b9e6e2cb-5ce8-4cb6-9173-a266dd9a2f0c
-              supportedNssaiAvailabilityData:
-                - tai:
-                    plmnId:
-                      mcc: 466
-                      mnc: 92
-                    tac: 33456
-                  supportedSnssaiList:
-                    - sst: 1
-                    - sst: 1
-                      sd: 1
-                    - sst: 1
-                      sd: 2
-                    - sst: 2
-                - tai:
-                    plmnId:
-                      mcc: 466
-                      mnc: 92
-                    tac: 33458
-                  supportedSnssaiList:
-                    - sst: 1
-                    - sst: 1
-                      sd: 1
-                    - sst: 2
-                    - sst: 2
-                      sd: 1
-          taList:
-            - tai:
-                plmnId:
-                  mcc: 466
-                  mnc: 92
-                tac: 33456
-              accessType: 3GPP_ACCESS
-              supportedSnssaiList:
-                - sst: 1
-                - sst: 1
-                  sd: 1
-                - sst: 1
-                  sd: 2
-                - sst: 2
-            - tai:
-                plmnId:
-                  mcc: 466
-                  mnc: 92
-                tac: 33457
-              accessType: 3GPP_ACCESS
-              supportedSnssaiList:
-                - sst: 1
-                - sst: 1
-                  sd: 1
-                - sst: 1
-                  sd: 2
-                - sst: 2
-            - tai:
-                plmnId:
-                  mcc: 466
-                  mnc: 92
-                tac: 33458
-              accessType: 3GPP_ACCESS
-              supportedSnssaiList:
-                - sst: 1
-                - sst: 1
-                  sd: 1
-                - sst: 1
-                  sd: 3
-                - sst: 2
-              restrictedSnssaiList:
-                - homePlmnId:
-                    mcc: 310
-                    mnc: 560
-                  sNssaiList:
-                    - sst: 1
-                      sd: 3
-            - tai:
-                plmnId:
-                  mcc: 466
-                  mnc: 92
-                tac: 33459
-              accessType: 3GPP_ACCESS
-              supportedSnssaiList:
-                - sst: 1
-                - sst: 1
-                  sd: 1
-                - sst: 2
-                - sst: 2
-                  sd: 1
-              restrictedSnssaiList:
-                - homePlmnId:
-                    mcc: 310
-                    mnc: 560
-                  sNssaiList:
-                    - sst: 2
-                      sd: 1
-          mappingListFromPlmn:
-            - operatorName: NTT Docomo
-              homePlmnId:
-                mcc: 440
-                mnc: 10
-              mappingOfSnssai:
-                - servingSnssai:
-                    sst: 1
-                    sd: 1
-                  homeSnssai:
-                    sst: 1
-                    sd: 1
-                - servingSnssai:
-                    sst: 1
-                    sd: 2
-                  homeSnssai:
-                    sst: 1
-                    sd: 3
-                - servingSnssai:
-                    sst: 1
-                    sd: 3
-                  homeSnssai:
-                    sst: 1
-                    sd: 4
-                - servingSnssai:
-                    sst: 2
-                    sd: 1
-                  homeSnssai:
-                    sst: 2
-                    sd: 2
-            - operatorName: AT&T Mobility
-              homePlmnId:
-                mcc: 310
-                mnc: 560
-              mappingOfSnssai:
-                - servingSnssai:
-                    sst: 1
-                    sd: 1
-                  homeSnssai:
-                    sst: 1
-                    sd: 2
-                - servingSnssai:
-                    sst: 1
-                    sd: 2
-                  homeSnssai:
-                    sst: 1
-                    sd: 3
-
   amf:
     deploy: true
     podAnnotations:
@@ -973,69 +357,23 @@
       port: 29518
       nodePort:
         enabled: false
-
         port: 30088
     ngapp:
       port: 38412
       nodePort:
         enabled: false
         port: 30071
-    yamlCfgFiles:
-      free5GC.conf:
-        db_uri: mongodb://onf-mongo/free5GC
-        logger:
-        # network function
-          AMF:
-            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
-        # webui
-          WEBUI:
-            debugLevel: info
-            ReportCaller: false
+    cfgFiles:
+      # https://github.com/free5gc/free5gc/blob/main/config/amfcfg.yaml
       amfcfg.conf:
         info:
           version: 1.0.0
           description: AMF initial local configuration
         configuration:
           amfName: AMF
-          ngapIpList:
-            - POD_IP
+          nrfUri: http://nrf:29510
           sbi:
             scheme: http
-            registerIPv4: POD_IP # IP used to register to NRF
-            bindingIPv4: POD_IP  # IP used to bind the service
-            port: 29518
           serviceNameList:
             - namf-comm
             - namf-evts
@@ -1059,18 +397,13 @@
               snssaiList:
                 - sst: 1
                   sd: "010203"
-                - sst: 1
-                  sd: "112233"
           supportDnnList:
             - internet
-          nrfUri: http://nrf.free5gc.org:29510
           security:
             integrityOrder:
               - NIA2
-              # - NIA0
             cipheringOrder:
               - NEA0
-              # - NEA2
           networkName:
             full: free5GC
             short: free
@@ -1086,66 +419,18 @@
       nodePort:
         enabled: false
         port: 30070
-    yamlCfgFiles1:
-      debugLevel: info
-    yamlCfgFiles:
-      free5GC.conf:
-        logger:
-        # network function
-          NRF:
-            debugLevel: info
-            ReportCaller: false
-        # library
-          NAS:
-            debugLevel: info
-            ReportCaller: true
-          FSM:
-            debugLevel: info
-            ReportCaller: true
-          NGAP:
-            debugLevel: info
-            ReportCaller: true
-          NamfComm:
-            debugLevel: info
-            ReportCaller: true
-          NamfEventExposure:
-            debugLevel: info
-            ReportCaller: true
-          NsmfPDUSession:
-            debugLevel: info
-            ReportCaller: true
-          NudrDataRepository:
-            debugLevel: info
-            ReportCaller: true
-          OpenApi:
-            debugLevel: info
-            ReportCaller: true
-          Aper:
-            debugLevel: info
-            ReportCaller: true
-          CommonConsumerTest:
-            debugLevel: info
-            ReportCaller: true
-        # webui
-          WEBUI:
-            debugLevel: info
-            ReportCaller: true
+    cfgFiles:
+      # https://github.com/free5gc/free5gc/blob/main/config/nrfcfg.yaml
       nrfcfg.conf:
         info:
           version: 1.0.0
           description: NRF initial local configuration
         configuration:
-          MongoDBName: "free5gc"
-          MongoDBUrl: "mongodb://onf-mongo:27017"
-          DefaultServiceIP: "nrf.free5gc.org"
           sbi:
             scheme: http
-            #ipv4Addr: nrf.free5gc.org
-            ipv4Addr: POD_IP
-            port: 29510
           DefaultPlmnId:
-            mcc: "208"
-            mnc: "93"
+            mcc: 208
+            mnc: 93
           serviceNameList:
             - nnrf-nfm
             - nnrf-disc
@@ -1168,95 +453,21 @@
       nodePort:
         enabled: false
         port: 30080
-    yamlCfgFiles1:
-      debugLevel: info
-    yamlCfgFiles:
-      free5GC.conf:
-        db_uri: mongodb://onf-mongo/free5GC
-        logger:
-          SMF:
-            debugLevel: info
-            ReportCaller: true
-        # library
-          NAS:
-            debugLevel: info
-            ReportCaller: true
-          FSM:
-            debugLevel: info
-            ReportCaller: true
-          NGAP:
-            debugLevel: info
-            ReportCaller: true
-          NamfComm:
-            debugLevel: info
-            ReportCaller: true
-          NamfEventExposure:
-            debugLevel: info
-            ReportCaller: true
-          NsmfPDUSession:
-            debugLevel: info
-            ReportCaller: true
-          NudrDataRepository:
-            debugLevel: info
-            ReportCaller: true
-          OpenApi:
-            debugLevel: info
-            ReportCaller: true
-          Aper:
-            debugLevel: info
-            ReportCaller: true
-          CommonConsumerTest:
-            debugLevel: info
-            ReportCaller: true
-        # webui
-          WEBUI:
-            debugLevel: info
-            ReportCaller: true
-      uerouting.yaml:
+    cfgFiles:
+      uerouting.conf:
         info:
           version: 1.0.0
           description: Routing information for UE
-
-        ueRoutingInfo:
-          - SUPI: imsi-2089300007487
-            AN: upf-headless
-            PathList:
-              - DestinationIP: 10.0.0.10
-                DestinationPort: 8888
-                UPF: !!seq
-                  - AnchorUPF1
-
-              - DestinationIP: 10.0.0.11
-                DestinationPort: 9999
-                UPF: !!seq
-                  - BranchingUPF
-                  - AnchorUPF2
-
-          - SUPI: imsi-2089300007486
-            AN: upf-headless
-            PathList:
-              - DestinationIP: 10.0.0.10
-                DestinationPort: 8888
-                UPF: !!seq
-                  - BranchingUPF
-                  - AnchorUPF1
-
-              - DestinationIP: 10.0.0.11
-                DestinationPort: 9999
-                UPF: !!seq
-                  - BranchingUPF
-                  - AnchorUPF2
+      # https://github.com/free5gc/free5gc/blob/main/config/smfcfg.yaml
       smfcfg.conf:
         info:
           version: 1.0.0
           description: SMF initial local configuration
         configuration:
           smfName: SMF
+          nrfUri: http://nrf:29510
           sbi:
             scheme: http
-            registerIPv4: POD_IP # IP used to register to NRF
-            bindingIPv4: POD_IP  # IP used to bind the service
-            port: 29502
             tls:
               key: gofree5gc/support/TLS/smf.key
               pem: gofree5gc/support/TLS/smf.pem
@@ -1269,35 +480,21 @@
                 sd: "010203"
               dnnSmfInfoList:
                 - dnn: internet
-            - sNssai:
-                sst: 1
-                sd: 112233
-              dnnSmfInfoList:
-                - dnn: internet
-          pfcp:
-            addr: POD_IP
           userplane_information:
             up_nodes:
               gNB1:
                 type: AN
-                an_ip: 192.188.2.3
-              AnchorUPF1:
+              UPF:
                 type: UPF
-                node_id: upf-headless
+                node_id: upf
             links:
               - A: gNB1
-                B: AnchorUPF1
+                B: UPF
           dnn:
             internet:
               dns:
                 ipv4: 8.8.8.8
-                ipv6: 2001:4860:4860::8888
-            internet2:
-              dns:
-                ipv4: 8.8.4.4
-                ipv6: 2001:4860:4860::8844
           ue_subnet: 10.250.0.0/16
-          nrfUri: http://nrf.free5gc.org:29510
           ulcl: false
   ausf:
     deploy: true
@@ -1313,52 +510,19 @@
       nodePort:
         enabled: false
         port: 30082
-    yamlCfgFiles:
-      free5GC.conf:
-        db_uri: mongodb://onf-mongo/free5GC
-        logger:
-          AUSF:
-            debugLevel: info
-            ReportCaller: false
-        # library
-          NAS:
-            debugLevel: info
-            ReportCaller: true
-          FSM:
-            debugLevel: info
-            ReportCaller: true
-          NamfComm:
-            debugLevel: info
-            ReportCaller: true
-          OpenApi:
-            debugLevel: info
-            ReportCaller: true
-          Aper:
-            debugLevel: info
-            ReportCaller: true
-          CommonConsumerTest:
-            debugLevel: info
-            ReportCaller: true
-        # webui
-          WEBUI:
-            debugLevel: info
-            ReportCaller: true
+    cfgFiles:
+      # https://github.com/free5gc/free5gc/blob/main/config/ausfcfg.yaml
       ausfcfg.conf:
         info:
           version: 1.0.0
           description: AUSF initial local configuration
         configuration:
+          nrfUri: http://nrf:29510
           sbi:
             scheme: http
-            registerIPv4: POD_IP # IP used to register to NRF
-            bindingIPv4: POD_IP  # IP used to bind the service
-            port: 29509
           serviceNameList:
             - nausf-auth
-          nrfUri: http://nrf.free5gc.org:29510
           plmnSupportList:
             - mcc: 208
               mnc: 93
-            - mcc: 123
-              mnc: 45
           groupId: ausfGroup001