diff --git a/doc/tutorial_resources/oai-cn5g/conf/oai-amf.conf b/doc/tutorial_resources/oai-cn5g/conf/oai-amf.conf
deleted file mode 100644
index 628899eb7ddb6fadd1dd950a7dc3c5fac8c08602..0000000000000000000000000000000000000000
--- a/doc/tutorial_resources/oai-cn5g/conf/oai-amf.conf
+++ /dev/null
@@ -1,146 +0,0 @@
-################################################################################
-# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The OpenAirInterface Software Alliance licenses this file to You under
-# the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.openairinterface.org/?page_id=698
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#-------------------------------------------------------------------------------
-# For more information about the OpenAirInterface (OAI) Software Alliance:
-#      contact@openairinterface.org
-################################################################################
-
-AMF = 
-{
-  INSTANCE_ID = 0;            # 0 is the default
-  PID_DIRECTORY = "/var/run";   # /var/run is the default
-  
-  AMF_NAME = "OAI-AMF";
-  
-  RELATIVE_CAPACITY = 30;
-  # Display statistics about whole system (in seconds)
-  STATISTICS_TIMER_INTERVAL = 20;  # YOUR CONFIG HERE
-  
-  CORE_CONFIGURATION:
-  {
-    EMERGENCY_SUPPORT = "false";
-  };
-  
-  GUAMI: 
-  {
-    MCC = "001"; MNC = "01"; RegionID = "128"; AMFSetID = "1"; AMFPointer = "1" # YOUR GUAMI CONFIG HERE
-  }
-  
-  SERVED_GUAMI_LIST = (
-    {MCC = "001"; MNC = "01"; RegionID = "128"; AMFSetID = "1"; AMFPointer = "0"} #48bits <MCC><MNC><RegionID><AMFSetID><AMFPointer>
-  );
-    
-  PLMN_SUPPORT_LIST = (
-  {
-    MCC = "001"; MNC = "01"; TAC = 0x0001;  # YOUR PLMN CONFIG HERE
-    SLICE_SUPPORT_LIST = (
-      {SST = 1,SD= "0xFFFFFF"}         #SST, SD value can be decimal or hexadecimal
-     )
-  }
-  ); # At the moment only one PLMN configuration is supported 
-  
-  INTERFACES:
-  {
-    # AMF binded interface for N1/N2 interface (NGAP) 
-    NGAP_AMF: 
-    {
-      INTERFACE_NAME = "eth0";  # YOUR NETWORK CONFIG HERE
-      IPV4_ADDRESS   = "read";
-      PORT           = 38412;                            # YOUR NETWORK CONFIG HERE
-      PPID           = 60;                               # YOUR NETWORK CONFIG HERE
-    };  
-   
-    # AMF binded interface for SBI (N11 (SMF)/N12 (AUSF), etc.)
-    SBI:
-    {
-      INTERFACE_NAME = "eth0"; # YOUR NETWORK CONFIG HERE
-      IPV4_ADDRESS   = "read"; 
-      PORT           = 80;                             # YOUR NETWORK CONFIG HERE
-      API_VERSION    = "v1";                           # YOUR AMF API VERSION CONFIG HERE
-      HTTP2_PORT     = 8080;                           # YOUR NETWORK CONFIG HERE      
-      
-      SMF_INSTANCES_POOL = (
-        {SMF_INSTANCE_ID = 1; IPV4_ADDRESS = "192.168.70.133"; PORT = "80"; HTTP2_PORT = 8080, VERSION = "v1"; FQDN = "oai-smf", SELECTED = "true"} # YOUR SMF CONFIG HERE
-      );
-    };
-     
-    NRF :
-    {
-      IPV4_ADDRESS = "192.168.70.130";  # YOUR NRF CONFIG HERE
-      PORT         = 80;            # YOUR NRF CONFIG HERE (default: 80)
-      API_VERSION  = "v1";   # YOUR NRF API VERSION FOR SBI CONFIG HERE
-      FQDN         = "oai-nrf"           # YOUR NRF FQDN CONFIG HERE
-    };
-    
-    AUSF :
-    {
-      IPV4_ADDRESS = "192.168.70.138";  # YOUR AUSF CONFIG HERE
-      PORT         = 80;            # YOUR AUSF CONFIG HERE (default: 80)
-      API_VERSION  = "v1";   # YOUR AUSF API VERSION FOR SBI CONFIG HERE
-      FQDN         = "oai-ausf"           # YOUR AUSF FQDN CONFIG HERE
-    };
-
-    NSSF :
-    {
-      IPV4_ADDRESS = "192.168.70.138";  # YOUR NSSF CONFIG HERE
-      PORT         = 80;            # YOUR NSSF CONFIG HERE (default: 80)
-      API_VERSION  = "v2";   # YOUR NSSF API VERSION FOR SBI CONFIG HERE
-      FQDN         = "oai-nssf"           # YOUR NSSF FQDN CONFIG HERE
-    };
-  };  
-
-  SUPPORT_FEATURES: 
-  {
-     # STRING, {"yes", "no"}, 
-     NF_REGISTRATION = "yes";  # Set to yes if AMF resgisters to an NRF
-     NRF_SELECTION   = "no";   # Set to yes to enable NRF discovery and selection
-     SMF_SELECTION   = "no";   # Set to yes to enable SMF discovery and selection
-     EXTERNAL_NRF    = "no";   # Set to yes if AMF works with an external NRF
-     EXTERNAL_NSSF   = "no";
-     EXTERNAL_AUSF   = "yes";  # Set to yes if AMF works with an external AUSF
-     EXTERNAL_UDM    = "no";   # Set to yes if AMF works with an external UDM
-     USE_FQDN_DNS    = "no";   # Set to yes if AMF relies on a DNS to resolve NRF/SMF/UDM/AUSF's FQDN
-     USE_HTTP2       = "no";   # Set to yes to enable HTTP2 for AMF server
-}
-  
-  AUTHENTICATION:
-  { #NOT USED because authentication requests go via AUSF
-    ## MySQL mandatory options
-    MYSQL_server = "mysql"; # MySQL Server address
-    MYSQL_user   = "root";   # Database server login
-    MYSQL_pass   = "linux";   # Database server password
-    MYSQL_db     = "oai_db";     # Your database name
-    
-    ## OP
-    RANDOM = "true";
-  };
-  
-  NAS:
-  {
-    ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "NIA1" , "NIA1" , "NIA2" ];  #Default [ "NIA0" , "NIA1" , "NIA2" ];
-    ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "NEA0" , "NEA1" , "NEA2" ]; #Default [ "NEA0" , "NEA1" , "NEA2" ];
-  };
-  
-};
-
-
-MODULES =
-{
-  NGAP_MESSAGE = (
-    {MSG_NAME = "NGSetupRequest"; ProcedureCode = 21; TypeOfMessage = "initialMessage"}
-  );
-};
diff --git a/doc/tutorial_resources/oai-cn5g/conf/oai-ausf.conf b/doc/tutorial_resources/oai-cn5g/conf/oai-ausf.conf
deleted file mode 100644
index b5c834455053e6870021860e20ac346c1d47e929..0000000000000000000000000000000000000000
--- a/doc/tutorial_resources/oai-cn5g/conf/oai-ausf.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-################################################################################
-# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The OpenAirInterface Software Alliance licenses this file to You under
-# the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.openairinterface.org/?page_id=698
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#-------------------------------------------------------------------------------
-# For more information about the OpenAirInterface (OAI) Software Alliance:
-#      contact@openairinterface.org
-################################################################################
-
-AUSF =
-{
-  INSTANCE_ID = 0;
-  PID_DIRECTORY = "/var/run";
-  AUSF_NAME = "OAI_AUSF";
-
-  INTERFACES:{
-    # AUSF binded interface for SBI interface (e.g., communication with AMF, UDM)
-    SBI:{
-	INTERFACE_NAME = "eth0";      # YOUR NETWORK CONFIG HERE
-        IPV4_ADDRESS   = "read";
-        PORT           = 80;           # YOUR NETWORK CONFIG HERE (default: 80)
-        API_VERSION    = "v1";  # YOUR API VERSION FOR UDM CONFIG HERE
-        HTTP2_PORT     = 8080;     # YOUR NETWORK CONFIG HERE
-    };
-  };
-
-  # SUPPORT FEATURES
-  SUPPORT_FEATURES:{
-    # STRING, {"yes", "no"}, 
-    USE_FQDN_DNS = "no";    # Set to yes if AUSF will relying on a DNS to resolve UDM's FQDN
-    USE_HTTP2    = "no";                 # Set to yes to enable HTTP2 for AMF server
-    REGISTER_NRF = "no";    # Set to 'yes' if AUSF resgisters to an NRF
-  }
-
-  # UDM Information
-  UDM:{
-    IPV4_ADDRESS   = "192.168.70.137";  # YOUR NETWORK CONFIG HERE
-    PORT           = 80;          # YOUR NETWORK CONFIG HERE  (default: 80)
-    API_VERSION    = "v1";  # YOUR API VERSION FOR UDM CONFIG HERE
-    FQDN           = "oai-udm"         # YOUR UDM FQDN CONFIG HERE
-  };
-
-  NRF :
-  {
-    IPV4_ADDRESS = "192.168.70.130";  # YOUR NRF CONFIG HERE
-    PORT         = 80;            # YOUR NRF CONFIG HERE (default: 80)
-    API_VERSION  = "v1";   # YOUR NRF API VERSION HERE
-    FQDN = "oai-nrf";
-  };
-};
\ No newline at end of file
diff --git a/doc/tutorial_resources/oai-cn5g/conf/oai-nrf.conf b/doc/tutorial_resources/oai-cn5g/conf/oai-nrf.conf
deleted file mode 100644
index 80dd6fbcefc64fe384946905c50cea1913212067..0000000000000000000000000000000000000000
--- a/doc/tutorial_resources/oai-cn5g/conf/oai-nrf.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-################################################################################
-# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The OpenAirInterface Software Alliance licenses this file to You under
-# the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.openairinterface.org/?page_id=698
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#-------------------------------------------------------------------------------
-# For more information about the OpenAirInterface (OAI) Software Alliance:
-#      contact@openairinterface.org
-################################################################################
-
-NRF =
-{
-    INSTANCE      = 0;         # 0 is the default
-    PID_DIRECTORY = "/var/run";  # /var/run is the default
-
-
-    SBI_INTERFACE :
-    {
-        # NRF binded interface for SBI interface (e.g., communication with other NFs e.g., AMF, SMF, UDM)
-        INTERFACE_NAME = "eth0";     # YOUR NETWORK CONFIG HERE
-        IPV4_ADDRESS   = "read";
-        PORT           = 80;       # YOUR NETWORK CONFIG HERE (default: 80)
-        HTTP2_PORT     = 8080; # YOUR NETWORK CONFIG HERE
-        API_VERSION    = "v1";                # YOUR NRF API VERSION CONFIG HERE
-    };                 
-   
-};
-
diff --git a/doc/tutorial_resources/oai-cn5g/conf/oai-smf.conf b/doc/tutorial_resources/oai-cn5g/conf/oai-smf.conf
deleted file mode 100644
index f39a5c875d9c1a87481e166f23e9b5f0c3964d2c..0000000000000000000000000000000000000000
--- a/doc/tutorial_resources/oai-cn5g/conf/oai-smf.conf
+++ /dev/null
@@ -1,131 +0,0 @@
-################################################################################
-# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The OpenAirInterface Software Alliance licenses this file to You under
-# the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.openairinterface.org/?page_id=698
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#-------------------------------------------------------------------------------
-# For more information about the OpenAirInterface (OAI) Software Alliance:
-#      contact@openairinterface.org
-################################################################################
-
-SMF =
-{
-    FQDN          = "oai-smf";
-    INSTANCE      = 1;         # 0 is the default
-    PID_DIRECTORY = "/var/run";  # /var/run is the default
-
-    INTERFACES :
-    {
-        N4 :
-        {
-            # SMF binded interface for N4 communication (UPF)
-            INTERFACE_NAME = "eth0"; # YOUR NETWORK CONFIG HERE
-            IPV4_ADDRESS   = "read";                        
-         };
-
-        SBI :
-        {
-            # SMF binded interface for SBI interface (e.g., communication with AMF, UDM)
-            INTERFACE_NAME = "eth0";     # YOUR NETWORK CONFIG HERE
-            IPV4_ADDRESS   = "read";
-            PORT           = 80;       # YOUR NETWORK CONFIG HERE (default: 80)
-            HTTP2_PORT     = 8080; # YOUR NETWORK CONFIG HERE
-            API_VERSION    = "v1";                # YOUR SMF API VERSION CONFIG HERE
-         };                 
-
-    };
-
-    # DNN configurations with pool of UE assigned IP addresses
-    # Do not make IP pools overlap
-    # first IPv4 address X.Y.Z.1 is reserved for GTP network device on UPF
-    DNN_LIST = (
-       # PDU_SESSION_TYPE choice in {IPv4, IPv6, IPv4v6}
-      {DNN_NI = "oai"; PDU_SESSION_TYPE = "IPv4"; IPV4_RANGE = "12.1.1.2 - 12.1.1.254"; IPV6_PREFIX = "2001:1:2::/64"},
-      {DNN_NI = "openairinterface"; PDU_SESSION_TYPE = "IPv4v6"; IPV4_RANGE = "12.1.2.2 - 12.1.2.254"; IPV6_PREFIX = "2001:1:2::/64"},
-      {DNN_NI = "ims"; PDU_SESSION_TYPE = "IPv4v6"; IPV4_RANGE = "12.2.1.1 - 12.2.1.254"; IPV6_PREFIX = "2001:1:2::/64"}
-    );
-
-    # DNS address communicated to UEs
-    DEFAULT_DNS_IPV4_ADDRESS     = "8.8.8.8";      # YOUR DNS CONFIG HERE
-    DEFAULT_DNS_SEC_IPV4_ADDRESS = "4.4.4.4";  # YOUR DNS CONFIG HERE
-    DEFAULT_DNS_IPV6_ADDRESS     = "2001:4860:4860::8888";            # YOUR DNS CONFIG HERE
-    DEFAULT_DNS_SEC_IPV6_ADDRESS = "2001:4860:4860::8844";            # YOUR DNS CONFIG HERE
-
-    DEFAULT_CSCF_IPV4_ADDRESS = "192.168.70.139"; #not defined at the moment 
-    DEFAULT_CSCF_IPV6_ADDRESS = "fe80::7915:f408:1787:db8b";
-    
-    #Default UE MTU
-    UE_MTU = 1500;
-    
-    # SUPPORT FEATURES
-    SUPPORT_FEATURES: 
-    {
-      # STRING, {"yes", "no"}, 
-      REGISTER_NRF = "yes";  # Set to yes if SMF resgisters to an NRF
-      DISCOVER_UPF = "yes";  # Set to yes to enable UPF discovery and selection
-      FORCE_PUSH_PROTOCOL_CONFIGURATION_OPTIONS = "no"; # Non standard feature, normally should be set to "no", 
-                                                        # but you may need to set to yes for UE that do not explicitly request a PDN address through NAS signalling
-      USE_LOCAL_SUBSCRIPTION_INFO = "yes";  # Set to yes if SMF uses local subscription information instead of from an UDM
-      USE_FQDN_DNS = "no";                  # Set to yes if AMF/UDM/NRF/UPF will relying on a DNS to resolve FQDN
-      HTTP_VERSION = 1;                    # Default: 1
-      USE_NETWORK_INSTANCE = "no"   # Set yes if network instance is to be used for given UPF
-      DISCOVER_PCF = "no";
-      USE_LOCAL_PCC_RULES = "yes";
-      INCLUDE_DL_PDR_IN_PFCP_SESSION_ESTAB  = "no";
-      ENABLE_REL15_SUPPORT = "no";
-    }  
-  
-    AMF :
-    {
-      IPV4_ADDRESS = "192.168.70.132";  # YOUR AMF CONFIG HERE
-      PORT         = 80;            # YOUR AMF CONFIG HERE (default: 80)
-      API_VERSION  = "v1";   # YOUR AMF API VERSION FOR SBI CONFIG HERE
-      FQDN         = "oai-amf"           # YOUR AMF FQDN CONFIG HERE
-    };
-    
-    UDM :
-    {
-      IPV4_ADDRESS = "192.168.70.137";  # YOUR UDM CONFIG HERE
-      PORT         = 80;            # YOUR UDM CONFIG HERE (default: 80)
-      API_VERSION  = "v1";   # YOUR UDM API VERSION FOR SBI CONFIG HERE
-      FQDN         = "oai-udm"           # YOUR UDM FQDN CONFIG HERE
-    };    
-
-    NRF :
-    {
-      IPV4_ADDRESS = "192.168.70.130";  # YOUR NRF CONFIG HERE
-      PORT         = 80;            # YOUR NRF CONFIG HERE (default: 80)
-      API_VERSION  = "v1";   # YOUR NRF API VERSION FOR SBI CONFIG HERE
-      FQDN         = "oai-nrf"           # YOUR NRF FQDN CONFIG HERE
-    };
-        
-    UPF_LIST = (
-         {IPV4_ADDRESS = "192.168.70.134" ; FQDN = "oai-spgwu-tiny"; NWI_LIST = ({DOMAIN_ACCESS  = "access.oai.org", DOMAIN_CORE = "core.oai.org"})}
-    );                                                               # NWI_LIST IS OPTIONAL PARAMETER   
-    # Not in use because information is getting fetched from UDR
-    LOCAL_CONFIGURATION :
-    {
-      SESSION_MANAGEMENT_SUBSCRIPTION_LIST = (
-         { NSSAI_SST = 1; NSSAI_SD = "0xFFFFFF", DNN = "oai", DEFAULT_SESSION_TYPE = "IPv4", DEFAULT_SSC_MODE = 1,
-           QOS_PROFILE_5QI = 1, QOS_PROFILE_PRIORITY_LEVEL = 1, QOS_PROFILE_ARP_PRIORITY_LEVEL = 15, QOS_PROFILE_ARP_PREEMPTCAP = "NOT_PREEMPT",
-           QOS_PROFILE_ARP_PREEMPTVULN = "NOT_PREEMPTABLE", SESSION_AMBR_UL = "10000Mbps", SESSION_AMBR_DL = "10000Mbps"},
-         { NSSAI_SST = 1; NSSAI_SD = "0xFFFFFF", DNN = "openairinterface", DEFAULT_SESSION_TYPE = "IPv4v6", DEFAULT_SSC_MODE = 1,
-           QOS_PROFILE_5QI = 1, QOS_PROFILE_PRIORITY_LEVEL = 1, QOS_PROFILE_ARP_PRIORITY_LEVEL = 15, QOS_PROFILE_ARP_PREEMPTCAP = "NOT_PREEMPT",
-           QOS_PROFILE_ARP_PREEMPTVULN = "NOT_PREEMPTABLE", SESSION_AMBR_UL = "10000Mbps", SESSION_AMBR_DL = "10000Mbps"},
-         { NSSAI_SST = 1; NSSAI_SD = "0xFFFFFF", DNN = "ims", DEFAULT_SESSION_TYPE = "IPv4v6", DEFAULT_SSC_MODE = 1,
-           QOS_PROFILE_5QI = 1, QOS_PROFILE_PRIORITY_LEVEL = 1, QOS_PROFILE_ARP_PRIORITY_LEVEL = 15, QOS_PROFILE_ARP_PREEMPTCAP = "NOT_PREEMPT",
-           QOS_PROFILE_ARP_PREEMPTVULN = "NOT_PREEMPTABLE", SESSION_AMBR_UL = "330Mbps", SESSION_AMBR_DL = "330Mbps"}
-        );
-    };     
-};
diff --git a/doc/tutorial_resources/oai-cn5g/conf/oai-spgwu-tiny.conf b/doc/tutorial_resources/oai-cn5g/conf/oai-spgwu-tiny.conf
deleted file mode 100644
index 2b2078231e13541c8b635a879e1723d3c5796546..0000000000000000000000000000000000000000
--- a/doc/tutorial_resources/oai-cn5g/conf/oai-spgwu-tiny.conf
+++ /dev/null
@@ -1,138 +0,0 @@
-################################################################################
-# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The OpenAirInterface Software Alliance licenses this file to You under
-# the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.openairinterface.org/?page_id=698
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#-------------------------------------------------------------------------------
-# For more information about the OpenAirInterface (OAI) Software Alliance:
-#      contact@openairinterface.org
-################################################################################
-SPGW-U =
-{
-    FQDN = "gw1.spgw.node.epc.mnc01.mcc001.3gpp.org"; # FQDN for 4G
-    INSTANCE                       = 0;            # 0 is the default
-    PID_DIRECTORY                  = "/var/run";     # /var/run is the default
-
-    #ITTI_TASKS :
-    #{
-        #ITTI_TIMER_SCHED_PARAMS :
-        #{
-            #CPU_ID       = 1;
-            #SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
-            #SCHED_PRIORITY = 85;
-        #};
-        #S1U_SCHED_PARAMS :
-        #{
-            #CPU_ID       = 1;
-            #SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
-            #SCHED_PRIORITY = 84;
-        #};
-        #SX_SCHED_PARAMS :
-        #{
-            #CPU_ID       = 1;
-            #SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
-            #SCHED_PRIORITY = 84;
-        #};
-        #ASYNC_CMD_SCHED_PARAMS :
-        #{
-            #CPU_ID       = 1;
-            #SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
-            #SCHED_PRIORITY = 84;
-        #};
-    #};
-
-    INTERFACES :
-    {
-        S1U_S12_S4_UP :
-        {
-            # S-GW binded interface for S1-U (N3) communication (GTPV1-U) can be ethernet interface, virtual ethernet interface, we don't advise wireless interfaces
-            INTERFACE_NAME         = "eth0";  # STRING, interface name, YOUR NETWORK CONFIG HERE
-            IPV4_ADDRESS           = "read";                                    # STRING, CIDR or "read to let app read interface configured IP address
-            #PORT                   = 2152;                                     # Default is 2152
-            SCHED_PARAMS :
-            {
-                #CPU_ID       = 2;
-                SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
-                SCHED_PRIORITY = 98;
-                POOL_SIZE = 1; # NUM THREADS
-            };
-        };
-        SX :
-        {
-            # S/P-GW binded interface for SX (N4) communication
-            INTERFACE_NAME         = "eth0"; # STRING, interface name
-            IPV4_ADDRESS           = "read";                        # STRING, CIDR or "read" to let app read interface configured IP address
-            #PORT                   = 8805;                         # Default is 8805
-            SCHED_PARAMS :
-            {
-                #CPU_ID       = 1;
-                SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
-                SCHED_PRIORITY = 88;
-                POOL_SIZE = 1; # NUM THREADS
-            };
-        };
-        SGI :
-        {
-           # No config to set, the software will set the SGi (N6) interface to the interface used for the default route.
-            INTERFACE_NAME         = "eth0"; # STRING, interface name or "default_gateway"
-            IPV4_ADDRESS           = "read";                         # STRING, CIDR or "read" to let app read interface configured IP address
-            SCHED_PARAMS :
-            {
-                #CPU_ID       = 3;
-                SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
-                SCHED_PRIORITY = 99;
-                POOL_SIZE = 1; # NUM THREADS
-            };
-        };
-    };
-
-    SNAT = "yes"; # SNAT Values in {yes, no}
-    PDN_NETWORK_LIST  = (
-                      {NETWORK_IPV4 = "12.1.0.0/16";}  # 1 ITEM SUPPORTED ONLY
-                    );
-    # SMF LIST
-    SPGW-C_LIST = (
-         {IPV4_ADDRESS="192.168.70.133" ;}
-    );
-
-    NON_STANDART_FEATURES :
-    {
-        BYPASS_UL_PFCP_RULES = "no"; # 'no' for standard features, yes for enhancing UL throughput
-    };
-
-    SUPPORT_5G_FEATURES:  
-    {
-       # STRING, {"yes", "no"},
-       ENABLE_5G_FEATURES = "yes" # Set to 'yes' to support 5G Features
-       REGISTER_NRF = "yes";  # Set to 'yes' if UPF resgisters to an NRF
-       USE_FQDN_NRF = "no"; # Set to 'yes' if UPF relies on a DNS/FQDN service to resolve NRF's FQDN
-       UPF_FQDN_5G  = "oai-spgwu-tiny";  #Set FQDN of UPF
-
-       NRF :
-       {
-          IPV4_ADDRESS = "192.168.70.130";  # YOUR NRF CONFIG HERE
-          PORT         = 80;            # YOUR NRF CONFIG HERE (default: 80)
-          HTTP_VERSION = 1;   #Set HTTP version for NRF (1 or 2)Default 1
-          API_VERSION  = "v1";   # YOUR NRF API VERSION HERE
-          FQDN = "oai-nrf";
-       };
-
-       # Additional info to be sent to NRF for supporting Network Slicing 
-       UPF_INFO = (
-          { NSSAI_SST = 1; NSSAI_SD = "0xFFFFFF";  DNN_LIST = ({DNN = "oai";}); },
-          { NSSAI_SST = 1; NSSAI_SD = "0xFFFFFF";  DNN_LIST = ({DNN = "openairinterface";}); },
-          { NSSAI_SST = 1; NSSAI_SD = "0xFFFFFF";  DNN_LIST = ({DNN = "ims";}); }
-       );
-    }
-};
\ No newline at end of file
diff --git a/doc/tutorial_resources/oai-cn5g/conf/oai-udm.conf b/doc/tutorial_resources/oai-cn5g/conf/oai-udm.conf
deleted file mode 100644
index 7654346a06e007dfffc69e849b6193c03501bde6..0000000000000000000000000000000000000000
--- a/doc/tutorial_resources/oai-cn5g/conf/oai-udm.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-################################################################################
-# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The OpenAirInterface Software Alliance licenses this file to You under
-# the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.openairinterface.org/?page_id=698
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#-------------------------------------------------------------------------------
-# For more information about the OpenAirInterface (OAI) Software Alliance:
-#      contact@openairinterface.org
-################################################################################
-
-UDM =
-{
-  INSTANCE_ID = 0;
-  PID_DIRECTORY = "/var/run";
-
-  UDM_NAME = "OAI_UDM";
-
-  INTERFACES:{
-    # UDM binded interface for SBI interface (e.g., communication with UDR, AUSF)
-    SBI:{
-        INTERFACE_NAME = "eth0";       # YOUR NETWORK CONFIG HERE
-        IPV4_ADDRESS   = "read";
-        PORT           = 80;            # YOUR NETWORK CONFIG HERE (default: 80)
-        PPID           = 60;
-        API_VERSION    = "v1"; 
-        HTTP2_PORT     = 8080;     # YOUR NETWORK CONFIG HERE
-    };
-  };
-
-  # SUPPORT FEATURES
-  SUPPORT_FEATURES: {
-    # STRING, {"yes", "no"}, 
-    USE_FQDN_DNS = "no";    # Set to yes if UDM will relying on a DNS to resolve UDR's FQDN
-    USE_HTTP2    = "no";       # Set to yes to enable HTTP2 for AUSF server
-    REGISTER_NRF = "no";    # Set to 'yes' if UDM resgisters to an NRF
-  }  
-    
-  UDR:{
-    IPV4_ADDRESS   = "192.168.70.136";   # YOUR NETWORK CONFIG HERE
-    PORT           = 80;           # YOUR NETWORK CONFIG HERE (default: 80)
-    API_VERSION    = "v1";   # YOUR API VERSION FOR UDR CONFIG HERE
-    FQDN           = "oai-udr"          # YOUR UDR FQDN CONFIG HERE
-  };
-  
-  NRF :
-  {
-    IPV4_ADDRESS = "192.168.70.130";  # YOUR NRF CONFIG HERE
-    PORT         = 80;            # YOUR NRF CONFIG HERE (default: 80)
-    API_VERSION  = "v1";   # YOUR NRF API VERSION HERE
-    FQDN         = "oai-nrf";          # YOUR NRF FQDN HERE
-  };
-};
\ No newline at end of file
diff --git a/doc/tutorial_resources/oai-cn5g/conf/oai-udr.conf b/doc/tutorial_resources/oai-cn5g/conf/oai-udr.conf
deleted file mode 100644
index ba88f99f7f80b36564d8eb6e795edeaca3eeccfe..0000000000000000000000000000000000000000
--- a/doc/tutorial_resources/oai-cn5g/conf/oai-udr.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-################################################################################
-# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The OpenAirInterface Software Alliance licenses this file to You under
-# the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.openairinterface.org/?page_id=698
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#-------------------------------------------------------------------------------
-# For more information about the OpenAirInterface (OAI) Software Alliance:
-#      contact@openairinterface.org
-################################################################################
-UDR = 
-{
-  INSTANCE_ID = 0;            # 0 is the default
-  PID_DIRECTORY = "/var/run";   # /var/run is the default
-  UDR_NAME = "OAI_UDR";
-
-
-  SUPPORT_FEATURES:{
-    USE_FQDN_DNS = "no";    # Set to yes if UDR will relying on a DNS to resolve UDM's FQDN
-    REGISTER_NRF = "no";    # Set to yes if UDR resgisters to an NRF
-    USE_HTTP2    = "no";       # Set to yes to enable HTTP2 for UDR server
-    DATABASE     = "MySQL";             # Set to 'MySQL'/'Cassandra' to use MySQL/Cassandra
-  }; 
-
-  INTERFACES:
-  {
-    # NUDR Interface (SBI) 
-    NUDR: 
-    {
-      INTERFACE_NAME = "eth0";  
-      IPV4_ADDRESS   = "read";
-      PORT           = 80;         # Default value: 80
-      HTTP2_PORT     = 8080;   
-      API_VERSION    = "v1";                   
-    };
-  };
-
-  NRF:
-  {
-    IPV4_ADDRESS = "192.168.70.130";  
-    PORT         = 80;            # Default value: 80
-    API_VERSION  = "v1";   
-    FQDN         = "oai-nrf";
-  };
-   
-  MYSQL:
-  {
-    # MySQL options
-    MYSQL_SERVER = "mysql";
-    MYSQL_USER   = "root";        
-    MYSQL_PASS   = "linux";        
-    MYSQL_DB     = "oai_db";          
-    DB_CONNECTION_TIMEOUT = 300;           # Reset the connection to the DB after expiring the timeout (in second)
-  };
-};
-
diff --git a/doc/tutorial_resources/oai-cn5g/docker-compose.yml b/doc/tutorial_resources/oai-cn5g/docker-compose.yml
index b00a6b3c94c17232844dda859b1afde218c3b9b0..feb95b7bb1bd046a1d8bb9dc1cdc75589f64c604 100644
--- a/doc/tutorial_resources/oai-cn5g/docker-compose.yml
+++ b/doc/tutorial_resources/oai-cn5g/docker-compose.yml
@@ -37,65 +37,166 @@ services:
     oai-udr:
         container_name: "oai-udr"
         image: oaisoftwarealliance/oai-udr:develop
-        entrypoint: ["/openair-udr/bin/oai_udr", "-c", "/openair-udr/etc/udr.conf", "-o"]
+        environment:
+            - TZ=Europe/Paris
+            - UDR_NAME=OAI_UDR
+            - UDR_INTERFACE_NAME_FOR_NUDR=eth0
+            - MYSQL_IPV4_ADDRESS=mysql
+            - MYSQL_USER=test
+            - MYSQL_PASS=test
+            - MYSQL_DB=oai_db
+            - WAIT_MYSQL=120
+            - USE_FQDN_DNS=yes
+            - REGISTER_NRF=yes
+            - NRF_IPV4_ADDRESS=192.168.70.130
+            - NRF_FQDN=oai-nrf
         depends_on:
             - mysql
             - oai-nrf
-        volumes:
-            - ./conf/oai-udr.conf:/openair-udr/etc/udr.conf
         networks:
             public_net:
                 ipv4_address: 192.168.70.136
     oai-udm:
         container_name: "oai-udm"
         image: oaisoftwarealliance/oai-udm:develop
-        entrypoint: ["/openair-udm/bin/oai_udm", "-c", "/openair-udm/etc/udm.conf", "-o"]
+        environment:
+            - TZ=Europe/Paris
+            - UDM_NAME=OAI_UDM
+            - SBI_IF_NAME=eth0
+            - REGISTER_NRF=yes
+            - USE_FQDN_DNS=yes
+            - UDR_IP_ADDRESS=192.168.70.136
+            - UDR_FQDN=oai-udr
+            - NRF_IPV4_ADDRESS=192.168.70.130
+            - NRF_FQDN=oai-nrf
         depends_on:
             - oai-nrf
-        volumes:
-            - ./conf/oai-udm.conf:/openair-udm/etc/udm.conf
+            - oai-udr
         networks:
             public_net:
                 ipv4_address: 192.168.70.137
     oai-ausf:
         container_name: "oai-ausf"
         image: oaisoftwarealliance/oai-ausf:develop
-        entrypoint: ["/openair-ausf/bin/oai_ausf", "-c", "/openair-ausf/etc/ausf.conf", "-o"]
+        environment:
+            - TZ=Europe/Paris
+            - AUSF_NAME=OAI_AUSF
+            - SBI_IF_NAME=eth0
+            - USE_FQDN_DNS=yes
+            - REGISTER_NRF=yes
+            - UDM_IP_ADDRESS=192.168.70.137
+            - UDM_FQDN=oai-udm
+            - NRF_IPV4_ADDRESS=192.168.70.130
+            - NRF_FQDN=oai-nrf
         depends_on:
             - oai-nrf
-        volumes:
-            - ./conf/oai-ausf.conf:/openair-ausf/etc/ausf.conf
+            - oai-udm
         networks:
             public_net:
                 ipv4_address: 192.168.70.138
     oai-nrf:
         container_name: "oai-nrf"
         image: oaisoftwarealliance/oai-nrf:develop
-        entrypoint: ["/openair-nrf/bin/oai_nrf", "-c", "/openair-nrf/etc/nrf.conf", "-o"]
-        volumes:
-            - ./conf/oai-nrf.conf:/openair-nrf/etc/nrf.conf
+        environment:
+            - TZ=Europe/Paris
+            - NRF_INTERFACE_NAME_FOR_SBI=eth0
         networks:
             public_net:
                 ipv4_address: 192.168.70.130
     oai-amf:
         container_name: "oai-amf"
         image: oaisoftwarealliance/oai-amf:develop
-        entrypoint: ["/openair-amf/bin/oai_amf", "-c", "/openair-amf/etc/amf.conf", "-o"]
+        environment:
+            - TZ=Europe/Paris
+            # PLMN informations
+            - MCC=001
+            - MNC=01
+            - REGION_ID=128
+            - AMF_SET_ID=1
+            - SERVED_GUAMI_MCC_0=001
+            - SERVED_GUAMI_MNC_0=01
+            - SERVED_GUAMI_REGION_ID_0=128
+            - SERVED_GUAMI_AMF_SET_ID_0=1
+            - PLMN_SUPPORT_MCC=001
+            - PLMN_SUPPORT_MNC=01
+            - PLMN_SUPPORT_TAC=0x0001
+            # Slice 0 (1, 0xFFFFFF)
+            - SST_0=1
+            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
+            - AMF_INTERFACE_NAME_FOR_N11=eth0
+            # One single SMF instance
+            - SMF_INSTANCE_ID_0=1
+            - SMF_FQDN_0=oai-smf
+            - SMF_IPV4_ADDR_0=192.168.70.133
+            - SELECTED_0=true
+            # Interaction with other NFs
+            - NF_REGISTRATION=yes
+            - USE_FQDN_DNS=yes
+            - EXTERNAL_AUSF=yes
+            # Algorithm choices
+            - CIPH_ALGO_LIST=["NEA0" , "NEA1" , "NEA2"]
+            - INT_ALGO_LIST=["NIA1" , "NIA2"]
+            # Other NF
+            - NRF_IPV4_ADDRESS=192.168.70.130
+            - NRF_FQDN=oai-nrf
+            - AUSF_IPV4_ADDRESS=192.168.70.138
+            - AUSF_FQDN=oai-ausf
+            - UDM_IPV4_ADDRESS=192.168.70.137
+            - UDM_FQDN=oai-udm
         depends_on:
             - oai-nrf
-        volumes:
-            - ./conf/oai-amf.conf:/openair-amf/etc/amf.conf
+            - oai-ausf
         networks:
             public_net:
                 ipv4_address: 192.168.70.132
     oai-smf:
         container_name: "oai-smf"
         image: oaisoftwarealliance/oai-smf:develop
-        entrypoint: ["/openair-smf/bin/oai_smf", "-c", "/openair-smf/etc/smf.conf", "-o"]
+        environment:
+            - TZ=Europe/Paris
+            - SMF_INTERFACE_NAME_FOR_N4=eth0
+            - SMF_INTERFACE_NAME_FOR_SBI=eth0
+            - DEFAULT_DNS_IPV4_ADDRESS=8.8.8.8
+            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
+            - AMF_IPV4_ADDRESS=192.168.70.132
+            - AMF_FQDN=oai-amf
+            - UDM_IPV4_ADDRESS=192.168.70.137
+            - UDM_FQDN=oai-udm
+            - UPF_IPV4_ADDRESS=192.168.70.134
+            - UPF_FQDN_0=oai-spgwu-tiny
+            - NRF_IPV4_ADDRESS=192.168.70.130
+            - NRF_FQDN=oai-nrf
+            - USE_LOCAL_SUBSCRIPTION_INFO=yes
+            - REGISTER_NRF=yes
+            - DISCOVER_UPF=yes
+            - USE_FQDN_DNS=yes
+            - UE_MTU=1500
+            # Slice 0 (1, 0xFFFFFF)
+            - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.254
+            - NSSAI_SST0=1
+            - SESSION_AMBR_UL0=10Gbps
+            - SESSION_AMBR_DL0=10Gbps
+            # Slice 1 (1, 0xFFFFFF)
+            - DNN_NI1=openairinterface
+            - TYPE1=IPv4v6
+            - DNN_RANGE1=12.1.2.2 - 12.1.2.254
+            - NSSAI_SST1=1
+            - SESSION_AMBR_UL1=10Gbps
+            - SESSION_AMBR_DL1=10Gbps
+            # Slice 2 for ims
+            - DNN_NI2=ims
+            - TYPE2=IPv4v6
+            - DNN_RANGE2=12.2.1.1 - 12.2.1.254
+            - NSSAI_SST2=1
+            - SESSION_AMBR_UL2=10Gbps
+            - SESSION_AMBR_DL2=10Gbps
+            # IMS server
+            - DEFAULT_CSCF_IPV4_ADDRESS=192.168.70.139
         depends_on:
             - oai-nrf
-        volumes:
-            - ./conf/oai-smf.conf:/openair-smf/etc/smf.conf
+            - oai-amf
         networks:
             public_net:
                 ipv4_address: 192.168.70.133
@@ -104,11 +205,31 @@ services:
         image: oaisoftwarealliance/oai-spgwu-tiny:develop
         #for ims we need to execute below command once the container is running
         # iptables -t nat -A POSTROUTING -o eth0 -s 12.2.1.0/24 -j SNAT --to 192.168.70.134
-        entrypoint: ["/openair-spgwu-tiny/bin/oai_spgwu", "-c", "/openair-spgwu-tiny/etc/spgw_u.conf","-o"]
+        environment:
+            - TZ=Europe/Paris
+            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
+            - SGW_INTERFACE_NAME_FOR_SX=eth0
+            - PGW_INTERFACE_NAME_FOR_SGI=eth0
+            - NETWORK_UE_NAT_OPTION=yes
+            - NETWORK_UE_IP=12.1.0.0/16
+            - ENABLE_5G_FEATURES=yes
+            - REGISTER_NRF=yes
+            - USE_FQDN_NRF=yes
+            - UPF_FQDN_5G=oai-spgwu-tiny
+            - NRF_IPV4_ADDRESS=192.168.70.130
+            - NRF_FQDN=oai-nrf
+            # Slice 0 (1, 0xFFFFFF)
+            - NSSAI_SST_0=1
+            - DNN_0=oai
+            # Slice 1 (1, 0xFFFFFF)
+            - NSSAI_SST_1=1
+            - DNN_1=openairinterface
+            # Slice 2 (1, 0xFFFFFF)
+            - NSSAI_SST_2=1
+            - DNN_2=ims
         depends_on:
             - oai-nrf
-        volumes:
-            - ./conf/oai-spgwu-tiny.conf:/openair-spgwu-tiny/etc/spgw_u.conf
+            - oai-smf
         cap_add:
             - NET_ADMIN
             - SYS_ADMIN
@@ -127,7 +248,7 @@ services:
         depends_on:
             - oai-spgwu-tiny
         healthcheck:
-            test: /bin/bash -c "ip r | grep 12.1.1"
+            test: /bin/bash -c "ip r | grep 12.1.0"
             interval: 10s
             timeout: 5s
             retries: 5