Dockerfiles to build OAI gNB using the split

2026-07-16 06:00:28 +00:00 · 2024-05-13 00:15:02 -04:00
752 changed files with 32910 additions and 35293 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@

 # Author: laurent THOMAS, Lionel GAUTHIER

-cmake_minimum_required (VERSION 3.16)
+cmake_minimum_required (VERSION 3.12)
 project (OpenAirInterface LANGUAGES C CXX)

 #########################################################
@@ -180,6 +180,22 @@ add_boolean_option(SANITIZE_ADDRESS False "enable the address sanitizer (ASan)"
 if (SANITIZE_ADDRESS)
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fno-common")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer -fno-common")
+  # There seems to be some incompatibility with pthread_create and the RT scheduler, which
+  # results in pthread_create hanging.
+  #
+  # When we switch from Ubuntu 16.04 to 18.04, we found that running with the address sanitizer,
+  # the pthread_create function calls were not working. The inital thought was that we were
+  # trying to create a thread that was not-blocking and would eventually crash the machine during
+  # the run. After more debugging, we found that we would never even start the thread. We narrowed
+  # down the first two instances of pthread_create in the gNB and NR UE to be sctp_eNB_task and
+  # one_thread, respectively. We found that adding sleeps, and various other pauses to the threads
+  # had not effect. From there, we found that if we add an abort(); prior to the thread loop, we
+  # do not execute that. This indicated to us that the problem is not likely to be a non-blocking
+  # thread, but perhaps and issue with pthread_create itself. From there we begain to research the
+  # issue on the web. See: https://github.com/google/sanitizers/issues/1125
+  #
+  # Google searching indicates this appears to be a problem since at least 2018. This could be something
+  # wrong in the pthread library, or something subtly wrong in this CMakeLists.txt. Use Ubuntu 20.04 instead.
 endif ()

 add_boolean_option(SANITIZE_THREAD False "enable the address sanitizer (TSan)" ON)
@@ -268,7 +284,6 @@ add_boolean_option(DEBUG_ASN1 False "Enable ASN1 debug logs" OFF)
 # see common/utils/config.h
 add_boolean_option(TRACE_ASN1C_ENC_DEC OFF "Enable ASN1 encoder/decoder debug traces via OAI logging system" ON)
 add_boolean_option(T_TRACER            True  "Activate the T tracer, a debugging/monitoring framework" ON)
-add_boolean_option(ENABLE_LTTNG        False "Activate the LTTNG tracer, a debugging/monitoring framework" ON)
 add_boolean_option(UE_AUTOTEST_TRACE   False "Activate UE autotest specific logs" ON)
 add_boolean_option(UE_DEBUG_TRACE      False "Activate UE debug trace" ON)
 add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace" ON)
@@ -447,7 +462,7 @@ add_library(f1ap
            ${F1AP_DIR}/f1ap_handlers.c
            ${F1AP_DIR}/f1ap_itti_messaging.c)
 target_include_directories(f1ap PUBLIC F1AP_DIR)
-target_link_libraries(f1ap PUBLIC asn1_f1ap L2_NR)
+target_link_libraries(f1ap PUBLIC asn1_f1ap)
 target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE)

 # LPP
@@ -498,36 +513,19 @@ if (ENABLE_LDPC_T2)
  add_library(ldpc_t2 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
  set_target_properties(ldpc_t2 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
  target_link_libraries(ldpc_t2 ${LIBDPDK_T2_LDFLAGS} ${PMD_T2})
-  set(PHY_LDPC_SLOT_T2_SRC
-    ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_coding_t2.c
-    ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
-    ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
-  )
-add_library(ldpc_slot_t2 MODULE ${PHY_LDPC_SLOT_T2_SRC})
-  set_target_properties(ldpc_slot_t2 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
-  target_link_libraries(ldpc_slot_t2 PRIVATE ldpc_gen_HEADERS ${LIBDPDK_T2_LDFLAGS} ${PMD_T2})
 endif()

 ##########################################################

-# LDPC offload library - XDMA
-##########################################################
-add_boolean_option(ENABLE_LDPC_XDMA OFF "Build support for LDPC Offload to XDMA library" OFF)
-if (ENABLE_LDPC_XDMA)
-  set(PHY_NRLDPC_CODING_XDMA_SRC
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload_xdma.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding_interface_xdma.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding_interface_demo_encoder.c
-  )
-  add_library(ldpc_xdma MODULE ${PHY_NRLDPC_CODING_XDMA_SRC})
-endif()
-
 include_directories ("${OPENAIR_DIR}/radio/COMMON")

 ##############################################################
 #    ???!!! TO BE DOCUMENTED OPTIONS !!!???
 ##############################################################

+add_boolean_option(OAI_NW_DRIVER_TYPE_ETHERNET False "????" ON)
+add_boolean_option(OAI_NW_DRIVER_USE_NETLINK True "????" ON)
+
 add_boolean_option(UE_EXPANSION             False         "enable UE_EXPANSION with max 256 UE" ON)
 add_boolean_option(PHY_TX_THREAD            False         "enable UE_EXPANSION with max 256 UE" ON)
 add_boolean_option(PRE_SCD_THREAD           False         "enable UE_EXPANSION with max 256 UE" ON)
@@ -651,22 +649,17 @@ add_library(HASHTABLE
 include_directories(${OPENAIR_DIR}/common/utils/hashtable)

 add_library(UTIL
+  ${OPENAIR_DIR}/common/utils/LOG/log.c
  ${OPENAIR_DIR}/common/utils/LOG/vcd_signal_dumper.c
+  ${OPENAIR2_DIR}/UTIL/MATH/oml.c
  ${OPENAIR2_DIR}/UTIL/OPT/probe.c
+  ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
+  ${OPENAIR_DIR}/common/utils/utils.c
+  ${OPENAIR_DIR}/common/utils/system.c
+  ${OPENAIR_DIR}/common/utils/time_meas.c
+  ${OPENAIR_DIR}/common/utils/time_stat.c
 )
-if (ENABLE_LTTNG)
-  find_package(LTTngUST 2.3.8 EXACT REQUIRED)
-else()
-  message(STATUS "LTTNG support disabled")
-endif()
-
-pkg_check_modules(cap libcap)
-if (cap_FOUND)
-  # see system.c for more info
-  target_link_libraries(UTIL PRIVATE cap)
-  target_compile_definitions(UTIL PRIVATE HAVE_LIB_CAP)
-endif()
-target_link_libraries(UTIL PUBLIC ${T_LIB} pthread LOG thread-pool utils)
+target_link_libraries(UTIL PUBLIC ${T_LIB} pthread)

 set(SECURITY_SRC
  ${OPENAIR3_DIR}/SECU/secu_defs.c
@@ -740,14 +733,20 @@ target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs

 # nFAPI
 #################################
+set(NFAPI_COMMON_SRC
+  ${NFAPI_DIR}/common/src/debug.c
+  )
+add_library(NFAPI_COMMON_LIB ${NFAPI_COMMON_SRC})
+
+include_directories(${NFAPI_DIR}/common/public_inc)
+
 set(NFAPI_SRC
+  ${NFAPI_DIR}/nfapi/src/nfapi.c
  ${NFAPI_DIR}/nfapi/src/nfapi_p4.c
  ${NFAPI_DIR}/nfapi/src/nfapi_p5.c
  ${NFAPI_DIR}/nfapi/src/nfapi_p7.c
 )
 add_library(NFAPI_LIB ${NFAPI_SRC})
-target_link_libraries(NFAPI_LIB PUBLIC nfapi_common)
-target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5)

 include_directories(${NFAPI_DIR}/nfapi/public_inc)
 include_directories(${NFAPI_DIR}/nfapi/inc)
@@ -772,10 +771,7 @@ set(NFAPI_VNF_SRC
 )
 add_library(NFAPI_VNF_LIB ${NFAPI_VNF_SRC})
 target_link_libraries(NFAPI_VNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5)
-if(OAI_AERIAL)
-  target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_AERIAL)
-endif()
+
 include_directories(${NFAPI_DIR}/vnf/public_inc)
 include_directories(${NFAPI_DIR}/vnf/inc)

@@ -805,6 +801,7 @@ set(PHY_POLARSRC
  ${OPENAIR1_DIR}/PHY/CODING/nr_polar_init.c
  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_bitwise_operations.c
  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_crc_byte.c
+  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_crc.c
  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
  ${OPENAIR1_DIR}/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
@@ -868,19 +865,10 @@ add_library(ldpc_cl MODULE ${PHY_LDPC_CL_SRC} )
 target_link_libraries(ldpc_cl OpenCL)
 add_dependencies(ldpc_cl nrLDPC_decoder_kernels_CL)

-set(PHY_NRLDPC_CODING_DEMO_SRC
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding_interface_demo_decoder.c
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding_interface_demo_encoder.c
-)
-
 set(PHY_NR_CODINGIF
  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c
 )

-set(PHY_NRLDPC_CODINGIF
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding_interface_load.c
-)
-
 ##############################################
 # Base CUDA setting
 ##############################################
@@ -901,7 +889,6 @@ add_library(coding MODULE ${PHY_TURBOSRC} )

 add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts_neon.c)

-add_library(ldpc_slot_demo MODULE ${PHY_NRLDPC_CODING_DEMO_SRC})

 set(PHY_SRC_COMMON
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
@@ -1044,7 +1031,6 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_csi_rs.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_scrambling.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/scrambling_luts.c
-  ${OPENAIR1_DIR}/PHY/NR_REFSIG/refsig.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
  )

@@ -1061,9 +1047,7 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_tools.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding_slot.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding_slot.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_dmrs.c
@@ -1072,6 +1056,7 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/ul_ref_seq_nr.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_dmrs_rx.c
+  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gen_mod_table.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/dmrs_nr.c
  ${OPENAIR1_DIR}/PHY/NR_REFSIG/ptrs_nr.c
@@ -1093,7 +1078,6 @@ set(PHY_SRC_UE
  ${PHY_POLARSRC}
  ${PHY_SMALLBLOCKSRC}
  ${PHY_NR_CODINGIF}
-  ${PHY_NRLDPC_CODINGIF}
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/pucch_rx.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/srs_rx.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_uci_tools_common.c
@@ -1113,9 +1097,7 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_tx.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding_slot.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding_slot.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach_common.c
@@ -1154,7 +1136,6 @@ set(PHY_SRC_UE
  ${PHY_POLARSRC}
  ${PHY_SMALLBLOCKSRC}
  ${PHY_NR_CODINGIF}
-  ${PHY_NRLDPC_CODINGIF}
  )


@@ -1186,14 +1167,9 @@ target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE
 add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})

 add_library(PHY_NR ${PHY_NR_SRC})
-target_link_libraries(PHY_NR nr_phy_common nr_common)
-
-add_library(PHY_NR_NO_AVX_256 ${PHY_NR_SRC})
-target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common)
-target_compile_definitions(PHY_NR_NO_AVX_256 PUBLIC USE_128BIT)

 add_library(PHY_NR_UE ${PHY_NR_UE_SRC})
-target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common)
+target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs)

 add_library(PHY_RU ${PHY_SRC_RU})
 target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs)
@@ -1216,9 +1192,10 @@ set(PHY_MEX_UE
  ${OPENAIR1_DIR}/PHY/TOOLS/simde_operations.c
  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
+  ${OPENAIR_DIR}/common/utils/LOG/log.c
  )
 add_library(PHY_MEX ${PHY_MEX_UE})
-target_link_libraries(PHY_MEX PRIVATE asn1_lte_rrc_hdrs UTIL)
+target_link_libraries(PHY_MEX PRIVATE asn1_lte_rrc_hdrs)

 #Layer 2 library
 #####################
@@ -1420,9 +1397,9 @@ set (MAC_NR_SRC_UE
  ${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_scheduler_sl.c
  ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
  ${NR_UE_MAC_DIR}/nr_ra_procedures.c
+  ${NR_UE_MAC_DIR}/nr_ue_power_procedures.c
 )

 set (ENB_APP_SRC
@@ -1471,7 +1448,7 @@ endif()


 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
-target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures)
+target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 add_library(L2_LTE ${L2_LTE_SRC})
 target_link_libraries(L2_LTE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -1481,7 +1458,6 @@ add_library(L2_NR
  ${MAC_NR_SRC}
  ${GNB_APP_SRC}
  )
-target_link_libraries(L2_NR PRIVATE ds alg)

 add_library(e1_if
  ${NR_RRC_DIR}/cucp_cuup_direct.c
@@ -1490,10 +1466,7 @@ add_library(e1_if

 target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap SECURITY ${OPENSSL_LIBRARIES} e1ap GTPV1U)

-target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc nr_common)
-if(OAI_AERIAL)
-    target_compile_definitions(L2_NR PRIVATE ENABLE_AERIAL)
-endif()
+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_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
@@ -1520,11 +1493,15 @@ add_library(L2_UE_LTE_NR
 )
 target_link_libraries(L2_UE_LTE_NR PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

+if (NOT ${NOS1})
+target_compile_definitions(L2_UE PUBLIC -DPDCP_USE_NETLINK)
+endif()
+
 target_link_libraries(L2_UE PRIVATE asn1_lte_rrc_hdrs)

 add_library( NR_L2_UE ${NR_L2_SRC_UE} ${MAC_NR_SRC_UE} )
 target_link_libraries(NR_L2_UE PRIVATE f1ap nr_rlc)
-target_link_libraries(NR_L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs nr_common nr_ue_power_procedures)
+target_link_libraries(NR_L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_library(MAC_NR_COMMON
            ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
@@ -1918,6 +1895,28 @@ set (SIMUSRC
 add_library(SIMU STATIC ${SIMUSRC} )
 target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)

+# Qt-based scope
+add_boolean_option(ENABLE_NRQTSCOPE OFF "Build the Qt-Scope" OFF)
+if (ENABLE_NRQTSCOPE)
+  find_package(Qt5 REQUIRED COMPONENTS Widgets Charts)
+  message ("Qt5 Widgets and Charts found for nrqtscope")
+  set(QTSCOPE_SOURCE_NR
+    ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_qt_scope.cpp
+    ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c)
+  # Creates rules for calling the Meta-Object Compiler (moc) on the given source files
+  qt5_wrap_cpp(QTSCOPE_SOURCE_NR ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_qt_scope.h)
+  add_library(nrqtscope MODULE ${QTSCOPE_SOURCE_NR})
+  target_link_libraries(nrqtscope PRIVATE Qt5::Widgets Qt5::Charts)
+  target_link_libraries(nrqtscope PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+endif()
+
+add_library(SIMU_ETH STATIC
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
+)
+target_link_libraries(SIMU_ETH PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+
 include_directories("${NFAPI_DIR}/nfapi/public_inc")
 include_directories("${NFAPI_DIR}/common/public_inc")
 include_directories("${NFAPI_DIR}/pnf/public_inc")
@@ -1934,9 +1933,10 @@ set(CMAKE_MODULE_PATH "${OPENAIR_DIR}/cmake_targets/tools/MODULES" "${CMAKE_MODU
 # add executables for operation
 #################################
 add_library(minimal_lib
+  ${OPENAIR_DIR}/common/utils/LOG/log.c
  ${OPENAIR_DIR}/common/utils/minimal_stub.c
  )
-target_link_libraries(minimal_lib PUBLIC pthread dl ${T_LIB} LOG)
+target_link_libraries(minimal_lib pthread dl ${T_LIB})

 add_executable(nfapi_test
  ${OPENAIR_DIR}/openair2/NR_PHY_INTERFACE/nfapi_5g_test.c
@@ -1966,6 +1966,8 @@ add_executable(lte-softmodem
  ${OPENAIR_DIR}/executables/create_tasks_mbms.c
  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
  ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
@@ -1977,8 +1979,8 @@ add_dependencies(lte-softmodem oai_iqplayer)
 target_link_libraries(lte-softmodem PRIVATE
  -Wl,--start-group
  lte_rrc nr_rrc s1ap m2ap x2ap m3ap GTPV1U SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
-  PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
-  ${NAS_UE_LIB} ITTI SIMU shlib_loader
+  PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
+  ${NAS_UE_LIB} ITTI SIMU SIMU_ETH shlib_loader
  -Wl,--end-group z dl)

 target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)
@@ -2022,17 +2024,22 @@ add_executable(lte-uesoftmodem
  ${OPENAIR_DIR}/executables/create_tasks_ue.c
  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
  ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
  ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
  )

+if (NOT ${NOS1})
+	target_compile_definitions(lte-uesoftmodem PRIVATE -DPDCP_USE_NETLINK)
+endif()
 target_link_libraries(lte-uesoftmodem PRIVATE
  -Wl,--start-group
  lte_rrc nr_rrc s1ap x2ap m2ap m3ap
  SECURITY UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
-  PHY_UE PHY_RU L2_UE L2_LTE SIMU NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
+  PHY_UE PHY_RU L2_UE L2_LTE SIMU SIMU_ETH NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
  ${NAS_UE_LIB} ITTI shlib_loader
  -Wl,--end-group z dl)

@@ -2057,17 +2064,22 @@ add_executable(nr-softmodem
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
  ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
  ${OPENAIR_DIR}/common/utils/lte/ue_power.c
  ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
  )

+include(${OPENAIR_DIR}/nfapi/CMakeLists.txt)
+
 target_link_libraries(nr-softmodem PRIVATE
  -Wl,--start-group
  UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECURITY
  ITTI ${NAS_UE_LIB} lte_rrc nr_rrc
-  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU
+  ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU SIMU_ETH
  x2ap f1ap m2ap m3ap e1ap shlib_loader
  -Wl,--end-group z dl)

@@ -2075,24 +2087,15 @@ target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)
 target_link_libraries(nr-softmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
-add_boolean_option(OAI_AERIAL OFF "Activate OAI's AERIAL driver" OFF)
-if (OAI_AERIAL)
-  target_compile_definitions(nr-softmodem PUBLIC ENABLE_AERIAL)
-  target_link_libraries(nr-softmodem PUBLIC aerial_lib)
-endif()
 if(E2_AGENT)
  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()


-add_dependencies(nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc ldpc_slot_demo)
+add_dependencies(nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc)

 if (ENABLE_LDPC_T2)
-  add_dependencies(nr-softmodem ldpc_t2 ldpc_slot_t2)
-endif()
-
-if (ENABLE_LDPC_XDMA)
-  add_dependencies(nr-softmodem ldpc_xdma)
+  add_dependencies(nr-softmodem ldpc_t2)
 endif()

 # force the generation of ASN.1 so that we don't need to wait during the build
@@ -2102,6 +2105,7 @@ target_link_libraries(nr-softmodem PRIVATE
 add_executable(nr-cuup
  executables/nr-cuup.c
  executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${NR_RRC_DIR}/rrc_gNB_UE_context.c
  ${OPENAIR2_DIR}/E1AP/e1ap_setup.c
  ${NR_PDCP_SRC}
@@ -2110,7 +2114,7 @@ add_executable(nr-cuup

 target_link_libraries(nr-cuup PRIVATE
                      CONFIG_LIB ITTI SCTP_CLIENT
-                      GTPV1U e1ap f1ap
+                      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)
@@ -2129,24 +2133,27 @@ add_executable(nr-uesoftmodem
  ${OPENAIR_DIR}/executables/softmodem-common.c
  ${OPENAIR_DIR}/radio/COMMON/common_lib.c
  ${OPENAIR_DIR}/radio/COMMON/record_player.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
  )

 target_link_libraries(nr-uesoftmodem PRIVATE
  -Wl,--start-group
  nr_rrc SECURITY UTIL HASHTABLE SCHED_RU_LIB SCHED_NR_UE_LIB
-  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_LIB NFAPI_PNF_LIB
+  PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB
  NFAPI_USER_LIB MISC_NFAPI_NR_LIB
-  ITTI LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB} SIMU shlib_loader
+  ITTI LIB_5GNAS_GNB LIB_NAS_SIMUE ${NAS_SIM_LIB} SIMU SIMU_ETH shlib_loader
  -Wl,--end-group z dl)

-target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt nr_ue_phy_meas)
+target_link_libraries(nr-uesoftmodem PRIVATE pthread m CONFIG_LIB rt)
 target_link_libraries(nr-uesoftmodem PRIVATE ${T_LIB})
 target_link_libraries(nr-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

-add_dependencies( nr-uesoftmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc ldpc_slot_demo)
+add_dependencies( nr-uesoftmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc )
 if (ENABLE_LDPC_CUDA)
   add_dependencies(nr-uesoftmodem ldpc_cuda)
   add_dependencies(nr-softmodem ldpc_cuda)
@@ -2185,6 +2192,7 @@ target_link_libraries(rftest PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

 add_executable(polartest
  ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/polartest.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  )
 target_link_libraries(polartest PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_COMMON PHY_NR_UE CONFIG_LIB -Wl,--end-group
@@ -2193,6 +2201,7 @@ target_link_libraries(polartest PRIVATE

 add_executable(smallblocktest
  ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/smallblocktest.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
 )

 target_link_libraries(smallblocktest PRIVATE
@@ -2218,6 +2227,7 @@ target_link_libraries(ldpctest PRIVATE
 add_executable(nr_dlschsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  )
 target_link_libraries(nr_dlschsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
@@ -2228,6 +2238,7 @@ target_link_libraries(nr_dlschsim PRIVATE asn1_nr_rrc_hdrs)
 add_executable(nr_pbchsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  )
 target_link_libraries(nr_pbchsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
@@ -2238,14 +2249,16 @@ target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_psbchsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${NR_UE_RRC_DIR}/rrc_nsa.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  )
 target_link_libraries(nr_psbchsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -lz -Wl,--end-group
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON CONFIG_LIB L2_NR -lz -Wl,--end-group
  m pthread ${T_LIB} ITTI dl shlib_loader
  )
 target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -2254,6 +2267,7 @@ target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_pucchsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  )
 target_link_libraries(nr_pucchsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
@@ -2264,21 +2278,24 @@ target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_dlsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${NR_UE_RRC_DIR}/rrc_nsa.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  )
 target_link_libraries(nr_dlsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader
  )
 target_link_libraries(nr_dlsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

 add_executable(nr_prachsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/prachsim.c
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
 )
 target_link_libraries(nr_prachsim PRIVATE
  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_RU PHY_NR_UE MAC_NR_COMMON SCHED_NR_LIB CONFIG_LIB -lz -Wl,--end-group
@@ -2288,6 +2305,7 @@ target_link_libraries(nr_prachsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_ulschsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulschsim.c
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${PHY_INTERFACE_DIR}/queue_t.c
  )
 target_link_libraries(nr_ulschsim PRIVATE
@@ -2299,7 +2317,9 @@ target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_ulsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
  ${NR_UE_RRC_DIR}/rrc_nsa.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
@@ -2307,16 +2327,12 @@ add_executable(nr_ulsim
  )

 if (ENABLE_LDPC_T2)
-  add_dependencies(nr_ulsim ldpc_t2 ldpc_slot_t2)
+  add_dependencies(nr_ulsim ldpc_t2)
 endif()
-if (ENABLE_LDPC_XDMA)
-  add_dependencies(nr_ulsim ldpc_xdma)
-endif()
-add_dependencies(nr_ulsim ldpc_slot_demo)

 target_link_libraries(nr_ulsim PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
-  m pthread ${T_LIB} ITTI dl shlib_loader nr_ue_phy_meas
+  -Wl,--start-group UTIL SIMU SIMU_ETH PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_UE_NR MAC_NR_COMMON nr_rrc CONFIG_LIB L2_NR HASHTABLE x2ap SECURITY ngap -lz -Wl,--end-group
+  m pthread ${T_LIB} ITTI dl shlib_loader
  )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

@@ -2363,7 +2379,7 @@ endforeach(myExe)
 #ensure that the T header files are generated before targets depending on them
 if (${T_TRACER})
  foreach(i
-        #all "add_executable" definitions (except tests, updatefw)
+        #all "add_executable" definitions (except tests, rb_tool, updatefw)
        lte-softmodem lte-uesoftmodem nr-softmodem
        nr-uesoftmodem dlsim dlsim_tm4 dlsim_tm7
        ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim
@@ -2374,18 +2390,98 @@ if (${T_TRACER})
        params_libconfig oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
        oai_eth_transpro oai_mobipass coding HASHTABLE UTIL OMG_SUMO
        SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
-        NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
+        NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
        MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX
        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_UE_NR ngap
-        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU OPENAIR0_LIB
-        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc ldpc_slot_demo ldpc_slot_t2 ldpc_xdma dfts config_internals nr_common)
+        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU SIMU_ETH OPENAIR0_LIB
+        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc dfts config_internals)
    if (TARGET ${i})
      add_dependencies(${i} generate_T)
    endif()
  endforeach(i)
 endif (${T_TRACER})

+##################################################
+# Generated specific cases is not regular code
+###############################################
+
+################
+# Kernel modules
+###############
+# Set compiler options for kernel modules
+# we need to get out cmake to use the regular Linux Kernel process
+# this is documented as https://www.kernel.org/doc/Documentation/kbuild/modules.txt
+######################################
+
+# retrieve the compiler options to send it to gccxml
+get_directory_property(DirDefs COMPILE_DEFINITIONS )
+foreach( d ${DirDefs} )
+  set(module_cc_opt "${module_cc_opt} -D${d}")
+endforeach()
+get_directory_property( DirDefs INCLUDE_DIRECTORIES )
+foreach( d ${DirDefs} )
+  set(module_cc_opt "${module_cc_opt} -I${d}")
+endforeach()
+
+EXECUTE_PROCESS(COMMAND uname -r
+  OUTPUT_VARIABLE os_release
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+SET(module_build_path /lib/modules/${os_release}/build)
+
+function(make_driver name dir)
+  file(MAKE_DIRECTORY ${OPENAIR_BIN_DIR}/${name})
+  foreach(f  IN  ITEMS ${ARGN})
+    list(APPEND src_path_list ${dir}/${f})
+    string(REGEX REPLACE "c *$" "o" obj ${f})
+    set(objs "${objs} ${obj}")
+  endforeach()
+  CONFIGURE_FILE(${OPENAIR_CMAKE}/tools/Kbuild.cmake ${OPENAIR_BIN_DIR}/${name}/Kbuild)
+  add_custom_command(OUTPUT ${name}.ko
+    COMMAND make -C ${module_build_path} M=${OPENAIR_BIN_DIR}/${name}
+    WORKING_DIRECTORY ${OPENAIR_BIN_DIR}/${name}
+    COMMENT "building ${module}.ko"
+    VERBATIM
+    SOURCES  ${src_path_list}
+    )
+  add_custom_target(${name} DEPENDS ${name}.ko)
+endfunction(make_driver name dir src)
+
+# nashmesh module
+################
+list(APPEND nasmesh_src device.c common.c ioctl.c classifier.c tool.c mesh.c)
+set(module_cc_opt "${module_cc_opt} -DNAS_NETLINK -DPDCP_USE_NETLINK")
+# legacy Makefile was using NAS_NETLINK flag, but other drivers the hereafter flag
+# so, this cmake use OAI_NW_DRIVER_USE_NETLINK everywhere
+if (OAI_NW_DRIVER_USE_NETLINK)
+  list(APPEND nasmesh_src netlink.c)
+endif()
+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/RB_TOOL/rb_tool.c
+)
+target_include_directories(rb_tool PRIVATE ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH/)
+
+# ???
+####################
+list(APPEND oai_nw_drv_src device.c common.c ioctl.c classifier.c tool.c)
+if(OAI_NW_DRIVER_USE_NETLINK)
+  list(APPEND oai_nw_drv_src netlink.c)
+endif()
+make_driver(oai_nw_drv ${OPENAIR2_DIR}/NETWORK_DRIVER/LTE ${oai_nw_drv_src})
+
+
+# ue_ip: purpose ???
+###############
+list(APPEND ue_ip_src device.c common.c)
+if(OAI_NW_DRIVER_USE_NETLINK)
+  list(APPEND ue_ip_src netlink.c)
+endif()
+make_driver(ue_ip ${OPENAIR2_DIR}/NETWORK_DRIVER/UE_IP ${ue_ip_src})
+
 include(${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/CMakeLists.txt)

 set(ENABLE_TESTS OFF CACHE STRING "Activate build of tests")
@@ -2396,26 +2492,10 @@ if(ENABLE_TESTS)
  # meta-target: each test is supposed to add_dependencies(tests ${NEWTEST})
  # then, it is possible to build and execute all tests using "ninja tests && ctest"
  add_custom_target(tests)
-  find_package(GTest)
-  if (NOT GTest_FOUND)
-    message(STATUS "GTest package not found, will download googletest automatically. To prevent that install google test on your system (libgtest-dev)")
-    include(FetchContent)
-    FetchContent_Declare(
-      googletest
-      GIT_REPOSITORY https://github.com/google/googletest.git
-      GIT_TAG        58d77fa8070e8cec2dc1ed015d66b454c8d78850 # 1.12.1
-    )
-    set(BUILD_GMOCK OFF)
-    set(INSTALL_GTEST OFF)
-    FetchContent_MakeAvailable(googletest)
-    add_library(GTest::gtest ALIAS gtest)
-    add_library(GTest::gtest_main ALIAS gtest_main)
-  endif()
 endif()

 add_subdirectory(common)
 add_subdirectory(doc)
-add_subdirectory(nfapi)
 add_subdirectory(openair1)
 add_subdirectory(openair2)
 add_subdirectory(openair3)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,26 +5,22 @@ We want to make contributing to this project as easy and transparent as possible
 Please refer to the steps described on our website: [How to contribute to OAI](https://www.openairinterface.org/?page_id=112).

 1. Sign and return a Contributor License Agreement to OAI team.
-2. Register on [Eurecom GitLab Server](https://gitlab.eurecom.fr/users/sign_up)
-   if you do not have any.
+2. Register on [Eurecom GitLab Server](https://gitlab.eurecom.fr/users/sign_up) if you do not have any.
   - We recommend that you register with a professional or student email address.
-   - If your email domain (`@domain.com`) is not whitelisted, please contact us
-     (mailto:contact@openairinterface.org).
+   - If your email domain (`@domain.com`) is not whitelisted, please contact us (mailto:contact@openairinterface.org).
   - Eurecom GitLab does NOT accept public email domains.
-3. Provide the OAI team with the **username** of this account to
-   (mailto:contact@openairinterface.org) ; we will give you the developer
-   rights on this repository.
-4. The contributing policies are described in the [corresponding documentation
-   page](doc/code-style-contrib.md).
-   - PLEASE DO NOT FORK the OAI repository on your own Eurecom GitLab account.
-     It just eats up space on our servers.
-   - You can fork onto another hosting system. But we will NOT accept a merge
-     request from a forked repository.
+3. Provide the OAI team with the **username** of this account to (mailto:contact@openairinterface.org) ; we will give you the developer rights on this repository.
+4. The policies are described in these wiki pages: [OAI Policies](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/oai-policies-home).
+   - PLEASE DO NOT FORK the OAI repository on your own Eurecom GitLab account. It just eats up space on our servers.
+   - You can fork onto another hosting system. But we will NOT accept a merge request from a forked repository.
      * This decision was made for the license reasons.
      * The Continuous Integration will reject your merge request.
+   - All merge requests SHALL have `develop` branch as target branch.

-# License #
+## Coding Styles ##

-By contributing to OpenAirInterface, you agree that your contributions will be
-licensed under the license described in the file [`LICENSE`](./LICENSE) in the
-root directory of this source tree.
+There are described [here](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/guidelines/guidelines-home).
+
+## License ##
+
+By contributing to OpenAirInterface, you agree that your contributions will be licensed under the LICENSE file in the root directory of this source tree.
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -4,6 +4,15 @@ For more details of the license, refer to [LICENSE](LICENSE) file in the same di

 However, the source code also contains third party software that is acknowledged here for reference.

+## Credits for LFDS user space source code located in folder openair2/UTILS/LFDS/ ##
+
+See on [liblfds website](https://liblfds.org/) the license section.
+
+<pre>
+"There is no license. You are free to use this software in any way, for any purpose. Go forth and create wealth!
+If however for legal reasons a licence is required, the license of your choice will be granted."
+</pre>
+
 ## Credits for source code common/utils/collection/queue.h: ##

 The Regents of the University of California: BSD 3-Clause Licence.
--- a/README.md
+++ b/README.md
@@ -4,12 +4,12 @@

 <p align="center">
    <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-OAI--Public--V1.1-blue" alt="License"></a>
+    <a href="https://releases.ubuntu.com/18.04/"><img src="https://img.shields.io/badge/OS-Ubuntu18-Green" alt="Supported OS Ubuntu 18"></a>
    <a href="https://releases.ubuntu.com/20.04/"><img src="https://img.shields.io/badge/OS-Ubuntu20-Green" alt="Supported OS Ubuntu 20"></a>
    <a href="https://releases.ubuntu.com/22.04/"><img src="https://img.shields.io/badge/OS-Ubuntu22-Green" alt="Supported OS Ubuntu 22"></a>
-    <a href="https://releases.ubuntu.com/24.04/"><img src="https://img.shields.io/badge/OS-Ubuntu24-Green" alt="Supported OS Ubuntu 24"></a>
    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL8-Green" alt="Supported OS RHEL8"></a>
    <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL9-Green" alt="Supported OS RELH9"></a>
-    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore40-Green" alt="Supported OS Fedora 40"></a>
+    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore37-Green" alt="Supported OS Fedora 37"></a>
 </p>

 <p align="center">
@@ -25,7 +25,6 @@
  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-ue?label=NR-UE%20docker%20pulls"></a>
  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-enb"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-enb?label=eNB%20docker%20pulls"></a>
  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-lte-ue"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-lte-ue?label=LTE-UE%20docker%20pulls"></a>
-  <a href="https://hub.docker.com/r/oaisoftwarealliance/oai-nr-cuup"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/oaisoftwarealliance/oai-nr-cuup?label=NR-CUUP%20docker%20pulls"></a>
 </p>

 # OpenAirInterface License #
@@ -70,11 +69,11 @@ openairinterface5g
 ├── executables       : Top-level executable source files (gNB, eNB, ...)
 ├── maketags          : Script to generate emacs tags.
 ├── nfapi             : (n)FAPI code for MAC-PHY interface
-├── openair1          : Layer 1 (3GPP LTE Rel-10/12 PHY, NR Rel-15 PHY)
-├── openair2          : Layer 2 (3GPP LTE Rel-10 MAC/RLC/PDCP/RRC/X2AP, LTE Rel-14 M2AP, NR Rel-15+ MAC/RLC/PDCP/SDAP/RRC/X2AP/F1AP/E1AP), E2AP
-├── openair3          : Layer 3 (3GPP LTE Rel-10 S1AP/GTP, NR Rel-15 NGAP/GTP)
+├── openair1          : 3GPP LTE Rel-10/12 PHY layer / 3GPP NR Rel-15 layer. A local Readme file provides more details.
+├── openair2          : 3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP + LTE Rel-14 M2AP implementation. Also 3GPP NR Rel-15 RLC/MAC/PDCP/RRC/X2AP.
+├── openair3          : 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
 ├── openshift         : OpenShift helm charts for some deployment options of OAI
-├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, 7.2 FHI, ...
+├── radio             : Drivers for various radios such as USRP, AW2S, RFsim, ...
 └── targets           : Some configuration files; only historical relevance, and might be deleted in the future
 ```

--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -30,11 +30,11 @@ global:
    nrpsbchsim: dedale
    nrprachsim: dedale
    nrpucchsim: dedale
-    nrulschsim: demophon
-    nrulsim3gpp: demophon
-    nrulsimmimo: demophon
-    nrulsimmisc: demophon
-    nrulsimscfdma: demophon
-    polartest: demophon
-    smallblocktest: demophon
-    ulsim: demophon
+    nrulschsim: theseus
+    nrulsim3gpp: theseus
+    nrulsimmimo: theseus
+    nrulsimmisc: theseus
+    nrulsimscfdma: theseus
+    polartest: theseus
+    smallblocktest: theseus
+    ulsim: theseus
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -585,29 +585,6 @@ pipeline {
            }
          }
        }
-        stage ("SA-FHI72-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-FHI72-CN5G', 'SA-FHI72-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saFHI72Status = finalizeSlaveJob('RAN-SA-FHI72-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saFHI72Status
-              }
-            }
-          }
-        }
        stage ("SA-OAIUE-CN5G") {
          when { expression {do5Gtest} }
          steps {
--- a/ci-scripts/Jenkinsfile-nrue
+++ b/ci-scripts/Jenkinsfile-nrue
@@ -229,10 +229,6 @@ pipeline {
            // Zipping all archived log files
              sh "mkdir test_logs"
              sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
              sh "rm -rf *test_log*/"
              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
--- a/ci-scripts/Jenkinsfile-physim-deploy
+++ b/ci-scripts/Jenkinsfile-physim-deploy
@@ -221,10 +221,6 @@ pipeline {
            // Zipping all archived log files
              sh "mkdir test_logs"
              sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
              sh "rm -rf *test_log*/"
              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
--- a/ci-scripts/Jenkinsfile-push-registry
+++ b/ci-scripts/Jenkinsfile-push-registry
@@ -76,7 +76,7 @@ pipeline {
          withCredentials([
            [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.DH_Credentials}", usernameVariable: 'DH_Username', passwordVariable: 'DH_Password']
          ]) {
-            def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "oai-nr-cuup", "oai-gnb-fhi72"]
+            def listOfImages = ["oai-enb", "oai-gnb", "oai-lte-ue", "oai-nr-ue", "oai-nr-cuup"]
            // Logging in on both registries
            sh "docker login -u ${DH_Username} -p ${DH_Password} > /dev/null 2>&1"
            sh "docker login -u oaicicd -p oaicicd porcepix.sboai.cs.eurecom.fr > /dev/null 2>&1"
--- a/ci-scripts/Jenkinsfile-tmp-full-ran
+++ b/ci-scripts/Jenkinsfile-tmp-full-ran
@@ -304,7 +304,7 @@ pipeline {
                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
                        ]) {
                            echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-                            sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
+                            sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"

                            echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
                            sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"
--- a/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
@@ -274,7 +274,7 @@ pipeline {
               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']
            ]) {
              echo '\u2705 \u001B[32mLog Collection (eNB - Run)\u001B[0m'
-              sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath} --BuildId=${env.BUILD_ID}"
+              sh "python3 ci-scripts/main.py --mode=LogCollecteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"

              echo '\u2705 \u001B[32mLog Transfer (eNB - Run)\u001B[0m'
              sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/enb.log.zip ./enb.log.${env.BUILD_ID}.zip || true"
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -18,14 +18,6 @@ up2:
  IF: wwan0
  MTU: 1500

-up2-fhi72:
-  Host: up2
-  AttachScript: sudo /opt/mbim-fhi72/start_quectel_mbim.sh
-  DetachScript: sudo /opt/mbim-fhi72/stop_quectel_mbim.sh
-  NetworkScript: ip a show dev wwan0
-  IF: wwan0
-  MTU: 1500
-
 sphex_quectel:
  Host: sphex
  InitScript: sudo stdbuf -oL /home/oaicicd/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log &
@@ -66,18 +58,9 @@ adb_ue_2:

 oc-cn5g:
  Host: avra
-  Namespace: "oaicicd-core-for-ci-ran"
-  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-00102"
  NetworkScript: echo "inet 172.21.6.102"
  RunIperf3Server: False

-oc-cn5g-20897:
-  Host: cacofonix
-  Namespace: "oaicicd-core-for-fhi72"
-  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-20897"
-  NetworkScript: echo "inet 172.21.6.105"
-  RunIperf3Server: False
-
 matix-cn5g:
  Host: matix
  NetworkScript: docker exec prod-trf-gen ip a show dev eth0
@@ -116,10 +99,6 @@ amarisoft_ue:
  Host: amariue
  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-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_fhi72:
-  Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_fhi72_asue_2x2_benetel550/fhi72-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
  AttachScript: /root/2023-10-27/libs/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -43,6 +43,7 @@ NAMESPACE = "oaicicd-ran"
 OCUrl = "https://api.oai.cs.eurecom.fr:6443"
 OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
 CI_OC_RAN_NAMESPACE = "oaicicd-ran"
+CI_OC_CORE_NAMESPACE = "oaicicd-core-for-ci-ran"
 CN_IMAGES = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-upf", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
 CN_CONTAINERS = ["", "-c nrf", "-c amf", "-c smf", "-c upf", "-c ausf", "-c udm", "-c udr", ""]

@@ -67,9 +68,10 @@ def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 def OC_logout(cmd):
 	cmd.run(f'oc logout')

-def OC_deploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
-	logging.debug(f'OC OAI CN5G: Deploying OAI CN5G on Openshift Cluster: {ocNamespace}')
-	succeeded = OC_login(cmd, ocUserName, ocPassword, ocNamespace)
+def OC_deploy_CN(cmd, ocUserName, ocPassword):
+	logging.debug('OC OAI CN5G: Deploying OAI CN5G on Openshift Cluster')
+	path = "/opt/oai-cn5g-fed-develop-2024-april-00102"
+	succeeded = OC_login(cmd, ocUserName, ocPassword, CI_OC_CORE_NAMESPACE)
 	if not succeeded:
 		return False, CONST.OC_LOGIN_FAIL
 	cmd.run('helm uninstall oai5gcn --wait --timeout 60s')
@@ -82,9 +84,10 @@ def OC_deploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
 	OC_logout(cmd)
 	return True, report

-def OC_undeploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path):
-	logging.debug(f'OC OAI CN5G: Terminating CN on Openshift Cluster: {ocNamespace}')
-	succeeded = OC_login(cmd, ocUserName, ocPassword, ocNamespace)
+def OC_undeploy_CN(cmd, ocUserName, ocPassword):
+	logging.debug('OC OAI CN5G: Terminating CN on Openshift Cluster')
+	path = "/opt/oai-cn5g-fed-develop-2024-april-00102"
+	succeeded = OC_login(cmd, ocUserName, ocPassword, CI_OC_CORE_NAMESPACE)
 	if not succeeded:
 		return False, CONST.OC_LOGIN_FAIL
 	cmd.run(f'rm -Rf {path}/logs')
@@ -459,34 +462,6 @@ class Cluster:
 			self.cmd.run(f'oc logs {nrue_job} &> cmake_targets/log/oai-nr-ue.log')
 			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)

-		if status:
-			self._recreate_is_tag('ran-build-fhi72', imageTag, 'openshift/ran-build-fhi72-is.yaml')
-			self._recreate_bc('ran-build-fhi72', imageTag, 'openshift/ran-build-fhi72-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.fhi72.rhel9')
-			ranbuildfhi72_job = self._start_build('ran-build-fhi72')
-			attemptedImages += ['ran-build-fhi72']
-
-			wait = ranbuildfhi72_job is not None and self._wait_build_end([ranbuildfhi72_job], 1200)
-			if not wait: logging.error('error during build of ranbuildfhi72_job')
-			status = status and wait
-			self.cmd.run(f'oc logs {ranbuildfhi72_job} &> cmake_targets/log/ran-build-fhi72.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
-
-		if status:
-			self._recreate_is_tag('oai-gnb-fhi72', imageTag, 'openshift/oai-gnb-fhi72-is.yaml')
-			self._recreate_bc('oai-gnb-fhi72', imageTag, 'openshift/oai-gnb-fhi72-bc.yaml')
-			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.fhi72.rhel9')
-			self._retag_image_statement('ran-build-fhi72', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build-fhi72', imageTag, 'docker/Dockerfile.gNB.fhi72.rhel9')
-			gnb_fhi72_job = self._start_build('oai-gnb-fhi72')
-			attemptedImages += ['oai-gnb-fhi72']
-
-			wait = gnb_fhi72_job is not None and self._wait_build_end([gnb_fhi72_job], 600)
-			if not wait: logging.error('error during build of gNB-fhi72')
-			status = status and wait
-			# recover logs
-			self.cmd.run(f'oc logs {gnb_fhi72_job} &> cmake_targets/log/oai-gnb-fhi72.log')
-			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)
-
 		# split and analyze logs
 		imageSize = {}
 		for image in attemptedImages:
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -58,7 +58,7 @@ import cls_oaicitest
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
+IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial']

 def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
@@ -286,7 +286,7 @@ class Containerize():
 		self.host = result.group(0)
 		if self.host == 'Ubuntu':
 			self.cli = 'docker'
-			self.dockerfileprefix = '.ubuntu22'
+			self.dockerfileprefix = '.ubuntu20'
 			self.cliBuildOptions = ''
 		elif self.host == 'Red Hat':
 			self.cli = 'sudo podman'
@@ -319,11 +319,9 @@ class Containerize():
 				imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 				imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
-				imageNames.append(('ran-build-fhi72', 'build.fhi72', 'ran-build-fhi72', ''))
-				imageNames.append(('oai-gnb', 'gNB.fhi72', 'oai-gnb-fhi72', ''))
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
-			self.dockerfileprefix = '.ubuntu22.cross-arm64'
+			self.dockerfileprefix = '.ubuntu20.cross-arm64'
 		
 		# Workaround for some servers, we need to erase completely the workspace
 		if self.forcedWorkspaceCleanup:
@@ -411,15 +409,13 @@ class Containerize():
 			# target images should use the proper ran-build image
 			if image != 'ran-build' and "-asan" in name:
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			elif "fhi72" in name:
-				cmd.run(f'sed -i -e "s#ran-build-fhi72:latest#ran-build-fhi72:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2024.05.23.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2023.11.28.tar.gz .')
 			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200)
 			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc_src.2024.05.23.tar.gz')
+				cmd.run('rm -f nvipc_src.2023.11.28.tar.gz')
 			if image == 'ran-build' and ret.returncode == 0:
 				cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true")
 				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/")
@@ -449,7 +445,7 @@ class Containerize():
 			cmd.run(f"{self.cli} image prune --force")

 		# Remove all intermediate build images and clean up
-		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag} ran-build-fhi72:{imageTag} || true")
+		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag}")
 		cmd.run(f"{self.cli} volume prune --force")

 		# Remove some cached artifacts to prevent out of diskspace problem
@@ -672,7 +668,7 @@ class Containerize():
 				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 = 'ci-temp'
+					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')
@@ -681,11 +677,9 @@ class Containerize():
 			return False

 		# build ran-unittests image
-		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu22"
+		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:
-			build_log_name = f'build_log_{self.testCase_id}'
-			CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
 			logging.error(f'Cannot build unit tests')
 			HTML.CreateHtmlTestRow("Unit test build failed", 'KO', [dockerfile])
 			HTML.CreateHtmlTabFooter(False)
@@ -694,8 +688,8 @@ class Containerize():
 		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:{baseTag} ctest --output-on-failure --no-label-summary -j$(nproc)')
-		cmd.run(f'docker rmi ran-unittests:{baseTag}')
+		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()
@@ -903,7 +897,9 @@ class Containerize():
 		mySSH.command(f'docker compose --file ci-docker-compose.yml up -d -- {svcName}', '\$', 30)

 		# Checking Status
-		mySSH.command(f'docker compose --file ci-docker-compose.yml config {svcName}', '\$', 5)
+		grep = ''
+		if svcName != '': grep = f' | grep -A3 --color=never {svcName}'
+		mySSH.command(f'docker compose --file ci-docker-compose.yml config {grep}', '\$', 5)
 		result = re.search('container_name: (?P<container_name>[a-zA-Z0-9\-\_]+)', mySSH.getBefore())
 		unhealthyNb = 0
 		healthyNb = 0
--- a/ci-scripts/cls_module.py
+++ b/ci-scripts/cls_module.py
@@ -65,8 +65,6 @@ class Module_UE:
 			self.logStore = m.get('LogStore')
 			self.cmd_prefix = m.get('CmdPrefix')
 			self.runIperf3Server = m.get('RunIperf3Server', True)
-			self.namespace = m.get('Namespace')
-			self.cnPath = m.get('CNPath')
 			logging.info(f'initialized {self.module_name}@{self.host} from {filename}')

 	def __str__(self):
@@ -192,12 +190,6 @@ class Module_UE:
 	def getHost(self):
 		return self.host

-	def getNamespace(self):
-		return self.namespace
-
-	def getCNPath(self):
-		return self.cnPath
-
 	def getRunIperf3Server(self):
 		return self.runIperf3Server

--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -96,44 +96,45 @@ def Iperf_ComputeTime(args):
 	return int(result.group('iperf_time'))

 def Iperf_analyzeV3TCPJson(filename, iperf_tcp_rate_target):
-	try:
-		with open(filename) as f:
-			 results = json.load(f)
-		sender_bitrate   = round(results['end']['streams'][0]['sender']['bits_per_second'] / 1000000, 2)
-		receiver_bitrate = round(results['end']['streams'][0]['receiver']['bits_per_second'] / 1000000, 2)
-	except json.JSONDecodeError as e:
-		return (False, f'Could not decode JSON log file {filename}: {e}')
-	except KeyError as e:
-		e_msg = results.get('error', f'error report not found in {filename}')
-		return (False, f'While parsing Iperf3 results: missing key {e}, {e_msg}')
-	except Exception as e:
-		return (False, f'While parsing Iperf3 results: exception: {e}')
+	if (not os.path.isfile(filename)):
+		return (False, 'Iperf3 TCP: Log file not present')
+	if (os.path.getsize(filename)==0):
+		return (False, 'Iperf3 TCP: Log file is empty')
+
+	with open(filename) as file:
+		filename = json.load(file)
+		try:
+			sender_bitrate   = round(filename['end']['streams'][0]['sender']['bits_per_second']/1000000,2)
+			receiver_bitrate = round(filename['end']['streams'][0]['receiver']['bits_per_second']/1000000,2)
+		except Exception as e:
+			return (False, 'Could not compute Iperf3 bitrate!')
+
 	snd_msg = f'Sender Bitrate   : {sender_bitrate} Mbps'
 	rcv_msg = f'Receiver Bitrate : {receiver_bitrate} Mbps'
 	success = True
-	if iperf_tcp_rate_target is not None:
-		success = float(receiver_bitrate) >= float(iperf_tcp_rate_target)
-		if success:
-			rcv_msg += f" (target: {iperf_tcp_rate_target})"
+	if (iperf_tcp_rate_target is not None):
+		if (int(receiver_bitrate) < int(iperf_tcp_rate_target)):
+			rcv_msg += f" (too low! < {iperf_tcp_rate_target} Mbps)"
+			success = False
 		else:
-			rcv_msg += f" (too low! < {iperf_tcp_rate_target})"
+			rcv_msg += f" (target : {iperf_tcp_rate_target} Mbps)"
 	return(success, f'{snd_msg}\n{rcv_msg}')

 def Iperf_analyzeV3BIDIRJson(filename):
-	try:
-		with open(filename) as f:
-			results = json.load(f)
-		sender_bitrate_ul   = round(results['end']['streams'][0]['sender']['bits_per_second'] / 1000000, 2)
-		receiver_bitrate_ul = round(results['end']['streams'][0]['receiver']['bits_per_second'] / 1000000, 2)
-		sender_bitrate_dl   = round(results['end']['streams'][1]['sender']['bits_per_second'] / 1000000, 2)
-		receiver_bitrate_dl = round(results['end']['streams'][1]['receiver']['bits_per_second'] / 1000000, 2)
-	except json.JSONDecodeError as e:
-		return (False, f'Could not decode JSON log file: {e}')
-	except KeyError as e:
-		e_msg = results.get('error', f'error report not found in {filename}')
-		return (False, f'While parsing Iperf3 results: missing key {e}, {e_msg}')
-	except Exception as e:
-		return (False, f'While parsing Iperf3 results: exception: {e}')
+	if (not os.path.isfile(filename)):
+		return (False, 'Iperf3 Bidir TCP: Log file not present')
+	if (os.path.getsize(filename)==0):
+		return (False, 'Iperf3 Bidir TCP: Log file is empty')
+
+	with open(filename) as file:
+		filename = json.load(file)
+		try:
+			sender_bitrate_ul   = round(filename['end']['streams'][0]['sender']['bits_per_second']/1000000,2)
+			receiver_bitrate_ul = round(filename['end']['streams'][0]['receiver']['bits_per_second']/1000000,2)
+			sender_bitrate_dl   = round(filename['end']['streams'][1]['sender']['bits_per_second']/1000000,2)
+			receiver_bitrate_dl = round(filename['end']['streams'][1]['receiver']['bits_per_second']/1000000,2)
+		except Exception as e:
+			return (False, 'Could not compute BIDIR bitrate!')

 	msg = f'Sender Bitrate DL   : {sender_bitrate_dl} Mbps\n'
 	msg += f'Receiver Bitrate DL : {receiver_bitrate_dl} Mbps\n'
@@ -201,6 +202,8 @@ def Iperf_analyzeV2UDP(server_filename, iperf_bitrate_threshold, iperf_packetlos
 		with open(server_filename, 'r') as server_file:
 			for line in server_file.readlines():
 				result = re.search(statusTemplate, str(line))
+				if result is not None:
+					break
 		if result is None:
 			return (False, 'Could not parse server report!')
 		bitrate = float(result.group('bitrate'))
@@ -787,8 +790,10 @@ class OaiCiTest():
 		udpIperf = re.search('-u', iperf_opt) is not None
 		bidirIperf = re.search('--bidir', iperf_opt) is not None
 		client_filename = f'iperf_client_{self.testCase_id}_{ue.getName()}.log'
+		server_filename = f'iperf_server_{self.testCase_id}_{ue.getName()}.log'
 		ymlPath = CONTAINERS.yamlPath[0].split('/')
 		logPath = f'../cmake_targets/log/{ymlPath[1]}'
+
 		if udpIperf:
 			target_bitrate, iperf_opt = Iperf_ComputeModifiedBW(idx, ue_num, self.iperf_profile, self.iperf_args)
 			# note: for UDP testing we don't want to use json report - reports 0 Mbps received bitrate
@@ -800,29 +805,35 @@ class OaiCiTest():
 		# hack: the ADB UEs don't have iperf in $PATH, so we need to hardcode for the moment
 		iperf_ue = '/data/local/tmp/iperf3' if re.search('adb', ue.getName()) else 'iperf3'
 		ue_header = f'UE {ue.getName()} ({ueIP})'
-		# create log directory on executor node
-		with cls_cmd.getConnection('localhost') as local:
-			local.run(f'mkdir -p {logPath}')
-		with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
-			port = 5002 + idx
-			# note: some core setups start an iperf3 server automatically, indicated in ci_infra by runIperf3Server: False`
-			t = iperf_time * 2.5
-			cmd_ue.run(f'rm /tmp/{client_filename}', reportNonZero=False)
-			if runIperf3Server:
-				cmd_svr.run(f'{svr.getCmdPrefix()} nohup timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} &', timeout=t)
-			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> /tmp/{client_filename}', timeout=t)
-			localPath = f'{os.getcwd()}'
-			# note: copy iperf3 log to the directory for log collection, used by pipelines running on executor machine
-			cmd_ue.copyin(f'/tmp/{client_filename}', f'{localPath}/{logPath}/{client_filename}')
-			# note: copy iperf3 log to the current directory for log analysis and log collection
-			cmd_ue.copyin(f'/tmp/{client_filename}', f'{localPath}/{client_filename}')
-			cmd_ue.run(f'rm /tmp/{client_filename}', reportNonZero=False)
-		if udpIperf:
-			status, msg = Iperf_analyzeV3UDP(client_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
-		elif bidirIperf:
-			status, msg = Iperf_analyzeV3BIDIRJson(client_filename)
+
+		if svr.getName() == "rfsim4g_enb_fembms":
+			with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
+				port = 5002 + idx
+				cmd_ue.run(f'{ue.getCmdPrefix()} iperf -B {ueIP} -s -u -i1 >> {server_filename} &', timeout=iperf_time*1.5)
+				cmd_svr.run(f'{svr.getCmdPrefix()} iperf -c {ueIP} -B {svrIP} {iperf_opt} -i1 2>&1 | tee {client_filename}', timeout=iperf_time*1.5)
+				cmd_ue.run(f'cp {client_filename} {logPath}/{client_filename}')
+				cmd_ue.run(f'cp {server_filename} {logPath}/{server_filename}')
+				status, msg = Iperf_analyzeV2UDP(server_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
 		else:
-			status, msg = Iperf_analyzeV3TCPJson(client_filename, self.iperf_tcp_rate_target)
+			with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
+				port = 5002 + idx
+				# note: some core setups start an iperf3 server automatically, indicated in ci_infra by runIperf3Server: False`
+				if runIperf3Server:
+					cmd_svr.run(f'{svr.getCmdPrefix()} nohup iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} &', timeout=iperf_time*1.5)
+				cmd_ue.run(f'rm /tmp/{client_filename}', reportNonZero=False)
+				cmd_ue.run(f'{ue.getCmdPrefix()} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> /tmp/{client_filename}', timeout=iperf_time*1.5)
+				if svr.getHost() == 'localhost':
+					cmd_ue.run(f'mkdir -p {logPath}')
+					cmd_ue.run(f'cp /tmp/{client_filename} {logPath}/{client_filename}')
+					cmd_ue.run(f'cp /tmp/{client_filename} {client_filename}')
+				else:
+					cmd_ue.copyin(f'/tmp/{client_filename}', client_filename)
+			if udpIperf:
+				status, msg = Iperf_analyzeV3UDP(client_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
+			elif bidirIperf:
+				status, msg = Iperf_analyzeV3BIDIRJson(client_filename)
+			else:
+				status, msg = Iperf_analyzeV3TCPJson(client_filename, self.iperf_tcp_rate_target)

 		logging.info(f'\u001B[1;37;45m iperf result for {ue_header}\u001B[0m')
 		for l in msg.split('\n'):
@@ -860,46 +871,6 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
 			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)

-	def Iperf2_Unidir(self,HTML,RAN,EPC,CONTAINERS):
-		if self.ue_ids == [] or self.svr_id == None or len(self.ue_ids) != 1:
-			raise Exception("no module names in self.ue_ids or/and self.svr_id provided, multi UE scenario not supported")
-		ue = cls_module.Module_UE(self.ue_ids[0].strip())
-		svr = cls_module.Module_UE(self.svr_id)
-		ueIP = ue.getIP()
-		if not ueIP:
-			return (False, f"UE {ue.getName()} has no IP address")
-		svrIP = svr.getIP()
-		if not svrIP:
-			return (False, f"Iperf server {ue.getName()} has no IP address")
-		server_filename = f'iperf_server_{self.testCase_id}_{ue.getName()}.log'
-		ymlPath = CONTAINERS.yamlPath[0].split('/')
-		logPath = f'../cmake_targets/log/{ymlPath[-1]}'
-		iperf_time = Iperf_ComputeTime(self.iperf_args)
-		target_bitrate, iperf_opt = Iperf_ComputeModifiedBW(0, 1, self.iperf_profile, self.iperf_args)
-		t = iperf_time*2.5
-		with cls_cmd.getConnection('localhost') as local:
-			local.run(f'mkdir -p {logPath}')
-		with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(EPC.IPAddress) as cmd_svr:
-			cmd_ue.run(f'rm /tmp/{server_filename}', reportNonZero=False)
-			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} iperf -B {ueIP} -s -u -i1 >> /tmp/{server_filename} &', timeout=t)
-			cmd_svr.run(f'{svr.getCmdPrefix()} timeout -vk3 {t} iperf -c {ueIP} -B {svrIP} {iperf_opt} -i1', timeout=t)
-			localPath = f'{os.getcwd()}'
-			# note: copy iperf2 log to the directory for log collection
-			cmd_ue.copyin(f'/tmp/{server_filename}', f'{localPath}/{logPath}/{server_filename}')
-			# note: copy iperf2 log to the current directory for log analysis and log collection
-			cmd_ue.copyin(f'/tmp/{server_filename}', f'{localPath}/{server_filename}')
-			cmd_ue.run(f'rm /tmp/{server_filename}', reportNonZero=False)
-		success, msg = Iperf_analyzeV2UDP(server_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
-		ue_header = f'UE {ue.getName()} ({ueIP})'
-		logging.info(f'\u001B[1;37;45m iperf result for {ue_header}\u001B[0m')
-		for l in msg.split('\n'):
-			logging.info(f'\u001B[1;35m	{l} \u001B[0m')
-		if success:
-			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'OK', [f'{ue_header}\n{msg}'])
-		else:
-			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', [f'{ue_header}\n{msg}'])
-			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
-
 	def AnalyzeLogFile_UE(self, UElogFile,HTML,RAN):
 		if (not os.path.isfile(f'./{UElogFile}')):
 			return -1
--- a/ci-scripts/conf_files/gnb-cu.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.f1.conf
@@ -22,8 +22,8 @@ gNBs =

    tr_s_preference = "f1";

-    local_s_address = "127.0.0.4";
-    remote_s_address = "127.0.0.5";
+    local_s_address = "192.168.68.194";
+    remote_s_address = "192.168.68.195";
    local_s_portc   = 501;
    local_s_portd   = 2153;
    remote_s_portc  = 500;
@@ -44,8 +44,8 @@ gNBs =
    NETWORK_INTERFACES :
    {

-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
--- a/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf
+++ b/ci-scripts/conf_files/gnb-cucp.sa.f1.quectel.conf
@@ -23,8 +23,8 @@ gNBs =

    tr_s_preference = "f1";

-    local_s_address = "127.0.0.4";
-    remote_s_address = "127.0.0.5";
+    local_s_address = "192.168.68.194";
+    remote_s_address = "192.168.68.195";
    local_s_portc   = 501;
    local_s_portd   = 2153;
    remote_s_portc  = 500;
@@ -46,16 +46,16 @@ gNBs =
    (
      {
        type = "cp";
-        ipv4_cucp = "127.0.0.4";
+        ipv4_cucp = "192.168.68.194";
        port_cucp = 38462;
-        ipv4_cuup = "127.0.0.6";
+        ipv4_cuup = "192.168.68.196";
        port_cuup = 38462;
      }
    )

    NETWORK_INTERFACES :
    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
    };
  }
 );
--- a/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf
+++ b/ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf
@@ -21,8 +21,8 @@ gNBs =

    tr_s_preference = "f1";

-    local_s_address = "127.0.0.6";
-    remote_s_address = "127.0.0.5";
+    local_s_address = "192.168.68.196";
+    remote_s_address = "192.168.68.195";
    local_s_portc   = 501;
    local_s_portd   = 2153;
    remote_s_portc  = 500;
@@ -40,15 +40,15 @@ gNBs =
    (
      {
        type = "up";
-        ipv4_cucp = "127.0.0.4";
-        ipv4_cuup = "127.0.0.6";
+        ipv4_cucp = "192.168.68.194";
+        ipv4_cuup = "192.168.68.196";
      }
    )

    NETWORK_INTERFACES :
    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.196";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.196";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
--- a/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf
@@ -206,6 +206,14 @@ RUs = (
    }
 );  

+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

 rfsimulator: {
    serveraddr = "server";
--- a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
@@ -162,8 +162,8 @@ MACRLCs = (
    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "f1";
-    local_n_address = "127.0.0.5";
-    remote_n_address = "127.0.0.4";
+    local_n_address = "192.168.68.195";
+    remote_n_address = "192.168.68.194";
    local_n_portc   = 500;
    local_n_portd   = 2153;
    remote_n_portc  = 501;
@@ -202,6 +202,14 @@ RUs = (
    }
 );

+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

 log_config : {
  global_log_level = "info";
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
@@ -206,6 +206,14 @@ RUs = (
    }
 );  

+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);
 rfsimulator: {
 serveraddr = "server";
    serverport = 4043;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
@@ -169,8 +169,8 @@ MACRLCs = (
    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "f1";
-    local_n_address = "127.0.0.5";
-    remote_n_address = "127.0.0.4";
+    local_n_address = "192.168.68.195";
+    remote_n_address = "192.168.68.194";
    local_n_portc   = 500;
    local_n_portd   = 2153;
    remote_n_portc  = 501;
@@ -207,6 +207,14 @@ RUs = (
    }
 );  

+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

 log_config : {
  global_log_level = "info";
--- a/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
@@ -209,6 +209,14 @@ rfsimulator: {
    serveraddr = "server";
 };

+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
--- a/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
@@ -85,7 +85,7 @@ gNBs =
        powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
+        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;
@@ -217,6 +217,14 @@ rfsimulator: {
    serveraddr = "server";
 };

+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
--- a/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf
@@ -213,6 +213,14 @@ RUs = (
    }
 );  

+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
--- a/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf
@@ -197,6 +197,12 @@ RUs = ({
  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
--- a/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf
@@ -199,6 +199,12 @@ RUs = ({
  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
--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
@@ -215,6 +215,14 @@ RUs = (
  }
 );  

+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
--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpn310.2x2.conf
@@ -220,6 +220,14 @@ RUs = (
    }
 );  

+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
@@ -211,6 +211,14 @@ RUs = (
    }
 );

+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

 rfsimulator :
 {
--- a/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
@@ -28,11 +28,11 @@ gNBs =

 #  downlinkConfigCommon
    #frequencyInfoDL
-      # this is 2150.43 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
+      # this is 2150 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
      absoluteFrequencySSB                                          = 430590;
      dl_frequencyBand                                              = 66;
-      # this is 2150.43 MHz
-      dl_absoluteFrequencyPointA                                    = 430086;
+      # this is 2150 MHz
+      dl_absoluteFrequencyPointA                                    = 430002;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
@@ -53,8 +53,8 @@ gNBs =
  #uplinkConfigCommon
     #frequencyInfoUL
      ul_frequencyBand                                              = 66;
-      # this is 1750.43 MHz
-      ul_absoluteFrequencyPointA                                    = 350086;
+      # this is 1750 MHz
+      ul_absoluteFrequencyPointA                                    = 350002;
      #scs-SpecificCarrierList
      ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
@@ -220,6 +220,14 @@ RUs = (
    }
 );

+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_DISABLE";
+  }
+);

 rfsimulator :
 {
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
@@ -1,297 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    //nr_cellid = 12345678L;
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 1;
-    maxMIMO_layers        = 2;
-    pusch_AntennaPorts    = 4;
-    do_CSIRS              = 1;
-    do_SRS                = 0 ;
-
-    pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 11;
-        searchSpaceZero = 0;
-      }
-    );
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-      physCellId                                                    = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3450.72 MHz (center frequency)
-      absoluteFrequencySSB                                          = 666624;
-      dl_frequencyBand                                              = 77;
-      # this is 3401.58 MHz
-      dl_absoluteFrequencyPointA                                    = 663348;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 159;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 7;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 2;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
-#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                = 3;
-#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,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -100;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# 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                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 4;
-
-  ssPBCH_BlockPower                                                 = 0;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.103"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.18.20";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.18.20";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 180;
-  pucch_TargetSNRx10          = 230;
-  ul_bler_target_upper=.35;
-  ul_bler_target_lower=.15;
-  pusch_FailureThres          = 100;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 130
-  pucch0_dtx_threshold = 80;
-  pusch_dtx_threshold = -100;
-  tx_amp_backoff_dB = 3;
-  L1_rx_thread_core = 3;
-  L1_tx_thread_core = 4;
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 5;
-  sl_ahead       = 5;
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000,0x00007fff, 0x0000];
-  clock_src = "internal";
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding = 0; # needs to match O-RU configuration
-}
-);
-
-rfsimulator :
-{
-  serveraddr = "server";
-  serverport = "4043";
-  options = (); #("saviq"); or/and "chanmod"
-  modelname = "AWGN";
-  IQfile = "/tmp/rfsimulator.iqs";
-};
-
-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";
-  ngap_log_level   = "info";
-  f1ap_log_level   = "info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:c3:11.0", "0000:c3:11.1");
-  system_core = 0;
-  io_core = 1;
-  worker_cores = (2);
-  du_addr = ("76:76:64:6e:00:01", "76:76:64:6e:00:01");
-  ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb");
-  mtu = 9216; # check if xran uses this properly
-  fh_config = ({
-    Tadv_cp_dl = 125;
-    T2a_cp_dl = (285, 429); # (min, max)
-    T2a_cp_ul = (285, 429); # (min, max)
-    T2a_up = (125, 428); # (min, max)
-    Ta3 = (130, 170); # (min, max)
-    T1a_cp_dl = (285, 470); # (min, max)
-    T1a_cp_ul = (285, 429); # (min, max)
-    T1a_up = (125, 350); # (min, max)
-    Ta4 = (110, 180); # (min, max)
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-    prach_config = {
-      eAxC_offset = 4;
-    };
-  });
-};
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
@@ -19,7 +19,7 @@ gNBs =

    ////////// Physical parameters:

-    min_rxtxtime                                              = 5;
+    min_rxtxtime                                              = 2;
    do_SRS                                                    = 0;
    force_256qam_off                                          = 1;
    pdsch_AntennaPorts_N1                                     = 1;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
@@ -212,6 +212,14 @@ RUs = (
 }
 );

+THREAD_STRUCT = (
+{
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_SINGLE_THREAD";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+}
+);

 rfsimulator :
 {
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
@@ -220,6 +220,14 @@ RUs = (
    }
 );

+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

 rfsimulator: {
    serveraddr = "server";
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
@@ -1,313 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
- ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
- // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; sd = 0x1; }) });
-
-    @include "neighbour-config.conf"
-    nr_cellid = 1;
-
- ////////// Physical parameters:
-
-    do_CSIRS                                                  = 0;
-    do_SRS                                                    = 0;
-    min_rxtxtime = 6;
-      pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 12;
-        searchSpaceZero = 0;
-      }
-      );
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 641280;
-      dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640008;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 106;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
-# 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                                            = 106;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
-# 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                               = -96;
-#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                   = 14;
-#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;
-     }
-
-    );
-
-    # Dedicated Serving Cell Configuration
-    servingCellConfigDedicated = ({
-    # BWP-Downlink
-      # BWP 1 Configuration
-        dl_bwp-Id_1 = 1;
-        dl_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_bwp1_subcarrierSpacing = 1;
-
-      # BWP 2 Configuration
-        dl_bwp-Id_2 = 2;
-        dl_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_bwp2_subcarrierSpacing = 1;
-
-      # BWP 3 Configuration
-        dl_bwp-Id_3 = 3;
-        dl_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
-        # subcarrierSpacing
-        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_bwp3_subcarrierSpacing = 1;
-
-      firstActiveDownlinkBWP-Id = 1;  #BWP-Id
-      defaultDownlinkBWP-Id     = 1;  #BWP-Id
-
-      # bwp-InactivityTimer                 ENUMERATED {ms2, ms3, ms4, ms5, ms6, ms8, ms10, ms20, ms30,
-      #                                                ms40,ms50, ms60, ms80,ms100, ms200,ms300, ms500,
-      #                                                ms750, ms1280, ms1920, ms2560, spare10, spare9, spare8,
-      #                                                spare7, spare6, spare5, spare4, spare3, spare2, spare1 }
-
-    # UplinkConfig
-      # BWP-Uplink
-        # BWP 1 Configuration
-          ul_bwp-Id_1 = 1;
-          ul_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
-          # subcarrierSpacing
-          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-          ul_bwp1_subcarrierSpacing = 1;
-
-        # BWP 2 Configuration
-          ul_bwp-Id_2 = 2;
-          ul_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
-          # subcarrierSpacing
-          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-          ul_bwp2_subcarrierSpacing = 1;
-
-        # BWP 3 Configuration
-          ul_bwp-Id_3 = 3;
-          ul_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
-          # subcarrierSpacing
-          # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-          ul_bwp3_subcarrierSpacing = 1;
-
-        firstActiveUplinkBWP-Id = 1;  #BWP-Id
-      }
-    );
-
-
-    # ------- SCTP definitions
-    SCTP : {
-       # Number of streams to use in input/output
-       SCTP_INSTREAMS  = 2;
-       SCTP_OUTSTREAMS = 2;
-     };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ( { ipv4 = "192.168.70.132"; });
-
-
-    NETWORK_INTERFACES : {
-	   GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.129";
-	   GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129";
-	   GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 250;
-  pucch_TargetSNRx10          = 200;
-  ulsch_max_frame_inactivity  = 0;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference       = "local_mac";
-  prach_dtx_threshold   = 120;
-  pucch0_dtx_threshold  = 100;
-  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
-}
-);
-
-RUs = ({
-  local_rf       = "yes";
-  nb_tx          = 1;
-  nb_rx          = 1;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 114;
-  eNB_instances  = [0];
-  #beamforming 1x4 matrix:
-  bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-  clock_src = "internal";
-});
-
-
-rfsimulator: {
-  serveraddr = "server";
-  serverport = 4043;
-  options = (); #("saviq"); or/and "chanmod"
-  modelname = "AWGN";
-  IQfile = "/tmp/rfsimulator.iqs"
-}
-
-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";
-	nr_rrc_log_level		                  ="info";
-	rrc_log_level                         ="info";
-	ngap_log_level                        ="debug";
-	f1ap_log_level                        ="debug";
-};
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrp310.2x2.conf
@@ -219,6 +219,14 @@ RUs = (
    }
 );

+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf
@@ -161,8 +161,8 @@ gNBs =

    NETWORK_INTERFACES :
    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };

--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
@@ -233,6 +233,14 @@ RUs = (
    }
 );

+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.162prb.usrpn310.2x2.conf
@@ -233,6 +233,14 @@ RUs = (
    }
 );

+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
@@ -215,6 +215,14 @@ rfsimulator: {
    serveraddr = "server";
 };

+THREAD_STRUCT = (
+{
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_SINGLE_THREAD";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+}
+);

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf
@@ -1,296 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 1;
-    maxMIMO_layers        = 2;
-    pusch_AntennaPorts    = 4;
-    do_CSIRS              = 1;
-    do_SRS                = 0 ;
-    sib1_tda			  = 15;
-#    force_UL256qam_off    = 1;
-
-    pdcch_ConfigSIB1 = (
-      {
-        controlResourceSetZero = 11;
-        searchSpaceZero = 0;
-      }
-    );
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-     # n_TimingAdvanceOffset                                         = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3450.72 MHz (center frequency)
-      absoluteFrequencySSB                                          = 623328;
-      dl_frequencyBand                                              = 78;
-      # this is 3401.58 MHz
-      dl_absoluteFrequencyPointA                                    = 620052;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        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                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 151;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 8;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 1;
-#ra_ReponseWindow
-#1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 5;
-#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                = 3;
-#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,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -96;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-# ssb_PositionsInBurs_BitmapPR
-# 1=short, 2=medium, 3=long
-      ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# 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                                                 = -15;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.103"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.18.20";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.18.20";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 100;
-  pucch_TargetSNRx10          = 200;
-  dl_bler_target_upper=.35;
-  dl_bler_target_lower=.15;
-  ul_bler_target_upper=.35;
-  ul_bler_target_lower=.15;
-  pusch_FailureThres          = 1000;
-  ul_max_mcs                  = 28;
-}
-);
-
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 90;
-  pucch0_dtx_threshold = 80;
-  pusch_dtx_threshold = 10;
-  max_ldpc_iterations = 15;
-  tx_amp_backoff_dB = 12; # needs to match O-RU configuration
-  L1_rx_thread_core = 3;
-  L1_tx_thread_core = 4;
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 5;
-  sl_ahead       = 10;
-  ##beamforming 1x2 matrix: 1 layer x 2 antennas
-  bf_weights = [0x00007fff, 0x0000,0x00007fff, 0x0000];
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding = 0; # needs to match O-RU configuration
-}
-);
-
-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";
-  ngap_log_level                        ="info";
-  f1ap_log_level                        ="info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:c3:11.0", "0000:c3:11.1");
-  system_core = 0;
-  io_core = 1;
-  worker_cores = (2);
-  du_addr = ("00:11:22:33:44:66", "00:11:22:33:44:67");
-  ru_addr = ("70:b3:d5:e1:5b:81", "70:b3:d5:e1:5b:81");
-  mtu = 9216;
-  file_prefix = "fhi_72";
-  fh_config = ({
-    Tadv_cp_dl = 125;
-    T2a_cp_dl = (259, 500);
-    T2a_cp_ul = (25, 500);
-    T2a_up = (134, 375);
-    Ta3 = (152, 160);
-    T1a_cp_dl = (419, 470);
-    T1a_cp_ul = (285, 336);
-    T1a_up = (294, 345);
-    Ta4 = (0, 200);
-    ru_config = {
-      iq_width = 9;
-      iq_width_prach = 9;
-    };
-    prach_config = {
-      eAxC_offset = 4;
-    };
-  });
-};
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -232,6 +232,14 @@ RUs = (
    }
 );

+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
@@ -161,8 +161,8 @@ gNBs =

    NETWORK_INTERFACES :
    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };

@@ -207,6 +207,14 @@ RUs = (
 }
 );

+THREAD_STRUCT = (
+{
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_SINGLE_THREAD";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+}
+);

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/neighbour-config.conf
+++ b/ci-scripts/conf_files/neighbour-config.conf
@@ -1,76 +0,0 @@
-neighbour_list = (
-  {
-    nr_cellid = 1;
-    neighbour_cell_configuration = (
-      {
-        gNB_ID = 0xb00;
-        nr_cellid = 2;
-        physical_cellId = 0x002;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 216; mnc = 03; mnc_length = 2};
-        tracking_area_code = 2;
-      },
-      {
-        gNB_ID = 0xa00;
-        nr_cellid = 3;
-        physical_cellId = 0x003;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 999; mnc = 99; mnc_length = 2};
-        tracking_area_code = 3;
-      },
-      {
-        gNB_ID = 0xc00;
-        nr_cellid = 4;
-        physical_cellId = 0x004;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 999; mnc = 99; mnc_length = 2};
-        tracking_area_code = 4;
-      }
-  )
-  },
-  {
-    nr_cellid = 2;
-    neighbour_cell_configuration = (
-      {
-        gNB_ID = 0xe00;
-        nr_cellid = 1;
-        physical_cellId = 0x000;
-        absoluteFrequencySSB = 641280 ;
-        subcarrierSpacing = 1; #30 KHz
-        plmn = { mcc = 001; mnc = 01; mnc_length = 2};
-        tracking_area_code = 1;
-      }
-    )
-  }
- );
-
-
-nr_measurement_configuration = {
-  Periodical = {
-    enable = 1;
-    includeBeamMeasurements = 1;
-    maxNrofRS_IndexesToReport = 4;
-  };
-
-  A2 = {
-    enable = 1;
-    threshold = 60;
-    timeToTrigger = 1;
-  };
-
-  A3 = ({
-    cell_id = -1; #Default
-    offset = 10;
-    hysteresis = 0;
-    timeToTrigger = 1
-  }, {
-    cell_id = 2;
-    offset = 5;
-    hysteresis = 1;
-    timeToTrigger = 2
-  })
-};
-
--- a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -236,6 +236,14 @@ RUs = (
    }
 );

+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
@@ -214,6 +214,14 @@ RUs = (
  }
 );  

+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
--- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
@@ -218,6 +218,15 @@ RUs = (
    }
 );  

+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";
+    //parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

 security = {
  # preferred ciphering algorithms
--- a/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
@@ -211,6 +211,14 @@ RUs = (
    }
 );

+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_ENABLE";
+  }
+);

 rfsimulator :
 {
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
@@ -209,6 +209,14 @@ RUs = (
 }
 );

+THREAD_STRUCT = (
+{
+  #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+  parallel_config    = "PARALLEL_SINGLE_THREAD";
+  #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+  worker_config      = "WORKER_ENABLE";
+}
+);

 rfsimulator :
 {
--- a/ci-scripts/datalog_rt_stats.60.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.60.2x2.yaml
@@ -14,7 +14,7 @@ Ref :
  L1 Tx processing : 400.0
  DLSCH encoding : 177.0
  L1 Rx processing : 345.0
-  PUSCH inner-receiver : 200.0
+  PUSCH inner-receiver : 210.0
  Schedule Response : 3.0
  DL & UL scheduling timing : 13.0
  UL Indication : 3.0
--- a/ci-scripts/docker/Dockerfile.cppcheck.xenial
+++ b/ci-scripts/docker/Dockerfile.cppcheck.xenial
@@ -1,32 +1,5 @@
-#/*
-# * 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 22.04
-#
-#---------------------------------------------------------------------
 FROM ubuntu:xenial AS oai-cppcheck

-
 ENV DEBIAN_FRONTEND=noninteractive

 RUN apt-get update && \
--- a/ci-scripts/docker/Dockerfile.formatting.bionic
+++ b/ci-scripts/docker/Dockerfile.formatting.bionic
@@ -1,30 +1,3 @@
-#/*
-# * 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 22.04
-#
-#---------------------------------------------------------------------
-
 FROM ubuntu:bionic AS oai-formatting-check

 ARG MERGE_REQUEST
--- a/ci-scripts/docker/Dockerfile.unittest.ubuntu20
+++ b/ci-scripts/docker/Dockerfile.unittest.ubuntu20
@@ -21,20 +21,15 @@
 #---------------------------------------------------------------------
 #
 # Dockerfile for the Open-Air-Interface BUILD service
-#   Valid for Ubuntu 22.04
+#   Valid for Ubuntu 20.04
 #
 #---------------------------------------------------------------------

-FROM ran-base:develop AS ran-tests
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
-    DEBIAN_FRONTEND=noninteractive apt-get install --yes \
-        libgtest-dev
+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 -DSANITIZE_ADDRESS=True .. && ninja tests
+RUN cmake -GNinja -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug .. && ninja tests
--- a/ci-scripts/epc.py
+++ b/ci-scripts/epc.py
@@ -48,7 +48,6 @@ import helpreadme as HELP
 import constants as CONST
 import cls_cluster as OC
 import cls_cmd
-import cls_module
 #-----------------------------------------------------------
 # Class Declaration
 #-----------------------------------------------------------
@@ -76,7 +75,6 @@ class EPCManagement():
 		self.OCRegistry = "default-route-openshift-image-registry.apps.oai.cs.eurecom.fr/"
 		self.OCUserName = ''
 		self.OCPassword = ''
-		self.cnID = ''
 		self.imageToPull = ''
 		self.eNBSourceCodePath = ''

@@ -300,8 +298,7 @@ class EPCManagement():
 						html_cell += '(' + res4.group('date') + ')'
 					html_cell += '\n'
 		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			cn = cls_module.Module_UE(self.cnID)
-			succeeded, report = OC.OC_deploy_CN(mySSH, self.OCUserName, self.OCPassword, cn.getNamespace(), cn.getCNPath())
+			succeeded, report = OC.OC_deploy_CN(mySSH, self.OCUserName, self.OCPassword)
 			if not succeeded:
 				HTML.CreateHtmlTestRow('N/A', 'KO', report)
 				HTML.CreateHtmlTabFooter(False)
@@ -578,8 +575,7 @@ class EPCManagement():
 			mySSH.copyin(f'{self.SourceCodePath}/logs/test_logs_CN.zip','test_logs_CN.zip')
 			logging.debug(message)
 		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			cn = cls_module.Module_UE(self.cnID)
-			succeeded, report = OC.OC_undeploy_CN(mySSH, self.OCUserName, self.OCPassword, cn.getNamespace(), cn.getCNPath())
+			succeeded, report = OC.OC_undeploy_CN(mySSH, self.OCUserName, self.OCPassword)
 			if not succeeded:
 				HTML.CreateHtmlTestRow('N/A', 'KO', report)
 				HTML.CreateHtmlTabFooter(False)
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -281,14 +281,6 @@ def GetParametersFromXML(action):
 			logging.error('test-case has wrong option ' + CiTestObj.iperf_options)
 			CiTestObj.iperf_options = 'check'

-	elif action == 'Iperf2_Unidir':
-		CiTestObj.iperf_args = test.findtext('iperf_args')
-		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		CiTestObj.svr_id = test.findtext('svr_id') or None
-		CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
-		CiTestObj.iperf_bitrate_threshold = test.findtext('iperf_bitrate_threshold') or '90'
-		CiTestObj.iperf_profile = test.findtext('iperf_profile') or 'balanced'
-
 	elif action == 'IdleSleep':
 		string_field = test.findtext('idle_sleep_time_in_sec')
 		if (string_field is None):
@@ -337,13 +329,11 @@ def GetParametersFromXML(action):
 		string_field = test.findtext('args')
 		if (string_field is not None):
 			EPC.cfgDeploy = string_field	
-		EPC.cnID = test.findtext('cn_id')

 	elif action == 'Terminate_5GCN':
 		string_field = test.findtext('args')
 		if (string_field is not None):
 			EPC.cfgUnDeploy = string_field	
-		EPC.cnID = test.findtext('cn_id')

 	elif action == 'Deploy_Object' or action == 'Undeploy_Object':
 		eNB_instance=test.findtext('eNB_instance')
@@ -780,8 +770,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 						CiTestObj.Ping(HTML,RAN,EPC,CONTAINERS)
 					elif action == 'Iperf':
 						CiTestObj.Iperf(HTML,RAN,EPC,CONTAINERS)
-					elif action == 'Iperf2_Unidir':
-						CiTestObj.Iperf2_Unidir(HTML,RAN,EPC,CONTAINERS)
 					elif action == 'Initialize_HSS':
 						EPC.InitializeHSS(HTML)
 					elif action == 'Terminate_HSS':
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -21,7 +21,6 @@
  - CheckStatusUE
  - Ping
  - Iperf
-  - Iperf2_Unidir
  - Deploy_EPC
  - Undeploy_EPC
  - Initialize_HSS
--- a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml
@@ -72,8 +72,8 @@
        </testCase>

        <testCase id="030011">
-                <class>Iperf2_Unidir</class>
-                <desc>Iperf2 UDP DL</desc>
+                <class>Iperf</class>
+                <desc>Iperf UDP DL</desc>
                <id>rfsim4g_ue_fembms</id>
                <svr_id>rfsim4g_enb_fembms</svr_id>
                <iperf_args>-u -t 30 -b 2M</iperf_args>
--- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_quectel.xml
@@ -97,7 +97,7 @@
        <testCase id="000022">
                <class>Iperf</class>
                <desc>iperf (DL/UDP/80M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 150M -t 30 -R</iperf_args>
+                <iperf_args>-u -b 80M -t 30 -R</iperf_args>
                <svr_id>porcepix-cn5g</svr_id>
                <id>sphex_quectel</id>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
--- a/ci-scripts/xml_files/container_sa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml
@@ -185,14 +185,14 @@
    <class>Custom_Command</class>
    <desc>Trigger Reestablishment</desc>
    <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 127.0.0.1 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command>echo ci force_reestab | nc -N 192.168.68.194 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
    <command_fail>yes</command_fail>
  </testCase>
  <testCase id="060002">
    <class>Custom_Command</class>
    <desc>Verify Reestablishment</desc>
    <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
    <command_fail>yes</command_fail>
  </testCase>

--- a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
@@ -177,14 +177,14 @@
    <class>Custom_Command</class>
    <desc>Trigger Reestablishment (on DU)</desc>
    <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command>echo ci force_reestab | nc -N 192.168.68.195 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
    <command_fail>yes</command_fail>
  </testCase>
  <testCase id="360002">
    <class>Custom_Command</class>
    <desc>Verify Reestablishment (on CU)</desc>
    <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
    <command_fail>yes</command_fail>
  </testCase>

--- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
@@ -209,14 +209,14 @@
    <class>Custom_Command</class>
    <desc>Trigger Reestablishment (on DU)</desc>
    <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command>echo ci force_reestab | nc -N 192.168.68.195 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
    <command_fail>yes</command_fail>
  </testCase>
  <testCase id="160002">
    <class>Custom_Command</class>
    <desc>Verify Reestablishment (on CU)</desc>
    <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
    <command_fail>yes</command_fail>
  </testCase>

--- a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml
+++ b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml
@@ -1,143 +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>test-5g-fhi72-vvdn</htmlTabRef>
-  <htmlTabName>100 MHz TDD SA VVDN</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <repeatCount>1</repeatCount>
-  <TestCaseRequestedList>
-    200000
-    110000
-    120000
-    102000
-    102001
-    100100
-    100010
-    100020
-    100030
-    100040
-    103000
-    100002
-    130000
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="200000">
-    <class>Custom_Command</class>
-    <desc>Setup sriov and network interfaces VVDN</desc>
-    <node>cacofonix</node>
-    <command>/opt/FHI7.2/setup_sriov_vvdn.sh</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-
-  <testCase id="110000">
-    <class>Pull_Cluster_Image</class>
-    <desc>Pull Images from Cluster</desc>
-    <oc_project>oaicicd-ran</oc_project>
-    <images_to_pull>oai-gnb-fhi72</images_to_pull>
-  </testCase>
-
-  <testCase id="120000">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB (TDD/Band78/100MHz/VVDN) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="102001">
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>up2-fhi72</id>
-  </testCase>
-
-  <testCase id="100100">
-    <class>Ping</class>
-    <desc>Ping: 100 pings in 10 sec</desc>
-    <id>up2-fhi72</id>
-    <ping_args>-c 100 -i 0.1 172.21.6.104</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase id="100010">
-    <class>Iperf</class>
-    <desc>iperf (DL/300Mbps/UDP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-u -b 300M -t 30 -R</iperf_args>
-    <id>up2-fhi72</id>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-    <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g-20897</svr_id>
-  </testCase>
-
-  <testCase id="100030">
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>up2-fhi72</id>
-    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-20897</svr_id>
-  </testCase>
-
-  <testCase id="100020">
-    <class>Iperf</class>
-    <desc>iperf (UL/70Mbps/UDP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-u -b 70M -t 30</iperf_args>
-    <id>up2-fhi72</id>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-    <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g-20897</svr_id>
-  </testCase>
-
-  <testCase id="100040">
-    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
-    <iperf_args>-t 30</iperf_args>
-    <id>up2-fhi72</id>
-    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-20897</svr_id>
-  </testCase>
-
-  <testCase id="103000">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>up2-fhi72</id>
-  </testCase>
-
-  <testCase id="100002">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="130000">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2_cleanup.xml
+++ b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2_cleanup.xml
@@ -1,63 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-  <htmlTabRef>cleanup-fhi72-vvdn</htmlTabRef>
-  <htmlTabName>Cleanup VVDN</htmlTabName>
-  <htmlTabIcon>trash</htmlTabIcon>
-  <TestCaseRequestedList>
-    555555
-    666666
-    777777
-    888888
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="555555">
-    <class>Detach_UE</class>
-    <desc>Detach UE</desc>
-    <id>up2-fhi72</id>
-  </testCase>
-
-  <testCase id="666666">
-    <class>Undeploy_Object</class>
-    <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
-  </testCase>
-
-  <testCase id="777777">
-    <class>Clean_Test_Server_Images</class>
-    <desc>Clean Test Images on Test Server</desc>
-    <test_svr_id>0</test_svr_id>
-  </testCase>
-
-  <testCase id="888888">
-    <class>Custom_Command</class>
-    <desc>Set CPU to idle state, set kernel parameters to default values</desc>
-    <node>cacofonix</node>
-    <command>/opt/FHI7.2/setup_cleanup.sh</command>
-    <command_fail>yes</command_fail>
-  </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
@@ -179,14 +179,14 @@
    <class>Custom_Command</class>
    <desc>Trigger Reestablishment</desc>
    <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 127.0.0.1 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command>echo ci force_reestab | nc -N 192.168.68.194 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
    <command_fail>yes</command_fail>
  </testCase>
  <testCase id="260002">
    <class>Custom_Command</class>
    <desc>Verify Reestablishment</desc>
    <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
    <command_fail>yes</command_fail>
  </testCase>

--- a/ci-scripts/xml_files/sa_cn5g_20897_closure.xml
+++ b/ci-scripts/xml_files/sa_cn5g_20897_closure.xml
@@ -1,38 +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>cn5g-closure</htmlTabRef>
-  <htmlTabName>CN5G-Closure</htmlTabName>
-  <htmlTabIcon>log-out</htmlTabIcon>
-  <TestCaseRequestedList>
-    060000
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="060000">
-    <class>Terminate_5GCN</class>
-    <desc>Terminate 5G Core</desc>
-    <cn_id>oc-cn5g-20897</cn_id>
-  </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/sa_cn5g_20897_start.xml
+++ b/ci-scripts/xml_files/sa_cn5g_20897_start.xml
@@ -1,38 +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>cn5g-start-tab</htmlTabRef>
-  <htmlTabName>CN5G-Start</htmlTabName>
-  <htmlTabIcon>log-in</htmlTabIcon>
-  <TestCaseRequestedList>
-    000100
-  </TestCaseRequestedList>
-  <TestCaseExclusionList>
-  </TestCaseExclusionList>
-
-  <testCase id="000100">
-    <class>Initialize_5GCN</class>
-    <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g-20897</cn_id>
-  </testCase>
-</testCaseList>
--- a/ci-scripts/xml_files/sa_cn5g_closure.xml
+++ b/ci-scripts/xml_files/sa_cn5g_closure.xml
@@ -32,7 +32,6 @@
 	<testCase id="060000">
 		<class>Terminate_5GCN</class>
 		<desc>Terminate 5G Core</desc>
-		<cn_id>oc-cn5g</cn_id>
 	</testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/sa_cn5g_start.xml
+++ b/ci-scripts/xml_files/sa_cn5g_start.xml
@@ -33,6 +33,5 @@
 	<testCase id="000100">
 		<class>Initialize_5GCN</class>
 		<desc>Initialize 5G Core</desc>
-		<cn_id>oc-cn5g</cn_id>
 	</testCase>
 </testCaseList>
--- a/ci-scripts/xml_files/t2_offload_dec_nr_ulsim.xml
+++ b/ci-scripts/xml_files/t2_offload_dec_nr_ulsim.xml
@@ -44,7 +44,7 @@
 		<desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 5, 106 PRBs, 1 layer</desc>
 		<physim_run>nr_ulsim</physim_run>
 		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -m5 -r106 -R106 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+		<physim_run_args>-n100 -s30 -m5 -r106 -R106 -o -P</physim_run_args>
 	</testCase>

 	<testCase id="010121">
@@ -60,7 +60,7 @@
 		<desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 15, 106 PRBs, 1 layer</desc>
 		<physim_run>nr_ulsim</physim_run>
 		<physim_time_threshold>150</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -m15 -r106 -R106 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+		<physim_run_args>-n100 -s30 -m15 -r106 -R106 -o -P</physim_run_args>
 	</testCase>

 	<testCase id="010131">
@@ -76,7 +76,7 @@
                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 25, 106 PRBs, 1 layer</desc>
                <physim_run>nr_ulsim</physim_run>
                <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m25 -r106 -R106 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m25 -r106 -R106 -o -P</physim_run_args>
        </testCase>

        <testCase id="010211">
@@ -92,7 +92,7 @@
                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 5, 273 PRBs, 1 layer</desc>
                <physim_run>nr_ulsim</physim_run>
                <physim_time_threshold>150</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m5 -r273 -R273 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m5 -r273 -R273 -o -P</physim_run_args>
 	</testCase>

 	<testCase id="010221">
@@ -108,7 +108,7 @@
                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 15, 273 PRBs, 1 layer</desc>
                <physim_run>nr_ulsim</physim_run>
                <physim_time_threshold>350</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m15 -r273 -R273 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m15 -r273 -R273 -o -P</physim_run_args>
        </testCase>

        <testCase id="010231">
@@ -124,7 +124,7 @@
                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 25, 273 PRBs, 1 layer</desc>
                <physim_run>nr_ulsim</physim_run>
                <physim_time_threshold>550</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m25 -r273 -R273 -o -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m25 -r273 -R273 -o -P</physim_run_args>
        </testCase>

        <testCase id="010311">
@@ -140,7 +140,7 @@
                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 5, 273 PRBs, 2 layers</desc>
                <physim_run>nr_ulsim</physim_run>
                <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m5 -r273 -R273 -o -W2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m5 -r273 -R273 -o -W2 -z2 -y2 -P</physim_run_args>
        </testCase>

        <testCase id="010321">
@@ -156,7 +156,7 @@
                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 15, 273 PRBs, 2 layers</desc>
                <physim_run>nr_ulsim</physim_run>
                <physim_time_threshold>650</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m15 -r273 -R273 -o -W2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m15 -r273 -R273 -o -W2 -z2 -y2 -P</physim_run_args>
        </testCase>

        <testCase id="010331">
@@ -172,7 +172,7 @@
                <desc>Run nr_ulsim with T2 LDPC offload: SNR = 30, MCS = 25, 273 PRBs, 2 layers</desc>
                <physim_run>nr_ulsim</physim_run>
                <physim_time_threshold>1100</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -m25 -r273 -R273 -o -W2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -m25 -r273 -R273 -o -W2 -z2 -y2 -P</physim_run_args>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/t2_offload_enc_nr_dlsim.xml
+++ b/ci-scripts/xml_files/t2_offload_enc_nr_dlsim.xml
@@ -44,7 +44,7 @@
 		<desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 5, 106 PRBs, 1 layer</desc>
 		<physim_run>nr_dlsim</physim_run>
 		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -e5 -b106 -R106 -c -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+		<physim_run_args>-n100 -s30 -e5 -b106 -R106 -c -P</physim_run_args>
 	</testCase>

 	<testCase id="000121">
@@ -60,7 +60,7 @@
 		<desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 15, 106 PRBs, 1 layer</desc>
 		<physim_run>nr_dlsim</physim_run>
 		<physim_time_threshold>100</physim_time_threshold>
-		<physim_run_args>-n100 -s30 -e15 -b106 -R106 -c -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+		<physim_run_args>-n100 -s30 -e15 -b106 -R106 -c -P</physim_run_args>
 	</testCase>

 	<testCase id="000131">
@@ -76,7 +76,7 @@
                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 25, 106 PRBs, 1 layer</desc>
                <physim_run>nr_dlsim</physim_run>
                <physim_time_threshold>200</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e25 -b106 -R106 -c -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e25 -b106 -R106 -c -P</physim_run_args>
        </testCase>

        <testCase id="000211">
@@ -92,7 +92,7 @@
                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 5, 273 PRBs, 1 layer</desc>
                <physim_run>nr_dlsim</physim_run>
                <physim_time_threshold>150</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e5 -b273 -R273 -c -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e5 -b273 -R273 -c -P</physim_run_args>
 	</testCase>

 	<testCase id="000221">
@@ -108,7 +108,7 @@
                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 15, 273 PRBs, 1 layer</desc>
                <physim_run>nr_dlsim</physim_run>
                <physim_time_threshold>250</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e15 -b273 -R273 -c -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e15 -b273 -R273 -c -P</physim_run_args>
        </testCase>

        <testCase id="000231">
@@ -124,7 +124,7 @@
                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 25, 273 PRBs, 1 layer</desc>
                <physim_run>nr_dlsim</physim_run>
                <physim_time_threshold>400</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e25 -b273 -R273 -c -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e25 -b273 -R273 -c -P</physim_run_args>
        </testCase>

        <testCase id="000311">
@@ -140,7 +140,7 @@
                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 5, 273 PRBs, 2 layers</desc>
                <physim_run>nr_dlsim</physim_run>
                <physim_time_threshold>200</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e5 -b273 -R273 -c -x2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e5 -b273 -R273 -c -x2 -z2 -y2 -P</physim_run_args>
        </testCase>

        <testCase id="000321">
@@ -156,7 +156,7 @@
                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 15, 273 PRBs, 2 layers</desc>
                <physim_run>nr_dlsim</physim_run>
                <physim_time_threshold>500</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e15 -b273 -R273 -c -x2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e15 -b273 -R273 -c -x2 -z2 -y2 -P</physim_run_args>
        </testCase>

        <testCase id="000331">
@@ -172,7 +172,7 @@
                <desc>Run nr_dlsim with T2 LDPC offload: SNR = 30, MCS = 25, 273 PRBs, 2 layers</desc>
                <physim_run>nr_dlsim</physim_run>
                <physim_time_threshold>800</physim_time_threshold>
-                <physim_run_args>-n100 -s30 -e25 -b273 -R273 -c -x2 -z2 -y2 -P --ldpc_offload.dpdk_dev d8:00.0</physim_run_args>
+                <physim_run_args>-n100 -s30 -e25 -b273 -R273 -c -x2 -z2 -y2 -P</physim_run_args>
        </testCase>

 </testCaseList>
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md
@@ -12,7 +12,7 @@
  </tr>
 </table>

-This page is only valid for an `Ubuntu 22` host.
+This page is only valid for an `Ubuntu18` host.

 **Table of Contents**

--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
@@ -84,9 +84,8 @@ services:

    oai-cu:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-cu
-        cap_drop:
-            - ALL
        environment: 
            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
@@ -105,15 +104,14 @@ services:

    oai-du:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-du
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim
                                    --log_config.global_log_options level,nocolor,time
                                    --rfsimulator.options chanmod
                                    --telnetsrv --telnetsrv.listenaddr 192.168.71.171
-            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+            ASAN_OPTIONS: detect_leaks=0
        depends_on:
            - oai-cu
        networks:
@@ -130,12 +128,8 @@ services:

    oai-nr-ue:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                    -r 106 --numerology 1 -C 3619200000
@@ -143,14 +137,11 @@ services:
                                    --rfsimulator.serveraddr 192.168.71.171
                                    --rfsimulator.options chanmod
                                    --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.181 --telnetsrv.listenport 8091
-            ASAN_OPTIONS: detect_odr_violation=0
        depends_on:
            - oai-du
        networks:
            public_net:
                ipv4_address: 192.168.71.181
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
            - ../../conf_files/rfsim_channel_ci.conf:/opt/oai-nr-ue/etc/rfsim_channel_ci.conf
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
@@ -82,9 +82,8 @@ services:
            retries: 5
    oai-gnb:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
@@ -102,12 +101,8 @@ services:
            retries: 5
    oai-nr-ue:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        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
        depends_on:
@@ -115,8 +110,6 @@ services:
        networks:
            public_net:
                ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
--- a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md
+++ b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md
@@ -12,8 +12,10 @@
  </tr>
 </table>

-It is also valid for `Ubuntu 22.04`.
+This page is valid for an `Ubuntu18` host.
+It is also valid for `Ubuntu 20.04`.

+This tutorial is only valid once this file is merged into the `develop` branch.
 # 1. Adapt the `docker-compose` to your environment #
 The yaml file is in the following directory:  `ci-scripts/yaml_files/5g_l2sim_tdd`

--- a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
@@ -82,9 +82,8 @@ services:
            retries: 5
    oai-gnb:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: "l2sim-oai-gnb"
-        cap_drop:
-            - ALL
        network_mode: "host"
        environment:
            TZ: Europe/Paris
@@ -103,9 +102,8 @@ services:

    proxy:
        image: oai-lte-multi-ue-proxy:latest
+        privileged: true
        container_name: "l2sim-proxy"
-        cap_drop:
-            - ALL
        network_mode: "host"
        environment:
            TZ: Europe/Paris
@@ -120,20 +118,14 @@ services:

    oai-nr-ue0:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: "l2sim-oai-nr-ue0"
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        network_mode: "host"
        environment:
            TZ: Europe/Paris
            OPENAIR_DIR: /opt/oai-nr-ue
            USE_ADDITIONAL_OPTIONS: --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor
            ASAN_OPTIONS: detect_leaks=0
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.band78.106prb.l2sim.conf:/opt/oai-nr-ue/etc/nr-ue.conf
            - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results
--- a/ci-scripts/yaml_files/5g_rfsimulator/README.md
+++ b/ci-scripts/yaml_files/5g_rfsimulator/README.md
@@ -12,7 +12,7 @@
  </tr>
 </table>

-This page is only valid for an `Ubuntu 22` host.
+This page is only valid for an `Ubuntu18` host.

 **NOTE: this version (2023-01-27) has been updated  for the `v1.5.0` version of the `OAI 5G CN`.**

@@ -237,18 +237,12 @@ Create the entry for the second UE in `docker-compose.yaml` file as follows:
 ```yaml
    oai-nr-ue2:
        image: oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue2
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
        depends_on:
            - oai-gnb
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        networks:
@@ -535,40 +529,3 @@ snssais:
 ```

 The `ST` and `SD` values shall also match.
-
-
-# 6. Running with local changes
-
-You can run the testcase with local changes by substituting the binaries in
-execution images. `local-override.yaml` file provides a way to substitute the
-gNB and nrUE executables as well as librfsimulator.so. Refer to the `-volumes`
-section in the file for details. This includes an image build service as well as
-code compilation service. This is necessary as the executable has to be linked
-against the same libraries that are present in the executing image. This might
-take a while the first time but other that that is very fast. Here is a list of
-commands (wait between each command). Tested with `docker compose` v2.27.0
-
-
-This command deploys OAI 5G Core Network
-```bash
-docker compose -f docker-compose.yaml -f local-override.yaml up -d mysql oai-amf oai-smf oai-upf oai-ext-dn
-```
-This command builds base images locally, builds local gNB & nrUE executable and
-runs the gnb service with modified gNB executable.
-```bash
-docker compose -f docker-compose.yaml -f local-override.yaml up -d oai-gnb
-```
-This command rebuilds both the gNB & nrUE and runs the oai-nr-ue container with 
-modified nrUE executable.
-```bash
-docker compose -f docker-compose.yaml -f local-override.yaml up -d oai-nr-ue
-```
-
-## 6.1 Running nrUE in gdb
-`local-override-ue-gdb.yaml` is an additional override file which can be used
-to run the UE executable in gdb. Replace the last command above with the
-following:
-
-```bash
-docker compose -f docker-compose.yaml -f local-override.yaml -f local-override-ue-gdb.yaml run oai-nr-ue
-```
--- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
@@ -82,9 +82,8 @@ services:
            retries: 5
    oai-gnb:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
@@ -102,21 +101,15 @@ services:
            retries: 5
    oai-nr-ue:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            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
        depends_on:
            - oai-gnb
        networks:
            public_net:
                ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -126,21 +119,15 @@ services:
            retries: 5
    oai-nr-ue2:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue2
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            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
        depends_on:
            - oai-gnb
        networks:
            public_net:
                ipv4_address: 192.168.71.151
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -150,21 +137,15 @@ services:
            retries: 5
    oai-nr-ue3:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue3
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            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
        depends_on:
            - oai-gnb
        networks:
            public_net:
                ipv4_address: 192.168.71.152
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -174,21 +155,15 @@ services:
            retries: 5
    oai-nr-ue4:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue4
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            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
        depends_on:
            - oai-gnb
        networks:
            public_net:
                ipv4_address: 192.168.71.153
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -198,21 +173,15 @@ services:
            retries: 5
    oai-nr-ue5:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue5
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            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
        depends_on:
            - oai-gnb
        networks:
            public_net:
                ipv4_address: 192.168.71.154
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -222,21 +191,15 @@ services:
            retries: 5
    oai-nr-ue6:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue6
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            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
        depends_on:
            - oai-gnb
        networks:
            public_net:
                ipv4_address: 192.168.71.155
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -246,21 +209,15 @@ services:
            retries: 5
    oai-nr-ue7:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue7
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            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
        depends_on:
            - oai-gnb
        networks:
            public_net:
                ipv4_address: 192.168.71.156
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -270,21 +227,15 @@ services:
            retries: 5
    oai-nr-ue8:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue8
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            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
        depends_on:
            - oai-gnb
        networks:
            public_net:
                ipv4_address: 192.168.71.157
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -294,21 +245,15 @@ services:
            retries: 5
    oai-nr-ue9:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue9
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            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
        depends_on:
            - oai-gnb
        networks:
            public_net:
                ipv4_address: 192.168.71.158
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -318,21 +263,15 @@ services:
            retries: 5
    oai-nr-ue10:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue10
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
-            USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            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
        depends_on:
            - oai-gnb
        networks:
            public_net:
                ipv4_address: 192.168.71.159
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
--- a/ci-scripts/yaml_files/5g_rfsimulator/local-override-ue-gdb.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator/local-override-ue-gdb.yaml
@@ -1,6 +0,0 @@
-services:
-  oai-nr-ue:
-    privileged: true
-    stdin_open: true
-    tty: true
-    command: gdb --args /opt/oai-nr-ue/bin/nr-uesoftmodem -O /opt/oai-nr-ue/etc/nr-ue.conf -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
--- a/ci-scripts/yaml_files/5g_rfsimulator/local-override.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator/local-override.yaml
@@ -1,27 +0,0 @@
-include:
-  - ../local_common_overrides/build_images.yaml
-  - ../local_common_overrides/rebuild_nr_softmodems.yaml
-services:
-  oai-gnb:
-    privileged: true
-    depends_on:
-      rebuild-nr-softmodems:
-        condition: service_completed_successfully
-    volumes:
-      - ../../../cmake_targets/ran_build/build/nr-softmodem:/opt/oai-gnb/bin/nr-softmodem
-      - ../../../cmake_targets/ran_build/build/librfsimulator.so:/usr/local/lib/librfsimulator.so
-  oai-nr-ue:
-    privileged: true
-    image: ue-local
-    depends_on:
-      build-ran-build:
-        condition: service_completed_successfully
-        restart: true
-      oai-gnb:
-        condition: service_started
-      rebuild-nr-softmodems:
-        condition: service_completed_successfully
-    volumes:
-      - ../../../cmake_targets/ran_build/build/nr-uesoftmodem:/opt/oai-nr-ue/bin/nr-uesoftmodem
-      - ../../../cmake_targets/ran_build/build/librfsimulator.so:/usr/local/lib/librfsimulator.so 
-      - ../../../crashdumps/:/cores/
--- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
@@ -82,9 +82,8 @@ services:
            retries: 5
    oai-gnb:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
@@ -102,12 +101,8 @@ services:
            retries: 5
    oai-nr-ue:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        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
        depends_on:
@@ -115,8 +110,6 @@ services:
        networks:
            public_net:
                ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
--- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
@@ -82,9 +82,8 @@ services:
            retries: 5
    oai-gnb:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
@@ -103,12 +102,8 @@ services:

    oai-nr-ue:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        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
        depends_on:
@@ -116,8 +111,6 @@ services:
        networks:
            public_net:
                ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml:/opt/oai-nr-ue/etc/uecap.xml
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
--- a/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml
@@ -1,9 +1,8 @@
 services:
    oai-du:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-du
-        cap_drop:
-            - ALL
        network_mode: "host"
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --MACRLCs.[0].local_n_address 172.21.16.109 --MACRLCs.[0].remote_n_address 172.21.6.22 --log_config.global_log_options level,nocolor,time
@@ -16,19 +15,13 @@ services:
            retries: 5
    oai-nr-ue:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        network_mode: "host"
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 208990100001140 --rfsimulator.serveraddr 127.0.0.1 --log_config.global_log_options level,nocolor,time
        depends_on:
            - oai-du
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
--- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
@@ -66,9 +66,8 @@ services:

    oai-cucp:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-cucp
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.77.2
@@ -93,9 +92,8 @@ services:

    oai-cuup:
        image: oaisoftwarealliance/oai-nr-cuup:develop
+        privileged: true
        container_name: rfsim5g-oai-cuup
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
                                    --gNBs.[0].E1_INTERFACE.[0].ipv4_cucp 192.168.77.2
@@ -122,9 +120,8 @@ services:

    oai-cuup2:
        image: oaisoftwarealliance/oai-nr-cuup:develop
+        privileged: true
        container_name: rfsim5g-oai-cuup2
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
                                    --gNBs.[0].gNB_CU_UP_ID 0xe01
@@ -154,9 +151,8 @@ services:

    oai-cuup3:
        image: oaisoftwarealliance/oai-nr-cuup:develop
+        privileged: true
        container_name: rfsim5g-oai-cuup3
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
                                    --gNBs.[0].gNB_CU_UP_ID 0xe02
@@ -186,9 +182,8 @@ services:

    oai-du:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-du
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                    --MACRLCs.[0].local_n_address 192.168.72.3
@@ -215,9 +210,8 @@ services:

    oai-du2:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-du2
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                    --gNBs.[0].gNB_DU_ID 0xe01
@@ -247,9 +241,8 @@ services:

    oai-du3:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-du3
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                    --gNBs.[0].gNB_DU_ID 0xe02
@@ -279,12 +272,8 @@ services:

    oai-nr-ue:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                    -r 106 --numerology 1 -C 3619200000
@@ -295,8 +284,6 @@ services:
        networks:
            ue_net:
                ipv4_address: 192.168.78.5
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -307,12 +294,8 @@ services:

    oai-nr-ue2:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue2
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                    -r 106 --numerology 1 -C 3619200000
@@ -323,8 +306,6 @@ services:
        networks:
            ue_net:
                ipv4_address: 192.168.78.6
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
@@ -335,12 +316,8 @@ services:

    oai-nr-ue3:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue3
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
                                    -r 106 --numerology 1 -C 3619200000
@@ -352,8 +329,6 @@ services:
        networks:
            ue_net:
                ipv4_address: 192.168.78.7
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
--- a/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml
@@ -1,20 +1,14 @@
 services:
    oai-gnb:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
        networks:
            public_net:
                ipv4_address: 192.168.71.140
-        devices:
-            - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf
            - rrc.config:/opt/oai-gnb/
@@ -26,17 +20,11 @@ services:

    oai-nr-ue:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
-        devices:
-            - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
            - rrc.config:/opt/oai-nr-ue/etc/rrc/
--- a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml
@@ -83,9 +83,8 @@ services:

    oai-gnb:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
@@ -102,19 +101,13 @@ services:

    oai-nr-ue:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim
                                    --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
                                    -r 32 --numerology 3 --band 261 -C 27533160000 --ssb 73
            ASAN_OPTIONS: detect_leaks=0
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        depends_on:
--- a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml
@@ -1,20 +1,14 @@
 services:
    oai-gnb:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
        networks:
            public_net:
                ipv4_address: 192.168.71.140
-        devices:
-            - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf:/opt/oai-gnb/etc/gnb.conf
            - rrc.config:/opt/oai-gnb/
@@ -26,17 +20,11 @@ services:

    oai-nr-ue:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
-        devices:
-            - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
            - rrc.config:/opt/oai-nr-ue/etc/rrc/
--- a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/local-override.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/local-override.yaml
@@ -1,27 +0,0 @@
-include:
-  - ../local_common_overrides/build_images.yaml
-  - ../local_common_overrides/rebuild_nr_softmodems.yaml
-services:
-  oai-gnb:
-    privileged: true
-    depends_on:
-      rebuild-nr-softmodems:
-        condition: service_completed_successfully
-    # volumes:
-    # replace the gnb executable here
-  oai-nr-ue:
-    privileged: true
-    image: ue-local
-    depends_on:
-      build-ran-build:
-        condition: service_completed_successfully
-        restart: true
-      oai-gnb:
-        condition: service_started
-      rebuild-nr-softmodems:
-        condition: service_completed_successfully
-    container_name: local-oai-nr-ue
-    volumes:
-      - ../../../cmake_targets/ran_build/build/nr-uesoftmodem:/opt/oai-nr-ue/bin/nr-uesoftmodem
-      - ../../../cmake_targets/ran_build/build/librfsimulator.so:/usr/local/lib/librfsimulator.so 
-      - ../../../crashdumps/:/cores/
--- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
@@ -82,9 +82,8 @@ services:
            retries: 5
    oai-gnb:
        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
        container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
        environment:
            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
            ASAN_OPTIONS: detect_leaks=0
@@ -103,21 +102,15 @@ services:

    oai-nr-ue:
        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152680000 --CO -400000000 --ssb 48 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            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
        depends_on:
            - oai-gnb
        networks:
            public_net:
                ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
        volumes:
            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
--- a/ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz/docker-compose.yml
@@ -1,13 +1,9 @@
 services:
    oai-gnb:
        image: oai-gnb:latest
+        privileged: true
        network_mode: "host"
        container_name: oai-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
        environment:
            TZ: Europe/Paris
            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
--- a/ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz/docker-compose.yml
@@ -1,13 +1,9 @@
 services:
    oai-gnb:
        image: oai-gnb:latest
+        privileged: true
        network_mode: "host"
        container_name: oai-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
        environment:
            TZ: Europe/Paris
            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
--- a/ci-scripts/yaml_files/5g_sa_n310_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/5g_sa_n310_gnb/docker-compose.yml
@@ -1,18 +1,14 @@
 services:
    oai-gnb:
        image: oai-gnb:latest
+        privileged: true
        network_mode: "host"
        container_name: oai-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
        ulimits:
          core: -1 # for core dumps
        environment:
            TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --sa --tune-offset 20000000 -A 90 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --tune-offset 20000000 -A 45 --log_config.global_log_options level,nocolor,time
        volumes:
            - ../../conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf:/opt/oai-gnb/etc/gnb.conf
        healthcheck:
--- a/ci-scripts/yaml_files/5g_sa_n310_nrue/docker-compose.yml
+++ b/ci-scripts/yaml_files/5g_sa_n310_nrue/docker-compose.yml
@@ -1,23 +1,15 @@
 services:
    oai-nr-ue:
        image: oai-nr-ue:latest
+        privileged: true
        network_mode: host
        container_name: oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
-            - SYS_NICE   # for performance
-            - IPC_LOCK   # for memory locking
-        devices:
-             - /dev/net/tun:/dev/net/tun
        ulimits:
          core: -1 # for core dumps
        #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 90 --log_config.global_log_options level,nocolor,time --uicc0.imsi 001020000000111 --uicc0.nssai_sd 16777215
+            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 001020000000111 --uicc0.nssai_sd 16777215
        volumes:
            - ../../conf_files/ue.sa.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
--- a/ci-scripts/yaml_files/local_common_overrides/build_images.yaml
+++ b/ci-scripts/yaml_files/local_common_overrides/build_images.yaml
@@ -1,45 +0,0 @@
-services:
-  build-ran-base:
-    image: ran-base
-    build:
-      context: ../../../
-      dockerfile: docker/Dockerfile.base.ubuntu22
-      tags:
-        - ran-base
-
-  build-ran-build:
-    image: ran-build
-    build:
-      context: ../../../
-      dockerfile: docker/Dockerfile.build.ubuntu22
-      tags:
-        - ran-build
-    depends_on:
-      build-ran-base:
-        condition: service_completed_successfully
-  
-  build-gnb-image:
-    image: gnb-local
-    build:
-      context: ../../../
-      dockerfile: docker/Dockerfile.gNB.ubuntu22
-      tags:
-        - gnb-local
-    depends_on:
-      build-ran-build:
-        condition: service_completed_successfully
-    entrypoint: ""
-    command: echo "gnb-image built"
-
-  build-ue-image:
-    image: ue-local
-    build:
-      context: ../../../
-      dockerfile: docker/Dockerfile.nrUE.ubuntu22
-      tags:
-        - ue-local
-    depends_on:
-      build-ran-build:
-        condition: service_completed_successfully
-    entrypoint: ""
-    command: echo "ue-image built"
--- a/ci-scripts/yaml_files/local_common_overrides/rebuild_nr_softmodems.yaml
+++ b/ci-scripts/yaml_files/local_common_overrides/rebuild_nr_softmodems.yaml
@@ -1,13 +0,0 @@
-services:
-  rebuild-nr-softmodems:
-    image: ran-build
-    volumes:
-      - ../../../:/oai-dir/
-    command:
-      bash -c "cd /oai-dir/ && mkdir -p cmake_targets/ran_build/build && cd cmake_targets/ran_build/build && cmake ../../../ -GNinja && cmake --build . --target nr-uesoftmodem rfsimulator nr-softmodem"
-    entrypoint: ""
-    depends_on:
-      build-gnb-image:
-        condition: service_completed_successfully
-      build-ue-image:
-        condition: service_completed_successfully
--- a/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml
@@ -1,21 +1,16 @@
 services:
    gnb_mono_tdd:
        image: oai-gnb:latest
+        privileged: true
        container_name: nsa-b200-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
        ulimits:
          core: -1 # for core dumps
        environment:
            USE_B2XX: 'yes'
            USE_ADDITIONAL_OPTIONS: -E -q --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function
-        devices:
-            - /dev/bus/usb/:/dev/bus/usb/
        volumes:
            - ../../conf_files/gnb.nsa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
+            - /dev:/dev
        networks:
            public_net:
                ipv4_address: 192.168.68.194
--- a/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml
@@ -1,13 +1,9 @@
 services:
    oai-gnb:
        image: oai-gnb-aw2s:latest
+        privileged: true
        network_mode: "host"
        container_name: oai-gnb-aw2s
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
        ulimits:
          core: -1 # for core dumps
        environment:
--- a/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_b200_gnb/docker-compose.yml
@@ -1,26 +1,19 @@
 services:
    gnb_mono_tdd:
        image: oai-gnb:latest
+        privileged: true
        container_name: sa-b200-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
        ulimits:
          core: -1 # for core dumps
        environment:
            USE_B2XX: 'yes'
            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function
-        devices:
-            - /dev/bus/usb/:/dev/bus/usb/
        volumes:
            - ../../conf_files/gnb.sa.band78.51prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
-        # for performance reasons, we use host mode: in bridge mode, we have
-        # unacceptable DL TCP performance. However, the whole point of
-        # containerization is to not be in host mode, so update this to macvlan
-        # later.
-        network_mode: "host"
+            - /dev:/dev
+        networks:
+            public_net:
+                ipv4_address: 192.168.68.194
        #entrypoint: /bin/bash -c "sleep infinity"
        healthcheck:
            # pgrep does NOT work
@@ -28,3 +21,12 @@ services:
            interval: 10s
            timeout: 5s
            retries: 5
+
+networks:
+    public_net:
+        name: sa-b200-gnb-net
+        ipam:
+            config:
+                - subnet: 192.168.68.192/26
+        driver_opts:
+            com.docker.network.bridge.name: "sa-gnb-net"
--- a/ci-scripts/yaml_files/sa_e1_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_e1_b200_gnb/docker-compose.yml
@@ -1,22 +1,17 @@
 services:
    gnb_cucp:
        image: oai-gnb:latest
+        privileged: true
        container_name: sa-cucp-gnb
-        cap_drop:
-            - ALL
        ulimits:
          core: -1 # for core dumps
        environment:
-            USE_ADDITIONAL_OPTIONS: --sa
-                                    --telnetsrv --telnetsrv.listenport 9090 --telnetsrv.shrmod ci
-                                    --log_config.global_log_options level,nocolor,time,line_num,function
+            USE_ADDITIONAL_OPTIONS: --sa --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function
        volumes:
            - ../../conf_files/gnb-cucp.sa.f1.quectel.conf:/opt/oai-gnb/etc/gnb.conf
-        # for performance reasons, we use host mode: in bridge mode, we have
-        # unacceptable DL TCP performance. However, the whole point of
-        # containerization is to not be in host mode, so update this to macvlan
-        # later.
-        network_mode: "host"
+        networks:
+            public_net:
+                ipv4_address: 192.168.68.194
        healthcheck:
            # pgrep does NOT work
            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
@@ -26,24 +21,17 @@ services:

    gnb_cuup:
        image: oai-nr-cuup:latest
+        privileged: true
        container_name: sa-cuup-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
        ulimits:
          core: -1 # for core dumps
        environment:
-            USE_ADDITIONAL_OPTIONS: --sa
-                                    --log_config.global_log_options level,nocolor,time,line_num,function
+            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time,line_num,function
        volumes:
            - ../../conf_files/gnb-cuup.sa.f1.quectel.conf:/opt/oai-gnb/etc/gnb.conf
-        # for performance reasons, we use host mode: in bridge mode, we have
-        # unacceptable DL TCP performance. However, the whole point of
-        # containerization is to not be in host mode, so update this to macvlan
-        # later.
-        network_mode: "host"
+        networks:
+            public_net:
+                ipv4_address: 192.168.68.196
        healthcheck:
            # pgrep does NOT work
            test: /bin/bash -c "ps aux | grep -v grep | grep -c nr-cuup"
@@ -53,12 +41,8 @@ services:

    gnb_du_tdd:
        image: oai-gnb:latest
+        privileged: true
        container_name: sa-du-b200-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-            - IPC_LOCK
        ulimits:
          core: -1 # for core dumps
        environment:
@@ -66,19 +50,16 @@ services:
            USE_ADDITIONAL_OPTIONS: --sa
                                    --RUs.[0].sdr_addrs serial=30C51D4
                                    --continuous-tx -E
-                                    --telnetsrv --telnetsrv.listenport 9091 --telnetsrv.shrmod ci
+                                    --telnetsrv --telnetsrv.shrmod ci
                                    --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 1
                                    --RUs.[0].att_rx 14 --RUs.[0].att_tx 14
                                    --log_config.global_log_options level,nocolor,time,line_num,function
-        devices:
-            - /dev/bus/usb/:/dev/bus/usb/
        volumes:
            - ../../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
-        # for performance reasons, we use host mode: in bridge mode, we have
-        # unacceptable DL TCP performance. However, the whole point of
-        # containerization is to not be in host mode, so update this to macvlan
-        # later.
-        network_mode: "host"
+            - /dev:/dev
+        networks:
+            public_net:
+                ipv4_address: 192.168.68.195
        #entrypoint: /bin/bash -c "sleep infinity"
        healthcheck:
            # pgrep does NOT work
@@ -86,3 +67,12 @@ services:
            interval: 10s
            timeout: 5s
            retries: 5
+
+networks:
+    public_net:
+        name: sa-b200-gnb-net
+        ipam:
+            config:
+                - subnet: 192.168.68.192/26
+        driver_opts:
+            com.docker.network.bridge.name: "sa-gnb-net"
--- a/Show More
+++ b/Show More