Fix: avoid using id 0 for slice

Add default slice sst 0 sd 0 for SRB
Note: assume default slice nssai is sst 0 and sd 0, which is reserved for SRB. it needs to be assigned to sched_ctrl before gnb created slice from RC control message in order to be able associated to the corresponding slice
2026-07-14 21:20:30 +00:00 · 2024-01-12 20:20:35 +01:00 · 2024-01-12 20:20:35 +01:00 · 2024-01-12 20:20:35 +01:00 · 2024-01-12 20:20:35 +01:00 · 2024-01-12 20:20:35 +01:00
424 changed files with 15371 additions and 22154 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,32 +1,5 @@
 # RELEASE NOTES: #

-## [v2.1.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.1.0) -> February 2024. ##
-
-This release improves existing 5G support and adds various new features.
-
-* 5G gNB
-  - Add support for O-RAN 7.2 fronthaul interface
-    (tested with 3 O-RUs: Benetel, LITEON, VVDN)
-  - Add support for 2-layer UL MIMO
-  - FDD interoperability with COTS UE
-  - Compiles on ARM (through SIMDE)
-  - Introduce E2 agent and basic support for E2SM-KPM and E2SM-RC
-  - Add support for E1AP
-  - Add support for multiple DUs and CU-UPs at one CU-CP
-  - FR2 SA with OAI UE
-  - Improve computational efficiency
-* 5G UE
-  - Cleanup in MAC and RRC towards support of 3rd-party gNB
-  - FR2 SA with OAI gNB
-  - Improve computational efficiency
-
-Overall the stability is improved for the same resource usage.
-
-There is basic FR2 support between OAI gNB and OAI nrUE. COTS UE
-interoperability is under testing.
-
-This release also includes many fixes and documentation updates.
-
 ## [v2.0.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.0.0) -> August 2023. ##

 This release adds support for 5G and maintains previous features:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -500,10 +500,10 @@ target_link_libraries(shlib_loader PRIVATE CONFIG_LIB)
 add_boolean_option(ENABLE_LDPC_T2 OFF "Build support for LDPC Offload to T2 library" OFF)
 set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/x86_64-linux-gnu/pkgconfig")
 if (ENABLE_LDPC_T2)
-  pkg_check_modules(LIBDPDK_T2 REQUIRED libdpdk=20.11.9)
-  find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS ${LIBDPDK_T2_LIBRARY_DIRS})
+  pkg_check_modules(LIBDPDK_T2 REQUIRED libdpdk=20.11.7)
+  find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS "/opt/dpdk-t2/lib/x86_64-linux-gnu/")
  if (NOT PMD_T2)
-    message(FATAL_ERROR "could not find poll-mode driver for AccelerComm T2 LDPC Offload (rte_baseband_accl_ldpc.so)")
+    message(FATAL_ERROR "could not find PMD T2")
  endif()
  message(STATUS "T2 build: use ${PMD_T2}")
  add_library(ldpc_t2 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
@@ -1366,6 +1366,7 @@ set (MAC_NR_SRC
  ${NR_GNB_MAC_DIR}/mac_rrc_dl_handler.c
  ${NR_GNB_MAC_DIR}/mac_rrc_ul_direct.c
  ${NR_GNB_MAC_DIR}/mac_rrc_ul_f1ap.c
+  ${NR_GNB_MAC_DIR}/slicing/nr_slicing.c
 )


@@ -1384,11 +1385,9 @@ set (MAC_NR_SRC_UE
  ${NR_UE_PHY_INTERFACE_DIR}/NR_IF_Module.c
  ${NR_UE_PHY_INTERFACE_DIR}/NR_Packet_Drop.c
  ${NR_UE_MAC_DIR}/config_ue.c
-  ${NR_UE_MAC_DIR}/config_ue_sl.c
  ${NR_UE_MAC_DIR}/mac_vars.c
  ${NR_UE_MAC_DIR}/main_ue_nr.c
  ${NR_UE_MAC_DIR}/nr_ue_procedures.c
-  ${NR_UE_MAC_DIR}/nr_ue_procedures_sl.c
  ${NR_UE_MAC_DIR}/nr_ue_scheduler.c
  ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
  ${NR_UE_MAC_DIR}/nr_ra_procedures.c
@@ -1435,7 +1434,7 @@ target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 if(E2_AGENT)
-  target_link_libraries(L2 PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
+  target_link_libraries(L2 PUBLIC e2_agent e2_ran_func)
  target_compile_definitions(L2 PRIVATE E2_AGENT)
  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
 endif()
@@ -1462,7 +1461,7 @@ target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap

 target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc)
 if(E2_AGENT)
-  target_link_libraries(L2_NR PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
+  target_link_libraries(L2_NR PUBLIC e2_agent e2_ran_func)
  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION})
  target_compile_definitions(L2_NR PRIVATE E2_AGENT)
 endif()
@@ -1689,7 +1688,7 @@ set(libnas_ies_OBJS

 set (libnas_utils_OBJS
  ${NAS_SRC}COMMON/UTIL/device.c
-  common/utils/mem/memory.c
+  ${NAS_SRC}COMMON/UTIL/memory.c
  ${NAS_SRC}COMMON/UTIL/nas_timer.c
  ${NAS_SRC}COMMON/UTIL/socket.c
  ${NAS_SRC}COMMON/UTIL/stty.c
@@ -2054,6 +2053,7 @@ add_executable(nr-softmodem
  ${rrc_h}
  ${nr_rrc_h}
  ${s1ap_h}
+#  ${OPENAIR_BIN_DIR}/messages_xml.h
  ${OPENAIR_DIR}/executables/nr-gnb.c
  ${OPENAIR_DIR}/executables/nr-ru.c
  ${OPENAIR_DIR}/executables/nr-softmodem.c
@@ -2115,10 +2115,6 @@ target_link_libraries(nr-cuup PRIVATE
                      GTPV1U e1ap f1ap SIMU_ETH
                      z sctp dl pthread shlib_loader ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-if(E2_AGENT)
-  target_link_libraries(nr-cuup PRIVATE e2_agent e2_agent_arg e2_ran_func_cuup)
-  target_compile_definitions(nr-cuup PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
-endif()
                     
 # nr-uesoftmodem is  UE implementation
 #######################################
@@ -2126,6 +2122,7 @@ endif()
 add_executable(nr-uesoftmodem
  ${rrc_h}
  ${s1ap_h}
+#  ${OPENAIR_BIN_DIR}/messages_xml.h
  ${OPENAIR_DIR}/executables/nr-uesoftmodem.c
  ${OPENAIR_DIR}/executables/nr-ue.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
@@ -2443,6 +2440,9 @@ make_driver(nasmesh  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH ${nasmesh_src})
 # user space tool for configuring MESH IP driver
 ################
 add_executable(rb_tool
+  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/constant.h
+  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/ioctl.h
+  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/rrc_nas_primitives.h
  ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/RB_TOOL/rb_tool.c
 )
 target_include_directories(rb_tool PRIVATE ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/)
--- a/ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg
+++ b/ci-scripts/as_ue/aw2s-multi-20897-2x2.cfg
@@ -1,281 +0,0 @@
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 2
-#define N_ANTENNA_UL 2
-#define TDD 1
-
-log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-log_filename: "/tmp/ue.log",
-
-/* Enable remote API and Web interface */
-com_addr: "0.0.0.0:9002",
-
-include "rf_driver/1chan.cfg",
-
-/* If true, allow the simulation of several UEs at the same time and
-allow dynamic UE creation from remote API */
-
-  cell_groups: [{
-      group_type: "nr",
-      multi_ue: true,
-      cells: [{
-      rf_port: 0,
-      bandwidth: 20,
-      band: 78,
-      dl_nr_arfcn:627360,
-      ssb_nr_arfcn:627360,
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: N_ANTENNA_UL,
-      rx_to_tx_latency:2,
-    }],
-  }],
-
-  /* UE capabilities */
-  /* USIM data */
-  ue_list: [
-    {
-      "ue_id" : 1,
-      "imsi": "208970000000111",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 2,
-      "imsi": "208970000000112",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 3,
-      "imsi": "208970000000113",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 4,
-      "imsi": "208970000000114",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 5,
-      "imsi": "208970000000115",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 6,
-      "imsi": "208970000000116",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 7,
-      "imsi": "208970000000100",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 8,
-      "imsi": "208970000000102",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 9,
-      "imsi": "208970000000103",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 10,
-      "imsi": "208970000000104",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 11,
-      "imsi": "208970000000110",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 12,
-      "imsi": "208970000000105",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 13,
-      "imsi": "208970000000106",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-        {
-      "ue_id" : 14,
-      "imsi": "208970000000107",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 15,
-      "imsi": "208970000000108",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 16,
-      "imsi": "208970000000109",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
- ],
-}
--- a/ci-scripts/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -9,14 +9,16 @@ idefix:
  MTU: 1500
  Trace: True
  LogStore: /media/usb-drive/ci_qlogs
-
-up2:
-  Host: up2
-  AttachScript: sudo /opt/mbim/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim/stop_quectel_mbim.sh
+nrmodule2_quectel:
+  Host: nrmodule2
+  InitScript: sudo stdbuf -oL /home/nrmodule2/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log &
+  TermScript: sudo -S killall --signal SIGKILL quectel-CM
+  AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 wup
+  DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB2 detach
  NetworkScript: ip a show dev wwan0
  IF: wwan0
  MTU: 1500
+  LogStore: /media/ci_qlogs

 adb_ue_1:
  Host: nano
@@ -47,7 +49,7 @@ adb_ue_2:

 amarisoft_ue:
  Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-20897-2x2.cfg &
+  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-20897-2x2.cfg &
  TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
 amarisoft_ue_1:
  Host: amariue
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -132,7 +132,7 @@ class Cluster:
 	def _start_build(self, name):
 		# will return "immediately" but build runs in background
 		# if multiple builds are started at the same time, this can take some time, however
-		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.eNBSourceCodePath} --exclude=""')
+		ret = self.cmd.run(f'oc start-build {name} --from-file={self.eNBSourceCodePath}')
 		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', ret.stdout)
 		if ret.returncode != 0 or ret.stdout.count('Uploading finished') != 1 or regres is None:
 			logging.error(f"error during oc start-build: {ret.stdout}")
@@ -274,11 +274,6 @@ class Cluster:
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
-			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
-			if not forceBaseImageBuild and result is not None:
-				forceBaseImageBuild = True
-				baseTag = 'ci-temp'
 		else:
 			imageTag = f'develop-{self.ranCommitID[0:8]}'
 			forceBaseImageBuild = True
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -357,11 +357,11 @@ class Containerize():
 		if self.host == 'Ubuntu':
 			self.cli = 'docker'
 			self.dockerfileprefix = '.ubuntu20'
-			self.cliBuildOptions = ''
+			self.cliBuildOptions = '--no-cache'
 		elif self.host == 'Red Hat':
 			self.cli = 'sudo podman'
 			self.dockerfileprefix = '.rhel9'
-			self.cliBuildOptions = '--disable-compression'
+			self.cliBuildOptions = '--no-cache --disable-compression'

 		# we always build the ran-build image with all targets
 		# Creating a tupple with the imageName, the DockerFile prefix pattern, targetName and sanitized option
@@ -419,23 +419,19 @@ class Containerize():
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
-			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
-			if not forceBaseImageBuild and result is not None:
-				forceBaseImageBuild = True
-				baseTag = 'ci-temp'
 		else:
 			forceBaseImageBuild = True

 		# Let's remove any previous run artifacts if still there
 		cmd.run(f"{self.cli} image prune --force")
+		if forceBaseImageBuild:
+			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
 		for image,pattern,name,option in imageNames:
 			cmd.run(f"{self.cli} image rm {name}:{imageTag}")

 		# Build the base image only on Push Events (not on Merge Requests)
 		# On when the base image docker file is being modified.
 		if forceBaseImageBuild:
-			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
 			cmd.run(f"{self.cli} build {self.cliBuildOptions} --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{self.dockerfileprefix} . &> cmake_targets/log/ran-base.log", timeout=1600)
 		# First verify if the base image was properly created.
 		ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
@@ -449,7 +445,7 @@ class Containerize():
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlTabFooter(False)
-			return False
+			sys.exit(1)
 		else:
 			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
 			if result is not None:
@@ -510,11 +506,10 @@ class Containerize():
 			cmd.run(f"{self.cli} image prune --force")

 		# Remove all intermediate build images and clean up
+		if self.ranAllowMerge and forceBaseImageBuild:
+			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
 		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag}")
 		cmd.run(f"{self.cli} volume prune --force")
-		# Remove any cached artifacts: we don't use the cache for now, prevent
-		# out of diskspace problem
-		cmd.run(f"{self.cli} buildx prune --filter=until=6h --force")

 		# create a zip with all logs
 		build_log_name = f'build_log_{self.testCase_id}'
@@ -528,13 +523,12 @@ class Containerize():
 			logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'OK', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
-			return True
 		else:
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)
 			HTML.CreateHtmlTabFooter(False)
-			return False
+			sys.exit(1)

 	def BuildProxy(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
@@ -575,7 +569,7 @@ class Containerize():
 			sys.exit(1)

 		self.cli = 'docker'
-		self.cliBuildOptions = ''
+		self.cliBuildOptions = '--no-cache'

 		# Workaround for some servers, we need to erase completely the workspace
 		if self.forcedWorkspaceCleanup:
@@ -617,7 +611,7 @@ class Containerize():
 				mySSH.close()
 				HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
 				HTML.CreateHtmlTabFooter(False)
-				return False
+				sys.exit(1)
 		else:
 			logging.debug('L2sim proxy image for tag ' + tag + ' already exists, skipping build')

@@ -679,87 +673,6 @@ class Containerize():
 		HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
 		HTML.CreateHtmlNextTabHeaderTestRow(collectInfo, allImagesSize)

-	def BuildRunTests(self, HTML):
-		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		if self.eNB_serverId[self.eNB_instance] == '0':
-			lIpAddr = self.eNBIPAddress
-			lUserName = self.eNBUserName
-			lPassWord = self.eNBPassword
-			lSourcePath = self.eNBSourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '1':
-			lIpAddr = self.eNB1IPAddress
-			lUserName = self.eNB1UserName
-			lPassWord = self.eNB1Password
-			lSourcePath = self.eNB1SourceCodePath
-		elif self.eNB_serverId[self.eNB_instance] == '2':
-			lIpAddr = self.eNB2IPAddress
-			lUserName = self.eNB2UserName
-			lPassWord = self.eNB2Password
-			lSourcePath = self.eNB2SourceCodePath
-		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
-		logging.debug('Building on server: ' + lIpAddr)
-		cmd = cls_cmd.RemoteCmd(lIpAddr)
-		cmd.cd(lSourcePath)
-
-		ret = cmd.run('hostnamectl')
-		result = re.search('Ubuntu', ret.stdout)
-		host = result.group(0)
-		if host != 'Ubuntu':
-			cmd.close()
-			raise Exception("Can build unit tests only on Ubuntu server")
-		logging.debug('running on Ubuntu as expected')
-
-		if self.forcedWorkspaceCleanup:
-			cmd.run(f'sudo -S rm -Rf {lSourcePath}')
-		self.testCase_id = HTML.testCase_id
-	
-		# check that ran-base image exists as we expect it
-		baseImage = 'ran-base'
-		baseTag = 'develop'
-		if self.ranAllowMerge:
-			if self.ranTargetBranch == 'develop':
-				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{self.dockerfileprefix} | grep --colour=never -i INDEX')
-				result = re.search('index', cmd.getBefore())
-				if result is not None:
-					baseTag = 'develop'
-		ret = cmd.run(f"docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
-		if ret.returncode != 0:
-			logging.error(f'No {baseImage} image present, cannot build tests')
-			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
-			HTML.CreateHtmlTabFooter(False)
-			return False
-
-		# build ran-unittests image
-		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu20"
-		ret = cmd.run(f'docker build --progress=plain --tag ran-unittests:{baseTag} --file {dockerfile} . &> {lSourcePath}/cmake_targets/log/unittest-build.log')
-		if ret.returncode != 0:
-			logging.error(f'Cannot build unit tests')
-			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', [dockerfile])
-			HTML.CreateHtmlTabFooter(False)
-			return False
-
-		HTML.CreateHtmlTestRowQueue("Build unit tests", 'OK', [dockerfile])
-
-		# it worked, build and execute tests, and close connection
-		ret = cmd.run(f'docker run -a STDOUT --rm ran-unittests:develop ctest --output-on-failure --no-label-summary -j$(nproc)')
-		cmd.run(f'docker rmi ran-unittests:develop')
-		build_log_name = f'build_log_{self.testCase_id}'
-		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
-		cmd.close()
-
-		if ret.returncode == 0:
-			HTML.CreateHtmlTestRowQueue('Unit tests succeeded', 'OK', [ret.stdout])
-			HTML.CreateHtmlTabFooter(True)
-			return True
-		else:
-			HTML.CreateHtmlTestRowQueue('Unit tests failed (see also doc/UnitTests.md)', 'KO', [ret.stdout])
-			HTML.CreateHtmlTabFooter(False)
-			return False
-
 	def Push_Image_to_Local_Registry(self, HTML):
 		if self.registrySvrId == '0':
 			lIpAddr = self.eNBIPAddress
--- a/ci-scripts/cls_oai_html.py
+++ b/ci-scripts/cls_oai_html.py
@@ -437,19 +437,13 @@ class HTMLManagement():

 		for k in DataLog['Data']:
 			# TestRow 
-			avg = DataLog['Data'][k][0]
-			maxval = DataLog['Data'][k][1]
-			count = DataLog['Data'][k][2]
-			valnorm = float(DataLog['Data'][k][3])
-			dev = DataLog['DeviationThreshold'][k]
-			ref = DataLog['Ref'][k]
 			self.htmlFile.write('      <tr>\n')
 			self.htmlFile.write('        <td colspan="3" bgcolor = "lightcyan" >' + k  + ' </td>\n')				
-			self.htmlFile.write(f'        <td colspan="2" bgcolor = "lightcyan" >{avg}; {maxval}; {count}</td>\n')
-			if valnorm > 1.0 + dev or valnorm < 1.0 - dev:
-				self.htmlFile.write(f'        <th bgcolor = "red" >{valnorm} (Avg over Ref = {avg} over {ref}; max allowed deviation = {dev})</th>\n')
+			self.htmlFile.write('        <td colspan="2" bgcolor = "lightcyan" >' + DataLog['Data'][k][0] + '; ' + DataLog['Data'][k][1] + '; ' + DataLog['Data'][k][2] + ' </td>\n')
+			if float(DataLog['Data'][k][3])> DataLog['Threshold'][k]:
+				self.htmlFile.write('        <th bgcolor = "red" >' + DataLog['Data'][k][3]  + ' (Ref = ' + str(DataLog['Ref'][k]) + ' ; Thres = '   +str(DataLog['Threshold'][k])+') ' + '</th>\n')
 			else:
-				self.htmlFile.write(f'        <th bgcolor = "green" ><font color="white">{valnorm} (Avg over Ref = {avg} over {ref}; max allowed deviation = {dev})</font></th>\n')
+				self.htmlFile.write('        <th bgcolor = "green" ><font color="white">' + DataLog['Data'][k][3]  + ' (Ref = ' + str(DataLog['Ref'][k]) + ' ; Thres = '   +str(DataLog['Threshold'][k])+') ' + '</th>\n')
 			self.htmlFile.write('      </tr>\n')
 		self.htmlFile.close()

--- a/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.band78.106prb.conf
@@ -23,8 +23,8 @@ gNBs =
    tr_s_preference = "f1";

    local_s_if_name = "eth0";
-    local_s_address = "192.168.71.150";
-    remote_s_address = "192.168.71.171";
+    local_s_address = "192.168.71.140";
+    remote_s_address = "192.168.71.142";
    local_s_portc   = 501;
    local_s_portd   = 2153;
    remote_s_portc  = 500;
@@ -51,9 +51,9 @@ gNBs =
    {

        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.150";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.150";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
--- a/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.conf
@@ -16,7 +16,7 @@ gNBs =

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }, { sst = 2 }, { sst = 3 }) });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });


    nr_cellid = 12345678L;
@@ -24,8 +24,8 @@ gNBs =
    tr_s_preference = "f1";

    local_s_if_name = "lo";
-    local_s_address = "192.168.71.150";
-    remote_s_address = "0.0.0.0"; # multiple DUs
+    local_s_address = "192.168.72.140";
+    remote_s_address = "192.168.72.143";
    local_s_portc   = 501;
    local_s_portd   = 2152;
    remote_s_portc  = 500;
@@ -52,9 +52,9 @@ gNBs =
    (
      {
        type = "cp";
-        ipv4_cucp = "192.168.71.150";
+        ipv4_cucp = "192.168.72.140";
        port_cucp = 38462;
-        ipv4_cuup = "0.0.0.0"; # multiple CU-UPs
+        ipv4_cuup = "192.168.72.141";
        port_cuup = 38462;
      }
    )
--- a/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.conf
@@ -22,12 +22,12 @@ gNBs =
    tr_s_preference = "f1";

    local_s_if_name = "lo";
-    local_s_address = "192.168.72.161";
-    remote_s_address = "192.168.72.171";
+    local_s_address = "192.168.72.141";
+    remote_s_address = "192.168.72.142";
    local_s_portc   = 501;
-    local_s_portd   = 2153;
+    local_s_portd   = 2152;
    remote_s_portc  = 500;
-    remote_s_portd  = 2153;
+    remote_s_portd  = 2152;

    # ------- SCTP definitions
    SCTP :
@@ -41,17 +41,17 @@ gNBs =
    (
      {
        type = "up";
-        ipv4_cucp = "192.168.71.150";
-        ipv4_cuup = "192.168.71.161";
+        ipv4_cucp = "192.168.72.140";
+        ipv4_cuup = "192.168.72.141";
      }
    )

    NETWORK_INTERFACES :
    {
        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.161/24";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.141/24";
        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.161/24";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.141/24";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
@@ -15,7 +15,7 @@ gNBs =

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }, { sst = 2 }, { sst = 3 } ) });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });


    nr_cellid = 12345678L;
@@ -23,6 +23,7 @@ gNBs =
    ////////// Physical parameters:

    min_rxtxtime                                              = 6;
+    force_256qam_off = 1;

    servingCellConfigCommon = (
    {
@@ -169,8 +170,8 @@ MACRLCs = (
    tr_s_preference  = "local_L1";
    tr_n_preference  = "f1";
    local_n_if_name = "eth0";
-    local_n_address = "192.168.71.171";
-    remote_n_address = "192.168.71.150";
+    local_n_address = "192.168.71.142";
+    remote_n_address = "192.168.71.140";
    local_n_portc   = 500;
    local_n_portd   = 2153;
    remote_n_portc  = 501;
--- a/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf
@@ -1,242 +0,0 @@
-Active_gNBs = ( "gNB-Eurecom-5GNRBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-
-    cell_type =  "CELL_MACRO_GNB";
-
-    gNB_name  =  "gNB-Eurecom-5GNRBox";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-
-    plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;});
-
-    tr_s_preference     = "local_mac"
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pusch_AntennaPorts = 2;
-    min_rxtxtime = 6;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 621312;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 620040;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 273;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=41,L=24 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                                        = 31624;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                           = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
-        initialDLBWPsearchSpaceZero                                             = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                                 = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 273;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                                        = 31624;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                                           = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 98;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -118;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 6;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#oneHalf (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.26";
-                              ipv6       = "192:168:30::17";
-                              port       = 36412 ;
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
-
-    NETWORK_INTERFACES : {
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
-        GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = ({
-  num_cc = 1;
-  tr_s_preference = "local_L1";
-  tr_n_preference = "local_RRC";
-});
-
-L1s = ({
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-});
-
-RUs = ({
-  local_rf       = "yes"
-  nb_tx          = 2
-  nb_rx          = 2
-  att_tx         = 0
-  att_rx         = 0;
-  bands          = [7];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 50;
-  eNB_instances  = [0];
-  bf_weights = [0x00007fff, 0x0000];
-  sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
-});
-
-THREAD_STRUCT = ({
-  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
-  parallel_config    = "PARALLEL_RU_L1_TRX_SPLIT";
-  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
-  worker_config      = "WORKER_ENABLE";
-});
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config : {
-  global_log_level = "info";
-  hw_log_level     = "info";
-  phy_log_level    = "info";
-  mac_log_level    = "info";
-  rlc_log_level    = "info";
-  pdcp_log_level   = "info";
-  rrc_log_level    = "info";
-};
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -22,9 +22,9 @@ gNBs =

    ////////// Physical parameters:
    pdsch_AntennaPorts_XP                                     = 2;
-    pusch_AntennaPorts                                        = 2;
+    pusch_AntennaPorts                                        = 1;
    do_CSIRS                                                  = 1;
-    do_SRS                                                    = 1;
+    do_SRS                                                    = 0;

    servingCellConfigCommon = (
    {
--- a/ci-scripts/datalog_rt_stats.100.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.100.2x2.yaml
@@ -1,34 +0,0 @@
-#this is a configuration file
-#used to build real time processing statistics 
-#for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.100.2x2.yaml
-ColNames :
-  - Metric
-  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
-Ref : 
-  feprx : 150.0
-  feptx_prec : 0.0
-  feptx_ofdm : 65.0
-  feptx_total : 177.0
-  L1 Tx processing : 700.0
-  DLSCH encoding : 179.0
-  L1 Rx processing : 526.0
-  PUSCH inner-receiver : 400.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 15.0
-  UL Indication : 3.0
-  Slot Indication : 17.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.25
-  UL Indication : 1.00
-  Slot Indication : 0.50
--- a/ci-scripts/datalog_rt_stats.1x1.60.yaml
+++ b/ci-scripts/datalog_rt_stats.1x1.60.yaml
@@ -1,11 +1,11 @@
 #this is a configuration file
 #used to build real time processing statistics
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.1x1.60.yaml
+Title : Processing Time (us)
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref :
  feprx : 46.0
  feptx_prec : 15.0
@@ -15,20 +15,20 @@ Ref :
  DLSCH encoding : 137.0
  L1 Rx processing : 345.0
  PUSCH inner-receiver : 210.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 8.0
-  UL Indication : 3.0
-  Slot Indication : 8.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.50
-  UL Indication : 1.00
-  Slot Indication : 0.50
+  PUSCH decoding : 2200.0
+  Schedule Response : 48.0
+  DL & UL scheduling timing : 13.0
+  UL Indication : 60.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  Schedule Response : 1.25
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25
--- a/ci-scripts/datalog_rt_stats.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.2x2.yaml
@@ -1,11 +1,11 @@
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.2x2.yaml
+Title : Processing Time (us)
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref : 
  feprx : 120.0
  feptx_prec : 30.0
@@ -15,20 +15,18 @@ Ref :
  DLSCH encoding : 230.0
  L1 Rx processing : 175.0
  PUSCH inner-receiver : 100.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 11.0
-  UL Indication : 3.0
-  Slot Indication : 14.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.50
-  UL Indication : 1.00
-  Slot Indication : 0.25
+  PUSCH decoding : 180.0 
+  DL & UL scheduling timing : 37.0
+  UL Indication : 38.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25
--- a/ci-scripts/datalog_rt_stats.60.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.60.2x2.yaml
@@ -1,11 +1,11 @@
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.60.2x2.yaml
+Title : Processing Time (us)
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref : 
  feprx : 84.0
  feptx_prec : 14.0
@@ -15,20 +15,20 @@ Ref :
  DLSCH encoding : 177.0
  L1 Rx processing : 345.0
  PUSCH inner-receiver : 210.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 13.0
-  UL Indication : 3.0
-  Slot Indication : 15.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.35
-  UL Indication : 1.00
-  Slot Indication : 0.35
+  PUSCH decoding : 2200.0
+  Schedule Response : 111.0
+  DL & UL scheduling timing : 20.0
+  UL Indication : 127.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  Schedule Response : 48.0
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25
--- a/ci-scripts/datalog_rt_stats.default.yaml
+++ b/ci-scripts/datalog_rt_stats.default.yaml
@@ -1,11 +1,11 @@
 #this is a configuration file
 #used to build real time processing statistics 
 #for 5G NR phy test (gNB terminate)
-Title : Processing Time (us) from datalog_rt_stats.default.yaml
+Title : Processing Time (us)
 ColNames :
  - Metric
  - Average; Max; Count
-  - Average vs Reference Deviation (Reference Value; Acceptability Deviation Threshold)
+  - Average vs Reference Deviation (Reference Value; Acceptability Threshold)
 Ref : 
  feprx : 43.0
  feptx_prec : 13.0
@@ -15,20 +15,20 @@ Ref :
  DLSCH encoding : 118.0
  L1 Rx processing : 305.0
  PUSCH inner-receiver : 150.0
-  Schedule Response : 3.0
-  DL & UL scheduling timing : 6.0
-  UL Indication : 3.0
-  Slot Indication : 7.0
-DeviationThreshold :
-  feprx : 0.25
-  feptx_prec : 0.25
-  feptx_ofdm : 0.25
-  feptx_total : 0.25
-  L1 Tx processing : 0.25
-  DLSCH encoding : 0.25
-  L1 Rx processing : 0.25
-  PUSCH inner-receiver : 0.25
-  Schedule Response : 1.00
-  DL & UL scheduling timing : 0.50
-  UL Indication : 1.00
-  Slot Indication : 0.50
+  PUSCH decoding : 2200.0
+  Schedule Response : 30.0
+  DL & UL scheduling timing : 10.0
+  UL Indication : 40.0
+Threshold :
+  feprx : 1.25
+  feptx_prec : 1.25
+  feptx_ofdm : 1.25
+  feptx_total : 1.25
+  L1 Tx processing : 1.25
+  DLSCH encoding : 1.25
+  L1 Rx processing : 1.25
+  PUSCH inner-receiver : 1.25
+  PUSCH decoding : 1.25
+  Schedule Response : 1.25
+  DL & UL scheduling timing : 1.25
+  UL Indication : 1.25
--- a/ci-scripts/docker/Dockerfile.unittest.ubuntu20
+++ b/ci-scripts/docker/Dockerfile.unittest.ubuntu20
@@ -1,35 +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
-# */
-#---------------------------------------------------------------------
-#
-# Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Ubuntu 20.04
-#
-#---------------------------------------------------------------------
-
-FROM ran-base:develop as ran-tests
-
-RUN rm -Rf /oai-ran
-WORKDIR /oai-ran
-COPY . .
-
-WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug .. && ninja tests
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -65,7 +65,6 @@ import logging
 import datetime
 import signal
 import subprocess
-import traceback
 from multiprocessing import Process, Lock, SimpleQueue
 logging.basicConfig(
 	level=logging.DEBUG,
@@ -103,7 +102,7 @@ def AssignParams(params_dict):


 def GetParametersFromXML(action):
-	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
+	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
 		forced_workspace_cleanup = test.findtext('forced_workspace_cleanup')
@@ -746,157 +745,142 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					continue
 				CiTestObj.ShowTestID()
 				GetParametersFromXML(action)
-				try:
-					if action == 'Build_eNB':
-						RAN.BuildeNB(HTML)
-					elif action == 'WaitEndBuild_eNB':
-						RAN.WaitBuildeNBisFinished(HTML)
-					elif action == 'Custom_Command':
-						RAN.CustomCommand(HTML)
-						if RAN.prematureExit:
-							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Initialize_eNB':
-						RAN.InitializeeNB(HTML, EPC)
-						if RAN.prematureExit:
-							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Terminate_eNB':
-						RAN.TerminateeNB(HTML, EPC)
-					elif action == 'Initialize_UE':
-						CiTestObj.InitializeUE(HTML)
-					elif action == 'Terminate_UE':
-						CiTestObj.TerminateUE(HTML)
-					elif action == 'Attach_UE':
-						CiTestObj.AttachUE(HTML, RAN, EPC, CONTAINERS)
-					elif action == 'Detach_UE':
-						CiTestObj.DetachUE(HTML)
-					elif action == 'DataDisable_UE':
-						CiTestObj.DataDisableUE(HTML)
-					elif action == 'DataEnable_UE':
-						CiTestObj.DataEnableUE(HTML)
-					elif action == 'CheckStatusUE':
-						CiTestObj.CheckStatusUE(HTML)
-					elif action == 'Build_OAI_UE':
-						CiTestObj.BuildOAIUE(HTML)
-					elif action == 'Initialize_OAI_UE':
-						CiTestObj.InitializeOAIUE(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Terminate_OAI_UE':
-						CiTestObj.TerminateOAIUE(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Ping':
-						CiTestObj.Ping(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Iperf':
-						CiTestObj.Iperf(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Initialize_HSS':
-						EPC.InitializeHSS(HTML)
-					elif action == 'Terminate_HSS':
-						EPC.TerminateHSS(HTML)
-					elif action == 'Initialize_MME':
-						EPC.InitializeMME(HTML)
-					elif action == 'Terminate_MME':
-						EPC.TerminateMME(HTML)
-					elif action == 'Initialize_SPGW':
-						EPC.InitializeSPGW(HTML)
-					elif action == 'Terminate_SPGW':
-						EPC.TerminateSPGW(HTML)
-					elif action == 'Initialize_5GCN':
-						EPC.Initialize5GCN(HTML)
-					elif action == 'Terminate_5GCN':
-						EPC.Terminate5GCN(HTML)
-					elif action == 'Deploy_EPC':
-						EPC.DeployEpc(HTML)
-					elif action == 'Undeploy_EPC':
-						EPC.UndeployEpc(HTML)
-					elif action == 'IdleSleep':
-						CiTestObj.IdleSleep(HTML)
-					elif action == 'Perform_X2_Handover':
-						CiTestObj.Perform_X2_Handover(HTML,RAN,EPC)
-					elif action == 'Build_PhySim':
-						HTML=ldpc.Build_PhySim(HTML,CONST)
-						if ldpc.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'Run_LDPCTest':
-						HTML=ldpc.Run_LDPCTest(HTML,CONST,id)
-						if ldpc.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'Run_LDPCt1Test':
-						HTML=ldpc.Run_LDPCt1Test(HTML,CONST,id)
-						if ldpc.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'Run_NRulsimTest':
-						HTML=ldpc.Run_NRulsimTest(HTML,CONST,id)
-						if ldpc.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'Pull_Cluster_Image':
-						if not CLUSTER.PullClusterImage(HTML,RAN):
-							RAN.prematureExit = True
-					elif action == 'Build_Cluster_Image':
-						if not CLUSTER.BuildClusterImage(HTML):
-							RAN.prematureExit = True
-					elif action == 'Build_Image':
-						success = CONTAINERS.BuildImage(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Build_Run_Tests':
-						success = CONTAINERS.BuildRunTests(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Build_Proxy':
-						success = CONTAINERS.BuildProxy(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Push_Local_Registry':
-						success = CONTAINERS.Push_Image_to_Local_Registry(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Pull_Local_Registry':
-						success = CONTAINERS.Pull_Image_from_Local_Registry(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Clean_Test_Server_Images':
-						success = CONTAINERS.Clean_Test_Server_Images(HTML)
-						if not success:
-							RAN.prematureExit = True
-					elif action == 'Deploy_Object':
-						CONTAINERS.DeployObject(HTML, EPC)
-						if CONTAINERS.exitStatus==1:
-							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-							RAN.prematureExit = True
-					elif action == 'Undeploy_Object':
-						CONTAINERS.UndeployObject(HTML, RAN)
-						if CONTAINERS.exitStatus == 1:
-							CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
-							RAN.prematureExit = True
-					elif action == 'Cppcheck_Analysis':
-						SCA.CppCheckAnalysis(HTML)
-					elif action == 'LicenceAndFormattingCheck':
-						ret = SCA.LicenceAndFormattingCheck(HTML)
-						if ret != 0:
-							RAN.prematureExit = True
-					elif action == 'Deploy_Run_PhySim':
-						PHYSIM.Deploy_PhySim(HTML, RAN)
-					elif action == 'DeployGenObject':
-						CONTAINERS.DeployGenObject(HTML, RAN, CiTestObj)
-						if CONTAINERS.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'UndeployGenObject':
-						CONTAINERS.UndeployGenObject(HTML, RAN, CiTestObj)
-						if CONTAINERS.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'IperfFromContainer':
-						CONTAINERS.IperfFromContainer(HTML, RAN, CiTestObj)
-						if CONTAINERS.exitStatus==1:
-							RAN.prematureExit = True
-					elif action == 'StatsFromGenObject':
-						CONTAINERS.StatsFromGenObject(HTML)
-					elif action == 'Push_Images_To_Test_Servers':
-						logging.debug('To be implemented')
-					else:
-						sys.exit('Invalid class (action) from xml')
-				except Exception as e:
-					s = traceback.format_exc()
-					logging.error(f'while running CI, an exception occurred:\n{s}')
-					HTML.CreateHtmlTestRowQueue("N/A", 'KO', [f"CI test code encountered an exception:\n{s}"])
-					RAN.prematureExit = True
-
+				if action == 'Build_eNB':
+					RAN.BuildeNB(HTML)
+				elif action == 'WaitEndBuild_eNB':
+					RAN.WaitBuildeNBisFinished(HTML)
+				elif action == 'Custom_Command':
+					RAN.CustomCommand(HTML)
+					if RAN.prematureExit:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Initialize_eNB':
+					RAN.InitializeeNB(HTML, EPC)
+					if RAN.prematureExit:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Terminate_eNB':
+					RAN.TerminateeNB(HTML, EPC)
+				elif action == 'Initialize_UE':
+					CiTestObj.InitializeUE(HTML)
+				elif action == 'Terminate_UE':
+					CiTestObj.TerminateUE(HTML)
+				elif action == 'Attach_UE':
+					CiTestObj.AttachUE(HTML, RAN, EPC, CONTAINERS)
+				elif action == 'Detach_UE':
+					CiTestObj.DetachUE(HTML)
+				elif action == 'DataDisable_UE':
+					CiTestObj.DataDisableUE(HTML)
+				elif action == 'DataEnable_UE':
+					CiTestObj.DataEnableUE(HTML)
+				elif action == 'CheckStatusUE':
+					CiTestObj.CheckStatusUE(HTML)
+				elif action == 'Build_OAI_UE':
+					CiTestObj.BuildOAIUE(HTML)
+				elif action == 'Initialize_OAI_UE':
+					CiTestObj.InitializeOAIUE(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Terminate_OAI_UE':
+					CiTestObj.TerminateOAIUE(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Ping':
+					CiTestObj.Ping(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Iperf':
+					CiTestObj.Iperf(HTML,RAN,EPC,CONTAINERS)
+				elif action == 'Initialize_HSS':
+					EPC.InitializeHSS(HTML)
+				elif action == 'Terminate_HSS':
+					EPC.TerminateHSS(HTML)
+				elif action == 'Initialize_MME':
+					EPC.InitializeMME(HTML)
+				elif action == 'Terminate_MME':
+					EPC.TerminateMME(HTML)
+				elif action == 'Initialize_SPGW':
+					EPC.InitializeSPGW(HTML)
+				elif action == 'Terminate_SPGW':
+					EPC.TerminateSPGW(HTML)
+				elif action == 'Initialize_5GCN':
+					EPC.Initialize5GCN(HTML)
+				elif action == 'Terminate_5GCN':
+					EPC.Terminate5GCN(HTML)
+				elif action == 'Deploy_EPC':
+					EPC.DeployEpc(HTML)
+				elif action == 'Undeploy_EPC':
+					EPC.UndeployEpc(HTML)
+				elif action == 'IdleSleep':
+					CiTestObj.IdleSleep(HTML)
+				elif action == 'Perform_X2_Handover':
+					CiTestObj.Perform_X2_Handover(HTML,RAN,EPC)
+				elif action == 'Build_PhySim':
+					HTML=ldpc.Build_PhySim(HTML,CONST)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Run_LDPCTest':
+					HTML=ldpc.Run_LDPCTest(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Run_LDPCt1Test':
+					HTML=ldpc.Run_LDPCt1Test(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Run_NRulsimTest':
+					HTML=ldpc.Run_NRulsimTest(HTML,CONST,id)
+					if ldpc.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'Pull_Cluster_Image':
+					if not CLUSTER.PullClusterImage(HTML,RAN):
+						RAN.prematureExit = True
+				elif action == 'Build_Cluster_Image':
+					if not CLUSTER.BuildClusterImage(HTML):
+						RAN.prematureExit = True
+				elif action == 'Build_Image':
+					CONTAINERS.BuildImage(HTML)
+				elif action == 'Build_Proxy':
+					CONTAINERS.BuildProxy(HTML)
+				elif action == 'Push_Local_Registry':
+					success = CONTAINERS.Push_Image_to_Local_Registry(HTML)
+					if not success:
+						RAN.prematureExit = True
+				elif action == 'Pull_Local_Registry':
+					success = CONTAINERS.Pull_Image_from_Local_Registry(HTML)
+					if not success:
+						RAN.prematureExit = True
+				elif action == 'Clean_Test_Server_Images':
+					success = CONTAINERS.Clean_Test_Server_Images(HTML)
+					if not success:
+						RAN.prematureExit = True
+				elif action == 'Deploy_Object':
+					CONTAINERS.DeployObject(HTML, EPC)
+					if CONTAINERS.exitStatus==1:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+						RAN.prematureExit = True
+				elif action == 'Undeploy_Object':
+					CONTAINERS.UndeployObject(HTML, RAN)
+					if CONTAINERS.exitStatus == 1:
+						CiTestObj.AutoTerminateeNB(HTML,RAN,EPC,CONTAINERS)
+						RAN.prematureExit = True
+				elif action == 'Cppcheck_Analysis':
+					SCA.CppCheckAnalysis(HTML)
+				elif action == 'LicenceAndFormattingCheck':
+					ret = SCA.LicenceAndFormattingCheck(HTML)
+					if ret != 0:
+						RAN.prematureExit = True
+				elif action == 'Deploy_Run_PhySim':
+					PHYSIM.Deploy_PhySim(HTML, RAN)
+				elif action == 'DeployGenObject':
+					CONTAINERS.DeployGenObject(HTML, RAN, CiTestObj)
+					if CONTAINERS.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'UndeployGenObject':
+					CONTAINERS.UndeployGenObject(HTML, RAN, CiTestObj)
+					if CONTAINERS.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'IperfFromContainer':
+					CONTAINERS.IperfFromContainer(HTML, RAN, CiTestObj)
+					if CONTAINERS.exitStatus==1:
+						RAN.prematureExit = True
+				elif action == 'StatsFromGenObject':
+					CONTAINERS.StatsFromGenObject(HTML)
+				elif action == 'Push_Images_To_Test_Servers':
+					logging.debug('To be implemented')
+				else:
+					sys.exit('Invalid class (action) from xml')
 				if RAN.prematureExit:
 					if CiTestObj.testCase_id == CiTestObj.testMinStableId:
 						logging.warning('Scenario has reached minimal stability point')
--- a/ci-scripts/mbim_scripts/mbim-set-ip.sh
+++ b/ci-scripts/mbim_scripts/mbim-set-ip.sh
@@ -1,221 +0,0 @@
-#!/bin/bash
-
-# Modified by Karim Boutiba (karim.boutiba@eurecom.fr)
-# mbim-set-ip script version 1.1
-# Modified mbimcli IPv4 IPv6 parsing script based on parts of project https://github.com/grandcentrix/thinkpad-x260-modem-scripts
-# Licensed under the Apache License, Version 2.0
-# Modified by Jörgen Storvist, Techship http://www.techship.com
-# Further details in the Techship FAQ sections on using MBIM and setting correct modes in cellular modules:
-# https://techship.com/faq/how-to-set-up-a-simple-data-connection-over-the-mbim-interface-using-libmbim-and-driver-cdc-mbim-in-linux/
-#
-# Installation & Usage: 
-#
-# Verify that the cellular module is exposing the MBIM interface over the USB interface. 
-# Use mbimcli to check status for the cellular connection and enter the PIN code if necessary. 
-# Configure mbim-network.conf and place in /etc/ (example file included in the archive, check link bellow for details).
-# https://www.freedesktop.org/software/libmbim/man/latest/mbim-network.1.html
-# Start the mbim data connection with command:
-# mbim-network <MBIM-INTERFACE> start
-# Ensure execution of mbim-set-ip script with sufficient system priviledges
-# ./mbim-set-ip <MBIM-INTERFACE> <NETWORK-INTERFACE>
-#
-# Examples:
-# mbimcli -d /dev/cdc-wdm0 -p --query-device-caps
-# mbimcli -d /dev/cdc-wdm0 -p --enter-pin=1234
-# mbim-network /dev/cdc-wdm0 start
-# ./mbim-set-ip /dev/cdc-wdm0 wwan0
-#
-# You should now be able to ping over the data connection.
-# IP v4 ping: (only if IPv4 address was acquired from cellular module)
-# ping -4 -I wwan0 8.8.8.8
-# ping -4 -I wwan0 google.com
-
-# IP v6 ping: (only if IPv6 address was acquired from cellular module)
-# ping -6 -I wwan0 2001:4860:4860::8888
-# ping -6 -I wwan0 google.com
-#
-# The script relies on the linux tools mbimcli, ip, systemd-resolve
-# (Tested on libmbim 1.16.0 running on Ubuntu 18.10 cosmic (development) with kernel version 4.15.0)
-
-# Details on mbim-network and mbimcli
-# https://www.freedesktop.org/software/libmbim/man/latest/mbim-network.1.html
-# https://www.freedesktop.org/software/libmbim/man/latest/mbimcli.1.html
-
-ipv4_addresses=()
-ipv4_gateway=""
-ipv4_dns=()
-ipv4_mtu=""
-ipv6_addresses=()
-ipv6_gateway=""
-ipv6_dns=()
-ipv6_mtu=""
-
-#CONTROL-IFACE
-CONTROLDEV="$1" 
-#WWAN-IFACE
-DEV="$2" 
-SESSION="$3"
-echo $SESSION
-echo "Requesting IPv4 and IPv6 information through mbimcli proxy:"
-mbimcli -d $CONTROLDEV -p --query-ip-configuration
-IPDATA=$(mbimcli -d $CONTROLDEV -p --query-ip-configuration=$SESSION)
-
-function parse_ip {
-	#      IP [0]: '10.134.203.177/30'
-	local line_re="IP \[([0-9]+)\]: '(.+)'"
-	local input=$1
-	if [[ $input =~ $line_re ]]; then
-		local ip_cnt=${BASH_REMATCH[1]}
-		local ip=${BASH_REMATCH[2]}
-	fi
-	echo "$ip"
-}
-
-function parse_gateway {
-	#    Gateway: '10.134.203.178'
-	local line_re="Gateway: '(.+)'"
-	local input=$1
-	if [[ $input =~ $line_re ]]; then
-		local gw=${BASH_REMATCH[1]}
-	fi
-	echo "$gw"
-}
-
-function parse_dns {
-	#      DNS [0]: '10.134.203.177/30'
-	local line_re="DNS \[([0-9]+)\]: '(.+)'"
-	local input=$1
-	if [[ $input =~ $line_re ]]; then
-		local dns_cnt=${BASH_REMATCH[1]}
-		local dns=${BASH_REMATCH[2]}
-	fi
-	echo "$dns"
-}
-
-function parse_mtu {
-	#        MTU: '1500'
-	local line_re="MTU: '([0-9]+)'"
-	local input=$1
-	if [[ $input =~ $line_re ]]; then
-		local mtu=${BASH_REMATCH[1]}
-	fi
-	echo "$mtu"
-}
-while read -r line || [[ -n "$line" ]] ; do
-	[ -z "$line" ] && continue
-	case "$line" in
-		*"IPv4 configuration available: 'none'"*)
-		       	state="start"
-		        continue
-			;;
-		*"IPv4 configuration available"*)
-			state="ipv4"
-			continue
-			;;
-		*"IPv6 configuration available: 'none'"*)
-		        state="start"
-		        continue
-			;;
-		*"IPv6 configuration available"*)
-			state="ipv6"
-			continue
-			;;
-		*)
-			;;
-	esac
-	case "$state" in
-		"ipv4")
-
-			case "$line" in
-			*"IP"*)
-				row=$(parse_ip "$line")
-				ipv4_addresses+=("$row")
-			        continue
-				;;
-			*"Gateway"*)
-				row=$(parse_gateway "$line")
-				ipv4_gateway="$row"
-				continue
-				;;
-			*"DNS"*)
-				row=$(parse_dns "$line")
-				ipv4_dns+=("$row")
-				continue
-				;;
-			*"MTU"*)
-				row=$(parse_mtu "$line")
-				ipv4_mtu="$row"
-				continue
-				;;
-			*)
-				;;
-			esac
-			;;
-
-		"ipv6")
-			case "$line" in
-			*"IP"*)
-				row=$(parse_ip "$line")
-				ipv6_addresses+=("$row")
-			        continue
-				;;
-			*"Gateway"*)
-				row=$(parse_gateway "$line")
-				ipv6_gateway="$row"
-				continue
-				;;
-			*"DNS"*)
-				row=$(parse_dns "$line")
-				ipv6_dns+=("$row")
-				continue
-				;;
-			*"MTU"*)
-				row=$(parse_mtu "$line")
-				ipv6_mtu="$row"
-				continue
-				;;
-			*)
-				continue
-				;;
-			esac
-		;;
-	*)
-		continue
-	;;
-	esac
-done <<< "$IPDATA"
-
-execfile=$(mktemp)
-
-printf "ip link set $DEV down\n" >> $execfile
-printf "ip addr flush dev $DEV \n" >> $execfile
-printf "ip -6 addr flush dev $DEV \n" >> $execfile
-printf "ip link set $DEV up\n" >> $execfile
-
-if [[ "${#ipv4_addresses[@]}" > 0 ]]; then
-	printf "ip addr add %s dev $DEV broadcast +\n" "${ipv4_addresses[@]}" >> $execfile
-	printf "ip route add 192.168.61.0/24 via $ipv4_gateway dev $DEV\n" >> $execfile
-
-	if [ -n "$ipv4_mtu" ]; then
-		printf "ip link set mtu $ipv4_mtu dev $DEV \n" >> $execfile
-	fi
-	if [[ "${#ipv4_dns[@]}" > 0 ]]; then
-		printf "resolvectl -4 --interface=$DEV --set-dns=%s\n" "${ipv4_dns[@]}" >>$execfile
-	fi
-fi
-
-if [[ "${#ipv6_addresses[@]}" > 0 ]]; then
-	printf "ip -6 addr add %s dev $DEV\n" "${ipv6_addresses[@]}" >> $execfile
-	printf "ip -6 route add default via $ipv6_gateway dev $DEV\n" >> $execfile
-	if [ -n "$ipv6_mtu" ]; then
-		printf "ip -6 link set mtu $ipv6_mtu dev $DEV\n" >> $execfile
-	fi
-	if [[ "${#ipv6_dns[@]}" > 0 ]]; then
-		printf "systemd-resolve -6 --interface=$DEV --set-dns=%s\n" "${ipv6_dns[@]}" >>$execfile
-	fi
-fi
-echo "Applying the following network interface configurations:"
-cat $execfile
-bash $execfile
-rm $execfile
-echo "Network interface configurations completed."
--- a/ci-scripts/mbim_scripts/start_quectel_mbim.sh
+++ b/ci-scripts/mbim_scripts/start_quectel_mbim.sh
@@ -1,10 +0,0 @@
-set -x
-
-sudo mbimcli -p -d /dev/cdc-wdm0 --set-radio-state=off
-sleep 1
-sudo mbimcli -p -d /dev/cdc-wdm0 --set-radio-state=on
-sleep 2
-sudo mbimcli -p -d /dev/cdc-wdm0 --attach-packet-service
-
-sudo mbimcli -p -d /dev/cdc-wdm0 --connect=session-id=0,access-string=oai.ipv4,ip-type=ipv4
-sudo /opt/mbim/mbim-set-ip.sh /dev/cdc-wdm0 wwan0 0
--- a/ci-scripts/mbim_scripts/stop_quectel_mbim.sh
+++ b/ci-scripts/mbim_scripts/stop_quectel_mbim.sh
@@ -1,3 +0,0 @@
-set -x
-
-sudo mbimcli -p -d /dev/cdc-wdm0 --set-radio-state=off
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -992,7 +992,7 @@ class RANManagement():
 				NSA_RAPROC_PUSCH_check = 1

 			# Collect information on UE DLSCH and ULSCH statistics
-			keys = {'dlsch_rounds','ulsch_rounds'}
+			keys = {'dlsch_rounds','dlsch_total_bytes','ulsch_rounds','ulsch_total_bytes_scheduled'}
 			for k in keys:
 				result = re.search(k, line)
 				if result is None:
@@ -1161,7 +1161,7 @@ class RANManagement():
 				dlcheckers = [] if 'd_retx_th' not in checkers else checkers['d_retx_th']
 				retx_status[ue]['dl'] = self._analyzeUeRetx(dlulstat['dlsch_rounds'], dlcheckers, r'^.*dlsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+dlsch_errors\s+(\d+)')
 				ulcheckers = [] if 'u_retx_th' not in checkers else checkers['u_retx_th']
-				retx_status[ue]['ul'] = self._analyzeUeRetx(dlulstat['ulsch_rounds'], ulcheckers, r'^.*ulsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+ulsch_errors\s+(\d+)')
+				retx_status[ue]['ul'] = self._analyzeUeRetx(dlulstat['ulsch_rounds'], ulcheckers, r'^.*ulsch_rounds\s+(\d+)\/(\d+)\/(\d+)\/(\d+),\s+.*,\s+ulsch_errors\s+(\d+)')


 			#real time statistics
@@ -1179,10 +1179,8 @@ class RANManagement():
 				self.datalog_rt_stats=datalog_rt_stats
 				#check if there is a fail => will render the test as failed
 				for k in datalog_rt_stats['Data']:
-					valnorm = float(datalog_rt_stats['Data'][k][3])
-					dev = datalog_rt_stats['DeviationThreshold'][k]
-					if valnorm > 1.0 + dev or valnorm < 1.0 - dev: # condition for fail : avg/ref deviates by more than "deviation threshold"
-						logging.debug(f'\u001B[1;30;43m normalized datalog_rt_stats metric {k}={valnorm} deviates by more than {dev}\u001B[0m')
+					if float(datalog_rt_stats['Data'][k][3])> datalog_rt_stats['Threshold'][k]: #condition for fail : avg/ref is greater than the fixed threshold
+						logging.debug('\u001B[1;30;43m datalog_rt_stats metric ' + k + '=' + datalog_rt_stats['Data'][k][3] + ' > threshold ' + str(datalog_rt_stats['Threshold'][k]) + ' \u001B[0m')
 						RealTimeProcessingIssue = True
 			else:
 				statMsg = 'No real time stats found in the log file\n'
--- a/ci-scripts/stats_monitor_conf.yaml
+++ b/ci-scripts/stats_monitor_conf.yaml
@@ -24,9 +24,9 @@ gnb :
    DLSCH encoding:
    L1 Rx processing:
    PUSCH inner-receiver:
+    PUSCH decoding:
    DL & UL scheduling timing:
    UL Indication:
-    Slot Indication:
  graph : 
    page1:
      dlsch_err:
@@ -44,6 +44,6 @@ gnb :
      rt.L1 Rx processing:
    page4:
      rt.PUSCH inner-receiver:
+      rt.PUSCH decoding:
      rt.DL & UL scheduling timing:
      rt.UL Indication:
-      rt.Slot Indication:
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -34,7 +34,6 @@
  - IdleSleep
  - Perform_X2_Handover
  - Build_Image
-  - Build_Run_Tests
  - Deploy_Object
  - Undeploy_Object
  - Cppcheck_Analysis
--- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml
@@ -27,10 +27,14 @@
        <TestCaseRequestedList>
 111111
 100021
+ 000020
 000021
 000022
 000023
+ 000024
 020021
+ 020022
+ 030021
 100021
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
@@ -42,38 +46,80 @@
                <images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
        </testCase>

+        <testCase id="000020">
+                <class>DeployGenObject</class>
+                <desc>Deploy MySql Database</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
+                <services>mysql</services>
+                <nb_healthy>1</nb_healthy>
+        </testCase>
+
        <testCase id="000021">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf</services>
-                <nb_healthy>4</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000022">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G RAN RF sim SA (1 CU-CP, 3 CU-UPs, 3 DUs)</desc>
+                <desc>Deploy OAI 5G CU-CP RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-cucp oai-cuup oai-cuup2 oai-cuup3 oai-du oai-du2 oai-du3</services>
-                <nb_healthy>11</nb_healthy>
+                <services>oai-cucp</services>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000023">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G CU-UP and DU RF sim SA</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
+                <services>oai-cuup oai-du</services>
+                <nb_healthy>9</nb_healthy>
+        </testCase>
+
+        <testCase id="000024">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_e1</yaml_path>
-                <services>oai-nr-ue oai-nr-ue2 oai-nr-ue3</services>
-                <nb_healthy>14</nb_healthy>
+                <services>oai-nr-ue</services>
+                <nb_healthy>10</nb_healthy>
        </testCase>

        <testCase id="020021">
                <class>Ping</class>
-                <desc>Ping ext-dn from all NR-UEs</desc>
-                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <ping_args> -c 20 12.1.1.1 -i0.25</ping_args>
+                <desc>Ping ext-dn from NR-UE</desc>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.73.135</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

+        <testCase id="020022">
+                <class>Ping</class>
+                <desc>Ping NR-UE from ext-dn</desc>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
+        </testCase>
+
+        <testCase id="030021">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
+                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
+                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options>
+        </testCase>
+
+        <testCase id="030022">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
+                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.1.1.2 -c 192.168.73.135 -u -i 1 -t 30 -b 1M</client_options>
+        </testCase>
+
        <testCase id="100021">
                <class>UndeployGenObject</class>
                <desc>Undeploy all OAI 5G stack</desc>
--- a/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml
+++ b/ci-scripts/xml_files/container_5g_e1_rfsim_down.xml
@@ -22,7 +22,7 @@
 -->
 <testCaseList>
        <htmlTabRef>rfsim-5gnr-down-e1</htmlTabRef>
-        <htmlTabName>CleanUp E1+F1 split</htmlTabName>
+        <htmlTabName>CleanUp CUCP-CUUP-DU E1+F1 split</htmlTabName>
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100022
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -27,11 +27,13 @@
        <TestCaseRequestedList>
 111111
 100021
+ 000020
 000021
 000022
+ 000023
+ 000024
+ 000025
 020021
- 030021
- 030022
 100021
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
@@ -40,29 +42,61 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+        </testCase>
+
+        <testCase id="000020">
+                <class>DeployGenObject</class>
+                <desc>Deploy MySql Database</desc>
+                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
+                <services>mysql</services>
+                <nb_healthy>1</nb_healthy>
        </testCase>

        <testCase id="000021">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000022">
                <class>DeployGenObject</class>
-                <desc>Deploy OAI 5G CU+DU+UE RF sim SA</desc>
+                <desc>Deploy OAI 5G CU RF sim SA</desc>
                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-cu oai-du oai-nr-ue</services>
-                <nb_healthy>8</nb_healthy>
+                <services>oai-cu</services>
+                <nb_healthy>7</nb_healthy>
+        </testCase>
+
+        <testCase id="000023">
+                <class>DeployGenObject</class>
+                <desc>Deploy 3 OAI 5G DUs RF sim SA</desc>
+                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
+                <services>oai-du oai-du2 oai-du3</services>
+                <nb_healthy>10</nb_healthy>
+        </testCase>
+
+        <testCase id="000024">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
+                <services>oai-nr-ue oai-nr-ue2</services>
+                <nb_healthy>12</nb_healthy>
+        </testCase>
+
+        <testCase id="000025">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+                <yaml_path>yaml_files/5g_f1_rfsimulator</yaml_path>
+                <services>oai-nr-ue3</services>
+                <nb_healthy>13</nb_healthy>
        </testCase>

        <testCase id="020021">
                <class>Ping</class>
                <desc>Ping ext-dn from all NR-UEs</desc>
-                <id>rfsim5g_ue</id>
+                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
                <ping_args> -c 20 192.168.72.135 -i0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -73,7 +107,7 @@
                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
-                <client_options>-c 12.1.1.2 -u -i 1 -t 10 -b 20M</client_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 30 -b 3M</client_options>
        </testCase>

        <testCase id="030022">
@@ -82,7 +116,7 @@
                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
                <server_options>-u -i 1 -s</server_options>
-                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 10 -b 5M</client_options>
+                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 30 -b 1M</client_options>
        </testCase>

        <testCase id="100021">
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
@@ -59,8 +59,8 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000012">
@@ -68,7 +68,7 @@
                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000013">
@@ -76,7 +76,7 @@
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_fdd_rfsimulator</yaml_path>
                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>8</nb_healthy>
        </testCase>

        <testCase id="020011">
--- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
@@ -60,8 +60,8 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000002">
@@ -69,7 +69,7 @@
                <desc>Deploy OAI 5G gNB L2 sim SA</desc>
                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
@@ -77,7 +77,7 @@
                <desc>Deploy OAI 5G NR-UE L2 sim SA and Proxy</desc>
                <yaml_path>yaml_files/5g_l2sim_tdd</yaml_path>
                <services>proxy oai-nr-ue0</services>
-                <nb_healthy>8</nb_healthy>
+                <nb_healthy>9</nb_healthy>
        </testCase>

        <testCase id="000004">
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -28,6 +28,7 @@
        <TestCaseRequestedList>
 111111
 100001
+ 000000
 000001
 000002
 000003
@@ -35,7 +36,6 @@
 000005
 000006
 000007
- 000008
 020001
 020002
 020003
@@ -58,15 +58,23 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb-asan oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
+        </testCase>
+
+        <testCase id="000000">
+                <class>DeployGenObject</class>
+                <desc>Deploy MySql Database</desc>
+                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
+                <services>mysql</services>
+                <nb_healthy>1</nb_healthy>
        </testCase>

        <testCase id="000001">
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
-                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000002">
@@ -74,7 +82,7 @@
                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
@@ -82,7 +90,7 @@
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>8</nb_healthy>
        </testCase>

        <testCase id="000004">
@@ -90,7 +98,7 @@
                <desc>Deploy Second OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-nr-ue2</services>
-                <nb_healthy>8</nb_healthy>
+                <nb_healthy>9</nb_healthy>
        </testCase>

        <testCase id="000005">
@@ -98,7 +106,7 @@
                <desc>Deploy OAI 5G NR-UEs (#3, #4, #5) RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-nr-ue3 oai-nr-ue4 oai-nr-ue5</services>
-                <nb_healthy>11</nb_healthy>
+                <nb_healthy>12</nb_healthy>
        </testCase>

        <testCase id="000006">
@@ -106,7 +114,7 @@
                <desc>Deploy OAI 5G NR-UEs (#6, #7, #8) RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-nr-ue6 oai-nr-ue7 oai-nr-ue8</services>
-                <nb_healthy>14</nb_healthy>
+                <nb_healthy>15</nb_healthy>
        </testCase>

        <testCase id="000007">
@@ -114,13 +122,7 @@
                <desc>Deploy OAI 5G NR-UEs (#9, #10) RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator</yaml_path>
                <services>oai-nr-ue9 oai-nr-ue10</services>
-                <nb_healthy>16</nb_healthy>
-        </testCase>
-
-        <testCase id="000008">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
+                <nb_healthy>17</nb_healthy>
        </testCase>

        <testCase id="020001">
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
@@ -59,8 +59,8 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000002">
@@ -68,7 +68,7 @@
                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
@@ -76,7 +76,7 @@
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>8</nb_healthy>
        </testCase>

        <testCase id="020001">
--- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
@@ -59,8 +59,8 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000002">
@@ -68,7 +68,7 @@
                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
@@ -76,7 +76,7 @@
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_2x2</yaml_path>
                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>8</nb_healthy>
        </testCase>

        <testCase id="020001">
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
@@ -59,8 +59,8 @@
                <class>DeployGenObject</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-                <services>oai-amf oai-smf oai-upf oai-ext-dn</services>
-                <nb_healthy>5</nb_healthy>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
        </testCase>

        <testCase id="000002">
@@ -68,7 +68,7 @@
                <desc>Deploy OAI 5G gNB RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
                <services>oai-gnb</services>
-                <nb_healthy>6</nb_healthy>
+                <nb_healthy>7</nb_healthy>
        </testCase>

        <testCase id="000003">
@@ -76,7 +76,7 @@
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
                <yaml_path>yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
                <services>oai-nr-ue</services>
-                <nb_healthy>7</nb_healthy>
+                <nb_healthy>8</nb_healthy>
        </testCase>

        <testCase id="020001">
--- a/ci-scripts/xml_files/container_build_run_tests.xml
+++ b/ci-scripts/xml_files/container_build_run_tests.xml
@@ -1,40 +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
-
-->
-<testCaseList>
-	<htmlTabRef>build-run-test-tab</htmlTabRef>
-	<htmlTabName>Build and Run Unit Tests</htmlTabName>
-	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>
- 030201
-	</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="030201">
-		<class>Build_Run_Tests</class>
-		<desc>Build and Run UnitTests</desc>
-		<kind>all</kind>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
-	</testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
@@ -30,7 +30,7 @@

 111111
 100000
-010010
+010000
 030101
 010001
 000001
@@ -39,6 +39,7 @@
 070000
 070001
 010010
+010002
 030201

 </TestCaseRequestedList>
@@ -79,16 +80,28 @@
    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
  </testCase>

+  <testCase id="010000">
+    <class>Initialize_UE</class>
+    <desc>Initialize Quectel</desc>
+    <id>nrmodule2_quectel</id>
+  </testCase>
+
+  <testCase id="010002">
+    <class>Terminate_UE</class>
+    <desc>Terminate Quectel</desc>
+    <id>nrmodule2_quectel</id>
+  </testCase>
+
  <testCase id="010001">
    <class>Attach_UE</class>
    <desc>Attach UE</desc>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
  </testCase>

  <testCase id="050000">
    <class>Ping</class>
    <desc>Ping: 20 pings</desc>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
    <ping_args>-c 20 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>60</ping_rttavg_threshold>
@@ -97,8 +110,8 @@
 <testCase id="050001">
    <class>Ping</class>
    <desc>Ping: 100 pings, size 1024</desc>
-    <id>up2</id>
-    <ping_args>-c 100 -s 1024 -i 0.2 %cn_ip%</ping_args>
+    <id>nrmodule2_quectel</id>
+    <ping_args>-c 100 -s 1024 -i 0,2 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>60</ping_rttavg_threshold>
   </testCase>
@@ -108,7 +121,7 @@
    <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
    <iperf_args>-u -b 26M -t 60</iperf_args>
    <direction>DL</direction>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
    <iperf_profile>single-ue</iperf_profile>
@@ -119,7 +132,7 @@
     <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 7M -t 60</iperf_args>
     <direction>UL</direction>
-     <id>up2</id>
+     <id>nrmodule2_quectel</id>
     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
     <iperf_profile>single-ue</iperf_profile>
@@ -128,7 +141,7 @@
  <testCase id="010010">
    <class>Detach_UE</class>
    <desc>Detach UE</desc>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
  </testCase>

  <testCase id="030201">
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
@@ -30,7 +30,7 @@

 111111
 100000
-010010
+010000
 030101
 010001
 000001
@@ -39,6 +39,7 @@
 070000
 070001
 010010
+010002
 030201

 </TestCaseRequestedList>
@@ -79,16 +80,28 @@
    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
  </testCase>

+  <testCase id="010000">
+    <class>Initialize_UE</class>
+    <desc>Initialize Quectel</desc>
+    <id>nrmodule2_quectel</id>
+  </testCase>
+
+  <testCase id="010002">
+    <class>Terminate_UE</class>
+    <desc>Terminate Quectel</desc>
+    <id>nrmodule2_quectel</id>
+  </testCase>
+
  <testCase id="010001">
    <class>Attach_UE</class>
    <desc>Attach UE</desc>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
  </testCase>

  <testCase id="050000">
    <class>Ping</class>
    <desc>Ping: 20 pings</desc>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
    <ping_args>-c 20 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>60</ping_rttavg_threshold>
@@ -97,8 +110,8 @@
 <testCase id="050001">
    <class>Ping</class>
    <desc>Ping: 100 pings, size 1024</desc>
-    <id>up2</id>
-    <ping_args>-c 100 -s 1024 -i 0.2 %cn_ip%</ping_args>
+    <id>nrmodule2_quectel</id>
+    <ping_args>-c 100 -s 1024 -i 0,2 %cn_ip%</ping_args>
    <ping_packetloss_threshold>1</ping_packetloss_threshold>
    <ping_rttavg_threshold>60</ping_rttavg_threshold>
   </testCase>
@@ -108,7 +121,7 @@
    <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
    <iperf_args>-u -b 1M -t 60</iperf_args>
    <direction>DL</direction>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
    <iperf_profile>single-ue</iperf_profile>
@@ -119,7 +132,7 @@
     <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 7M -t 60</iperf_args>
     <direction>UL</direction>
-     <id>up2</id>
+     <id>nrmodule2_quectel</id>
     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
     <iperf_profile>single-ue</iperf_profile>
@@ -128,7 +141,7 @@
  <testCase id="010010">
    <class>Detach_UE</class>
    <desc>Detach UE</desc>
-    <id>up2</id>
+    <id>nrmodule2_quectel</id>
  </testCase>

  <testCase id="030201">
--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
@@ -185,8 +185,8 @@

 	<testCase id="070000">
 		<class>Iperf</class>
-		<desc>iperf (DL/70Mbps/UDP)(60 sec)(single-ue profile)</desc>
-		<iperf_args>-u -b 70M -t 60 -i 1 -fm</iperf_args>
+		<desc>iperf (DL/90Mbps/UDP)(60 sec)(single-ue profile)</desc>
+		<iperf_args>-u -b 90M -t 60 -i 1 -fm</iperf_args>
 		<direction>DL</direction>
 		<id>idefix</id>
 		<iperf_packetloss_threshold>25</iperf_packetloss_threshold>
--- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml
+++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
@@ -145,8 +145,8 @@

  <testCase id="000020">
    <class>Iperf</class>
-    <desc>iperf (UL/3.6Mbps/UDP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-u -b 36M -t 30 -i 1 </iperf_args>
+    <desc>iperf (UL/2Mbps/UDP)(30 sec)(multi-ue profile)</desc>
+    <iperf_args>-u -b 20M -t 30 -i 1 </iperf_args>
    <direction>IPERF3</direction>
    <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10</id>
    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
--- a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
@@ -129,8 +129,8 @@

  <testCase id="270000">
    <class>Iperf</class>
-    <desc>iperf (DL/80Mbps/UDP)(30 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 80M -t 30 -i 1 -fm</iperf_args>
+    <desc>iperf (DL/100Mbps/UDP)(30 sec)(single-ue profile)</desc>
+    <iperf_args>-u -b 100M -t 30 -i 1 -fm</iperf_args>
    <direction>DL</direction>
    <id>idefix</id>
    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml
@@ -1,68 +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
-
-->
-<testCaseList>
-  <htmlTabRef>gNB-PHY-Test-100-2x2</htmlTabRef>
-  <htmlTabName>Timing phytest 100 MHz 2x2</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <repeatCount>1</repeatCount>
-  <TestCaseRequestedList>
-100000 390101 000001 390109 200000
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-  <testCase id="100000">
-	  <class>Custom_Command</class>
-	  <desc>Disable Sleep States</desc>
-	  <node>caracal</node>
-	  <command>sudo cpupower idle-set -D 0</command>
-  </testCase>
-  <testCase id="200000">
-	  <class>Custom_Command</class>
-	  <desc>Enable Sleep States</desc>
-	  <node>caracal</node>
-	  <command>sudo cpupower idle-set -E</command>
-  </testCase>
-
-  <testCase id="390101">
-    <class>Initialize_eNB</class>
-    <desc>Initialize gNB USRP</desc>
-    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 273 -t 23 -D 130175 -m 23 -M 273 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
-    <rt_stats_cfg>datalog_rt_stats.100.2x2.yaml</rt_stats_cfg>
-    <air_interface>NR</air_interface>
-    <USRP_IPAddress>192.168.20.2</USRP_IPAddress>
-		<cmd_prefix>numactl --cpunodebind=netdev:enp94s0f0np0 --membind=netdev:enp94s0f0np0</cmd_prefix>
-  </testCase>
-
-  <testCase id="000001">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
-  </testCase>
-
-
-  <testCase id="390109">
-    <class>Terminate_eNB</class>
-    <desc>Terminate gNB</desc>
-    <air_interface>NR</air_interface>
-  </testCase>
-
-</testCaseList>
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/amf-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/amf-healthcheck.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+AMF_PORT_FOR_NGAP=38412
+AMF_PORT_FOR_N11_HTTP=80
+AMF_IP_NGAP_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_NGAP | grep inet | awk {'print $2'})
+AMF_IP_N11_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_N11 | grep inet | awk {'print $2'})
+N2_PORT_STATUS=$(netstat -Snpl | grep -o "$AMF_IP_NGAP_INTERFACE:$AMF_PORT_FOR_NGAP")
+N11_PORT_STATUS=$(netstat -tnpl | grep -o "$AMF_IP_N11_INTERFACE:$AMF_PORT_FOR_N11_HTTP")
+#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
+NB_UNREPLACED_AT=`cat /openair-amf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+
+if [ $NB_UNREPLACED_AT -ne 0 ]; then
+	STATUS=1
+	echo "Healthcheck error: configuration file is not configured properly"
+fi
+
+if [[ -z $N2_PORT_STATUS ]]; then
+	STATUS=1
+	echo "Healthcheck error: N2 SCTP port $AMF_PORT_FOR_NGAP is not listening"
+fi
+
+if [[ -z $N11_PORT_STATUS ]]; then
+	STATUS=1
+	echo "Healthcheck error: N11/SBI TCP/HTTP port $AMF_PORT_FOR_N11_HTTP is not listening"
+fi
+
+#host="${MYSQL_SERVER}"
+#user="${MYSQL_USER:-root}"
+#export MYSQL_PWD="${MYSQL_PASS}"
+
+#args=(
+#	-h"$host"
+#	-u"$user"
+#	--silent
+#)
+
+#if ! command -v mysql &> /dev/null; then
+#	echo "Installing mysql command"
+#	apt update
+#	apt-get -y install mysql-client
+#else
+#	if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
+#		database_check=$(mysql -h$host -u$user -D oai_db --silent -e "SELECT * FROM users;")
+#		if [[ -z $database_check ]]; then
+#			echo "Healthcheck error: oai_db not populated"
+#			STATUS=1
+#		fi
+#		STATUS=0
+#	else
+#		echo "Healthcheck error: Mysql port inactive"
+#		STATUS=1
+#	fi
+#fi
+
+exit $STATUS
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
@@ -1,11 +1,20 @@
 version: '3.8'
 services:
+    oai-nrf:
+        container_name: "rfsim5g-oai-nrf"
+        image: oaisoftwarealliance/oai-nrf:v1.5.0
+        environment:
+            - NRF_INTERFACE_NAME_FOR_SBI=eth0
+            - TZ=Europe/Paris
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.130
    mysql:
        container_name: "rfsim5g-mysql"
        image: mysql:8.0
        volumes:
-            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
-            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+            - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
+            - ./mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
        environment:
            - TZ=Europe/Paris
            - MYSQL_DATABASE=oai_db
@@ -22,36 +31,108 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.0.0
+        image: oaisoftwarealliance/oai-amf:v1.5.0
        environment:
            - TZ=Europe/paris
-        volumes:
-            - ../5g_rfsimulator_e1/mini_nonrf_config_3slices.yaml:/openair-amf/etc/config.yaml
+            - MCC=208
+            - MNC=99
+            - REGION_ID=128
+            - AMF_SET_ID=1
+            - SERVED_GUAMI_MCC_0=208
+            - SERVED_GUAMI_MNC_0=99
+            - SERVED_GUAMI_REGION_ID_0=128
+            - SERVED_GUAMI_AMF_SET_ID_0=1
+            - SERVED_GUAMI_MCC_1=460
+            - SERVED_GUAMI_MNC_1=11
+            - SERVED_GUAMI_REGION_ID_1=10
+            - SERVED_GUAMI_AMF_SET_ID_1=1
+            - PLMN_SUPPORT_MCC=208
+            - PLMN_SUPPORT_MNC=99
+            - PLMN_SUPPORT_TAC=0x0001
+            # Only one slice is defined (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.71.133
+            - SELECTED_0=true
+            # mysql definition in AMF is mandatory in mini deployment.
+            - MYSQL_SERVER=192.168.71.131
+            - MYSQL_USER=root
+            - MYSQL_PASS=linux
+            - MYSQL_DB=oai_db
+            # NF registration
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - NF_REGISTRATION=yes
+            - SMF_SELECTION=yes
+            - USE_FQDN_DNS=yes
+            - USE_HTTP2=no
        depends_on:
+            - oai-nrf
            - mysql
        networks:
            public_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.0.0
+        image: oaisoftwarealliance/oai-smf:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator_e1/mini_nonrf_config_3slices.yaml:/openair-smf/etc/config.yaml
+            - SMF_INTERFACE_NAME_FOR_N4=eth0
+            - SMF_INTERFACE_NAME_FOR_SBI=eth0
+            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
+            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
+            - AMF_IPV4_ADDRESS=192.168.71.132
+            - AMF_FQDN=oai-amf
+            - UPF_IPV4_ADDRESS=192.168.71.134
+            - UPF_FQDN_0=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - REGISTER_NRF=yes
+            - DISCOVER_UPF=yes
+            - USE_FQDN_DNS=yes
+            - USE_LOCAL_SUBSCRIPTION_INFO=yes
+            - UE_MTU=1500
+            # Only one slice is defined (1, 0xFFFFFF)
+            - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
+            - NSSAI_SST0=1
+            - SESSION_AMBR_UL0=200Mbps
+            - SESSION_AMBR_DL0=400Mbps
+            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
+            - ENABLE_USAGE_REPORTING=no
        depends_on:
+            - oai-nrf
            - oai-amf
        networks:
            public_net:
                ipv4_address: 192.168.71.133
-    oai-upf:
-        container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.0.0
+    oai-spgwu:
+        container_name: "rfsim5g-oai-spgwu"
+        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator_e1/mini_nonrf_config_3slices.yaml:/openair-upf/etc/config.yaml
+            - 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.1.0/24
+            - ENABLE_5G_FEATURES=yes
+            - REGISTER_NRF=yes
+            - USE_FQDN_NRF=yes
+            - UPF_FQDN_5G=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            # Only one slice is defined (1, 0xFFFFFF)
+            - NSSAI_SST_0=1
+            - NSSAI_SD_0=0xffffff
+            - DNN_0=oai
        depends_on:
+            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -64,7 +145,6 @@ services:
                ipv4_address: 192.168.71.134
            traffic_net:
                ipv4_address: 192.168.72.134
-
    oai-ext-dn:
        privileged: true
        container_name: rfsim5g-oai-ext-dn
@@ -73,7 +153,7 @@ services:
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
        depends_on:
-            - oai-upf
+            - oai-spgwu
        networks:
            traffic_net:
                ipv4_address: 192.168.72.135
@@ -82,19 +162,18 @@ services:
            interval: 10s
            timeout: 5s
            retries: 5
-
    oai-cu:
        image: oaisoftwarealliance/oai-gnb:develop
        privileged: true
        container_name: rfsim5g-oai-cu
        environment: 
-            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-ext-dn
        networks:
            public_net:
-                ipv4_address: 192.168.71.150
+                ipv4_address: 192.168.71.140
        volumes:
          - ../../conf_files/gnb-cu.sa.band78.106prb.conf:/opt/oai-gnb/etc/gnb.conf
        healthcheck:
@@ -102,19 +181,56 @@ services:
            interval: 10s
            timeout: 5s
            retries: 5
-
    oai-du:
        image: oaisoftwarealliance/oai-gnb:develop
        privileged: true
        container_name: rfsim5g-oai-du
-        environment:
+        environment: 
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-cu
        networks:
            public_net:
-                ipv4_address: 192.168.71.171
+                ipv4_address: 192.168.71.142
+        volumes:
+            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    oai-du2:
+        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
+        container_name: rfsim5g-oai-du2
+        environment:
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_DU_ID 0xe01 --gNBs.[0].nr_cellid 87654321 --gNBs.[0].servingCellConfigCommon.[0].physCellId 1 --MACRLCs.[0].local_n_address 192.168.71.143 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-cu
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.143
+        volumes:
+            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    oai-du3:
+        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
+        container_name: rfsim5g-oai-du3
+        environment:
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_DU_ID 0xe02 --gNBs.[0].nr_cellid 11111111 --gNBs.[0].servingCellConfigCommon.[0].physCellId 2 --MACRLCs.[0].local_n_address 192.168.71.144 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-cu
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.144
        volumes:
            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
        healthcheck:
@@ -122,21 +238,56 @@ services:
            interval: 10s
            timeout: 5s
            retries: 5
-
    oai-nr-ue:
        image: oaisoftwarealliance/oai-nr-ue:develop
        privileged: true
        container_name: rfsim5g-oai-nr-ue
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-                                    -r 106 --numerology 1 -C 3619200000
-                                    --uicc0.imsi 208990100001100
-                                    --rfsimulator.serveraddr 192.168.71.171
+        environment: 
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.142 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-du
        networks:
            public_net:
-                ipv4_address: 192.168.71.181
+                ipv4_address: 192.168.71.150
+        volumes:
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    oai-nr-ue2:
+        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
+        container_name: rfsim5g-oai-nr-ue2
+        environment:
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.143 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-du2
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.151
+        volumes:
+            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    oai-nr-ue3:
+        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
+        container_name: rfsim5g-oai-nr-ue3
+        environment:
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.144 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
+        depends_on:
+            - oai-du3
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.152
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -156,7 +307,7 @@ networks:
            com.docker.network.bridge.name: "rfsim5g-public"
    traffic_net:
        driver: bridge
-        name: rfsim5g-oai-traffic-net
+        name: rfsim5g-oai-traffic_net-net
        ipam:
            config:
                - subnet: 192.168.72.128/26
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/mysql-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/mysql-healthcheck.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+set -eo pipefail
+
+if [ "$MYSQL_ROOT_PASSWORD" ] && [ -z "$MYSQL_USER" ] && [ -z "$MYSQL_PASSWORD" ]; then
+	echo >&2 'Healthcheck error: cannot determine root password (and MYSQL_USER and MYSQL_PASSWORD were not set)'
+	exit 0
+fi
+
+host="$(hostname --ip-address || echo '127.0.0.1')"
+user="${MYSQL_USER:-root}"
+export MYSQL_PWD="${MYSQL_PASSWORD:-$MYSQL_ROOT_PASSWORD}"
+
+args=(
+	# force mysql to not use the local "mysqld.sock" (test "external" connectivity)
+	-h"$host"
+	-u"$user"
+	--silent
+)
+
+STATUS=0
+if command -v mysqladmin &> /dev/null; then
+	if mysqladmin "${args[@]}" ping > /dev/null; then
+		database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
+		if [[ -z $database_check ]]; then
+			echo "Healthcheck error: oai_db not populated"
+			STATUS=1
+		fi
+		STATUS=0
+	else
+		echo "Healthcheck error: Mysql port inactive"
+		STATUS=1
+	fi
+else
+	if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
+		database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
+		if [[ -z $database_check ]]; then
+			echo "Healthcheck error: oai_db not populated"
+			STATUS=1
+		fi
+		STATUS=0
+	else
+		echo "Healthcheck error: Mysql port inactive"
+		STATUS=1
+	fi
+fi
+exit $STATUS
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/nrf-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/nrf-healthcheck.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+NRF_IP_SBI_INTERFACE=$(ifconfig $NRF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
+NRF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$NRF_IP_SBI_INTERFACE:$NRF_INTERFACE_PORT_FOR_SBI")
+#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
+NB_UNREPLACED_AT=`cat /openair-nrf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+
+if [ $NB_UNREPLACED_AT -ne 0 ]; then
+	STATUS=1
+	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
+fi
+
+if [[ -z $NRF_SBI_PORT_STATUS ]]; then
+	STATUS=1
+	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $NRF_INTERFACE_PORT_FOR_SBI is not listening."
+fi
+
+exit $STATUS
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/oai_db.sql
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/oai_db.sql
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/smf-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/smf-healthcheck.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+SMF_IP_SBI_INTERFACE=$(ifconfig $SMF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
+SMF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$SMF_IP_SBI_INTERFACE:$SMF_INTERFACE_PORT_FOR_SBI")
+
+#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
+#NB_UNREPLACED_AT=`cat /openair-smf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+
+#if [ $NB_UNREPLACED_AT -ne 0 ]; then
+#	STATUS=-1
+#	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
+#fi
+#
+if [[ -z $SMF_SBI_PORT_STATUS ]]; then
+	STATUS=-1
+	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $SMF_INTERFACE_PORT_FOR_SBI is not listening."
+fi
+
+exit $STATUS
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/spgwu-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/spgwu-healthcheck.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+SGW_PORT_FOR_S1U_S12_S4_UP=2152
+SGW_PORT_FOR_SX=8805
+SGW_IP_S1U_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP | grep inet | awk {'print $2'})
+SGW_IP_SX_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_SX | grep inet | awk {'print $2'})
+S1U_S12_S4_UP_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_S1U_INTERFACE:$SGW_PORT_FOR_S1U_S12_S4_UP")
+SX_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_SX_INTERFACE:$SGW_PORT_FOR_SX")
+#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
+NB_UNREPLACED_AT=`cat /openair-spgwu/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+if [ $NB_UNREPLACED_AT -ne 0 ]; then
+	STATUS=1
+	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
+fi
+
+if [[ -z $S1U_S12_S4_UP_PORT_STATUS ]]; then
+	STATUS=1
+	echo "Healthcheck error: UNHEALTHY S1U port $SGW_PORT_FOR_S1U_S12_S4_UP is not listening."
+fi
+
+if [[ -z $SX_PORT_STATUS ]]; then
+	STATUS=1
+	echo "Healthcheck error: UNHEALTHY SX port $SGW_PORT_FOR_SX is not listening."
+fi
+
+exit $STATUS
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/amf-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/amf-healthcheck.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+AMF_PORT_FOR_NGAP=38412
+AMF_PORT_FOR_N11_HTTP=80
+AMF_IP_NGAP_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_NGAP | grep inet | awk {'print $2'})
+AMF_IP_N11_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_N11 | grep inet | awk {'print $2'})
+N2_PORT_STATUS=$(netstat -Snpl | grep -o "$AMF_IP_NGAP_INTERFACE:$AMF_PORT_FOR_NGAP")
+N11_PORT_STATUS=$(netstat -tnpl | grep -o "$AMF_IP_N11_INTERFACE:$AMF_PORT_FOR_N11_HTTP")
+#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
+NB_UNREPLACED_AT=`cat /openair-amf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+
+if [ $NB_UNREPLACED_AT -ne 0 ]; then
+	STATUS=1
+	echo "Healthcheck error: configuration file is not configured properly"
+fi
+
+if [[ -z $N2_PORT_STATUS ]]; then
+	STATUS=1
+	echo "Healthcheck error: N2 SCTP port $AMF_PORT_FOR_NGAP is not listening"
+fi
+
+if [[ -z $N11_PORT_STATUS ]]; then
+	STATUS=1
+	echo "Healthcheck error: N11/SBI TCP/HTTP port $AMF_PORT_FOR_N11_HTTP is not listening"
+fi
+
+#host="${MYSQL_SERVER}"
+#user="${MYSQL_USER:-root}"
+#export MYSQL_PWD="${MYSQL_PASS}"
+
+#args=(
+#	-h"$host"
+#	-u"$user"
+#	--silent
+#)
+
+#if ! command -v mysql &> /dev/null; then
+#	echo "Installing mysql command"
+#	apt update
+#	apt-get -y install mysql-client
+#else
+#	if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
+#		database_check=$(mysql -h$host -u$user -D oai_db --silent -e "SELECT * FROM users;")
+#		if [[ -z $database_check ]]; then
+#			echo "Healthcheck error: oai_db not populated"
+#			STATUS=1
+#		fi
+#		STATUS=0
+#	else
+#		echo "Healthcheck error: Mysql port inactive"
+#		STATUS=1
+#	fi
+#fi
+
+exit $STATUS
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
@@ -1,11 +1,20 @@
 version: '3.8'
 services:
+    oai-nrf:
+        container_name: "rfsim5g-oai-nrf"
+        image: oaisoftwarealliance/oai-nrf:v1.5.0
+        environment:
+            - NRF_INTERFACE_NAME_FOR_SBI=eth0
+            - TZ=Europe/Paris
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.130
    mysql:
        container_name: "rfsim5g-mysql"
        image: mysql:8.0
        volumes:
-            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
-            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+            - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
+            - ./mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
        environment:
            - TZ=Europe/Paris
            - MYSQL_DATABASE=oai_db
@@ -22,36 +31,108 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.0.0
+        image: oaisoftwarealliance/oai-amf:v1.5.0
        environment:
            - TZ=Europe/paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
+            - MCC=208
+            - MNC=99
+            - REGION_ID=128
+            - AMF_SET_ID=1
+            - SERVED_GUAMI_MCC_0=208
+            - SERVED_GUAMI_MNC_0=99
+            - SERVED_GUAMI_REGION_ID_0=128
+            - SERVED_GUAMI_AMF_SET_ID_0=1
+            - SERVED_GUAMI_MCC_1=460
+            - SERVED_GUAMI_MNC_1=11
+            - SERVED_GUAMI_REGION_ID_1=10
+            - SERVED_GUAMI_AMF_SET_ID_1=1
+            - PLMN_SUPPORT_MCC=208
+            - PLMN_SUPPORT_MNC=99
+            - PLMN_SUPPORT_TAC=0x0001
+            # Only one slice is defined (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.71.133
+            - SELECTED_0=true
+            # mysql definition in AMF is mandatory in mini deployment.
+            - MYSQL_SERVER=192.168.71.131
+            - MYSQL_USER=root
+            - MYSQL_PASS=linux
+            - MYSQL_DB=oai_db
+            # NF registration
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - NF_REGISTRATION=yes
+            - SMF_SELECTION=yes
+            - USE_FQDN_DNS=yes
+            - USE_HTTP2=no
        depends_on:
+            - oai-nrf
            - mysql
        networks:
            public_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.0.0
+        image: oaisoftwarealliance/oai-smf:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
+            - SMF_INTERFACE_NAME_FOR_N4=eth0
+            - SMF_INTERFACE_NAME_FOR_SBI=eth0
+            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
+            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
+            - AMF_IPV4_ADDRESS=192.168.71.132
+            - AMF_FQDN=oai-amf
+            - UPF_IPV4_ADDRESS=192.168.71.134
+            - UPF_FQDN_0=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - REGISTER_NRF=yes
+            - DISCOVER_UPF=yes
+            - USE_FQDN_DNS=yes
+            - USE_LOCAL_SUBSCRIPTION_INFO=yes
+            - UE_MTU=1500
+            # Only one slice is defined (1, 0xFFFFFF)
+            - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
+            - NSSAI_SST0=1
+            - SESSION_AMBR_UL0=200Mbps
+            - SESSION_AMBR_DL0=400Mbps
+            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
+            - ENABLE_USAGE_REPORTING=no
        depends_on:
+            - oai-nrf
            - oai-amf
        networks:
            public_net:
                ipv4_address: 192.168.71.133
-    oai-upf:
-        container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.0.0
+    oai-spgwu:
+        container_name: "rfsim5g-oai-spgwu"
+        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
+            - 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.1.0/24
+            - ENABLE_5G_FEATURES=yes
+            - REGISTER_NRF=yes
+            - USE_FQDN_NRF=yes
+            - UPF_FQDN_5G=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            # Only one slice is defined (1, 0xFFFFFF)
+            - NSSAI_SST_0=1
+            - NSSAI_SD_0=0xffffff
+            - DNN_0=oai
        depends_on:
+            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -72,7 +153,7 @@ services:
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
        depends_on:
-            - oai-upf
+            - oai-spgwu
        networks:
            traffic_net:
                ipv4_address: 192.168.72.135
@@ -85,7 +166,7 @@ services:
        image: oaisoftwarealliance/oai-gnb:develop
        privileged: true
        container_name: rfsim5g-oai-gnb
-        environment:
+        environment: 
            USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
        depends_on:
@@ -106,6 +187,7 @@ services:
        container_name: rfsim5g-oai-nr-ue
        environment: 
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169090000 --CO -400000000 --ssb 378 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/mysql-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/mysql-healthcheck.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+set -eo pipefail
+
+if [ "$MYSQL_ROOT_PASSWORD" ] && [ -z "$MYSQL_USER" ] && [ -z "$MYSQL_PASSWORD" ]; then
+	echo >&2 'Healthcheck error: cannot determine root password (and MYSQL_USER and MYSQL_PASSWORD were not set)'
+	exit 0
+fi
+
+host="$(hostname --ip-address || echo '127.0.0.1')"
+user="${MYSQL_USER:-root}"
+export MYSQL_PWD="${MYSQL_PASSWORD:-$MYSQL_ROOT_PASSWORD}"
+
+args=(
+	# force mysql to not use the local "mysqld.sock" (test "external" connectivity)
+	-h"$host"
+	-u"$user"
+	--silent
+)
+
+STATUS=0
+if command -v mysqladmin &> /dev/null; then
+	if mysqladmin "${args[@]}" ping > /dev/null; then
+		database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
+		if [[ -z $database_check ]]; then
+			echo "Healthcheck error: oai_db not populated"
+			STATUS=1
+		fi
+		STATUS=0
+	else
+		echo "Healthcheck error: Mysql port inactive"
+		STATUS=1
+	fi
+else
+	if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
+		database_check=$(mysql -u$user -D oai_db --silent -e "SELECT * FROM users;")
+		if [[ -z $database_check ]]; then
+			echo "Healthcheck error: oai_db not populated"
+			STATUS=1
+		fi
+		STATUS=0
+	else
+		echo "Healthcheck error: Mysql port inactive"
+		STATUS=1
+	fi
+fi
+exit $STATUS
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/nrf-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/nrf-healthcheck.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+NRF_IP_SBI_INTERFACE=$(ifconfig $NRF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
+NRF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$NRF_IP_SBI_INTERFACE:$NRF_INTERFACE_PORT_FOR_SBI")
+#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
+NB_UNREPLACED_AT=`cat /openair-nrf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+
+if [ $NB_UNREPLACED_AT -ne 0 ]; then
+	STATUS=1
+	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
+fi
+
+if [[ -z $NRF_SBI_PORT_STATUS ]]; then
+	STATUS=1
+	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $NRF_INTERFACE_PORT_FOR_SBI is not listening."
+fi
+
+exit $STATUS
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/oai_db.sql
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/oai_db.sql
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/smf-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/smf-healthcheck.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+SMF_IP_SBI_INTERFACE=$(ifconfig $SMF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
+SMF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$SMF_IP_SBI_INTERFACE:$SMF_INTERFACE_PORT_FOR_SBI")
+
+#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
+#NB_UNREPLACED_AT=`cat /openair-smf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+
+#if [ $NB_UNREPLACED_AT -ne 0 ]; then
+#	STATUS=-1
+#	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
+#fi
+#
+if [[ -z $SMF_SBI_PORT_STATUS ]]; then
+	STATUS=-1
+	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $SMF_INTERFACE_PORT_FOR_SBI is not listening."
+fi
+
+exit $STATUS
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/spgwu-healthcheck.sh
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/spgwu-healthcheck.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+SGW_PORT_FOR_S1U_S12_S4_UP=2152
+SGW_PORT_FOR_SX=8805
+SGW_IP_S1U_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP | grep inet | awk {'print $2'})
+SGW_IP_SX_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_SX | grep inet | awk {'print $2'})
+S1U_S12_S4_UP_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_S1U_INTERFACE:$SGW_PORT_FOR_S1U_S12_S4_UP")
+SX_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_SX_INTERFACE:$SGW_PORT_FOR_SX")
+#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
+NB_UNREPLACED_AT=`cat /openair-spgwu/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+if [ $NB_UNREPLACED_AT -ne 0 ]; then
+	STATUS=1
+	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
+fi
+
+if [[ -z $S1U_S12_S4_UP_PORT_STATUS ]]; then
+	STATUS=1
+	echo "Healthcheck error: UNHEALTHY S1U port $SGW_PORT_FOR_S1U_S12_S4_UP is not listening."
+fi
+
+if [[ -z $SX_PORT_STATUS ]]; then
+	STATUS=1
+	echo "Healthcheck error: UNHEALTHY SX port $SGW_PORT_FOR_SX is not listening."
+fi
+
+exit $STATUS
--- a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md
+++ b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md
@@ -96,9 +96,10 @@ Now pull images.

 ```bash
 docker pull mysql:8.0
-docker pull oaisoftwarealliance/oai-amf:v2.0.0
-docker pull oaisoftwarealliance/oai-smf:v2.0.0
-docker pull oaisoftwarealliance/oai-upf:v2.0.0
+docker pull oaisoftwarealliance/oai-amf:v1.5.0
+docker pull oaisoftwarealliance/oai-nrf:v1.5.0
+docker pull oaisoftwarealliance/oai-smf:v1.5.0
+docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
 docker pull oaisoftwarealliance/trf-gen-cn5g:focal

 docker pull oaisoftwarealliance/oai-gnb:develop
@@ -138,13 +139,14 @@ sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up

 ```bash
 cd ci-scripts/yaml_files/5g_l2sim_tdd
-docker-compose up -d mysql oai-amf oai-smf oai-upf oai-ext-dn
+docker-compose up -d mysql oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn
 ```
 ```bash
 Creating network "l2sim-oai-public-net" with driver "bridge"
 Creating network "l2sim-oai-traffic_net-net" with driver "bridge"
+Creating l2sim-oai-nrf ... done
 Creating l2sim-mysql      ... done
-Creating l2sim-oai-upf   ... done
+Creating l2sim-oai-spgwu ... done
 Creating l2sim-oai-amf   ... done
 Creating l2sim-oai-smf   ... done
 Creating l2sim-oai-ext-dn ... done
@@ -158,11 +160,12 @@ docker-compose ps -a
 ```bash
       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
+l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
 l2sim-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
-l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
-l2sim-oai-upf      /bin/bash /openair-upf/bin ...   Up (healthy)   2152/udp, 8805/udp
+l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
+l2sim-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
+l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
+l2sim-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
 ```

 At this point, you can prepare a capture on the newly-created public docker bridges:
@@ -203,7 +206,8 @@ sudo nohup tshark -f "(host 192.168.72.135 and icmp) or (not host 192.168.72.135
 docker-compose up -d oai-gnb
 ```
 ```bash
-l2sim-oai-upf is up-to-date
+l2sim-oai-nrf is up-to-date
+l2sim-oai-spgwu is up-to-date
 l2sim-oai-ext-dn is up-to-date
 Creating l2sim-oai-gnb ... done
 ```
@@ -216,12 +220,13 @@ $ docker-compose ps -a
 ```bash
       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
+l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
 l2sim-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
-l2sim-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
-l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
-l2sim-oai-upf      /bin/bash /openair-upf/bin ...   Up (healthy)   2152/udp, 8805/udp
+l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
+l2sim-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)                               
+l2sim-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
+l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
+l2sim-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
 ```

 You can verify that the `gNB` is connected with the `AMF`:
@@ -245,9 +250,10 @@ docker-compose up -d proxy oai-nr-ue
 ```
 ```bash
 l2sim-mysql is up-to-date
+l2sim-oai-nrf is up-to-date
 l2sim-oai-amf is up-to-date
 l2sim-oai-smf is up-to-date
-l2sim-oai-upf is up-to-date
+l2sim-oai-spgwu is up-to-date
 l2sim-oai-ext-dn is up-to-date
 l2sim-oai-gnb is up-to-date
 Creating l2sim-oai-nr-ue ... done
@@ -262,17 +268,18 @@ docker-compose ps -a
 ```bash
       Name                     Command                  State                  Ports
 -------------------------------------------------------------------------------------------------
-l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
+l2sim-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
 l2sim-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
-l2sim-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
-l2sim-oai-nr-ue0   /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)
-l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
-l2sim-oai-upf      /bin/bash /openair-upf/bin ...   Up (healthy)   2152/udp, 8805/udp
-l2sim-proxy        /oai-lte-multi-ue-proxy/bi ...   Up (healthy)
+l2sim-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
+l2sim-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)                               
+l2sim-oai-nr-ue0   /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)                               
+l2sim-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
+l2sim-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
+l2sim-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
+l2sim-proxy        /oai-lte-multi-ue-proxy/bi ...   Up (healthy)                               
 ```
 ```bash
-docker stats --no-stream --format "table {{.Container}}\t{{.CPUPerc}}	{{.MemUsage}}\t{{.MemPerc}}" l2sim-mysql l2sim-oai-amf l2sim-oai-ext-dn l2sim-oai-gnb l2sim-oai-nr-ue0 l2sim-oai-smf l2sim-oai-upf l2sim-proxy
+docker stats --no-stream --format "table {{.Container}}\t{{.CPUPerc}}	{{.MemUsage}}\t{{.MemPerc}}" l2sim-mysql l2sim-oai-amf l2sim-oai-ext-dn l2sim-oai-gnb l2sim-oai-nr-ue0 l2sim-oai-nrf l2sim-oai-smf l2sim-oai-spgwu l2sim-proxy
 ```
 ```bash
 CONTAINER          CPU %     MEM USAGE / LIMIT     MEM %
@@ -281,8 +288,9 @@ l2sim-oai-amf      4.05%     29.49MiB / 62.54GiB   0.05%
 l2sim-oai-ext-dn   0.00%     31.27MiB / 62.54GiB   0.05%
 l2sim-oai-gnb      1.29%     1.853GiB / 62.54GiB   2.96%
 l2sim-oai-nr-ue0   1.43%     350.8MiB / 62.54GiB   0.55%
+l2sim-oai-nrf      0.21%     9.105MiB / 62.54GiB   0.01%
 l2sim-oai-smf      3.24%     30.23MiB / 62.54GiB   0.05%
-l2sim-oai-upf      0.00%     11.78MiB / 62.54GiB   0.02%
+l2sim-oai-spgwu    0.00%     11.78MiB / 62.54GiB   0.02%
 l2sim-proxy        6.97%     290.4MiB / 62.54GiB   0.45%
 ```

@@ -381,17 +389,19 @@ Stopping l2sim-oai-nr-ue2 ... done
 Stopping l2sim-oai-nr-ue  ... done
 Stopping l2sim-oai-gnb    ... done
 Stopping l2sim-oai-ext-dn ... done
-Stopping l2sim-oai-upf    ... done
+Stopping l2sim-oai-spgwu  ... done
 Stopping l2sim-oai-smf    ... done
 Stopping l2sim-oai-amf    ... done
+Stopping l2sim-oai-nrf    ... done
 Stopping l2sim-mysql      ... done
 Removing l2sim-oai-nr-ue2 ... done
 Removing l2sim-oai-nr-ue  ... done
 Removing l2sim-oai-gnb    ... done
 Removing l2sim-oai-ext-dn ... done
-Removing l2sim-oai-upf    ... done
+Removing l2sim-oai-spgwu  ... done
 Removing l2sim-oai-smf    ... done
 Removing l2sim-oai-amf    ... done
+Removing l2sim-oai-nrf    ... done
 Removing l2sim-mysql      ... done
 Removing network l2sim-oai-public-net
 Removing network l2sim-oai-traffic-net
--- a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
@@ -1,5 +1,14 @@
 version: '3.8'
 services:
+    oai-nrf:
+        container_name: "l2sim-oai-nrf"
+        image: oaisoftwarealliance/oai-nrf:v1.5.0
+        environment:
+            - NRF_INTERFACE_NAME_FOR_SBI=eth0
+            - TZ=Europe/Paris
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.130
    mysql:
        container_name: "l2sim-mysql"
        image: mysql:8.0
@@ -22,36 +31,108 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "l2sim-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.0.0
+        image: oaisoftwarealliance/oai-amf:v1.5.0
        environment:
            - TZ=Europe/paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
+            - MCC=208
+            - MNC=99
+            - REGION_ID=128
+            - AMF_SET_ID=1
+            - SERVED_GUAMI_MCC_0=208
+            - SERVED_GUAMI_MNC_0=99
+            - SERVED_GUAMI_REGION_ID_0=128
+            - SERVED_GUAMI_AMF_SET_ID_0=1
+            - SERVED_GUAMI_MCC_1=460
+            - SERVED_GUAMI_MNC_1=11
+            - SERVED_GUAMI_REGION_ID_1=10
+            - SERVED_GUAMI_AMF_SET_ID_1=1
+            - PLMN_SUPPORT_MCC=208
+            - PLMN_SUPPORT_MNC=99
+            - PLMN_SUPPORT_TAC=0x0001
+            # Only one slice is defined (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.71.133
+            - SELECTED_0=true
+            # mysql definition in AMF is mandatory in mini deployment.
+            - MYSQL_SERVER=192.168.71.131
+            - MYSQL_USER=root
+            - MYSQL_PASS=linux
+            - MYSQL_DB=oai_db
+            # NF registration
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - NF_REGISTRATION=yes
+            - SMF_SELECTION=yes
+            - USE_FQDN_DNS=yes
+            - USE_HTTP2=no
        depends_on:
+            - oai-nrf
            - mysql
        networks:
            public_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "l2sim-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.0.0
+        image: oaisoftwarealliance/oai-smf:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
+            - SMF_INTERFACE_NAME_FOR_N4=eth0
+            - SMF_INTERFACE_NAME_FOR_SBI=eth0
+            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
+            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
+            - AMF_IPV4_ADDRESS=192.168.71.132
+            - AMF_FQDN=oai-amf
+            - UPF_IPV4_ADDRESS=192.168.71.134
+            - UPF_FQDN_0=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - REGISTER_NRF=yes
+            - DISCOVER_UPF=yes
+            - USE_FQDN_DNS=yes
+            - USE_LOCAL_SUBSCRIPTION_INFO=yes
+            - UE_MTU=1500
+            # Only one slice is defined (1, 0xFFFFFF)
+            - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
+            - NSSAI_SST0=1
+            - SESSION_AMBR_UL0=200Mbps
+            - SESSION_AMBR_DL0=400Mbps
+            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
+            - ENABLE_USAGE_REPORTING=no
        depends_on:
+            - oai-nrf
            - oai-amf
        networks:
            public_net:
                ipv4_address: 192.168.71.133
-    oai-upf:
-        container_name: "l2sim-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.0.0
+    oai-spgwu:
+        container_name: "l2sim-oai-spgwu"
+        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
+            - 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.1.0/24
+            - ENABLE_5G_FEATURES=yes
+            - REGISTER_NRF=yes
+            - USE_FQDN_NRF=yes
+            - UPF_FQDN_5G=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            # Only one slice is defined (1, 0xFFFFFF)
+            - NSSAI_SST_0=1
+            - NSSAI_SD_0=0xffffff
+            - DNN_0=oai
        depends_on:
+            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -72,7 +153,7 @@ services:
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
        depends_on:
-            - oai-upf
+            - oai-spgwu
        networks:
            traffic_net:
                ipv4_address: 192.168.72.135
@@ -91,7 +172,7 @@ services:
            USE_ADDITIONAL_OPTIONS: --sa --nfapi VNF --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor
            ASAN_OPTIONS: detect_leaks=0
        depends_on:
-            - oai-upf
+            - oai-spgwu
            - oai-amf
        volumes:
            - ../../conf_files/gnb.sa.band78.106prb.l2sim.conf:/opt/oai-gnb/etc/gnb.conf
--- a/ci-scripts/yaml_files/5g_rfsimulator/README.md
+++ b/ci-scripts/yaml_files/5g_rfsimulator/README.md
@@ -37,9 +37,10 @@ Now pull images.

 ```bash
 $ docker pull mysql:8.0
-$ docker pull oaisoftwarealliance/oai-amf:v2.0.0
-$ docker pull oaisoftwarealliance/oai-smf:v2.0.0
-$ docker pull oaisoftwarealliance/oai-upf:v2.0.0
+$ docker pull oaisoftwarealliance/oai-amf:v1.5.0
+$ docker pull oaisoftwarealliance/oai-nrf:v1.5.0
+$ docker pull oaisoftwarealliance/oai-smf:v1.5.0
+$ docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
 $ docker pull oaisoftwarealliance/trf-gen-cn5g:focal

 $ docker pull oaisoftwarealliance/oai-gnb:develop
@@ -52,7 +53,7 @@ $ docker logout

 **CAUTION: 2023/01/27 with the release `v1.5.0` of the `CN5G`, the previous version was not compatible any-more.**

-**This new version is working only with the `v2.0.0` of the `CN5G`.**
+**This new version is working only with the `v1.5.0` of the `CN5G`.**

 # 2. Deploy containers #

@@ -64,18 +65,18 @@ $ docker logout

 All the following commands **SHALL** be run from the `ci-scripts/yaml_files/5g_rfsimulator` folder for a deployment with monolithic gNB.

-For a deployment with the gNB split in CU and DU components, please refer to the `../5g_f1_rfsimulator` folder.
-For a deployment with the gNB split in CU-CP, CU-UP, and DU components, please refer to the `../5g_rfsimulator_e1` folder.
+For a deployment with the gNB split in CU and DU components, the following commands **SHALL** be run from the `ci-scripts/yaml_files/5g_f1_rfsimulator` folder. 

 ## 2.1. Deploy OAI 5G Core Network ##

 ```bash
 $ cd ci-scripts/yaml_files/5g_rfsimulator
-$ docker-compose up -d mysql oai-amf oai-smf oai-upf oai-ext-dn
+$ docker-compose up -d mysql oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn
 Creating network "rfsim5g-oai-public-net" with driver "bridge"
 Creating network "rfsim5g-oai-traffic_net-net" with driver "bridge"
+Creating rfsim5g-oai-nrf ... done
 Creating rfsim5g-mysql      ... done
-Creating rfsim5g-oai-upf   ... done
+Creating rfsim5g-oai-spgwu ... done
 Creating rfsim5g-oai-amf   ... done
 Creating rfsim5g-oai-smf   ... done
 Creating rfsim5g-oai-ext-dn ... done
@@ -85,19 +86,20 @@ Wait for a bit.

 ```bash
 $ docker-compose ps -a
-       Name                     Command                  State                  Ports
+       Name                     Command                  State                  Ports            
 -------------------------------------------------------------------------------------------------
-rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
+rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
 rfsim5g-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
-rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
-rfsim5g-oai-upf      /bin/bash -c /openair-upf/ ...   Up (healthy)   2152/udp, 8805/udp
+rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
+rfsim5g-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
+rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
+rfsim5g-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
 ```

 At this point, you can prepare a capture on the newly-created public docker bridges:

 ```bash
-$ ifconfig
+$ ifconfig 
 ...
 rfsim5g-public: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
        inet 192.168.71.129  netmask 255.255.255.192  broadcast 192.168.71.191
@@ -128,7 +130,8 @@ The gNB can be deployed either in monolithic mode, or in CU/DU split mode.

 ```bash
 $ docker-compose up -d oai-gnb
-rfsim5g-oai-upf is up-to-date
+rfsim5g-oai-nrf is up-to-date
+rfsim5g-oai-spgwu is up-to-date
 rfsim5g-oai-ext-dn is up-to-date
 Creating rfsim5g-oai-gnb ... done
 ```
@@ -146,14 +149,15 @@ Wait for a bit.

 ```bash
 $ docker-compose ps -a
-       Name                     Command                  State                  Ports
+       Name                     Command                  State                  Ports            
 -------------------------------------------------------------------------------------------------
-rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
+rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
 rfsim5g-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
-rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
-rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
-rfsim5g-oai-upf      /bin/bash -c /openair-upf/ ...   Up (healthy)   2152/udp, 8805/udp
+rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
+rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)                               
+rfsim5g-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
+rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
+rfsim5g-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
 ```

 You can verify that the `gNB` is connected with the `AMF`:
@@ -173,9 +177,10 @@ $ docker logs rfsim5g-oai-amf
 ```bash
 $ docker-compose up -d oai-nr-ue
 rfsim5g-mysql is up-to-date
+rfsim5g-oai-nrf is up-to-date
 rfsim5g-oai-amf is up-to-date
 rfsim5g-oai-smf is up-to-date
-rfsim5g-oai-upf is up-to-date
+rfsim5g-oai-spgwu is up-to-date
 rfsim5g-oai-ext-dn is up-to-date
 rfsim5g-oai-gnb is up-to-date
 Creating rfsim5g-oai-nr-ue ... done
@@ -185,22 +190,23 @@ Wait for a bit.

 ```bash
 $ docker-compose ps -a
-       Name                     Command                  State                  Ports
+       Name                     Command                  State                  Ports            
 -------------------------------------------------------------------------------------------------
-rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
+rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp         
 rfsim5g-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
-rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
-rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
-rfsim5g-oai-nr-ue    /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)
-rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
-rfsim5g-oai-upf      /bin/bash -c /openair-upf/ ...   Up (healthy)   2152/udp, 8805/udp
+rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)                               
+rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)                               
+rfsim5g-oai-nr-ue    /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)                               
+rfsim5g-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp            
+rfsim5g-oai-smf      /bin/bash -c /openair-smf/ ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp  
+rfsim5g-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp          
 ```

 Making sure the OAI UE is connected:

 ```bash
 $ docker exec -it rfsim5g-oai-nr-ue /bin/bash
-root@bb4d400a832d:/opt/oai-nr-ue# ifconfig
+root@bb4d400a832d:/opt/oai-nr-ue# ifconfig 
 eth0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
        inet 192.168.71.150  netmask 255.255.255.192  broadcast 192.168.71.191
        ether 02:42:c0:a8:47:89  txqueuelen 0  (Ethernet)
@@ -259,9 +265,10 @@ Create the entry for the second UE in `docker-compose.yaml` file as follows:
 ```bash
 $ docker-compose up -d oai-nr-ue2
 rfsim5g-mysql is up-to-date
+rfsim5g-oai-nrf is up-to-date
 rfsim5g-oai-amf is up-to-date
 rfsim5g-oai-smf is up-to-date
-rfsim5g-oai-upf is up-to-date
+rfsim5g-oai-spgwu is up-to-date
 rfsim5g-oai-ext-dn is up-to-date
 rfsim5g-oai-gnb is up-to-date
 Creating rfsim5g-oai-nr-ue2 ... done
@@ -271,7 +278,7 @@ Wait for a bit.

 ```bash
 $ docker-compose ps -a
-       Name                     Command                  State                  Ports
+       Name                     Command                  State                  Ports            
 -------------------------------------------------------------------------------------------------
 rfsim5g-mysql        docker-entrypoint.sh mysqld      Up (healthy)   3306/tcp, 33060/tcp
 rfsim5g-oai-amf      /bin/bash /openair-amf/bin ...   Up (healthy)   38412/sctp, 80/tcp, 9090/tcp
@@ -279,15 +286,16 @@ rfsim5g-oai-ext-dn   /bin/bash -c  apt update;  ...   Up (healthy)
 rfsim5g-oai-gnb      /opt/oai-gnb/bin/entrypoin ...   Up (healthy)
 rfsim5g-oai-nr-ue    /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)
 rfsim5g-oai-nr-ue2   /opt/oai-nr-ue/bin/entrypo ...   Up (healthy)
+rfsim5g-oai-nrf      /bin/bash /openair-nrf/bin ...   Up (healthy)   80/tcp, 9090/tcp
 rfsim5g-oai-smf      /bin/bash /openair-smf/bin ...   Up (healthy)   80/tcp, 8805/udp, 9090/tcp
-rfsim5g-oai-upf      /bin/bash /openair-upf/bin ...   Up (healthy)   2152/udp, 8805/udp
+rfsim5g-oai-spgwu    /openair-spgwu-tiny/bin/en ...   Up (healthy)   2152/udp, 8805/udp
 ```

 Making sure the Second OAI UE is connected:

 ```bash
 $ docker exec -it rfsim5g-oai-nr-ue2 /bin/bash
-root@bb4d400a832d:/opt/oai-nr-ue# ifconfig
+root@bb4d400a832d:/opt/oai-nr-ue# ifconfig 
 eth0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
        inet 192.168.71.151  netmask 255.255.255.192  broadcast 192.168.71.191
        ether 02:42:c0:a8:47:8a  txqueuelen 0  (Ethernet)
@@ -449,17 +457,19 @@ Stopping rfsim5g-oai-nr-ue2 ... done
 Stopping rfsim5g-oai-nr-ue  ... done
 Stopping rfsim5g-oai-gnb    ... done
 Stopping rfsim5g-oai-ext-dn ... done
-Stopping rfsim5g-oai-upf    ... done
+Stopping rfsim5g-oai-spgwu  ... done
 Stopping rfsim5g-oai-smf    ... done
 Stopping rfsim5g-oai-amf    ... done
+Stopping rfsim5g-oai-nrf    ... done
 Stopping rfsim5g-mysql      ... done
 Removing rfsim5g-oai-nr-ue2 ... done
 Removing rfsim5g-oai-nr-ue  ... done
 Removing rfsim5g-oai-gnb    ... done
 Removing rfsim5g-oai-ext-dn ... done
-Removing rfsim5g-oai-upf    ... done
+Removing rfsim5g-oai-spgwu  ... done
 Removing rfsim5g-oai-smf    ... done
 Removing rfsim5g-oai-amf    ... done
+Removing rfsim5g-oai-nrf    ... done
 Removing rfsim5g-mysql      ... done
 Removing network rfsim5g-oai-public-net
 Removing network rfsim5g-oai-traffic-net
@@ -511,21 +521,24 @@ docker-compose entry mount another config, or add `--uicc0.imsi
 feature of the configuration module to overwrite any configuration option in
 the config file on the command line.

+We are also using a dedicated `oai-smf.conf` for the `SMF` container: the `oai` DNN shall match the one in  the NR-UE section of `docker-compose.yaml` (`DNN: oai`).
+
 ## 5.2. Making the gNB connect to the core network ##

-Mainly you need to match the PLMN in `gNB`, `AMF` and `UPF` parameters in the `mini_nonrf_config.yaml`:
+Mainly you need to match the PLMN in `gNB`, `AMF` and `SPGWU` parameters:

-```yaml
-  plmn_support_list:
-    - mcc: 208
-      mnc: 99
-      tac: 0x0001
-      nssai:
-        - *embb_slice1
-...
-snssais:
-  - &embb_slice1
-    sst: 1
-```
+* `AMF`
+  - `MCC=208`
+  - `MNC=99`
+  - `PLMN_SUPPORT_TAC=0x0001`
+  - ...
+* `SPGWU`
+  - `MCC=208`
+  - `MNC=99`
+  - `TAC=1`
+* `gNB`
+  - `MCC: '208'`
+  - `MNC: '99'`
+  - `TAC: 1`

 The `ST` and `SD` values shall also match.
--- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
@@ -1,5 +1,14 @@
 version: '3.8'
 services:
+    oai-nrf:
+        container_name: "rfsim5g-oai-nrf"
+        image: oaisoftwarealliance/oai-nrf:v1.5.0
+        environment:
+            - NRF_INTERFACE_NAME_FOR_SBI=eth0
+            - TZ=Europe/Paris
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.130
    mysql:
        container_name: "rfsim5g-mysql"
        image: mysql:8.0
@@ -22,36 +31,108 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.0.0
+        image: oaisoftwarealliance/oai-amf:v1.5.0
        environment:
            - TZ=Europe/paris
-        volumes:
-            - ./mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
+            - MCC=208
+            - MNC=99
+            - REGION_ID=128
+            - AMF_SET_ID=1
+            - SERVED_GUAMI_MCC_0=208
+            - SERVED_GUAMI_MNC_0=99
+            - SERVED_GUAMI_REGION_ID_0=128
+            - SERVED_GUAMI_AMF_SET_ID_0=1
+            - SERVED_GUAMI_MCC_1=460
+            - SERVED_GUAMI_MNC_1=11
+            - SERVED_GUAMI_REGION_ID_1=10
+            - SERVED_GUAMI_AMF_SET_ID_1=1
+            - PLMN_SUPPORT_MCC=208
+            - PLMN_SUPPORT_MNC=99
+            - PLMN_SUPPORT_TAC=0x0001
+            # Only one slice is defined (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.71.133
+            - SELECTED_0=true
+            # mysql definition in AMF is mandatory in mini deployment.
+            - MYSQL_SERVER=192.168.71.131
+            - MYSQL_USER=root
+            - MYSQL_PASS=linux
+            - MYSQL_DB=oai_db
+            # NF registration
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - NF_REGISTRATION=yes
+            - SMF_SELECTION=yes
+            - USE_FQDN_DNS=yes
+            - USE_HTTP2=no
        depends_on:
+            - oai-nrf
            - mysql
        networks:
            public_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.0.0
+        image: oaisoftwarealliance/oai-smf:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ./mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
+            - SMF_INTERFACE_NAME_FOR_N4=eth0
+            - SMF_INTERFACE_NAME_FOR_SBI=eth0
+            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
+            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
+            - AMF_IPV4_ADDRESS=192.168.71.132
+            - AMF_FQDN=oai-amf
+            - UPF_IPV4_ADDRESS=192.168.71.134
+            - UPF_FQDN_0=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - REGISTER_NRF=yes
+            - DISCOVER_UPF=yes
+            - USE_FQDN_DNS=yes
+            - USE_LOCAL_SUBSCRIPTION_INFO=yes
+            - UE_MTU=1500
+            # Only one slice is defined (1, 0xFFFFFF)
+            - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
+            - NSSAI_SST0=1
+            - SESSION_AMBR_UL0=200Mbps
+            - SESSION_AMBR_DL0=400Mbps
+            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
+            - ENABLE_USAGE_REPORTING=no
        depends_on:
+            - oai-nrf
            - oai-amf
        networks:
            public_net:
                ipv4_address: 192.168.71.133
-    oai-upf:
-        container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.0.0
+    oai-spgwu:
+        container_name: "rfsim5g-oai-spgwu"
+        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ./mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
+            - 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.1.0/24
+            - ENABLE_5G_FEATURES=yes
+            - REGISTER_NRF=yes
+            - USE_FQDN_NRF=yes
+            - UPF_FQDN_5G=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            # Only one slice is defined (1, 0xFFFFFF)
+            - NSSAI_SST_0=1
+            - NSSAI_SD_0=0xffffff
+            - DNN_0=oai
        depends_on:
+            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -72,7 +153,7 @@ services:
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
        depends_on:
-            - oai-upf
+            - oai-spgwu
        networks:
            traffic_net:
                ipv4_address: 192.168.72.135
@@ -106,6 +187,7 @@ services:
        container_name: rfsim5g-oai-nr-ue
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -124,6 +206,7 @@ services:
        container_name: rfsim5g-oai-nr-ue2
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -142,6 +225,7 @@ services:
        container_name: rfsim5g-oai-nr-ue3
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -160,6 +244,7 @@ services:
        container_name: rfsim5g-oai-nr-ue4
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -178,6 +263,7 @@ services:
        container_name: rfsim5g-oai-nr-ue5
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -196,6 +282,7 @@ services:
        container_name: rfsim5g-oai-nr-ue6
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -214,6 +301,7 @@ services:
        container_name: rfsim5g-oai-nr-ue7
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -232,6 +320,7 @@ services:
        container_name: rfsim5g-oai-nr-ue8
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -250,6 +339,7 @@ services:
        container_name: rfsim5g-oai-nr-ue9
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
@@ -268,6 +358,7 @@ services:
        container_name: rfsim5g-oai-nr-ue10
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/5g_rfsimulator/mini_nonrf_config.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator/mini_nonrf_config.yaml
@@ -1,189 +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
-################################################################################
-
-# OAI CN Configuration File
-### This file can be used by all OAI NFs
-### Some fields are specific to an NF and will be ignored by other NFs
-
-## NOTE ON YAML ANCHORS ##
-# We use YAML anchors to ease the configuration and to avoid duplicating parts of the configuration.
-# This is especially true for the SNSSAIs, as we have to define them for multiple NFs.
-# Please note that the use of anchors is not mandatory, and you can define the SNSSAI in each NF yourself.
-# You can read more about anchors here: https://yaml.org/spec/1.2.2/#anchors-and-aliases
-
-############# Common configuration
-
-# Log level for all the NFs
-log_level:
-  general: debug
-
-# If you enable registration, the other NFs will use the NRF discovery mechanism
-register_nf:
-  general: no
-
-http_version: 1
-
-############## SBI Interfaces
-### Each NF takes its local SBI interfaces and remote interfaces from here, unless it gets them using NRF discovery mechanisms
-nfs:
-  amf:
-    host: oai-amf
-    sbi:
-      port: 80
-      api_version: v1
-      interface_name: eth0
-    n2:
-      interface_name: eth0
-      port: 38412
-  smf:
-    host: oai-smf
-    sbi:
-      port: 80
-      api_version: v1
-      interface_name: eth0
-    n4:
-      interface_name: eth0
-      port: 8805
-
-  upf:
-    host: oai-upf
-    sbi:
-      port: 80
-      api_version: v1
-      interface_name: eth0
-    n3:
-      interface_name: eth0
-      port: 2152
-    n4:
-      interface_name: eth0
-      port: 8805
-    n6:
-      interface_name: eth1
-    n9:
-      interface_name: eth0
-      port: 2152
-
-#### Common for UDR and AMF
-database:
-  host: mysql
-  user: test
-  type: mysql
-  password: test
-  database_name: oai_db
-  generate_random: true
-  connection_timeout: 300 # seconds
-
-## general single_nssai configuration
-## Defines YAML anchors, which are reused in the config file
-snssais:
-  - &embb_slice1
-    sst: 1
-
-############## NF-specific configuration
-amf:
-  amf_name: "OAI-AMF"
-  # This really depends on if we want to keep the "mini" version or not
-  support_features_options:
-    enable_simple_scenario: yes # "no" by default with the normal deployment scenarios with AMF/SMF/UPF/AUSF/UDM/UDR/NRF.
-                               # set it to "yes" to use with the minimalist deployment scenario (including only AMF/SMF/UPF) by using the internal AUSF/UDM implemented inside AMF.
-                               # There's no NRF in this scenario, SMF info is taken from "nfs" section.
-    enable_nssf: no
-    enable_smf_selection: no
-  relative_capacity: 30
-  statistics_timer_interval: 20  # in seconds
-  emergency_support: false
-  served_guami_list:
-    - mcc: 208
-      mnc: 99
-      amf_region_id: 01
-      amf_set_id: 001
-      amf_pointer: 01
-  plmn_support_list:
-    - mcc: 208
-      mnc: 99
-      tac: 0x0001
-      nssai:
-        - *embb_slice1
-  supported_integrity_algorithms:
-    - "NIA0"
-    - "NIA1"
-    - "NIA2"
-  supported_encryption_algorithms:
-    - "NEA0"
-    - "NEA1"
-    - "NEA2"
-
-smf:
-  ue_mtu: 1500
-  support_features:
-    use_local_subscription_info: yes # Use infos from local_subscription_info or from UDM
-    use_local_pcc_rules: yes # Use infos from local_pcc_rules or from PCF
-  upfs:
-    - host: oai-upf
-      port: 8805
-      config:
-        enable_usage_reporting: no
-        # follows UPFInfo from 3GPP TS 29.510, currently only these values from interfaceUpfInfoList are supported
-      upf_info:
-        interfaceUpfInfoList:
-          - interfaceType: "N3"
-            networkInstance: "access.oai.org"
-          - interfaceType: "N6"
-            networkInstance: "core.oai.org"
-  ue_dns:
-    primary_ipv4: "172.21.3.100"
-    primary_ipv6: "2001:4860:4860::8888"
-    secondary_ipv4: "8.8.8.8"
-    secondary_ipv6: "2001:4860:4860::8888"
-  ims:
-    pcscf_ipv4: "127.0.0.1"
-    pcscf_ipv6: "fe80::7915:f408:1787:db8b"
-  # the DNN you configure here should be configured in "dnns"
-  # follows the SmfInfo datatype from 3GPP TS 29.510
-  smf_info:
-    sNssaiSmfInfoList:
-      - sNssai: *embb_slice1
-        dnnSmfInfoList:
-          - dnn: "oai"
-  local_subscription_infos:
-    - single_nssai: *embb_slice1
-      dnn: "oai"
-      qos_profile:
-        5qi: 9
-        session_ambr_ul: "200Mbps"
-        session_ambr_dl: "400Mbps"
-
-upf:
-  support_features:
-    enable_bpf_datapath: no    # If "on": BPF is used as datapath else simpleswitch is used, DEFAULT= off
-    enable_snat: yes           # If "on": Source natting is done for UE, DEFAULT= off
-  remote_n6_gw: localhost      # Dummy host since simple-switch does not use N6 GW
-  upf_info:
-    sNssaiUpfInfoList:
-      - sNssai: *embb_slice1
-        dnnUpfInfoList:
-          - dnn: "oai"
-
-## DNN configuration
-dnns:
-  - dnn: "oai"
-    pdu_session_type: "IPV4"
-    ipv4_subnet: "12.1.1.0/24"
--- a/ci-scripts/yaml_files/5g_rfsimulator/oai_db.sql
+++ b/ci-scripts/yaml_files/5g_rfsimulator/oai_db.sql
--- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
@@ -1,5 +1,14 @@
 version: '3.8'
 services:
+    oai-nrf:
+        container_name: "rfsim5g-oai-nrf"
+        image: oaisoftwarealliance/oai-nrf:v1.5.0
+        environment:
+            - NRF_INTERFACE_NAME_FOR_SBI=eth0
+            - TZ=Europe/Paris
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.130
    mysql:
        container_name: "rfsim5g-mysql"
        image: mysql:8.0
@@ -22,36 +31,108 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.0.0
+        image: oaisoftwarealliance/oai-amf:v1.5.0
        environment:
            - TZ=Europe/paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
+            - MCC=208
+            - MNC=99
+            - REGION_ID=128
+            - AMF_SET_ID=1
+            - SERVED_GUAMI_MCC_0=208
+            - SERVED_GUAMI_MNC_0=99
+            - SERVED_GUAMI_REGION_ID_0=128
+            - SERVED_GUAMI_AMF_SET_ID_0=1
+            - SERVED_GUAMI_MCC_1=460
+            - SERVED_GUAMI_MNC_1=11
+            - SERVED_GUAMI_REGION_ID_1=10
+            - SERVED_GUAMI_AMF_SET_ID_1=1
+            - PLMN_SUPPORT_MCC=208
+            - PLMN_SUPPORT_MNC=99
+            - PLMN_SUPPORT_TAC=0x0001
+            # Only one slice is defined (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.71.133
+            - SELECTED_0=true
+            # mysql definition in AMF is mandatory in mini deployment.
+            - MYSQL_SERVER=192.168.71.131
+            - MYSQL_USER=root
+            - MYSQL_PASS=linux
+            - MYSQL_DB=oai_db
+            # NF registration
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - NF_REGISTRATION=yes
+            - SMF_SELECTION=yes
+            - USE_FQDN_DNS=yes
+            - USE_HTTP2=no
        depends_on:
+            - oai-nrf
            - mysql
        networks:
            public_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.0.0
+        image: oaisoftwarealliance/oai-smf:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
+            - SMF_INTERFACE_NAME_FOR_N4=eth0
+            - SMF_INTERFACE_NAME_FOR_SBI=eth0
+            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
+            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
+            - AMF_IPV4_ADDRESS=192.168.71.132
+            - AMF_FQDN=oai-amf
+            - UPF_IPV4_ADDRESS=192.168.71.134
+            - UPF_FQDN_0=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - REGISTER_NRF=yes
+            - DISCOVER_UPF=yes
+            - USE_FQDN_DNS=yes
+            - USE_LOCAL_SUBSCRIPTION_INFO=yes
+            - UE_MTU=1500
+            # Only one slice is defined (1, 0xFFFFFF)
+            - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
+            - NSSAI_SST0=1
+            - SESSION_AMBR_UL0=200Mbps
+            - SESSION_AMBR_DL0=400Mbps
+            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
+            - ENABLE_USAGE_REPORTING=no
        depends_on:
+            - oai-nrf
            - oai-amf
        networks:
            public_net:
                ipv4_address: 192.168.71.133
-    oai-upf:
-        container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.0.0
+    oai-spgwu:
+        container_name: "rfsim5g-oai-spgwu"
+        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
+            - 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.1.0/24
+            - ENABLE_5G_FEATURES=yes
+            - REGISTER_NRF=yes
+            - USE_FQDN_NRF=yes
+            - UPF_FQDN_5G=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            # Only one slice is defined (1, 0xFFFFFF)
+            - NSSAI_SST_0=1
+            - NSSAI_SD_0=0xffffff
+            - DNN_0=oai
        depends_on:
+            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -72,7 +153,7 @@ services:
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
        depends_on:
-            - oai-upf
+            - oai-spgwu
        networks:
            traffic_net:
                ipv4_address: 192.168.72.135
@@ -106,6 +187,7 @@ services:
        container_name: rfsim5g-oai-nr-ue
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604800000 --uicc0.imsi 208990100001100 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
@@ -1,5 +1,14 @@
 version: '3.8'
 services:
+    oai-nrf:
+        container_name: "rfsim5g-oai-nrf"
+        image: oaisoftwarealliance/oai-nrf:v1.5.0
+        environment:
+            - NRF_INTERFACE_NAME_FOR_SBI=eth0
+            - TZ=Europe/Paris
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.130
    mysql:
        container_name: "rfsim5g-mysql"
        image: mysql:8.0
@@ -22,36 +31,108 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.0.0
+        image: oaisoftwarealliance/oai-amf:v1.5.0
        environment:
            - TZ=Europe/paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
+            - MCC=208
+            - MNC=99
+            - REGION_ID=128
+            - AMF_SET_ID=1
+            - SERVED_GUAMI_MCC_0=208
+            - SERVED_GUAMI_MNC_0=99
+            - SERVED_GUAMI_REGION_ID_0=128
+            - SERVED_GUAMI_AMF_SET_ID_0=1
+            - SERVED_GUAMI_MCC_1=460
+            - SERVED_GUAMI_MNC_1=11
+            - SERVED_GUAMI_REGION_ID_1=10
+            - SERVED_GUAMI_AMF_SET_ID_1=1
+            - PLMN_SUPPORT_MCC=208
+            - PLMN_SUPPORT_MNC=99
+            - PLMN_SUPPORT_TAC=0x0001
+            # Only one slice is defined (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.71.133
+            - SELECTED_0=true
+            # mysql definition in AMF is mandatory in mini deployment.
+            - MYSQL_SERVER=192.168.71.131
+            - MYSQL_USER=root
+            - MYSQL_PASS=linux
+            - MYSQL_DB=oai_db
+            # NF registration
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - NF_REGISTRATION=yes
+            - SMF_SELECTION=yes
+            - USE_FQDN_DNS=yes
+            - USE_HTTP2=no
        depends_on:
+            - oai-nrf
            - mysql
        networks:
            public_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.0.0
+        image: oaisoftwarealliance/oai-smf:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
+            - SMF_INTERFACE_NAME_FOR_N4=eth0
+            - SMF_INTERFACE_NAME_FOR_SBI=eth0
+            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
+            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
+            - AMF_IPV4_ADDRESS=192.168.71.132
+            - AMF_FQDN=oai-amf
+            - UPF_IPV4_ADDRESS=192.168.71.134
+            - UPF_FQDN_0=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - REGISTER_NRF=yes
+            - DISCOVER_UPF=yes
+            - USE_FQDN_DNS=yes
+            - USE_LOCAL_SUBSCRIPTION_INFO=yes
+            - UE_MTU=1500
+            # Only one slice is defined (1, 0xFFFFFF)
+            - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
+            - NSSAI_SST0=1
+            - SESSION_AMBR_UL0=200Mbps
+            - SESSION_AMBR_DL0=400Mbps
+            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
+            - ENABLE_USAGE_REPORTING=no
        depends_on:
+            - oai-nrf
            - oai-amf
        networks:
            public_net:
                ipv4_address: 192.168.71.133
-    oai-upf:
-        container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.0.0
+    oai-spgwu:
+        container_name: "rfsim5g-oai-spgwu"
+        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
+            - 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.1.0/24
+            - ENABLE_5G_FEATURES=yes
+            - REGISTER_NRF=yes
+            - USE_FQDN_NRF=yes
+            - UPF_FQDN_5G=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            # Only one slice is defined (1, 0xFFFFFF)
+            - NSSAI_SST_0=1
+            - NSSAI_SD_0=0xffffff
+            - DNN_0=oai
        depends_on:
+            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -72,7 +153,7 @@ services:
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
        depends_on:
-            - oai-upf
+            - oai-spgwu
        networks:
            traffic_net:
                ipv4_address: 192.168.72.135
@@ -107,6 +188,7 @@ services:
        container_name: rfsim5g-oai-nr-ue
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/5g_rfsimulator_e1/README.md
+++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/README.md
@@ -1,229 +0,0 @@
-# CI test for 5G F1+E1 splits with RFsimulator
-
-## General
-
-This docker-compose file deploys a core, RAN, and 3 UEs. Specifically:
-
- 5GC mini deployment,
- 1 CU-CP,
- 3 CU-UPs, one for slices SST=1,2,3,
- 3 DUs, 
- 3 UEs connecting to each DU, each requesting slice SST=1,2,3.
-
-The CU-CP associates each UE X connecting through DU X to CU-UP X, X=1,2,3.  To this end, the docker-compose file deliberately employs the three `f1u_netX` networks to route the user-plane traffic of each DU X/CU-UP X pair, through the `f1u_netX` network in order to effectively test that the correct CU-UP is associated. Basically, the traffic test will only succeed if the correct pair of DU/CU-UP has been established; if not, the DU/CU-UP cannot communicate, as the traffic cannot be routed.
-
-Core network components are on `core_net` network, CU-CP <--> CU-UP X communicate via `e1_net` network, CU-CP <--> DU X communicate via `f1c_net` network and DU X <--> NR_UE X communicate via `ue_net` network.
-
-
-## Connectivity
-
-```
-AMF  --> 192.168.71.132 (N2,Namf)
-SMF  --> 192.168.71.133 (N4,Nsmf)
-UPF    --> 192.168.71.134 (N3)
-CU-CP  --> 192.168.71.X (N2), 192.168.72.2 (F1C), 192.168.77.2 (E1)
-CU-UP1 --> 192.168.71.X (N3), 192.168.73.2 (F1U), 192.168.77.3 (E1)
-CU-UP2 --> 192.168.71.X (N3), 192.168.74.2 (F1U), 192.168.77.4 (E1)
-CU-UP3 --> 192.168.71.X (N3), 192.168.76.2 (F1U), 192.168.77.5 (E1)
-DU1    --> 192.168.72.2 (F1C), 192.168.73.3 (F1U), 192.168.78.2 (RFSIM)
-DU2    --> 192.168.72.3 (F1C), 192.168.74.3 (F1U), 192.168.78.3 (RFSIM)
-DU3    --> 192.168.72.4 (F1C), 192.168.76.3 (F1U), 192.168.78.4 (RFSIM)
-UE1    --> 192.168.78.5 (RFSIM)
-UE2    --> 192.168.78.6 (RFSIM)
-UE3    --> 192.168.78.7 (RFSIM)
-```
-
-## How to run
-
-You should be able to deploy the [basic 5G RFsim deployment](../5g_rfsimulator/README.md).
-
-First, start the MySQL server and 5GC:
-
-```bash
-docker-compose up -d mysql oai-amf oai-smf oai-upf
-docker-compose ps -a
-```
-
-Wait till everything is healthy.
-
-Next, start the RAN:
-
-```bash
-docker-compose up -d oai-cucp oai-cuup{,2,3} oai-du{,2,3}
-```
-
-You can verify that the DUs and CU-UPs connected successfully:
-```bash
-docker logs rfsim5g-oai-cucp
-```
-
-<details>
-<summary>The output is similar to:</summary>
-
-```console
-[...]
-18535.139811 [RRC] I Accepting new CU-UP ID 3585 name gNB-OAI (assoc_id 257)
-18535.425744 [RRC] I Accepting new CU-UP ID 3584 name gNB-OAI (assoc_id 260)
-18535.425757 [RRC] I Accepting new CU-UP ID 3586 name gNB-OAI (assoc_id 261)
-18535.669733 [NR_RRC] I Received F1 Setup Request from gNB_DU 3585 (du-rfsim) on assoc_id 263
-18535.669814 [RRC] I Accepting DU 3585 (du-rfsim), sending F1 Setup Response
-18536.066417 [NR_RRC] I Received F1 Setup Request from gNB_DU 3586 (du-rfsim) on assoc_id 265
-18536.066476 [RRC] I Accepting DU 3586 (du-rfsim), sending F1 Setup Response
-18536.135581 [NR_RRC] I Received F1 Setup Request from gNB_DU 3584 (du-rfsim) on assoc_id 267
-18536.135650 [RRC] I Accepting DU 3584 (du-rfsim), sending F1 Setup Response
-```
-</details>
-
-You should see that the CU-UP initialized two GTP instances (one for NG-U, the other for F1-U):
-
-```bash
-docker logs -f rfsim5g-oai-cuup
-```
-
-<details>
-<summary>The output is similar to:</summary>
-
-```console
-[...]
-122690.500374 [GTPU] I Initializing UDP for local address 192.168.73.2 with port 2153
-122690.500406 [GTPU] I Created gtpu instance id: 96
-122690.500413 [GTPU] I Configuring GTPu address : 192.168.71.161, port : 2152
-122690.500414 [GTPU] I Initializing UDP for local address 192.168.71.161 with port 2152
-122690.500420 [GTPU] I Created gtpu instance id: 97
-```
-</details>
-
-
-
-You should see the typical periodical output at the DUs:
-
-```bash
-docker logs rfsim5g-oai-du
-```
-<details>
-<summary>The output is similar to:</summary>
-
-```console
-[...]
-18626.446953 [NR_MAC] I Frame.Slot 128.0
-
-18629.151076 [NR_MAC] I Frame.Slot 256.0
-```
-</details>
-
-```
-
-Next, connect the UEs. They are configured to connect to each DU by setting the
-RFsimulator server address to the `public_net` IP address of each DU. For each,
-you should see that they get an IP address
-
-```bash
-docker compose up -d oai-nr-ue{,2,3}
-```
-
-```bash
-docker logs rfsim5g-oai-nr-ue
-```
-
-<details>
-<summary>The output is similar to:</summary>
-
-```console
-[...]
-18758.176149 [NR_RRC] I rrcReconfigurationComplete Encoded 10 bits (2 bytes)
-18758.176153 [NR_RRC] I  Logical Channel UL-DCCH (SRB1), Generating RRCReconfigurationComplete (bytes 2)
-18758.176154 [NAS] I [UE 0] Received NAS_CONN_ESTABLI_CNF: errCode 1, length 87
-18758.176455 [OIP] I Interface oaitun_ue1 successfully configured, ip address 12.1.1.3, mask 255.255.255.0 broadcast address 12.1.1.255
-```
-</details>
-
-
-Alternatively, check that they all received an IP address (the associated IP addresses might be different):
-
-```bash
-docker exec -it rfsim5g-oai-nr-ue3 ip a show oaitun_ue1
-```
-<details>
-<summary>The output is similar to:</summary>
-
-```console
-[...]
-    inet 12.1.1.2/24 brd 12.1.1.255 scope global oaitun_ue1
-[...]
-```
-</details>
-
-```bash
-docker exec -it rfsim5g-oai-nr-ue2 ip a show oaitun_ue1
-```
-<details>
-<summary>The output is similar to:</summary>
-
-```console
-[...]
-    inet 12.1.1.4/24 brd 12.1.1.255 scope global oaitun_ue1
-[...]
-```
-</details>
-
-```bash
-docker exec -it rfsim5g-oai-nr-ue ip a show oaitun_ue1
-```
-<details>
-<summary>The output is similar to:</summary>
-
-```console
-[...]
-    inet 12.1.1.3/24 brd 12.1.1.255 scope global oaitun_ue1
-[...]
-```
-</details>
-
-
-
-Also, note that each DU sees only one UE! At the CU-CP, you should see that
-each DU has been associated to a different CU-UP, based on the NSSAI (`exact
-NSSAI match`):
-```bash
-docker logs rfsim5g-oai-cucp | grep CU-U
-```
-
-<details>
-<summary>The output is similar to:</summary>
-
-```console
-[...]
-18757.531423 [RRC] I selecting CU-UP ID 3586 based on exact NSSAI match (3:0xffffff)
-18757.531434 [RRC] I UE 1 associating to CU-UP assoc_id 261 out of 3 CU-UPs
-18758.171502 [RRC] I selecting CU-UP ID 3584 based on exact NSSAI match (1:0xffffff)
-18758.171510 [RRC] I UE 2 associating to CU-UP assoc_id 260 out of 3 CU-UPs
-18758.772320 [RRC] I selecting CU-UP ID 3585 based on exact NSSAI match (2:0xffffff)
-18758.772327 [RRC] I UE 3 associating to CU-UP assoc_id 257 out of 3 CU-UPs
-```
-</details>
-
-
-Also, each UE should be able to ping the core network. For instance, with UE 1:
-```bash
-docker exec -it rfsim5g-oai-nr-ue ping -c1 12.1.1.1
-```
-<details>
-<summary>The output is similar to:</summary>
-
-```console
-PING 12.1.1.1 (12.1.1.1) 56(84) bytes of data.
-64 bytes from 12.1.1.1: icmp_seq=1 ttl=64 time=15.2 ms
-
--- 12.1.1.1 ping statistics ---
-1 packets transmitted, 1 received, 0% packet loss, time 0ms
-rtt min/avg/max/mdev = 15.155/15.155/15.155/0.000 ms
-```
-</details>
-
-
-Finally, undeploy the UEs (to give them time to do deregistration), and then
-the rest of the network:
-```bash
-docker compose stop oai-nr-ue{,2,3}
-docker compose down
-```
--- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
@@ -1,5 +1,14 @@
 version: '3.8'
 services:
+    oai-nrf:
+        container_name: "rfsim5g-oai-nrf"
+        image: oaisoftwarealliance/oai-nrf:v1.5.0
+        environment:
+            - NRF_INTERFACE_NAME_FOR_SBI=eth0
+            - TZ=Europe/Paris
+        networks:
+            core_net:
+                ipv4_address: 192.168.71.130
    mysql:
        container_name: "rfsim5g-mysql"
        image: mysql:8.0
@@ -22,36 +31,108 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.0.0
+        image: oaisoftwarealliance/oai-amf:v1.5.0
        environment:
            - TZ=Europe/paris
-        volumes:
-            - ./mini_nonrf_config_3slices.yaml:/openair-amf/etc/config.yaml
+            - MCC=208
+            - MNC=99
+            - REGION_ID=128
+            - AMF_SET_ID=1
+            - SERVED_GUAMI_MCC_0=208
+            - SERVED_GUAMI_MNC_0=99
+            - SERVED_GUAMI_REGION_ID_0=128
+            - SERVED_GUAMI_AMF_SET_ID_0=1
+            - SERVED_GUAMI_MCC_1=460
+            - SERVED_GUAMI_MNC_1=11
+            - SERVED_GUAMI_REGION_ID_1=10
+            - SERVED_GUAMI_AMF_SET_ID_1=1
+            - PLMN_SUPPORT_MCC=208
+            - PLMN_SUPPORT_MNC=99
+            - PLMN_SUPPORT_TAC=0x0001
+            # Only one slice is defined (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.71.133
+            - SELECTED_0=true
+            # mysql definition in AMF is mandatory in mini deployment.
+            - MYSQL_SERVER=192.168.71.131
+            - MYSQL_USER=root
+            - MYSQL_PASS=linux
+            - MYSQL_DB=oai_db
+            # NF registration
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - NF_REGISTRATION=yes
+            - SMF_SELECTION=yes
+            - USE_FQDN_DNS=yes
+            - USE_HTTP2=no
        depends_on:
+            - oai-nrf
            - mysql
        networks:
            core_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.0.0
+        image: oaisoftwarealliance/oai-smf:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ./mini_nonrf_config_3slices.yaml:/openair-smf/etc/config.yaml
+            - SMF_INTERFACE_NAME_FOR_N4=eth0
+            - SMF_INTERFACE_NAME_FOR_SBI=eth0
+            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
+            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
+            - AMF_IPV4_ADDRESS=192.168.71.132
+            - AMF_FQDN=oai-amf
+            - UPF_IPV4_ADDRESS=192.168.71.134
+            - UPF_FQDN_0=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - REGISTER_NRF=yes
+            - DISCOVER_UPF=yes
+            - USE_FQDN_DNS=yes
+            - USE_LOCAL_SUBSCRIPTION_INFO=yes
+            - UE_MTU=1500
+            # Only one slice is defined (1, 0xFFFFFF)
+            - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
+            - NSSAI_SST0=1
+            - SESSION_AMBR_UL0=200Mbps
+            - SESSION_AMBR_DL0=400Mbps
+            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
+            - ENABLE_USAGE_REPORTING=no
        depends_on:
+            - oai-nrf
            - oai-amf
        networks:
            core_net:
                ipv4_address: 192.168.71.133
-    oai-upf:
-        container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.0.0
+    oai-spgwu:
+        container_name: "rfsim5g-oai-spgwu"
+        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ./mini_nonrf_config_3slices.yaml:/openair-upf/etc/config.yaml
+            - 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.1.0/24
+            - ENABLE_5G_FEATURES=yes
+            - REGISTER_NRF=yes
+            - USE_FQDN_NRF=yes
+            - UPF_FQDN_5G=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            # Only one slice is defined (1, 0xFFFFFF)
+            - NSSAI_SST_0=1
+            - NSSAI_SD_0=0xffffff
+            - DNN_0=oai
        depends_on:
+            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -63,26 +144,40 @@ services:
            core_net:
                ipv4_address: 192.168.71.134
            traffic_net:
-                ipv4_address: 192.168.72.134
+                ipv4_address: 192.168.73.134
+
+    oai-ext-dn:
+        privileged: true
+        container_name: rfsim5g-oai-ext-dn
+        image: oaisoftwarealliance/trf-gen-cn5g:focal
+        entrypoint: /bin/bash -c \
+              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
+              "ip route add 12.1.1.0/24 via 192.168.73.134 dev eth0; sleep infinity"
+        depends_on:
+            - oai-spgwu
+        networks:
+            traffic_net:
+                ipv4_address: 192.168.73.135
+        healthcheck:
+            test: /bin/bash -c "ping -c 2 192.168.73.134"
+            interval: 10s
+            timeout: 5s
+            retries: 5

    oai-cucp:
        image: oaisoftwarealliance/oai-gnb:develop
        privileged: true
        container_name: rfsim5g-oai-cucp
        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
-                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.77.2
-                                    --gNBs.[0].local_s_address 192.168.72.2
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
        depends_on:
-            - oai-upf
+            - oai-ext-dn
        networks:
            core_net:
-                ipv4_address: 192.168.71.150
-            f1c_net:
-                ipv4_address: 192.168.72.2
-            e1_net:
-                ipv4_address: 192.168.77.2
+                ipv4_address: 192.168.71.140
+            ran_net:
+                ipv4_address: 192.168.72.140
        volumes:
            - ../../conf_files/gnb-cucp.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
        healthcheck:
@@ -96,83 +191,15 @@ services:
        privileged: true
        container_name: rfsim5g-oai-cuup
        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
-                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.77.2
-                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cuup 192.168.77.3
-                                    --gNBs.[0].local_s_address 192.168.73.2
-                                    --gNBs.[0].remote_s_address 127.0.0.1
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-cucp
        networks:
            core_net:
-                ipv4_address: 192.168.71.161
-            f1u_1_net:
-                ipv4_address: 192.168.73.2
-            e1_net:
-                ipv4_address: 192.168.77.3
-        volumes:
-            - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-cuup"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    oai-cuup2:
-        image: oaisoftwarealliance/oai-nr-cuup:develop
-        privileged: true
-        container_name: rfsim5g-oai-cuup2
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
-                                    --gNBs.[0].gNB_CU_UP_ID 0xe01
-                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.77.2
-                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cuup 192.168.77.4
-                                    --gNBs.[0].local_s_address 192.168.74.2
-                                    --gNBs.[0].remote_s_address 127.0.0.1
-                                    --gNBs.[0].NETWORK_INTERFACES.GNB_IPV4_ADDRESS_FOR_NGU 192.168.71.162
-                                    --gNBs.[0].plmn_list.[0].snssaiList.[0].sst 2
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-cucp
-        networks:
-            core_net:
-                ipv4_address: 192.168.71.162
-            f1u_2_net:
-                ipv4_address: 192.168.74.2
-            e1_net:
-                ipv4_address: 192.168.77.4
-        volumes:
-            - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-cuup"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    oai-cuup3:
-        image: oaisoftwarealliance/oai-nr-cuup:develop
-        privileged: true
-        container_name: rfsim5g-oai-cuup3
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
-                                    --gNBs.[0].gNB_CU_UP_ID 0xe02
-                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.77.2
-                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cuup 192.168.77.5
-                                    --gNBs.[0].local_s_address 192.168.76.2
-                                    --gNBs.[0].remote_s_address 127.0.0.1
-                                    --gNBs.[0].NETWORK_INTERFACES.GNB_IPV4_ADDRESS_FOR_NGU 192.168.71.163
-                                    --gNBs.[0].plmn_list.[0].snssaiList.[0].sst 3
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-cucp
-        networks:
-            core_net:
-                ipv4_address: 192.168.71.163
-            f1u_3_net:
-                ipv4_address: 192.168.76.2
-            e1_net:
-                ipv4_address: 192.168.77.5
+                ipv4_address: 192.168.71.141
+            ran_net:
+                ipv4_address: 192.168.72.141
        volumes:
            - ../../conf_files/gnb-cuup.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
        healthcheck:
@@ -187,81 +214,12 @@ services:
        container_name: rfsim5g-oai-du
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-                                    --MACRLCs.[0].local_n_address 192.168.73.3
-                                    --MACRLCs.[0].remote_n_address 192.168.72.2
            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-cucp
-            - oai-cuup
        networks:
-            f1c_net:
-                ipv4_address: 192.168.72.3
-            f1u_1_net:
-                ipv4_address: 192.168.73.3
-            ue_net:
-                ipv4_address: 192.168.78.2
+            ran_net:
+                ipv4_address: 192.168.72.142
        volumes:
-            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    oai-du2:
-        image: oaisoftwarealliance/oai-gnb:develop
-        privileged: true
-        container_name: rfsim5g-oai-du2
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-                                    --gNBs.[0].gNB_DU_ID 0xe01
-                                    --gNBs.[0].nr_cellid 87654321
-                                    --gNBs.[0].servingCellConfigCommon.[0].physCellId 1
-                                    --MACRLCs.[0].local_n_address 192.168.74.3
-                                    --MACRLCs.[0].remote_n_address 192.168.72.2
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-cucp
-            - oai-cuup2
-        networks:
-            f1c_net:
-                ipv4_address: 192.168.72.4
-            f1u_2_net:
-                ipv4_address: 192.168.74.3
-            ue_net:
-                ipv4_address: 192.168.78.3
-        volumes:
-            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-softmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    oai-du3:
-        image: oaisoftwarealliance/oai-gnb:develop
-        privileged: true
-        container_name: rfsim5g-oai-du3
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-                                    --gNBs.[0].gNB_DU_ID 0xe02
-                                    --gNBs.[0].nr_cellid 11111111
-                                    --gNBs.[0].servingCellConfigCommon.[0].physCellId 2
-                                    --MACRLCs.[0].local_n_address 192.168.76.3
-                                    --MACRLCs.[0].remote_n_address 192.168.72.2
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-cucp
-            - oai-cuup3
-        networks:
-            f1c_net:
-                ipv4_address: 192.168.72.5
-            f1u_3_net:
-                ipv4_address: 192.168.76.3
-            ue_net:
-                ipv4_address: 192.168.78.4
-        volumes:
-            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
+            - ../../conf_files/gnb-du.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
        healthcheck:
            test: /bin/bash -c "pgrep nr-softmodem"
            interval: 10s
@@ -273,60 +231,13 @@ services:
        privileged: true
        container_name: rfsim5g-oai-nr-ue
        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-                                    -r 106 --numerology 1 -C 3619200000
-                                    --uicc0.imsi 208990100001100
-                                    --rfsimulator.serveraddr 192.168.78.2
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.serveraddr 192.168.72.142 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-du
        networks:
-            ue_net:
-                ipv4_address: 192.168.78.5
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    oai-nr-ue2:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue2
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-                                    -r 106 --numerology 1 -C 3619200000
-                                    --uicc0.imsi 208990100001101 --uicc0.nssai_sst 2
-                                    --rfsimulator.serveraddr 192.168.78.3
-        depends_on:
-            - oai-du2
-        networks:
-            ue_net:
-                ipv4_address: 192.168.78.6
-        volumes:
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    oai-nr-ue3:
-        image: oaisoftwarealliance/oai-nr-ue:develop
-        privileged: true
-        container_name: rfsim5g-oai-nr-ue3
-        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
-                                    -r 106 --numerology 1 -C 3619200000
-                                    --uicc0.imsi 208990100001102 --uicc0.nssai_sst 3
-                                    --rfsimulator.serveraddr 192.168.78.4
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-du3
-        networks:
-            ue_net:
-                ipv4_address: 192.168.78.7
+            ran_net:
+                ipv4_address: 192.168.72.150
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -344,59 +255,19 @@ networks:
                - subnet: 192.168.71.128/26
        driver_opts:
            com.docker.network.bridge.name: "rfsim5g-core"
-    traffic_net:
+    ran_net:
        driver: bridge
-        name: rfsim5g-oai-traffic-net
+        name: rfsim5g-oai-ran-net
        ipam:
            config:
                - subnet: 192.168.72.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-ran"
+    traffic_net:
+        driver: bridge
+        name: rfsim5g-oai-traffic_net-net
+        ipam:
+            config:
+                - subnet: 192.168.73.128/26
        driver_opts:
            com.docker.network.bridge.name: "rfsim5g-traffic"
-    f1c_net:
-        driver: bridge
-        name: rfsim5g-oai-f1c-net
-        ipam:
-            config:
-                - subnet: 192.168.72.0/28
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-f1c"
-    f1u_1_net:
-        driver: bridge
-        name: rfsim5g-oai-f1u-1-net
-        ipam:
-            config:
-                - subnet: 192.168.73.0/28
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-f1u_1"
-    f1u_2_net:
-        driver: bridge
-        name: rfsim5g-oai-f1u-2-net
-        ipam:
-            config:
-                - subnet: 192.168.74.0/28
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-f1u_2"
-    f1u_3_net:
-        driver: bridge
-        name: rfsim5g-oai-f1u-3-net
-        ipam:
-            config:
-                - subnet: 192.168.76.0/28
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-f1u_3"
-    e1_net:
-        driver: bridge
-        name: rfsim5g-oai-e1-net
-        ipam:
-            config:
-                - subnet: 192.168.77.1/28
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-e1"
-    ue_net:
-        driver: bridge
-        name: rfsim5g-oai-ue-net
-        ipam:
-            config:
-                - subnet: 192.168.78.1/28
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-ue"
--- a/ci-scripts/yaml_files/5g_rfsimulator_e1/mini_nonrf_config_3slices.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/mini_nonrf_config_3slices.yaml
@@ -1,213 +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
-################################################################################
-
-# OAI CN Configuration File
-### This file can be used by all OAI NFs
-### Some fields are specific to an NF and will be ignored by other NFs
-
-## NOTE ON YAML ANCHORS ##
-# We use YAML anchors to ease the configuration and to avoid duplicating parts of the configuration.
-# This is especially true for the SNSSAIs, as we have to define them for multiple NFs.
-# Please note that the use of anchors is not mandatory, and you can define the SNSSAI in each NF yourself.
-# You can read more about anchors here: https://yaml.org/spec/1.2.2/#anchors-and-aliases
-
-############# Common configuration
-
-# Log level for all the NFs
-log_level:
-  general: debug
-
-# If you enable registration, the other NFs will use the NRF discovery mechanism
-register_nf:
-  general: no
-
-http_version: 1
-
-############## SBI Interfaces
-### Each NF takes its local SBI interfaces and remote interfaces from here, unless it gets them using NRF discovery mechanisms
-nfs:
-  amf:
-    host: oai-amf
-    sbi:
-      port: 80
-      api_version: v1
-      interface_name: eth0
-    n2:
-      interface_name: eth0
-      port: 38412
-  smf:
-    host: oai-smf
-    sbi:
-      port: 80
-      api_version: v1
-      interface_name: eth0
-    n4:
-      interface_name: eth0
-      port: 8805
-
-  upf:
-    host: oai-upf
-    sbi:
-      port: 80
-      api_version: v1
-      interface_name: eth0
-    n3:
-      interface_name: eth0
-      port: 2152
-    n4:
-      interface_name: eth0
-      port: 8805
-    n6:
-      interface_name: eth1
-    n9:
-      interface_name: eth0
-      port: 2152
-
-#### Common for UDR and AMF
-database:
-  host: mysql
-  user: test
-  type: mysql
-  password: test
-  database_name: oai_db
-  generate_random: true
-  connection_timeout: 300 # seconds
-
-## general single_nssai configuration
-## Defines YAML anchors, which are reused in the config file
-snssais:
-  - &embb_slice1
-    sst: 1
-  - &embb_slice2
-    sst: 2
-  - &embb_slice3
-    sst: 3
-
-############## NF-specific configuration
-amf:
-  amf_name: "OAI-AMF"
-  # This really depends on if we want to keep the "mini" version or not
-  support_features_options:
-    enable_simple_scenario: yes # "no" by default with the normal deployment scenarios with AMF/SMF/UPF/AUSF/UDM/UDR/NRF.
-                               # set it to "yes" to use with the minimalist deployment scenario (including only AMF/SMF/UPF) by using the internal AUSF/UDM implemented inside AMF.
-                               # There's no NRF in this scenario, SMF info is taken from "nfs" section.
-    enable_nssf: no
-    enable_smf_selection: no
-  relative_capacity: 30
-  statistics_timer_interval: 20  # in seconds
-  emergency_support: false
-  served_guami_list:
-    - mcc: 208
-      mnc: 99
-      amf_region_id: 01
-      amf_set_id: 001
-      amf_pointer: 01
-  plmn_support_list:
-    - mcc: 208
-      mnc: 99
-      tac: 0x0001
-      nssai:
-        - *embb_slice1
-        - *embb_slice2
-        - *embb_slice3
-  supported_integrity_algorithms:
-    - "NIA0"
-    - "NIA1"
-    - "NIA2"
-  supported_encryption_algorithms:
-    - "NEA0"
-    - "NEA1"
-    - "NEA2"
-
-smf:
-  ue_mtu: 1500
-  support_features:
-    use_local_subscription_info: yes # Use infos from local_subscription_info or from UDM
-    use_local_pcc_rules: yes # Use infos from local_pcc_rules or from PCF
-  upfs:
-    - host: oai-upf
-      port: 8805
-      config:
-        enable_usage_reporting: no
-        # follows UPFInfo from 3GPP TS 29.510, currently only these values from interfaceUpfInfoList are supported
-      upf_info:
-        interfaceUpfInfoList:
-          - interfaceType: "N3"
-            networkInstance: "access.oai.org"
-          - interfaceType: "N6"
-            networkInstance: "core.oai.org"
-  ue_dns:
-    primary_ipv4: "172.21.3.100"
-    primary_ipv6: "2001:4860:4860::8888"
-    secondary_ipv4: "8.8.8.8"
-    secondary_ipv6: "2001:4860:4860::8888"
-  ims:
-    pcscf_ipv4: "127.0.0.1"
-    pcscf_ipv6: "fe80::7915:f408:1787:db8b"
-  # the DNN you configure here should be configured in "dnns"
-  # follows the SmfInfo datatype from 3GPP TS 29.510
-  smf_info:
-    sNssaiSmfInfoList:
-      - sNssai: *embb_slice1
-        dnnSmfInfoList:
-          - dnn: "oai"
-  local_subscription_infos:
-    - single_nssai: *embb_slice1
-      dnn: "oai"
-      qos_profile:
-        5qi: 9
-        session_ambr_ul: "200Mbps"
-        session_ambr_dl: "400Mbps"
-    - single_nssai: *embb_slice2
-      dnn: "oai"
-      qos_profile:
-        5qi: 9
-        session_ambr_ul: "200Mbps"
-        session_ambr_dl: "400Mbps"
-    - single_nssai: *embb_slice3
-      dnn: "oai"
-      qos_profile:
-        5qi: 9
-        session_ambr_ul: "200Mbps"
-        session_ambr_dl: "400Mbps"
-
-upf:
-  support_features:
-    enable_bpf_datapath: no    # If "on": BPF is used as datapath else simpleswitch is used, DEFAULT= off
-    enable_snat: yes           # If "on": Source natting is done for UE, DEFAULT= off
-  remote_n6_gw: localhost      # Dummy host since simple-switch does not use N6 GW
-  upf_info:
-    sNssaiUpfInfoList:
-      - sNssai: *embb_slice1
-        dnnUpfInfoList:
-          - dnn: "oai"
-      - sNssai: *embb_slice2
-        dnnUpfInfoList:
-          - dnn: "oai"
-      - sNssai: *embb_slice3
-        dnnUpfInfoList:
-          - dnn: "oai"
-
-## DNN configuration
-dnns:
-  - dnn: "oai"
-    pdu_session_type: "IPV4"
-    ipv4_subnet: "12.1.1.0/24"
--- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
@@ -1,5 +1,14 @@
 version: '3.8'
 services:
+    oai-nrf:
+        container_name: "rfsim5g-oai-nrf"
+        image: oaisoftwarealliance/oai-nrf:v1.5.0
+        environment:
+            - NRF_INTERFACE_NAME_FOR_SBI=eth0
+            - TZ=Europe/Paris
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.130
    mysql:
        container_name: "rfsim5g-mysql"
        image: mysql:8.0
@@ -22,36 +31,108 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.0.0
+        image: oaisoftwarealliance/oai-amf:v1.5.0
        environment:
            - TZ=Europe/paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
+            - MCC=208
+            - MNC=99
+            - REGION_ID=128
+            - AMF_SET_ID=1
+            - SERVED_GUAMI_MCC_0=208
+            - SERVED_GUAMI_MNC_0=99
+            - SERVED_GUAMI_REGION_ID_0=128
+            - SERVED_GUAMI_AMF_SET_ID_0=1
+            - SERVED_GUAMI_MCC_1=460
+            - SERVED_GUAMI_MNC_1=11
+            - SERVED_GUAMI_REGION_ID_1=10
+            - SERVED_GUAMI_AMF_SET_ID_1=1
+            - PLMN_SUPPORT_MCC=208
+            - PLMN_SUPPORT_MNC=99
+            - PLMN_SUPPORT_TAC=0x0001
+            # Only one slice is defined (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.71.133
+            - SELECTED_0=true
+            # mysql definition in AMF is mandatory in mini deployment.
+            - MYSQL_SERVER=192.168.71.131
+            - MYSQL_USER=root
+            - MYSQL_PASS=linux
+            - MYSQL_DB=oai_db
+            # NF registration
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - NF_REGISTRATION=yes
+            - SMF_SELECTION=yes
+            - USE_FQDN_DNS=yes
+            - USE_HTTP2=no
        depends_on:
+            - oai-nrf
            - mysql
        networks:
            public_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.0.0
+        image: oaisoftwarealliance/oai-smf:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
+            - SMF_INTERFACE_NAME_FOR_N4=eth0
+            - SMF_INTERFACE_NAME_FOR_SBI=eth0
+            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
+            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
+            - AMF_IPV4_ADDRESS=192.168.71.132
+            - AMF_FQDN=oai-amf
+            - UPF_IPV4_ADDRESS=192.168.71.134
+            - UPF_FQDN_0=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            - REGISTER_NRF=yes
+            - DISCOVER_UPF=yes
+            - USE_FQDN_DNS=yes
+            - USE_LOCAL_SUBSCRIPTION_INFO=yes
+            - UE_MTU=1500
+            # Only one slice is defined (1, 0xFFFFFF)
+            - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
+            - NSSAI_SST0=1
+            - SESSION_AMBR_UL0=200Mbps
+            - SESSION_AMBR_DL0=400Mbps
+            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
+            - ENABLE_USAGE_REPORTING=no
        depends_on:
+            - oai-nrf
            - oai-amf
        networks:
            public_net:
                ipv4_address: 192.168.71.133
-    oai-upf:
-        container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.0.0
+    oai-spgwu:
+        container_name: "rfsim5g-oai-spgwu"
+        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
        environment:
            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
+            - 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.1.0/24
+            - ENABLE_5G_FEATURES=yes
+            - REGISTER_NRF=yes
+            - USE_FQDN_NRF=yes
+            - UPF_FQDN_5G=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_FQDN=oai-nrf
+            # Only one slice is defined (1, 0xFFFFFF)
+            - NSSAI_SST_0=1
+            - NSSAI_SD_0=0xffffff
+            - DNN_0=oai
        depends_on:
+            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -72,7 +153,7 @@ services:
              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
        depends_on:
-            - oai-upf
+            - oai-spgwu
        networks:
            traffic_net:
                ipv4_address: 192.168.72.135
@@ -107,6 +188,7 @@ services:
        container_name: rfsim5g-oai-nr-ue
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152260000 --CO -400000000 --ssb 76 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-gnb
        networks:
--- a/ci-scripts/yaml_files/5g_sa_n310_nrue/docker-compose.yml
+++ b/ci-scripts/yaml_files/5g_sa_n310_nrue/docker-compose.yml
@@ -8,7 +8,7 @@ services:
        #entrypoint: /bin/bash -c "sleep infinity"
        environment:
            TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --usrp-args type=n3xx,name=ni-n3xx-31641B9,addr=192.168.10.2 -r 106 --numerology 1 --band 78 -C 3511200000 --sa --ue-fo-compensation --ue-rxgain 65 --tune-offset 20000000 -A 45 --log_config.global_log_options level,nocolor,time --uicc0.imsi 208970000000111 --uicc0.nssai_sd 16777215
+            USE_ADDITIONAL_OPTIONS: --usrp-args type=n3xx,name=ni-n3xx-31641B9,addr=192.168.20.2 -r 106 --numerology 1 --band 78 -C 3511200000 --sa --ue-fo-compensation --ue-rxgain 65 --tune-offset 20000000 -A 45 --log_config.global_log_options level,nocolor,time --uicc0.imsi 208970000000111 --uicc0.nssai_sd 16777215
        volumes:
            - ../../conf_files/ue.sa.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
--- a/cmake_targets/at_commands/CMakeLists.txt
+++ b/cmake_targets/at_commands/CMakeLists.txt
@@ -139,7 +139,7 @@ target_include_directories(secu_cn PRIVATE
 ################################################################################
 set(util_SRC
    ${OPENAIR_NAS_DIR}/COMMON/UTIL/device.c
-    ${OPENAIR_DIR}/common/utils/mem/memory.c
+    ${OPENAIR_NAS_DIR}/COMMON/UTIL/memory.c
    ${OPENAIR_NAS_DIR}/COMMON/UTIL/nas_log.c
    ${OPENAIR_NAS_DIR}/COMMON/UTIL/nas_timer.c
    ${OPENAIR_NAS_DIR}/COMMON/UTIL/OctetString.c
@@ -149,8 +149,19 @@ set(util_SRC
    ${OPENAIR_NAS_DIR}/COMMON/UTIL/socket.c
    ${OPENAIR_NAS_DIR}/COMMON/UTIL/stty.c
 )
+set(util_HDR
+    ${OPENAIR_NAS_DIR}/COMMON/UTIL/device.h
+    ${OPENAIR_NAS_DIR}/COMMON/UTIL/memory.h
+    ${OPENAIR_NAS_DIR}/COMMON/UTIL/nas_log.h
+    ${OPENAIR_NAS_DIR}/COMMON/UTIL/nas_timer.h
+    ${OPENAIR_NAS_DIR}/COMMON/UTIL/OctetString.h
+    ${OPENAIR_NAS_DIR}/COMMON/UTIL/parser.h
+    ${OPENAIR_NAS_DIR}/COMMON/UTIL/TLVDecoder.h
+    ${OPENAIR_NAS_DIR}/COMMON/UTIL/TLVEncoder.h
+    ${OPENAIR_NAS_DIR}/COMMON/UTIL/socket.h
+)

-add_library(util ${util_SRC})
+add_library(util ${util_SRC} ${util_HDR})
 target_include_directories(util PRIVATE ${OPENAIR_NAS_DIR}/COMMON/UTIL
                                        ${OPENAIR_NAS_DIR}/COMMON
                                        )
@@ -167,7 +178,15 @@ set(api_user_SRC
    ${OPENAIR_NAS_DIR}/UE/API/USER/user_indication.c
 )

-add_library(api_user ${api_user_SRC})
+set(api_user_HDR
+    ${OPENAIR_NAS_DIR}/UE/API/USER/at_command.h
+    ${OPENAIR_NAS_DIR}/UE/API/USER/at_error.h
+    ${OPENAIR_NAS_DIR}/UE/API/USER/at_response.h
+    ${OPENAIR_NAS_DIR}/UE/API/USER/user_api.h
+    ${OPENAIR_NAS_DIR}/UE/API/USER/user_indication.h
+)
+
+add_library(api_user ${api_user_SRC} ${api_user_HDR})
 target_include_directories(api_user PRIVATE ${OPENAIR_NAS_DIR}/UE/API/USER
                                            ${OPENAIR_NAS_DIR}/COMMON
                                            ${OPENAIR_NAS_DIR}/UE
@@ -181,7 +200,13 @@ set(api_usim_SRC
    ${OPENAIR_NAS_DIR}/UE/API/USIM/usim_api.c
 )

-add_library(api_usim ${api_usim_SRC})
+set(api_usim_HDR
+    ${OPENAIR_NAS_DIR}/UE/API/USIM/aka_functions.h
+    ${OPENAIR_NAS_DIR}/UE/API/USIM/usim_api.h
+
+)
+
+add_library(api_usim ${api_usim_SRC} ${api_usim_HDR})
 target_include_directories(api_usim PRIVATE ${OPENAIR_NAS_DIR}/UE/API/USIM)

 ################################################################################
@@ -192,8 +217,13 @@ set(api_network_SRC
    ${OPENAIR_NAS_DIR}/COMMON/API/NETWORK/nas_message.c
    ${OPENAIR_NAS_DIR}/COMMON/API/NETWORK/network_api.c
 )
+set(api_network_HDR
+    ${OPENAIR_NAS_DIR}/COMMON/API/NETWORK/as_message.h
+    ${OPENAIR_NAS_DIR}/COMMON/API/NETWORK/nas_message.h
+    ${OPENAIR_NAS_DIR}/COMMON/API/NETWORK/network_api.h
+)

-add_library(api_network ${api_network_SRC})
+add_library(api_network ${api_network_SRC} ${api_network_HDR})
 target_include_directories(api_network PRIVATE ${OPENAIR_NAS_DIR}/COMMON/API/NETWORK
                                               ${OPENAIR_NAS_DIR}/COMMON
                                               )
@@ -281,7 +311,60 @@ set(emm_SRC
    
 )

-add_library(emm ${emm_SRC})
+set(emm_HDR
+    ${OPENAIR_NAS_DIR}/UE/EMM/emmData.h
+    ${OPENAIR_NAS_DIR}/UE/EMM/emm_main.h
+    ${OPENAIR_NAS_DIR}/UE/EMM/emm_proc.h
+    ${OPENAIR_NAS_DIR}/UE/EMM/IdleMode.h
+    ${OPENAIR_NAS_DIR}/UE/EMM/LowerLayer.h
+    
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AttachAccept.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AttachComplete.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AttachReject.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AttachRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AuthenticationFailure.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AuthenticationReject.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AuthenticationRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/AuthenticationResponse.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/CsServiceNotification.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/DetachAccept.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/DetachRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/DownlinkNasTransport.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/emm_cause.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/EmmInformation.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/emm_msgDef.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/emm_msg.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/EmmStatus.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/ExtendedServiceRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/GutiReallocationCommand.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/GutiReallocationComplete.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/IdentityRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/IdentityResponse.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/NASSecurityModeCommand.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/NASSecurityModeComplete.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/SecurityModeReject.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/ServiceReject.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/ServiceRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/TrackingAreaUpdateAccept.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/TrackingAreaUpdateComplete.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/TrackingAreaUpdateReject.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/TrackingAreaUpdateRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/EMM/MSG/UplinkNasTransport.h
+    
+    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_asDef.h
+    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_as.h
+    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_esmDef.h
+    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_esm.h
+    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_fsm.h
+    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_recv.h
+    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_regDef.h
+    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_reg.h
+    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_sap.h
+    ${OPENAIR_NAS_DIR}/UE/EMM/SAP/emm_send.h
+
+)
+
+add_library(emm ${emm_SRC} ${emm_HDR})

 target_include_directories(emm PRIVATE 
                     ${OPENAIR_DIR}/common/utils
@@ -340,7 +423,41 @@ set(esm_SRC
    ${OPENAIR_NAS_DIR}/UE/ESM/SAP/esm_send.c
 )

-add_library(esm ${esm_SRC})
+set(esm_HDR
+    ${OPENAIR_TARGETS}/COMMON/openairinterface5g_limits.h
+    ${OPENAIR_NAS_DIR}/UE/ESM/esm_main.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextAccept.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextReject.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDedicatedEpsBearerContextRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextAccept.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextReject.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ActivateDefaultEpsBearerContextRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/BearerResourceAllocationReject.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/BearerResourceAllocationRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/BearerResourceModificationReject.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/BearerResourceModificationRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/DeactivateEpsBearerContextAccept.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/DeactivateEpsBearerContextRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/esm_cause.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/EsmInformationRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/EsmInformationResponse.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/esm_msgDef.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/esm_msg.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/EsmStatus.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ModifyEpsBearerContextAccept.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ModifyEpsBearerContextReject.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/ModifyEpsBearerContextRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/PdnConnectivityReject.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/PdnConnectivityRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/PdnDisconnectReject.h
+    ${OPENAIR_NAS_DIR}/COMMON/ESM/MSG/PdnDisconnectRequest.h
+    ${OPENAIR_NAS_DIR}/UE/ESM/SAP/esm_recv.h
+    ${OPENAIR_NAS_DIR}/UE/ESM/SAP/esm_sap.h
+    ${OPENAIR_NAS_DIR}/UE/ESM/SAP/esm_send.h
+    ${OPENAIR_DIR}/common/utils/utils.h
+)
+
+add_library(esm ${esm_SRC} ${esm_HDR})

 target_include_directories(esm PRIVATE 
                     ${OPENAIR_DIR}/common/utils
@@ -436,8 +553,89 @@ set(ies_SRC
    ${OPENAIR_NAS_DIR}/COMMON/IES/UeSecurityCapability.c
    ${OPENAIR_NAS_DIR}/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.c
 )
+set(ies_HDR
+    ${OPENAIR_NAS_DIR}/COMMON/IES/AccessPointName.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/AdditionalUpdateResult.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/AdditionalUpdateType.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/ApnAggregateMaximumBitRate.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/AuthenticationFailureParameter.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/AuthenticationParameterAutn.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/AuthenticationParameterRand.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/AuthenticationResponseParameter.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/CipheringKeySequenceNumber.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/Cli.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/CsfbResponse.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/DaylightSavingTime.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/DetachType.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/DrxParameter.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EmergencyNumberList.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EmmCause.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsAttachResult.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsAttachType.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsBearerContextStatus.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsBearerIdentity.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsMobileIdentity.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsNetworkFeatureSupport.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsQualityOfService.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsUpdateResult.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EpsUpdateType.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EsmCause.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EsmInformationTransferFlag.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/EsmMessageContainer.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/GprsTimer.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/GutiType.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/IdentityType2.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/ImeisvRequest.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/KsiAndSequenceNumber.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/LcsClientIdentity.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/LcsIndicator.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/LinkedEpsBearerIdentity.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/LlcServiceAccessPointIdentifier.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/LocationAreaIdentification.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/MessageType.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/MobileIdentity.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/MobileStationClassmark2.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/MobileStationClassmark3.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/MsNetworkCapability.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/MsNetworkFeatureSupport.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/NasKeySetIdentifier.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/NasMessageContainer.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/NasRequestType.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/NasSecurityAlgorithms.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/NetworkName.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/Nonce.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/PacketFlowIdentifier.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/PagingIdentity.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/PdnAddress.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/PdnType.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/PlmnList.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/ProcedureTransactionIdentity.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/ProtocolConfigurationOptions.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/ProtocolDiscriminator.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/PTmsiSignature.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/QualityOfService.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/RadioPriority.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/SecurityHeaderType.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/ServiceType.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/ShortMac.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/SsCode.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/SupportedCodecList.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/TimeZoneAndTime.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/TimeZone.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/TmsiStatus.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/TrackingAreaIdentity.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/TrackingAreaIdentityList.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/TrafficFlowAggregateDescription.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/TrafficFlowTemplate.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/TransactionIdentifier.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/UeNetworkCapability.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/UeRadioCapabilityInformationUpdateNeeded.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/UeSecurityCapability.h
+    ${OPENAIR_NAS_DIR}/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h

-add_library(ies ${ies_SRC})
+)
+
+add_library(ies ${ies_SRC} ${ies_HDR})

 target_include_directories(ies PRIVATE 
                     ${OPENAIR_NAS_DIR}/COMMON/IES 
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -96,7 +96,7 @@ Options:
   USRP, BLADERF, LMSSDR, IRIS, SIMU, AW2SORI, None (Default)
   Adds this RF board support (in external packages installation and in compilation)
 -t | --transport
-   Selects the transport protocol type, options: None, Ethernet, benetel4g, benetel5g, oran_fhlib_5g
+   Selects the transport protocol type, options: None, Ethernet, benetel4g, benetel5g
 -P | --phy_simulators
   Makes the unitary tests Layer 1 simulators
 -S | --core_simulators
@@ -248,7 +248,7 @@ function main() {
            RU=1
            TARGET_LIST="$TARGET_LIST oairu"
            echo_info "Will compile RRU"
-            shift;;
+	    shift;;
       --UE)
            UE=1
            TARGET_LIST="$TARGET_LIST lte-uesoftmodem"
@@ -302,14 +302,10 @@ function main() {
                TARGET_LIST="$TARGET_LIST oai_eth_transpro"
                CMAKE_CMD="$CMAKE_CMD -DOAI_${2^^}=ON" # ^^ makes uppercase
                ;;
-              "benetel4g" | "benetel5g" | "oran_fhlib_4g")
+              "benetel4g" | "benetel5g")
                TARGET_LIST="$TARGET_LIST $2"
                CMAKE_CMD="$CMAKE_CMD -DOAI_${2^^}=ON" # ^^ makes uppercase
                ;;
-              "oran_fhlib_5g")
-                TARGET_LIST="$TARGET_LIST $2"
-                CMAKE_CMD="$CMAKE_CMD -DOAI_FHI72=ON"
-                ;;
              "None")
                ;;
              *)
@@ -391,7 +387,7 @@ function main() {
                echo_info "Enabling build of optional shared library $lib"
              done
            fi
-            shift 2;;
+            shift 2;;		
        --noavx512)
            CMAKE_CMD="$CMAKE_CMD -DAVX512=OFF"
            echo_info "Disabling AVX512 instructions"
@@ -428,8 +424,8 @@ function main() {
        -h | --help)
            print_help
            exit 1;;
-        *)
-            print_help
+	*)
+	    print_help
            echo_fatal "Unknown option $1"
            break;;
   esac
@@ -458,7 +454,7 @@ function main() {
      if [ ! -v BUILD_UHD_FROM_SOURCE ] && [ ! "$DISABLE_HARDWARE_DEPENDENCY" == "True" ]; then
        install_usrp_uhd_driver $UHD_IMAGES_DIR
      fi
-    fi
+    fi 
    if [ "$HW" == "OAI_BLADERF" ] ; then
      echo_info "installing packages for BLADERF support"
      check_install_bladerf_driver
@@ -504,13 +500,7 @@ function main() {
    # Doxygen Support #
    ###################
    if [ "$BUILD_DOXYGEN" = "1" ] ; then
-	echo_info "Built Doxygen based documentation. The documentation file is located here: $DIR/$BUILD_DIR/build/doc/html/index.html"
-    fi
-
-    # TODO: once we got the CMakeLists.txt file done for the ORAN files, remove the following lines
-    if [[ $TARGET_LIST =~ "oran_fhlib_5g" ]]; then
-      rm -f liboai_transpro.so
-      ln -s liboran_fhlib_5g.so liboai_transpro.so
+	echo_info "Built Doxygen based documentation. The documentation file is located here: $OPENAIR_DIR/$BUILD_DIR/build/html/index.html"
    fi

    if [ "$UE" = 1 ] ; then
--- a/cmake_targets/nas_sim_tools/CMakeLists.txt
+++ b/cmake_targets/nas_sim_tools/CMakeLists.txt
@@ -28,12 +28,24 @@ set(CONF2UEDATA_LIB_SRC
    ${OPENAIR_DIR}/openair3/NAS/TOOLS/display.c
    ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/usim_api.c
    ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/aka_functions.c
-    ${OPENAIR_DIR}/common/utils/mem/memory.c
+    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.c
    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/OctetString.c
    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/TLVEncoder.c
    ${OPENAIR_DIR}/common/utils/utils.c
 )

+set(conf2uedata_HDR
+    ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf2uedata.h
+    ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf_emm.h
+    ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/usim_api.h
+    ${OPENAIR_DIR}/openair3/NAS/UE/API/USIM/aka_functions.h
+    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/memory.h
+    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/nas_log.h
+    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/OctetString.h
+    ${OPENAIR_DIR}/openair3/NAS/COMMON/UTIL/TLVEncoder.h
+    ${OPENAIR_DIR}/common/utils/utils.h
+)
+
 include_directories(
    ${OPENAIR_DIR}/common/utils
    ${OPENAIR_DIR}/openair3/NAS/UE
@@ -53,7 +65,7 @@ set(conf2uedata_SRC
 	${CONF2UEDATA_LIB_SRC}
 )

-add_executable(conf2uedata  ${conf2uedata_SRC} )
+add_executable(conf2uedata  ${conf2uedata_SRC} ${conf2uedata_HDR} )
 target_link_libraries(conf2uedata ${CONFIG_LIBRARIES})

 # usim binary
@@ -64,7 +76,7 @@ set(usim_SRC
 )


-add_executable(usim  ${usim_SRC} )
+add_executable(usim  ${usim_SRC} ${conf2uedata_HDR} )
 target_link_libraries(usim ${CONFIG_LIBRARIES})

 # nvram binary
@@ -75,5 +87,5 @@ set(nvram_SRC
 )


-add_executable(nvram  ${nvram_SRC})
+add_executable(nvram  ${nvram_SRC} ${conf2uedata_HDR} )
 target_link_libraries(nvram ${CONFIG_LIBRARIES})
--- a/cmake_targets/tools/MODULES/Findxran.cmake
+++ b/cmake_targets/tools/MODULES/Findxran.cmake
@@ -1,142 +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
-# 
-
-# FindXran
-# -------
-# 
-# Finds the xran library. Note that the library number is as follows:
-# - oran_bronze_release_v1.1 -> 2.1.1 (B = second letter)
-# - oran_e_maintenance_release_v1.0 -> 5.1.0
-# the version is currently hardcoded to 5.1.0
-#
-# Required options
-# ^^^^^^^^^^^^^^^^
-#
-# ``xran_LOCATION``
-#   The location of the library.
-# 
-# Imported Targets
-# ^^^^^^^^^^^^^^^^
-# 
-# This module provides the following imported targets, if found:
-# 
-# ``xran::xran``
-#   The xran library
-# 
-# Result Variables
-# ^^^^^^^^^^^^^^^^
-# 
-# This will define the following variables:
-# 
-# ``xran_FOUND``
-#   True if the system has the xran library.
-# ``xran_VERSION``
-#   The version of the xran library which was found.
-# ``xran_INCLUDE_DIRS``
-#   Include directories needed to use xran.
-# ``xran_LIBRARIES``
-#   Libraries needed to link to xran.
-# 
-# Cache Variables
-# ^^^^^^^^^^^^^^^
-# 
-# The following cache variables may also be set:
-# 
-# ``xran_INCLUDE_DIR``
-#   The directory containing ``foo.h``.
-# ``xran_LIBRARY``
-#   The path to the xran library.
-
-option(xran_LOCATION "directory of XRAN library" "")
-if (NOT xran_LOCATION)
-  message(FATAL_ERROR "xran_LOCATION required")
-endif()
-if (NOT EXISTS ${xran_LOCATION})
-  message(FATAL_ERROR "no such directory: ${xran_LOCATION}")
-endif()
-
-find_path(xran_INCLUDE_DIR
-  NAMES
-    xran_common.h
-    xran_compression.h
-    xran_cp_api.h
-    xran_ecpri_owd_measurements.h
-    xran_fh_o_du.h
-    xran_pkt.h
-    xran_pkt_up.h
-    xran_sync_api.h
-  PATHS ${xran_LOCATION}
-  PATH_SUFFIXES api
-)
-find_library(xran_LIBRARY
-  NAMES xran
-  PATHS ${xran_LOCATION}/build
-)
-if (NOT xran_LIBRARY)
-  message(FATAL_ERROR "could not detect xran build artifacts at ${xran_LOCATION}/build")
-endif()
-
-set(xran_VERSION_FILE "${xran_LOCATION}/../app/src/common.h")
-if(NOT EXISTS ${xran_VERSION_FILE})
-  message(FATAL_ERROR "could not find xran version file at ${xran_VERSION_FILE}")
-endif()
-
-file(STRINGS ${xran_VERSION_FILE} xran_VERSION_LINE REGEX "^#define[ \t]+VERSIONX[ \t]+\"[a-z_.0-9]+\"$")
-string(REGEX REPLACE "^#define[ \t]+VERSIONX[ \t]+\"([a-z_.0-9]+)\"$" "\\1" xran_VERSION_STRING "${xran_VERSION_LINE}")
-message(STATUS "Found xran release ${xran_VERSION_STRING}")
-set(xran_VERSION "NOTFOUND")
-if (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.0")
-  set(xran_VERSION 5.1.0)
-elseif (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.1")
-  set(xran_VERSION 5.1.1)
-elseif (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.2")
-  set(xran_VERSION 5.1.2)
-endif()
-unset(xran_VERSION_LINE)
-unset(xran_VERSION_STRING)
-unset(xran_VERSION_FILE)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(xran
-  FOUND_VAR xran_FOUND
-  REQUIRED_VARS
-    xran_LIBRARY
-    xran_INCLUDE_DIR
-  VERSION_VAR xran_VERSION
-)
-
-if(xran_FOUND)
-  set(xran_LIBRARIES ${xran_LIBRARY})
-  set(xran_INCLUDE_DIRS ${xran_INCLUDE_DIR})
-endif()
-
-if(xran_FOUND AND NOT TARGET xran::xran)
-  add_library(xran::xran UNKNOWN IMPORTED)
-  set_target_properties(xran::xran PROPERTIES
-    IMPORTED_LOCATION "${xran_LIBRARY}"
-    INTERFACE_INCLUDE_DIRECTORIES "${xran_INCLUDE_DIR}"
-  )
-endif()
-
-mark_as_advanced(
-  xran_INCLUDE_DIR
-  xran_LIBRARY
-)
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -666,10 +666,7 @@ install_asn1c_from_source(){
    # GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/asn1c.git /tmp/asn1c
    git clone https://github.com/mouse07410/asn1c /tmp/asn1c
    cd /tmp/asn1c
-    # 2024-02-06: problem compatibility between E2-agent and 4cfcd4f191c3fa41f6ac1b15cb2ad3acc1520af5 from asn1c
-    # Reverting to previous commit that works
-    # TODO : revert to vlm_master once FlexRic and E2-agent are fixed
-    git checkout -f a6bdcd22658d6b7c3ed218d8c1375907ac532b64
+    git checkout vlm_master
    # Showing which version is used
    git log -n1
    autoreconf -iv
--- a/cmake_targets/tools/oran_fhi_integration_patches/E/oaioran_E.patch
+++ b/cmake_targets/tools/oran_fhi_integration_patches/E/oaioran_E.patch
@@ -1,460 +0,0 @@
-diff --git a/fhi_lib/app/src/common.h b/fhi_lib/app/src/common.h
-index 7508117..0dbe0bd 100644
--- a/fhi_lib/app/src/common.h
-+++ b/fhi_lib/app/src/common.h
-@@ -28,7 +28,7 @@
- #include <rte_common.h>
- #include <rte_mbuf.h>
- 
-#define VERSIONX                "oran_e_maintenance_release_v1.0"
-+#define VERSIONX                "oran_e_maintenance_release_v1.2"
- 
- #define APP_O_DU  0
- #define APP_O_RU  1
-diff --git a/fhi_lib/lib/Makefile b/fhi_lib/lib/Makefile
-index de141bf..c12b912 100644
--- a/fhi_lib/lib/Makefile
-+++ b/fhi_lib/lib/Makefile
-@@ -23,11 +23,11 @@ MYCUSTOMSPACE1='------------------------------------------------------------'
- ##############################################################
- #  Tools configuration
- ##############################################################
-CC  := icc
-CPP := icpc
-+CC  := gcc
-+CPP := g++
- AS := as
- AR := ar
-LD := icc
-+LD := gcc
- OBJDUMP := objdump
- 
- ifeq ($(SHELL),cmd.exe)
-@@ -57,7 +57,7 @@ endif
- 
- RTE_TARGET ?= x86_64-native-linux-icc
- 
-RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
-+RTE_INC := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
- API_DIR := $(PROJECT_DIR)/api
- SRC_DIR := $(PROJECT_DIR)/src
- ETH_DIR := $(PROJECT_DIR)/ethernet
-@@ -95,8 +95,7 @@ CPP_SRC = $(SRC_DIR)/xran_compression.cpp \
- 	$(SRC_DIR)/xran_bfp_cplane32.cpp \
- 	$(SRC_DIR)/xran_bfp_cplane64.cpp \
- 	$(SRC_DIR)/xran_bfp_uplane_9b16rb.cpp \
-	$(SRC_DIR)/xran_bfp_uplane.cpp \
-	$(SRC_DIR)/xran_mod_compression.cpp
-+	$(SRC_DIR)/xran_bfp_uplane.cpp
- 
- CPP_SRC_SNC = $(SRC_DIR)/xran_compression_snc.cpp \
- 	$(SRC_DIR)/xran_bfp_cplane8_snc.cpp \
-@@ -112,12 +111,12 @@ CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \
-         -fPIC \
- 	-Wall \
- 	-Wimplicit-function-declaration \
-	-g -O3 -wd1786 -mcmodel=large
-+	-g -O -mavx512bw -march=skylake-avx512 -mtune=skylake-avx512#--wd1786 -mcmodel=large
- 
-CPP_FLAGS := -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_GNU_SOURCE -D_REENTRANT -pipe -no-prec-div \
-                -no-prec-div -fp-model fast=2 -fPIC \
-                -no-prec-sqrt  -falign-functions=16 -fast-transcendentals \
-        -Werror -Wno-unused-variable -std=c++14 -mcmodel=large
-+CPP_FLAGS := -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_GNU_SOURCE -D_REENTRANT -pipe \
-+                -fPIC \
-+                -falign-functions=16  \
-+        -Werror -Wno-unused-variable -std=c++14 -mcmodel=large -mavx512bw -march=skylake-avx512 -mtune=skylake-avx512
- 
- INC :=  -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) -I$(RTE_INC)
- DEF :=
-@@ -150,8 +149,8 @@ CPP_SNC_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CPP_OBJS_SNC))
- 
- AS_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(AS_OBJS))
- #-qopt-report=5 -qopt-matmul -qopt-report-phase=all
-CPP_COMP       := -O3 -DNDEBUG  -xcore-avx512 -fPIE -restrict -fasm-blocks
-CPP_COMP_SNC   := -O3 -DNDEBUG -march=icelake-server -fPIE -restrict -fasm-blocks
-+CPP_COMP       := -O3 -DNDEBUG  -fPIE
-+CPP_COMP_SNC   := -O3 -DNDEBUG -march=icelake-server -fPIE
- CC_FLAGS_FULL  := $(CC_FLAGS)  $(INC) $(DEF)
- CPP_FLAGS_FULL := $(CPP_FLAGS) $(CPP_COMP) $(INC) $(DEF)
- CPP_FLAGS_FULL_SNC := $(CPP_FLAGS) $(CPP_COMP_SNC) $(INC) $(DEF)
-diff --git a/fhi_lib/lib/api/xran_fh_o_du.h b/fhi_lib/lib/api/xran_fh_o_du.h
-index 7419ae1..a85f973 100644
--- a/fhi_lib/lib/api/xran_fh_o_du.h
-+++ b/fhi_lib/lib/api/xran_fh_o_du.h
-@@ -1104,6 +1104,30 @@ int32_t xran_reg_physide_cb(void *pHandle, xran_fh_tti_callback_fn Cb, void *cbP
-  */
- int32_t xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,  uint32_t *nSlotIdx, uint64_t *nSecond);
- 
-+/**
-+ * @ingroup xran
-+ *
-+ *   Function returns Frame, Subframe, Slot Number based on rx_tti
-+ *
-+ * @param tti
-+ *    tti for which to compute Frame, Subframe, Slot
-+ *
-+ * @param nFrameIdx
-+ *    Pointer to Frame number [0-99]
-+ *
-+ * @param nSubframeIdx
-+ *    Pointer to Subframe number [0-10]
-+ *
-+ * @param nSlotIdx
-+ *    Pointer to Slot number [0-7]
-+ *
-+ * @param nSecond
-+ *    Pointer to current UTC second
-+ *
-+ * @return
-+ *   current TTI number [0-7999]
-+ */
-+int32_t xran_get_slot_idx_from_tti (uint32_t tti, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,  uint32_t *              nSlotIdx, uint64_t *nSecond);
- /**
-  * @ingroup xran
-  *
-diff --git a/fhi_lib/lib/api/xran_up_api.h b/fhi_lib/lib/api/xran_up_api.h
-index 7d3afc5..3e00c5a 100644
--- a/fhi_lib/lib/api/xran_up_api.h
-+++ b/fhi_lib/lib/api/xran_up_api.h
-@@ -80,6 +80,7 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
-     uint8_t *subframe_id,
-     uint8_t *slot_id,
-     uint8_t *symb_id,
-+    uint8_t *filter_id,
-     union ecpri_seq_id *seq_id,
-     uint16_t *num_prbu,
-     uint16_t *start_prbu,
-diff --git a/fhi_lib/lib/ethernet/ethdi.c b/fhi_lib/lib/ethernet/ethdi.c
-index b6ba257..b53325f 100644
--- a/fhi_lib/lib/ethernet/ethdi.c
-+++ b/fhi_lib/lib/ethernet/ethdi.c
-@@ -335,6 +335,7 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
-     uint16_t count;
- 
-     char *argv[] = { name, core_mask, "-n2", iova_mode, socket_mem, socket_limit, "--proc-type=auto",
-+        "--no-telemetry",
-         "--file-prefix", name, "-a0000:00:00.0", bbdev_wdev, bbdev_vdev};
- 
- 
-@@ -479,11 +480,13 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
-                     ctx->tx_ring[i] = rte_ring_create(ring_name, NUM_MBUFS_RING_TRX,
-                     rte_lcore_to_socket_id(*lcore_id), RING_F_SC_DEQ);
-                     PANIC_ON(ctx->tx_ring[i] == NULL, "failed to allocate rx ring");
-+                    printf("Created ring %s on core %d\n",ring_name,*lcore_id);
-                     for(qi = 0; qi < io_cfg->num_rxq; qi++) {
-                         snprintf(ring_name, RTE_DIM(ring_name), "%s_%d_%d", "rx_ring_cp", i, qi);
-                         ctx->rx_ring[i][qi] = rte_ring_create(ring_name, NUM_MBUFS_RING_TRX,
-                             rte_lcore_to_socket_id(*lcore_id), RING_F_SP_ENQ);
-                         PANIC_ON(ctx->rx_ring[i][qi] == NULL, "failed to allocate rx ring");
-+                        printf("Created ring %s on core %d\n",ring_name,*lcore_id);
-                     }
-                 }
-             } else {
-@@ -553,7 +556,7 @@ xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
-         ctx->up_dl_pkt_gen_ring[i] = rte_ring_create(ring_name, NUM_MBUFS_RING,
-         rte_lcore_to_socket_id(*lcore_id), /*RING_F_SC_DEQ*/0);
-         PANIC_ON(ctx->up_dl_pkt_gen_ring[i] == NULL, "failed to allocate dl gen ring");
-        printf("created %s\n", ring_name);
-+        printf("created %s on core %d\n", ring_name, *lcore_id);
-     }
- 
-     return 1;
-diff --git a/fhi_lib/lib/src/xran_bfp_ref.cpp b/fhi_lib/lib/src/xran_bfp_ref.cpp
-index e6d3067..8e0abee 100644
--- a/fhi_lib/lib/src/xran_bfp_ref.cpp
-+++ b/fhi_lib/lib/src/xran_bfp_ref.cpp
-@@ -29,6 +29,7 @@
- #include <complex>
- #include <algorithm>
- #include <limits.h>
-+#include <limits>
- 
- static int16_t saturateAbs(int16_t inVal)
- {
-diff --git a/fhi_lib/lib/src/xran_bfp_uplane.cpp b/fhi_lib/lib/src/xran_bfp_uplane.cpp
-index a345df4..7831fa0 100644
--- a/fhi_lib/lib/src/xran_bfp_uplane.cpp
-+++ b/fhi_lib/lib/src/xran_bfp_uplane.cpp
-@@ -116,7 +116,7 @@ namespace BFP_UPlane
-     /// Get AVX512 pointer aligned to desired RB
-     const __m512i* rawDataIn = reinterpret_cast<const __m512i*>(dataIn.dataExpanded + numREOffset);
-     /// Apply the exponent shift
-    const auto compData = _mm512_srai_epi16(*rawDataIn, thisExp);
-+    const auto compData = _mm512_srai_epi16(_mm512_loadu_epi16(rawDataIn), thisExp);
-     /// Pack compressed data network byte order
-     const auto compDataBytePacked = networkBytePack(compData);
-     /// Store exponent first
-@@ -201,7 +201,7 @@ namespace BFP_UPlane
-     /// Get AVX512 pointer aligned to desired RB
-     const __m512i* rawDataIn = reinterpret_cast<const __m512i*>(dataIn.dataExpanded + numREOffset);
-     /// Apply the exponent shift
-    const auto compData = _mm512_srai_epi16(*rawDataIn, thisExp);
-+    const auto compData = _mm512_srai_epi16(_mm512_loadu_epi16(rawDataIn), thisExp);
-     /// Store exponent first
-     dataOut->dataCompressed[thisRBExpAddr] = thisExp;
-     /// Now have 1 RB worth of bytes separated into 3 chunks (1 per lane)
-diff --git a/fhi_lib/lib/src/xran_common.c b/fhi_lib/lib/src/xran_common.c
-index baa673f..edd4ecb 100644
--- a/fhi_lib/lib/src/xran_common.c
-+++ b/fhi_lib/lib/src/xran_common.c
-@@ -656,6 +656,7 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
-     int32_t valid_res = 0;
-     int expect_comp  = (p_dev_ctx->fh_cfg.ru_conf.compMeth != XRAN_COMPMETHOD_NONE);
-     enum xran_comp_hdr_type staticComp = p_dev_ctx->fh_cfg.ru_conf.xranCompHdrType;
-+    uint8_t filter_id;
- 
-     if (staticComp == XRAN_COMP_HDR_TYPE_STATIC)
-     {
-@@ -674,6 +675,7 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
-                                         &subframe_id,
-                                         &slot_id,
-                                         &symb_id,
-+                                        &filter_id,
-                                         &seq,
-                                         &num_prbu,
-                                         &start_prbu,
-@@ -688,23 +690,9 @@ process_mbuf(struct rte_mbuf *pkt, void* handle, struct xran_eaxc_info *p_cid)
-         print_err("num_bytes is wrong [%d]\n", num_bytes);
-         return MBUF_FREE;
-     }
-
-    valid_res = xran_pkt_validate(p_dev_ctx,
-                                pkt,
-                                iq_samp_buf,
-                                num_bytes,
-                                CC_ID,
-                                Ant_ID,
-                                frame_id,
-                                subframe_id,
-                                slot_id,
-                                symb_id,
-                                &seq,
-                                num_prbu,
-                                start_prbu,
-                                sym_inc,
-                                rb,
-                                sect_id);
-+    pCnt->rx_counter++;
-+    pCnt->Rx_on_time++;
-+    pCnt->Total_msgs_rcvd++;
- #ifndef FCN_ADAPT
-     if(valid_res != 0) {
-         print_dbg("valid_res is wrong [%d] ant %u (%u : %u : %u : %u) seq %u num_bytes %d\n", valid_res, Ant_ID, frame_id, subframe_id, slot_id, symb_id, seq.seq_id, num_bytes);
-@@ -1189,7 +1177,7 @@ int generate_cpmsg_prach(void *pHandle, struct xran_cp_gen_params *params, struc
-         timeOffset += startSymId * (2048 + 144);
-     }
-     timeOffset = timeOffset >> nNumerology; //original number is Tc, convert to Ts based on mu
-    if ((slot_id == 0) || (slot_id == (SLOTNUM_PER_SUBFRAME(pxran_lib_ctx->interval_us_local) >> 1)))
-+    if (startSymId > 0 && ((slot_id == 0) || (slot_id == (SLOTNUM_PER_SUBFRAME(pxran_lib_ctx->interval_us_local) >> 1))))
-         timeOffset += 16;
- 
-     params->dir                  = XRAN_DIR_UL;
-@@ -1295,8 +1283,7 @@ int32_t ring_processing_func(void* args)
- 
-     for (i = 0; i < ctx->io_cfg.num_vfs && i < XRAN_VF_MAX; i++){
-         for(qi = 0; qi < ctx->rxq_per_port[i]; qi++) {
-            if (process_ring(ctx->rx_ring[i][qi], i, qi))
-            return 0;
-+            process_ring(ctx->rx_ring[i][qi],i,qi);
-         }
-     }
- 
-diff --git a/fhi_lib/lib/src/xran_common.h b/fhi_lib/lib/src/xran_common.h
-index 3ed75cd..d61fe7f 100644
--- a/fhi_lib/lib/src/xran_common.h
-+++ b/fhi_lib/lib/src/xran_common.h
-@@ -221,7 +221,7 @@ int generate_cpmsg_prach(void *pHandle, struct xran_cp_gen_params *params, struc
- struct xran_eaxcid_config *xran_get_conf_eAxC(void *pHandle);
- int xran_register_cb_mbuf2ring(xran_ethdi_mbuf_send_fn mbuf_send_cp, xran_ethdi_mbuf_send_fn mbuf_send_up);
- 
-uint16_t xran_alloc_sectionid(void *pHandle, uint8_t dir, uint8_t cc_id, uint8_t ant_id, uint8_t slot_id);
-+//uint16_t xran_alloc_sectionid(void *pHandle, uint8_t dir, uint8_t cc_id, uint8_t ant_id, uint8_t slot_id);
- uint8_t xran_get_seqid(void *pHandle, uint8_t dir, uint8_t cc_id, uint8_t ant_id, uint8_t slot_id);
- int32_t ring_processing_func(void* arg);
- int xran_init_prach(struct xran_fh_config* pConf, struct xran_device_ctx * p_xran_dev_ctx);
-diff --git a/fhi_lib/lib/src/xran_compression.cpp b/fhi_lib/lib/src/xran_compression.cpp
-index 112caae..7c74342 100644
--- a/fhi_lib/lib/src/xran_compression.cpp
-+++ b/fhi_lib/lib/src/xran_compression.cpp
-@@ -62,7 +62,7 @@ xranlib_compress(const struct xranlib_compress_request *request,
-         return xranlib_5gnr_mod_compression(&mod_request, &mod_response);
-   }
-     else{
-        if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52)) {
-+        if(false) {
-             return xranlib_compress_avxsnc(request,response);
-         } else {
-             return xranlib_compress_avx512(request,response);
-@@ -89,7 +89,7 @@ xranlib_decompress(const struct xranlib_decompress_request *request,
-         return xranlib_5gnr_mod_decompression(&mod_request, &mod_response);
-       }
-     else{
-        if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52)) {
-+        if(false) {
-             return xranlib_decompress_avxsnc(request,response);
-         } else {
-             return xranlib_decompress_avx512(request,response);
-@@ -101,7 +101,7 @@ int32_t
- xranlib_compress_bfw(const struct xranlib_compress_request *request,
-                         struct xranlib_compress_response *response)
-     {
-    if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52)) {
-+    if(false) {
-         return xranlib_compress_avxsnc_bfw(request,response);
-     } else {
-         return xranlib_compress_avx512_bfw(request,response);
-@@ -112,7 +112,7 @@ int32_t
- xranlib_decompress_bfw(const struct xranlib_decompress_request *request,
-     struct xranlib_decompress_response *response)
-   {
-    if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52)) {
-+    if(false) {
-         return xranlib_decompress_avxsnc_bfw(request,response);
-     } else {
-         return xranlib_decompress_avx512_bfw(request,response);
-diff --git a/fhi_lib/lib/src/xran_main.c b/fhi_lib/lib/src/xran_main.c
-index 89dcc1f..640f6b6 100644
--- a/fhi_lib/lib/src/xran_main.c
-+++ b/fhi_lib/lib/src/xran_main.c
-@@ -272,7 +272,7 @@ xran_init_prach(struct xran_fh_config* pConf, struct xran_device_ctx * p_xran_de
-         printf("PRACH start symbol %u lastsymbol %u\n", p_xran_dev_ctx->prach_start_symbol[0], p_xran_dev_ctx->prach_last_symbol[0]);
-     }
- 
-    pPrachCPConfig->eAxC_offset = xran_get_num_eAxc(p_xran_dev_ctx);
-+    pPrachCPConfig->eAxC_offset = pPRACHConfig->eAxC_offset;
-     print_dbg("PRACH eAxC_offset %d\n",  pPrachCPConfig->eAxC_offset);
- 
-     /* Save some configs for app */
-@@ -844,7 +844,7 @@ tx_cp_ul_cb(struct rte_timer *tim, void *arg)
-                         struct xran_cp_gen_params params;
-                         struct xran_section_gen_info sect_geninfo[8];
-                         struct rte_mbuf *mbuf = xran_ethdi_mbuf_alloc();
-                        prach_port_id = ant_id + num_eAxc;
-+                        prach_port_id = ant_id + pPrachCPConfig->eAxC_offset;
-                         /* start new section information list */
-                         xran_cp_reset_section_info(pHandle, XRAN_DIR_UL, cc_id, prach_port_id, ctx_id);
- 
-@@ -1059,6 +1059,7 @@ int32_t handle_ecpri_ethertype(struct rte_mbuf* pkt_q[], uint16_t xport_id, stru
-         {
-         case ECPRI_IQ_DATA:
-                 pkt_data[num_data++] = pkt;
-+            uint8_t *pkt_bytes=rte_pktmbuf_mtod(pkt,uint8_t*);
-             break;
-         // For RU emulation
-         case ECPRI_RT_CONTROL_DATA:
-@@ -1076,7 +1077,7 @@ int32_t handle_ecpri_ethertype(struct rte_mbuf* pkt_q[], uint16_t xport_id, stru
-                 break;
-             default:
-                 if (p_dev_ctx->fh_init.io_cfg.id == O_DU) {
-                    print_err("Invalid eCPRI message type - %d", ecpri_hdr->cmnhdr.bits.ecpri_mesg_type);
-+                    rte_pktmbuf_free(pkt);
-         }
-                 break;
-     }
-@@ -1771,8 +1772,7 @@ ring_processing_func_per_port(void* args)
-     for (i = 0; i < ctx->io_cfg.num_vfs && i < XRAN_VF_MAX; i = i+1) {
-         if (ctx->vf2xran_port[i] == port_id) {
-             for(qi = 0; qi < ctx->rxq_per_port[port_id]; qi++){
-                if (process_ring(ctx->rx_ring[i][qi], i, qi))
-                    return 0;
-+                process_ring(ctx->rx_ring[i][qi],i,qi);
-             }
-         }
-     }
-@@ -1837,8 +1837,6 @@ xran_spawn_workers(void)
-         nWorkerCore = nWorkerCore << 1;
-     }
- 
-    extern int _may_i_use_cpu_feature(unsigned __int64);
-    icx_cpu = _may_i_use_cpu_feature(_FEATURE_AVX512IFMA52);
- 
-     printf("O-XU      %d\n", eth_ctx->io_cfg.id);
-     printf("HW        %d\n", icx_cpu);
-@@ -3074,6 +3072,24 @@ xran_get_slot_idx (uint32_t PortId, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,
-     return tti;
- }
- 
-+int32_t
-+xran_get_slot_idx_from_tti (uint32_t tti, uint32_t *nFrameIdx, uint32_t *nSubframeIdx,  uint32_t *nSlotIdx, uint64_t *nSecond)
-+{
-+    struct xran_device_ctx * p_xran_dev_ctx = xran_dev_get_ctx_by_id(0);
-+    if (!p_xran_dev_ctx)
-+    {
-+      print_err("Null xRAN context on port id %u!!\n", 0);
-+      return 0;
-+    }
-+
-+    *nSlotIdx     = (uint32_t)XranGetSlotNum(tti, SLOTNUM_PER_SUBFRAME(p_xran_dev_ctx->interval_us_local));
-+    *nSubframeIdx = (uint32_t)XranGetSubFrameNum(tti,SLOTNUM_PER_SUBFRAME(p_xran_dev_ctx->interval_us_local),  SUBFRAMES_PER_SYSTEMFRAME);
-+    *nFrameIdx    = (uint32_t)XranGetFrameNum(tti,0/*xran_getSfnSecStart()*/,SUBFRAMES_PER_SYSTEMFRAME, SLOTNUM_PER_SUBFRAME(p_xran_dev_ctx->interval_us_local));
-+    *nSecond      = timing_get_current_second();
-+
-+    return tti;
-+}
-+
- int32_t
- xran_set_debug_stop(int32_t value, int32_t count)
- {
-diff --git a/fhi_lib/lib/src/xran_mod_compression.cpp b/fhi_lib/lib/src/xran_mod_compression.cpp
-index 7d4a5d0..87bdbd5 100644
--- a/fhi_lib/lib/src/xran_mod_compression.cpp
-+++ b/fhi_lib/lib/src/xran_mod_compression.cpp
-@@ -747,10 +747,11 @@ int xranlib_5gnr_mod_compression(const struct xranlib_5gnr_mod_compression_reque
- #ifdef C_Module_Used
-     return (xranlib_5gnr_mod_compression_c(request, response));
- #else
-    if(_may_i_use_cpu_feature(_FEATURE_AVX512IFMA52))
-+    if (false) {
-         return (xranlib_5gnr_mod_compression_snc(request, response));
-    else
-+    } else {
-         return (xranlib_5gnr_mod_compression_avx512(request, response));
-+    }
- #endif
- }
- 
-diff --git a/fhi_lib/lib/src/xran_rx_proc.c b/fhi_lib/lib/src/xran_rx_proc.c
-index 36bd72c..f7f5678 100644
--- a/fhi_lib/lib/src/xran_rx_proc.c
-+++ b/fhi_lib/lib/src/xran_rx_proc.c
-@@ -107,6 +107,10 @@ int xran_process_prach_sym(void *arg,
-             if(mb)
-                 rte_pktmbuf_free(mb);
- 
-+            mb = p_xran_dev_ctx->sFHPrachRxBbuIoBufCtrlDecomp[tti % XRAN_N_FE_BUF_LEN][CC_ID][Ant_ID].sBufferList.pBuffers[symb_id_offset].pCtrl;
-+            if(mb)
-+                rte_pktmbuf_free(mb);
-+
-             if(p_xran_dev_ctx->fh_cfg.ru_conf.byteOrder == XRAN_CPU_LE_BYTE_ORDER) {
-                 int idx = 0;
-                 uint16_t *psrc = (uint16_t *)iq_data_start;
-diff --git a/fhi_lib/lib/src/xran_up_api.c b/fhi_lib/lib/src/xran_up_api.c
-index 397853a..4a714b5 100644
--- a/fhi_lib/lib/src/xran_up_api.c
-+++ b/fhi_lib/lib/src/xran_up_api.c
-@@ -329,6 +329,7 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
-     uint8_t *subframe_id,
-     uint8_t *slot_id,
-     uint8_t *symb_id,
-+    uint8_t *filter_id,
-     union ecpri_seq_id *seq_id,
-     uint16_t *num_prbu,
-     uint16_t *start_prbu,
-@@ -387,6 +388,8 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
-     if (symb_id)
-         *symb_id = radio_hdr->sf_slot_sym.symb_id;
- 
-+    if (filter_id)
-+	*filter_id = radio_hdr->data_feature.filter_id;
-     /* Process data section hdr */
-     struct data_section_hdr *data_hdr =
-         (void *)rte_pktmbuf_adj(mbuf, sizeof(*radio_hdr));
-@@ -401,6 +404,7 @@ int32_t xran_extract_iq_samples(struct rte_mbuf *mbuf,
-     *sym_inc    = data_hdr->fields.sym_inc;
-     *rb         = data_hdr->fields.rb;
-     *sect_id    = data_hdr->fields.sect_id;
-+    if (*num_prbu == 0) *num_prbu=273;
- 
-     if(expect_comp) {
-             const struct data_section_compression_hdr *data_compr_hdr;
--- a/common/config/config_cmdline.c
+++ b/common/config/config_cmdline.c
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
-#include "common/platform_types.h"
+#include <platform_types.h>
 #include "config_userapi.h"
 #include "config_common.h"
 #include "../utils/LOG/log.h"
--- a/common/config/config_common.c
+++ b/common/config/config_common.c
@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <dlfcn.h>
 #include <arpa/inet.h>
-#include "common/platform_types.h"
+#include <platform_types.h>
 #include "config_common.h"
 #include "../utils/LOG/log.h"
 static int managed_ptr_sz(configmodule_interface_t *cfg, void *ptr)
--- a/common/config/config_load_configmodule.c
+++ b/common/config/config_load_configmodule.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <dlfcn.h>
-#include "common/platform_types.h"
+#include <platform_types.h>

 #define CONFIG_LOADCONFIG_MAIN
 #include "config_load_configmodule.h"
--- a/common/config/config_userapi.c
+++ b/common/config/config_userapi.c
@@ -39,7 +39,7 @@
 #include <errno.h>
 #include <dlfcn.h>
 #include <arpa/inet.h>
-#include "common/platform_types.h"
+#include <platform_types.h>
 #include "config_userapi.h"
 #include "config_common.h"
 #include "../utils/LOG/log.h"
--- a/common/platform_constants.h
+++ b/common/platform_constants.h
@@ -89,9 +89,7 @@
 #define NUM_MAX_CBA_GROUP 4

 #define printk printf
-#define RETURNok (0)
-#define RETURNerror (-1)
-#define DEFAULT_NAS_PATH "PWD"
+
 #define UNUSED_VARIABLE(vARIABLE) (void)(vARIABLE)

 #endif /* __PLATFORM_CONSTANTS_H__ */
--- a/common/utils/assertions.h
+++ b/common/utils/assertions.h
@@ -27,7 +27,7 @@
 #include <inttypes.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include "common/platform_types.h"
+#include <platform_types.h>

 #define OAI_EXIT_NORMAL 0
 #define OAI_EXIT_ASSERT 1
--- a/common/utils/config.h
+++ b/common/utils/config.h
@@ -37,9 +37,9 @@
 *
 * In code:
 * ```
- * set_log(ASN1, OAILOG_INFO); // enable logging
+ * set_log(ASN1, OAI_INFO); // enable logging
 * // do your encoding here
- * set_log(ASN1, OAILOG_ERR);  // disable logging
+ * set_log(ASN1, OAI_ERR);  // disable logging
 * ```
 *
 * in gdb:
--- a/common/utils/ds/byte_array.c
+++ b/common/utils/ds/byte_array.c
@@ -21,6 +21,7 @@

 #include "byte_array.h"

+#include "common/utils/assertions.h"
 #include <assert.h>
 #include <string.h>

@@ -28,7 +29,7 @@ byte_array_t copy_byte_array(byte_array_t src)
 {
  byte_array_t dst = {0};
  dst.buf = malloc(src.len);
-  assert(dst.buf != NULL && "Memory exhausted");
+  AssertFatal(dst.buf != NULL, "Memory exhausted");
  memcpy(dst.buf, src.buf, src.len);
  dst.len = src.len;
  return dst;
--- a/common/utils/minimal_stub.c
+++ b/common/utils/minimal_stub.c
@@ -4,9 +4,6 @@
 int T_stdout;
 #endif

-struct configmodule_interface_s;
-struct configmodule_interface_s *uniqCfg = NULL;
-
 void exit_function(const char *file, const char *function, const int line, const char *s, const int assert)
 {
  if (assert) {
--- a/common/utils/nr/nr_common.c
+++ b/common/utils/nr/nr_common.c
@@ -755,25 +755,11 @@ void SLIV2SL(int SLIV,int *S,int *L) {
  }
 }

-int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA, int scs)
+int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA)
 {
-  // for FR1 k_SSB expressed in terms of 15kHz SCS
-  // for FR2 k_SSB expressed in terms of the subcarrier spacing provided by the higher-layer parameter subCarrierSpacingCommon
-  // absoluteFrequencySSB and absoluteFrequencyPointA are ARFCN
-  // NR-ARFCN delta frequency is 5kHz if f < 3 GHz, 15kHz for other FR1 freq and 60kHz for FR2
-  const uint32_t absolute_diff = absoluteFrequencySSB - absoluteFrequencyPointA;
-  int scaling = 1;
-  if (absoluteFrequencyPointA < 600000) // correspond to 3GHz
-    scaling = 3;
-  if (scs > 2) // FR2
-    scaling <<= (scs - 2);
-  int sco_limit = scs == 1 ? 24 : 12;
-  int subcarrier_offset = (absolute_diff / scaling) % sco_limit;
-  // 30kHz is the only case where k_SSB is expressed in terms of a different SCS (15kHz)
-  // the assertion is to avoid having an offset of half a subcarrier
-  if (scs == 1)
-    AssertFatal(subcarrier_offset % 2 == 0, "ssb offset %d invalid for scs %d\n", subcarrier_offset, scs);
-  return subcarrier_offset;
+  uint32_t absolute_diff = (absoluteFrequencySSB - absoluteFrequencyPointA);
+  const int scaling_5khz = absoluteFrequencyPointA < 600000 ? 3 : 1;
+  return ((absolute_diff / scaling_5khz) % 24);
 }

 uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
@@ -781,16 +767,16 @@ uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
                                  int ssbSubcarrierSpacing,
                                  int frequency_range)
 {
-  // offset to pointA is expressed in terms of 15kHz SCS for FR1 and 60kHz for FR2
-  // only difference wrt NR-ARFCN is delta frequency 5kHz if f < 3 GHz for ARFCN
  uint32_t absolute_diff = (absoluteFrequencySSB - absoluteFrequencyPointA);
  const int scaling_5khz = absoluteFrequencyPointA < 600000 ? 3 : 1;
-  const int scaling = frequency_range == FR2 ? 1 << (ssbSubcarrierSpacing - 2) : 1 << ssbSubcarrierSpacing;
-  const int scaled_abs_diff = absolute_diff / (scaling_5khz * scaling);
-  // absoluteFrequencySSB is the central frequency of SSB which is made by 20RBs in total
-  const int ssb_offset_point_a = ((scaled_abs_diff / 12) - 10) * scaling;
-  // Offset to point A needs to be divisible by scaling
-  AssertFatal(ssb_offset_point_a % scaling == 0, "PRB offset %d not valid for scs %d\n", ssb_offset_point_a, ssbSubcarrierSpacing);
+  int sco = get_ssb_subcarrier_offset(absoluteFrequencySSB, absoluteFrequencyPointA);
+  const int scs_scaling = frequency_range == FR2 ? 1 << (ssbSubcarrierSpacing - 2) : 1 << ssbSubcarrierSpacing;
+  const int scaled_abs_diff = absolute_diff / scaling_5khz;
+  const int ssb_offset_point_a =
+      (scaled_abs_diff - sco) / 12
+      - 10 * scs_scaling; // absoluteFrequencySSB is the central frequency of SSB which is made by 20RBs in total
+  AssertFatal(ssb_offset_point_a % scs_scaling == 0, "PRB offset %d can create frequency offset\n", ssb_offset_point_a);
+  AssertFatal(sco % scs_scaling == 0, "ssb offset %d can create frequency offset\n", sco);
  return ssb_offset_point_a;
 }

@@ -879,44 +865,3 @@ void nr_est_delay(int ofdm_symbol_size, const c16_t *ls_est, c16_t *ch_estimates
  delay->delay_max_val = max_val;
  delay->est_delay = max_pos - sync_pos;
 }
-
-void nr_timer_start(NR_timer_t *timer)
-{
-  timer->active = true;
-  timer->counter = 0;
-}
-
-void nr_timer_stop(NR_timer_t *timer)
-{
-  timer->active = false;
-  timer->counter = 0;
-}
-
-bool is_nr_timer_active(NR_timer_t timer)
-{
-  return timer.active;
-}
-
-bool nr_timer_tick(NR_timer_t *timer)
-{
-  bool expired = false;
-  if (timer->active) {
-    timer->counter += timer->step;
-    expired = nr_timer_expired(*timer);
-    if (expired)
-      timer->active = false;
-  }
-  return expired;
-}
-
-bool nr_timer_expired(NR_timer_t timer)
-{
-  return (timer.counter >= timer.target);
-}
-
-void nr_timer_setup(NR_timer_t *timer, const uint32_t target, const uint32_t step)
-{
-  timer->target = target;
-  timer->step = step;
-  nr_timer_stop(timer);
-}
--- a/common/utils/nr/nr_common.h
+++ b/common/utils/nr/nr_common.h
@@ -44,51 +44,13 @@
 #define NR_NB_SC_PER_RB 12
 #define NR_MAX_NUM_LCID 32
 #define NR_MAX_NUM_QFI 64
-#define RNTI_NAMES /* see 38.321  Table 7.1-2  RNTI usage */      \
-  R(TYPE_C_RNTI_) /* Cell RNTI */                                  \
-  R(TYPE_CS_RNTI_) /* Configured Scheduling RNTI */                \
-  R(TYPE_TC_RNTI_) /* Temporary C-RNTI */                          \
-  R(TYPE_P_RNTI_) /* Paging RNTI */                                \
-  R(TYPE_SI_RNTI_) /* System information RNTI */                   \
-  R(TYPE_RA_RNTI_) /* Random Access RNTI */                        \
-  R(TYPE_SP_CSI_RNTI_) /* Semipersistent CSI reporting on PUSCH */ \
-  R(TYPE_SFI_RNTI_) /* Slot Format Indication on the given cell */ \
-  R(TYPE_INT_RNTI_) /* Indication pre-emption in DL */            \
-  R(TYPE_TPC_PUSCH_RNTI_) /* PUSCH power control */               \
-  R(TYPE_TPC_PUCCH_RNTI_) /* PUCCH power control */               \
-  R(TYPE_TPC_SRS_RNTI_)                                           \
-  R(TYPE_MCS_C_RNTI_)
-
-#define R(k) k ,
-typedef enum { RNTI_NAMES } nr_rnti_type_t;
-#undef R
-
-#define R(k) \
-  case k:       \
-    return #k;
-static inline const char *rnti_types(nr_rnti_type_t rr)
-{
-  switch (rr) {
-    RNTI_NAMES
-    default:
-      return "Not existing RNTI type";
-  }
-}
-#undef R
-
-#define NR_MAX_NB_LAYERS 4 // 8
+#define NR_MAX_NUM_SLICES 10

 typedef enum {
  nr_FR1 = 0,
  nr_FR2
 } nr_frequency_range_e;

-typedef struct {
-  int subcarrier_offset;
-  uint32_t absolute_diff;
-  int scaling;
-} nr_sco_info_t;
-
 typedef struct nr_bandentry_s {
  int16_t band;
  uint64_t ul_min;
@@ -122,49 +84,6 @@ typedef struct {
  int delay_max_val;
 } delay_t;

-typedef struct {
-  bool active;
-  uint32_t counter;
-  uint32_t target;
-  uint32_t step;
-} NR_timer_t;
-
-/**
- * @brief To start a timer
- * @param timer Timer to be started
- */
-void nr_timer_start(NR_timer_t *timer);
-/**
- * @brief To stop a timer
- * @param timer Timer to stopped
- */
-void nr_timer_stop(NR_timer_t *timer);
-/**
- * @brief If active, it increases timer counter by an amout of units equal to step. It stops timer if expired
- * @param timer Timer to be handled
- * @return Indication if the timer is expired or not
- */
-bool nr_timer_tick(NR_timer_t *timer);
-/**
- * @brief To setup a timer
- * @param timer Timer to setup
- * @param target Target value for timer (when reached, timer is considered expired)
- * @param step Amount of units to add to timer counter every tick
- */
-void nr_timer_setup(NR_timer_t *timer, const uint32_t target, const uint32_t step);
-/**
- * @brief To check if a timer is expired
- * @param timer Timer to be checked
- * @return Indication if the timer is expired or not
- */
-bool nr_timer_expired(NR_timer_t timer);
-/**
- * @brief To check if a timer is active
- * @param timer Timer to be checked
- * @return Indication if the timer is active or not
- */
-bool is_nr_timer_active(NR_timer_t timer);
-
 extern const nr_bandentry_t nr_bandtable[];

 static inline int get_num_dmrs(uint16_t dmrs_mask ) {
@@ -208,7 +127,7 @@ uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
                                  uint32_t absoluteFrequencyPointA,
                                  int ssbSubcarrierSpacing,
                                  int frequency_range);
-int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA, int scs);
+int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA);
 int get_delay_idx(int delay, int max_delay_comp);

 void freq2time(uint16_t ofdm_symbol_size,
--- a/common/utils/oai_asn1.h
+++ b/common/utils/oai_asn1.h
@@ -32,7 +32,7 @@
 *\param[in] pointer to the BIT_STRING_t object.
 *\return the extracted value.
 */
-static inline uint8_t BIT_STRING_to_uint8(const BIT_STRING_t *asn) {
+static inline uint8_t BIT_STRING_to_uint8(BIT_STRING_t *asn) {
  DevCheck ((asn->size == 1), asn->size, 0, 0);

  return asn->buf[0] >> asn->bits_unused;
@@ -43,7 +43,7 @@ static inline uint8_t BIT_STRING_to_uint8(const BIT_STRING_t *asn) {
 *\param[in] pointer to the BIT_STRING_t object.
 *\return the extracted value.
 */
-static inline uint16_t BIT_STRING_to_uint16(const BIT_STRING_t *asn) {
+static inline uint16_t BIT_STRING_to_uint16(BIT_STRING_t *asn) {
  uint16_t result = 0;
  int index = 0;

@@ -69,7 +69,7 @@ static inline uint16_t BIT_STRING_to_uint16(const BIT_STRING_t *asn) {
 *\param[in] pointer to the BIT_STRING_t object.
 *\return the extracted value.
 */
-static inline uint32_t BIT_STRING_to_uint32(const BIT_STRING_t *asn) {
+static inline uint32_t BIT_STRING_to_uint32(BIT_STRING_t *asn) {
  uint32_t result = 0;
  size_t index;

@@ -91,7 +91,7 @@ static inline uint32_t BIT_STRING_to_uint32(const BIT_STRING_t *asn) {
 *\param[in] pointer to the BIT_STRING_t object.
 *\return the extracted value.
 */
-static inline uint64_t BIT_STRING_to_uint64(const BIT_STRING_t *asn) {
+static inline uint64_t BIT_STRING_to_uint64(BIT_STRING_t *asn) {
  uint64_t result = 0;
  size_t index;
  int shift;
@@ -117,11 +117,5 @@ static inline uint64_t BIT_STRING_to_uint64(const BIT_STRING_t *asn) {
 #define asn1cSequenceAdd(VaR, TyPe, lOcPtr) \
  TyPe *lOcPtr= calloc(1,sizeof(TyPe)); \
  asn1cSeqAdd(&VaR,lOcPtr)
-#define asn1cFreeStruc(ASN_DEF, STRUCT) \
-  do {                                  \
-    ASN_STRUCT_RESET(ASN_DEF, STRUCT);  \
-    free(STRUCT);                       \
-    STRUCT = NULL;                      \
-  } while (0)

 #endif
--- a/common/utils/ocp_itti/intertask_interface.cpp
+++ b/common/utils/ocp_itti/intertask_interface.cpp
@@ -59,6 +59,29 @@ typedef struct timer_elm_s {
  static int nb_queues=0;
  static pthread_mutex_t lock_nb_queues;

+  void *pool_buffer_init (void) {
+    return 0;
+  }
+
+  void *pool_buffer_clean (void *arg) {
+    //-----------------------------------------------------------------------------
+    return 0;
+  }
+
+  void free_mem_block (mem_block_t *leP, const char *caller) {
+    AssertFatal(leP!=NULL,"");
+    free(leP);
+  }
+
+  mem_block_t *get_free_mem_block (uint32_t sizeP, const char *caller) {
+    mem_block_t *ptr=(mem_block_t *)malloc(sizeP+sizeof(mem_block_t));
+    ptr->next = NULL;
+    ptr->previous = NULL;
+    ptr->data=((unsigned char *)ptr)+sizeof(mem_block_t);
+    ptr->size=sizeP;
+    return ptr;
+  }
+
  void *itti_malloc(task_id_t origin_task_id, task_id_t destination_task_id, ssize_t size) {
    void *ptr = NULL;
    AssertFatal ((ptr=calloc (size, 1)) != NULL, "Memory allocation of %zu bytes failed (%d -> %d)!\n",
--- a/common/utils/ocp_itti/intertask_interface.h
+++ b/common/utils/ocp_itti/intertask_interface.h
@@ -26,8 +26,9 @@
 #include <stdint.h>
 #include <sys/epoll.h>

+#include <mem_block.h>
 #include <assertions.h>
-#include "common/utils/mem/oai_memory.h"
+

 typedef enum timer_type_s {
  TIMER_PERIODIC,
@@ -61,6 +62,7 @@ typedef struct itti_lte_time_s {
  uint8_t slot;
 } itti_lte_time_t;

+
 typedef struct IttiMsgEmpty_s {
  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
  // To be removed if the structure is filled
@@ -550,6 +552,7 @@ void itti_set_task_real_time(task_id_t task_id);
 void itti_send_terminate_message(task_id_t task_id);

 void *itti_malloc(task_id_t origin_task_id, task_id_t destination_task_id, ssize_t size);
+int memory_read(const char *datafile, void *data, size_t size);
 int itti_free(task_id_t task_id, void *ptr);

 int itti_init(task_id_t task_max, const task_info_t *tasks_info);
--- a/common/utils/system.c
+++ b/common/utils/system.c
@@ -230,7 +230,7 @@ void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name,
  int ret;
  int settingPriority = 1;
  ret=pthread_attr_init(&attr);
-  AssertFatal(ret == 0, "Error in pthread_attr_init(): ret: %d, errno: %d\n", ret, errno);
+  AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);

  LOG_I(UTIL,"Creating thread %s with affinity %d and priority %d\n",name,affinity,priority);

@@ -241,9 +241,9 @@ void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name,
  
  if (settingPriority) {
    ret=pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
-    AssertFatal(ret == 0, "Error in pthread_attr_setinheritsched(): ret: %d, errno: %d\n", ret, errno);
+    AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
    ret=pthread_attr_setschedpolicy(&attr, SCHED_OAI);
-    AssertFatal(ret == 0, "Error in pthread_attr_setschedpolicy(): ret: %d, errno: %d\n", ret, errno);
+    AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
    if(priority<sched_get_priority_min(SCHED_OAI) || priority>sched_get_priority_max(SCHED_OAI)) {
      LOG_E(UTIL,"Prio not possible: %d, min is %d, max: %d, forced in the range\n",
 	    priority,
@@ -258,20 +258,18 @@ void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name,
    struct sched_param sparam={0};
    sparam.sched_priority = priority;
    ret=pthread_attr_setschedparam(&attr, &sparam);
-    AssertFatal(ret == 0, "Error in pthread_attr_setschedparam(): ret: %d errno: %d\n", ret, errno);
+    AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
  }
- 
-  LOG_I(UTIL,"threadCreate for %s, affinity %x, priority %d\n",name,affinity,priority); 
+  
  ret=pthread_create(t, &attr, func, param);
-  AssertFatal(ret == 0, "Error in pthread_create(): ret: %d, errno: %d\n", ret, errno);
+  AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
  
  pthread_setname_np(*t, name);
  if (affinity != -1 ) {
    cpu_set_t cpuset;
    CPU_ZERO(&cpuset);
    CPU_SET(affinity, &cpuset);
-    ret = pthread_setaffinity_np(*t, sizeof(cpu_set_t), &cpuset);
-    AssertFatal(ret == 0, "Error in pthread_getaffinity_np(): ret: %d, errno: %d", ret, errno);
+    AssertFatal( pthread_setaffinity_np(*t, sizeof(cpu_set_t), &cpuset) == 0, "Error setting processor affinity");
  }
  pthread_attr_destroy(&attr);
 }
--- a/common/utils/telnetsrv/telnetsrv_bearer.c
+++ b/common/utils/telnetsrv/telnetsrv_bearer.c
@@ -56,7 +56,7 @@ int get_single_rnti(char *buf, int debug, telnet_printfunc_t prnt)
  return 0;
 }

-//void rrc_gNB_trigger_new_bearer(int rnti);
+void rrc_gNB_trigger_new_bearer(int rnti);
 int add_bearer(char *buf, int debug, telnet_printfunc_t prnt)
 {
  int rnti = -1;
@@ -75,13 +75,12 @@ int add_bearer(char *buf, int debug, telnet_printfunc_t prnt)
  if (!rrcue)
    ERROR_MSG_RET("could not find UE with RNTI %04x\n", rnti);

-  AssertFatal(false, "not implemented\n");
-  //rrc_gNB_trigger_new_bearer(rnti);
+  rrc_gNB_trigger_new_bearer(rnti);
  prnt("called rrc_gNB_trigger_new_bearer(%04x)\n", rnti);
  return 0;
 }

-//void rrc_gNB_trigger_release_bearer(int rnti);
+void rrc_gNB_trigger_release_bearer(int rnti);
 int release_bearer(char *buf, int debug, telnet_printfunc_t prnt)
 {
  int rnti = -1;
@@ -100,8 +99,7 @@ int release_bearer(char *buf, int debug, telnet_printfunc_t prnt)
  if (!rrcue)
    ERROR_MSG_RET("could not find UE with RNTI %04x\n", rnti);

-  AssertFatal(false, "not implemented\n");
-  //rrc_gNB_trigger_release_bearer(rnti);
+  rrc_gNB_trigger_release_bearer(rnti);
  prnt("called rrc_gNB_trigger_release_bearer(%04x)\n", rnti);
  return 0;
 }
--- a/common/utils/telnetsrv/telnetsrv_ci.c
+++ b/common/utils/telnetsrv/telnetsrv_ci.c
@@ -92,10 +92,10 @@ int get_reestab_count(char *buf, int debug, telnet_printfunc_t prnt)
      ERROR_MSG_RET("could not find UE with RNTI %04x in RRC\n");
  }

-  prnt("UE RNTI %04x reestab %d reconfig %d\n",
+  prnt("UE RNTI %04x reestab %d reconf_after_reestab %d\n",
       ue->ue_context.rnti,
       ue->ue_context.ue_reestablishment_counter,
-       ue->ue_context.ue_reconfiguration_counter);
+       ue->ue_context.ue_reconfiguration_after_reestablishment_counter);
  return 0;
 }

--- a/common/utils/threadPool/thread-pool.c
+++ b/common/utils/threadPool/thread-pool.c
@@ -150,11 +150,8 @@ void initNamedTpool(char *params,tpool_t *pool, bool performanceMeas, char *name
        //Configure the thread scheduler policy for Linux
        // set the thread name for debugging
        sprintf(pool->allthreads->name,"%s%d_%d",tname,pool->nbThreads,pool->allthreads->coreID);
-        // we set the maximum priority for thread pool threads (which is close
-        // but not equal to Linux maximum). See also the corresponding commit
-        // message; initially introduced for O-RAN 7.2 fronthaul split
        threadCreate(&pool->allthreads->threadID, one_thread, (void *)pool->allthreads,
-                     pool->allthreads->name, pool->allthreads->coreID, OAI_PRIORITY_RT_MAX);
+                     pool->allthreads->name, pool->allthreads->coreID, OAI_PRIORITY_RT);
        pool->nbThreads++;
    }

--- a/common/utils/time_meas.h
+++ b/common/utils/time_meas.h
@@ -218,10 +218,4 @@ time_stats_t *register_meas(char *name);
 void send_meas(time_stats_t *ts, int msgid);
 void end_meas(void);

-#define timeIt(a)                                           \
-  {                                                         \
-    uint64_t deb = rdtsc_oai();                             \
-    a;                                                      \
-    LOG_W(UTIL, #a ": %llu\n", (rdtsc_oai() - deb) / 3000); \
-  }
 #endif
--- a/common/utils/utils.c
+++ b/common/utils/utils.c
@@ -132,21 +132,3 @@ void set_priority(int priority)
    abort();
  }
 }
-
-/**
- * @brief Convert a version string x.y.z into numbers.
- *
- * The function takes a version string of format "x.y.z" where x is the major
- * version number, y minor, z patch. It tries to match version, and outputs the
- * numbers in the correspondingly named variables.
- *
- * @return The number of version parts matched (should be three on x.y.z).
- */
-int read_version(const char *version, uint8_t *major, uint8_t *minor, uint8_t *patch)
-{
-  int ret = sscanf(version, "%hhu.%hhu.%hhu", major, minor, patch);
-  // EOF means "end of input reached or matching failure"
-  if (ret == EOF)
-    return 3;
-  return ret; // ret has number of items matched
-}
--- a/common/utils/utils.h
+++ b/common/utils/utils.h
@@ -107,10 +107,6 @@ void set_priority(int priority);

 char *itoa(int i);

-#define STRINGIFY(S) #S
-#define TO_STRING(S) STRINGIFY(S)
-int read_version(const char *version, uint8_t *major, uint8_t *minor, uint8_t *patch);
-
 #define findInList(keY, result, list, element_type) {\
    int i;\
    for (i=0; i<sizeof(list)/sizeof(element_type) ; i++)\
--- a/doc/BUILD.md
+++ b/doc/BUILD.md
@@ -63,8 +63,6 @@ Calling the `build_oai` script with the `-h` option gives the list of all availa
 - `--ninja` is to use the `ninja` build tool, which speeds up compilation.
 - `-c` is to clean the workspace and force a complete rebuild.

-`build_oai` also provides various options to enable runtime error checkers, i.e. sanitizers in order to find various types of bugs in the codebase and eventually enhance the stability of the OAI softmodems. Refer to [sanitizers.md](./dev_tools/sanitizers.md) for more details.
-
 ## Installing dependencies

 Install all dependencies by issuing the `-I` option. To install furthermore libraries for optional libraries, use the `--install-optional-packages` option. The `-I` option will also install dependencies for an SDR when paired with `-w`. For instance, in order to install all dependencies and the ones for USRP, run:
@@ -186,7 +184,6 @@ Some libraries have further dependencies and might not build on every system:
 - `nrqtscope`: Qt5
 - `ldpc_cuda`: CUDA
 - `websrv`: npm and others
- `ldpc_t2`: DPDK with patch

 # Running `cmake` directly

--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -1337,9 +1337,9 @@ INPUT                  = \
@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/nas_timer.c \
@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/TLVDecoder.c \
@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/nas_timer.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/mem/memory.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/memory.c \
@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/OctetString.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/mem/oai_memory.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/memory.h \
@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/TLVDecoder.h \
@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/nas_log.h \
@CMAKE_CURRENT_SOURCE_DIR@/../openair3/NAS/COMMON/UTIL/TLVEncoder.h \
@@ -1771,6 +1771,7 @@ INPUT                  = \
@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_models.h \
@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_externs.h \
@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/OTG/otg_config.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/MEM/mem_block.h \
@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/MATH/oml.h \
@CMAKE_CURRENT_SOURCE_DIR@/../openair2/UTIL/MATH/oml.c \
@CMAKE_CURRENT_SOURCE_DIR@/../openair2/F1AP/f1ap_cu_ue_context_management.c \
@@ -1835,7 +1836,7 @@ INPUT                  = \
@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/udp_messages_def.h \
@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/nas_messages_types.h \
@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/sctp_messages_types.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/platform_types.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/platform_types.h \
@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/ngap_messages_types.h \
@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/gtpv1_u_messages_types.h \
@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rlc_messages_types.h \
--- a/doc/E1-design.md
+++ b/doc/E1-design.md
@@ -17,22 +17,17 @@ connection setup only in split-mode, the rest is the same for CU):
 sequenceDiagram
  participant c as CUCP
  participant u as CUUP
-
-  Note over c,u: E1 Setup Procedure
  u->c: SCTP connection setup (in split mode)
-  u->>c: E1 Setup Request
+  u->>c: E1AP Setup Request
  Note over c: Execute rrc_gNB_process_e1_setup_req()
-  c->>u: E1 Setup Response
-  c-->>u: E1 Setup Failure
+  c->>u: E1AP Setup Response

-  Note over c,u: E1 Bearer Context Setup Procedure
  Note over c: Receives PDU session setup request from AMF
  c->>u: Bearer Context Setup Request
  Note over u: Execute e1_bearer_context_setup()<br/>Configure DRBs and create GTP Tunnels for F1-U and N3
  u->>c: Bearer Context Setup Response
  Note over c: Execute rrc_gNB_process_e1_setup_req()<br/>Sends F1-U UL TNL info to DU and receives DL TNL info

-  Note over c,u: E1 Bearer Context Modification (CU-CP Initiated) Procedure
  c->>u: Bearer Context Modification Request
  Note over u: Execute e1_bearer_context_modif()<br/>Updates GTP Tunnels with received info
  u->>c: Bearer Context Modification Response
@@ -45,63 +40,19 @@ sequenceDiagram
  Note over c: Execute rrc_gNB_process_e1_bearer_context_release_cplt()
 ```

-The implementation of callbacks towards these handlers is distributed across the following file, depending on the operating mode:
-
-| Mode          | CP=>UP messages     |UP=>CP messages     |
-| --------------| --------------------|--------------------|
-| Integrated CU | `cucp_cuup_direct.c`|`cuup_cucp_direct.c`|
-| E1 Split      | `cucp_cuup_e1ap.c`  |`cuup_cucp_e1ap.c`  |
-
-As long as concerns E1 Interface Management Procedures, the code flow of request messages towards northbound looks like this:
-
-```mermaid
-sequenceDiagram
-  participant r as RRC
-  participant c as CUCP
-  participant u as CUUP
-
-  Note over u: E1AP_CUUP_task (SCTP Handler)
-  Note over u: ASN1 encoder
-  u->>c: e.g. E1 Setup Request (SCTP)
-  Note over c: E1AP_CUCP_task (SCTP Handler)
-  Note over c: ASN1 decoder
-  c->>r: E1AP_SETUP_REQ (ITTI)
-  Note over r: TASK_RRC_GNB (RRC Handler)
-  r->>c: E1AP_SETUP_RESP (ITTI)
-  Note over c: E1AP_CUCP_task (E1AP Callback)
-  Note over c: ASN1 encoder
-
-  c->>u: e.g. E1 Setup Response/Failure
-  Note over u: E1AP_CUUP_task (SCTP Handler)
-  Note over u: ASN1 decoder
-```
-
+The files that implement the callback towards these handlers are in
+- `cucp_cuup_direct.c`: integrated CU (for CP=>UP messages)
+- `cucp_cuup_e1ap.c`: E1 split mode (for CP=>UP messages)
+- `cuup_cucp_direct.c`: integrated CU (for UP=>CP messages)
+- `cuup_cucp_e1ap.c`: E1 split mode (for UP=>CP messages)

 # 2. Running the E1 Split

-The setup is assuming that all modules are running on the same machine. The user can refer to the [F1 design document](./F1-design.md) for local deployment of the DU.
-
 ## 2.1 Configuration File

-The gNB is started based on the node type that is specified in the configuration file. The following parameters must be configured accordingly.
+The gNB is started based on the node type that is specified in the configuration file. To start a gNB instance in CUCP or CUUP, the `tr_s_preference` should be set to "f1" and the config member `E1_INTERFACE` should be present in the config file. The `type` parameter within the `E1_INTERFACE` should be set to `cp`, and executable `nr-softmodem` should be used to run a CU-CP. The type should be `up` and executable `nr-cuup` should be used to run the CU-UP. Further, there are the parameters `ipv4_cucp` and `ipv4_cuup` to specify the IP addresses of the respective network functions.

-On either CUCP and CUUP:
-* The southbound transport preference `gNBs.[0].tr_s_preference` set to `f1`
-* config section `E1_INTERFACE` should be present
-
-On the CU-CP:
-* `type` parameter within the `E1_INTERFACE` should be set to `cp`
-
-On the CU-UP:
-* `type` parameter within the `E1_INTERFACE` should be set to `up`
-
-Executables:
-* executable `nr-softmodem` to run a CU-CP
-* executable `nr-cuup` to run the CU-UP
-
-In the `E1_INTERFACE` configuration section, the parameters `ipv4_cucp` and `ipv4_cuup` must be configured to specify the IP addresses of the respective network functions.
-
-For CUCP, a typical `E1_INTERFACE` config looks like:
+For CUCP, a typical `E1_INTERFACE` config looks like
 ```
 E1_INTERFACE =
 (
@@ -113,7 +64,7 @@ E1_INTERFACE =
 )
 ```

-For CUUP, it is:
+For CUUP, it is
 ```
 E1_INTERFACE =
 (
@@ -126,7 +77,7 @@ E1_INTERFACE =
 ```
 One could take an existing CU configuration file and add the above parameters to run the gNB as CUCP or CUUP.

-The CUUP uses the IP address specified in `gNBs.[0].local_s_address` for F1-U and `GNB_IPV4_ADDRESS_FOR_NGU` for N3 links. Note that `local_s_address` is under `gNBs` and `GNB_IPV4_ADDRESS_FOR_NGU` is part of the `NETWORK_INTERFACES` config member.
+The CUUP uses the IP address specified in `local_s_address` for F1-U and `GNB_IPV4_ADDRESS_FOR_NGU` for N3 links. Note that `local_s_address` is under `gNBs` and `GNB_IPV4_ADDRESS_FOR_NGU` is part of the `NETWORK_INTERFACES` config member.  

 Alternatively, you can use the config files `ci-scripts/conf_files/gnb-cucp.sa.f1.conf` and `ci-scripts/conf_files/gnb-cuup.sa.f1.conf`.

--- a/doc/F1-design.md
+++ b/doc/F1-design.md
@@ -20,15 +20,15 @@ The F1 interface is the functional split of 3GPP between the CU (centralized
 unit: PDCP, RRC, SDAP) and the DU (distributed unit: RLC, MAC, PHY). It is
 standardized in TS 38.470 - 38.473 for 5G NR. No equivalent for 4G exists.

-We assume that each DU handles only one cell. Multiple DUs connected to one CU
+We assume that each DU handles only one cell.  Multiple DUs connected to one CU
 are supported. Mobility over F1 is not yet supported.

 # Control plane status (F1-C)

 ## Implementation Status

-Note that OAI uses F1 "internally". That means, that even **if you run a
-monolithic gNB, the internal information exchange uses F1**. You can therefore
+Note that OAI uses F1 "internally". That means, that even if you run a
+monolithic gNB, the internal information exchange uses F1. You can therefore
 expect that everything working in a monolithic deployment should also work in
 F1.  The current implementation is based on R16.3.

@@ -118,13 +118,13 @@ see [this `docker-compose` file](../ci-scripts/yaml_files/5g_f1_rfsimulator/dock

 The rules to decide if a config triggers a start of a DU, CU, or monolithic
 gNB, are, in order:
-1. If the `MACRLCs` section lists `f1` as **northbound transport preference**
+1. If the `MACRLCs` section lists `f1` as northbound transport preference
   (`tr_n_preference`), it is a DU.
-2. If the `gNBs` section lists `f1` as a **southound transport preference**
+2. If the `gNBs` section lists `f1` as a southound transport preference
   (`tr_s_preference`), it is a CU.
 3. It is a (monolithic) gNB.

-## Local network deployment of F1
+## Configuration of F1 IP/port information

 For a local deployment, you should update the following fields.
 We assume that the CU will bind on `192.168.70.129` towards the core,
@@ -152,11 +152,9 @@ In the CU file:
 In the DU file:
 - Set `MACRLCs.[0].tr_n_preference` to `f1`
 - Update `MACRLCs.[0].local_n_address` (local north-bound address of the DU) to
-  `127.0.0.4`. This IP address is used to bind the GTP socket (F1-U user plane
-  traffic).
+  `127.0.0.4`
 - Update `MACRLCs.[].remote_n_address` (remote north-bound address of the CU)
-  to `127.0.0.3`. This IP address is used as the CU destination IP address for
-  F1AP communication.
+  to `127.0.0.3`

 Note: all `local_*_if_name` parameters are ignored.

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Chieh-Chun Chen	d47ded101e	Fix: avoid using id 0 for slice	2024-01-12 20:20:35 +01:00
Chieh-Chun Chen	f326c15d67	Add default slice sst 0 sd 0 for SRB Note: assume default slice nssai is sst 0 and sd 0, which is reserved for SRB. it needs to be assigned to sched_ctrl before gnb created slice from RC control message in order to be able associated to the corresponding slice	2024-01-12 20:20:35 +01:00
Chieh-Chun Chen	88daeb39db	Fix: remove released UE from slice before MAC removed	2024-01-12 20:20:35 +01:00
Chieh-Chun Chen	e2f35a2dcd	Fix: add default slice while initializing slice	2024-01-12 20:20:35 +01:00
Chieh-Chun Chen	bdfea1d001	Fix RC ran func	2024-01-12 20:20:35 +01:00
Sakthivel Velumani	8954a140fd	Remove UE from slice list(to be squashed)	2024-01-11 17:50:36 +01:00
Sakthivel Velumani	289c87d238	Add support for multiple slices per UE	2024-01-09 14:20:16 +01:00
Teodora	5bb186229e	Fix warnings, read functions in SMs should return bool	2024-01-09 14:19:37 +01:00
Teodora	dbb08a9c85	Made it compile with FlexRIC release v2	2024-01-09 14:19:37 +01:00
Chieh-Chun Chen	3faaf888e7	Fix: correct the function pointer of preprocessor function for nr dlsim	2023-12-18 11:36:27 +01:00
Chieh-Chun Chen	3bc87342c6	Add README for nr slicing	2023-12-15 12:03:50 +01:00
Chieh-Chun Chen	3544c35c7a	Fix: correct bytes_last_round to be the instantaneous transmission rate for each slice	2023-12-13 15:33:41 +01:00
Chieh-Chun Chen	b5177eb796	Fix: use min prb ratio as parameter for NVS algo	2023-12-13 14:43:30 +01:00
Chieh-Chun Chen	8eb350c5c8	Add new coming UEs to the corresponding slice if slice exists	2023-12-13 14:43:30 +01:00
Chieh-Chun Chen	d0b00aa53d	Fix: save plmn info in RRCSetupComplete	2023-12-13 14:43:30 +01:00
Chieh-Chun Chen	477510cb53	Fix: get the correct nssai in ngap	2023-12-13 14:42:42 +01:00
Chieh-Chun Chen	3c8a95e767	Add slice in RC ran func	2023-12-13 14:42:42 +01:00
Chieh-Chun Chen	f02f3af722	Fixes for NR slicing - correct return value of slice idx - add/move UE in UE_list - use rnti_t instead uint16_t	2023-12-13 14:42:42 +01:00
Chieh-Chun Chen	8f544acf20	Modify the return value of nr_pf_dl to int & remove the unused codes	2023-12-13 14:42:08 +01:00
Chieh-Chun Chen	09a2643518	Fix: correct the teidupf in GTP ran func	2023-12-13 14:42:08 +01:00
Robert Schmidt	2350bf56dd	Add 5G preprocessor with NVS slicing	2023-12-13 14:41:53 +01:00