Get handover working for FDD too

UE handles handover between gNB-DUs with different carrier frequencies
gNB-CU sends the ue_context_release_command to the source gNB-DU and receives the ue_context_release_complete from source gNB-DU
2026-07-21 00:20:30 +00:00 · 2024-06-12 11:19:48 +01:00 · 2024-06-12 11:19:47 +01:00 · 2024-06-12 11:19:47 +01:00 · 2024-06-12 11:19:47 +01:00 · 2024-06-12 11:19:47 +01:00
384 changed files with 11473 additions and 6074 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,11 +158,16 @@ endif()
 # add autotools definitions that were maybe used!
 add_definitions("-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP")

-set(commonOpts "-pipe -fPIC -Wall -fno-strict-aliasing")
+# we need -rdynamic to incorporate all symbols in shared objects, see man page
+set(commonOpts "-pipe -fPIC -Wall -fno-strict-aliasing -rdynamic")
 # GNU C/C++ Compiler might throw many warnings without packed-bitfield-compat, see man page
-# also, we need -rdynamic to incorporate all symbols in shared objects, again, see man page
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  set(commonOpts "${commonOpts} -Wno-packed-bitfield-compat -rdynamic")
+  set(commonOpts "${commonOpts} -Wno-packed-bitfield-compat")
+endif()
+# clang: suppress complaints about unused command line argument (-rdynamic only
+# used during linking)
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  set(commonOpts "${commonOpts} -Wno-unused-command-line-argument")
 endif()

 set(CMAKE_C_FLAGS
@@ -279,6 +284,7 @@ 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)
@@ -654,6 +660,20 @@ add_library(UTIL
  ${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)
+  target_sources(UTIL PRIVATE common/utils/LOG/lttng-tp.c)
+  target_link_libraries(UTIL PUBLIC lttng-ust)
+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)

 set(SECURITY_SRC
@@ -796,7 +816,6 @@ 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
@@ -1453,6 +1472,7 @@ 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
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,22 +5,26 @@ 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 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.
+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.
      * 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.

-## Coding Styles ##
+# License #

-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.
+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.
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@
  <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 #
--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -30,11 +30,11 @@ global:
    nrpsbchsim: dedale
    nrprachsim: dedale
    nrpucchsim: dedale
-    nrulschsim: theseus
-    nrulsim3gpp: theseus
-    nrulsimmimo: theseus
-    nrulsimmisc: theseus
-    nrulsimscfdma: theseus
-    polartest: theseus
-    smallblocktest: theseus
-    ulsim: theseus
+    nrulschsim: demophon
+    nrulsim3gpp: demophon
+    nrulsimmimo: demophon
+    nrulsimmisc: demophon
+    nrulsimscfdma: demophon
+    polartest: demophon
+    smallblocktest: demophon
+    ulsim: demophon
--- a/ci-scripts/as_ue/aw2s-multi-00102-2x2.cfg
+++ b/ci-scripts/as_ue/aw2s-multi-00102-2x2.cfg
@@ -25,8 +25,8 @@ allow dynamic UE creation from remote API */
      rf_port: 0,
      bandwidth: 20,
      band: 78,
-      dl_nr_arfcn:627360,
-      ssb_nr_arfcn:627360,
+      dl_nr_arfcn:630048,
+      ssb_nr_arfcn:630048,
      subcarrier_spacing: 30,
      n_antenna_dl: N_ANTENNA_DL,
      n_antenna_ul: N_ANTENNA_UL,
@@ -39,7 +39,7 @@ allow dynamic UE creation from remote API */
  ue_list: [
    {
      "ue_id" : 1,
-      "imsi": "208970000000111",
+      "imsi": "001020000000001",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -54,7 +54,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 2,
-      "imsi": "208970000000112",
+      "imsi": "001020000000002",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -69,7 +69,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 3,
-      "imsi": "208970000000113",
+      "imsi": "001020000000003",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -84,7 +84,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 4,
-      "imsi": "208970000000114",
+      "imsi": "001020000000004",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -99,7 +99,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 5,
-      "imsi": "208970000000115",
+      "imsi": "001020000000005",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -114,7 +114,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 6,
-      "imsi": "208970000000116",
+      "imsi": "001020000000006",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -129,7 +129,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 7,
-      "imsi": "208970000000100",
+      "imsi": "001020000000007",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -144,7 +144,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 8,
-      "imsi": "208970000000102",
+      "imsi": "001020000000008",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -159,7 +159,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 9,
-      "imsi": "208970000000103",
+      "imsi": "001020000000009",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -174,7 +174,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 10,
-      "imsi": "208970000000104",
+      "imsi": "001020000000010",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -189,7 +189,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 11,
-      "imsi": "208970000000110",
+      "imsi": "001020000000011",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -204,7 +204,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 12,
-      "imsi": "208970000000105",
+      "imsi": "001020000000012",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -219,7 +219,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 13,
-      "imsi": "208970000000106",
+      "imsi": "001020000000013",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -234,7 +234,7 @@ allow dynamic UE creation from remote API */
    },
        {
      "ue_id" : 14,
-      "imsi": "208970000000107",
+      "imsi": "001020000000014",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -249,7 +249,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 15,
-      "imsi": "208970000000108",
+      "imsi": "001020000000015",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
@@ -264,7 +264,7 @@ allow dynamic UE creation from remote API */
    },
    {
      "ue_id" : 16,
-      "imsi": "208970000000109",
+      "imsi": "001020000000016",
      "K": "fec86ba6eb707ed08905757b1bb44b8f",
      "sim_algo":"milenage",
      "op": "1006020f0a478bf6b699f15c062e42b3",
--- a/ci-scripts/as_ue/aw2s-multi-20897.cfg
+++ b/ci-scripts/as_ue/aw2s-multi-20897.cfg
@@ -1,280 +0,0 @@
-/* UE simulator configuration file version 2021-06-17
- * LTE / 5G Non StandAlone
- * Copyright (C) 2019-2021 Amarisoft
- */
-{
-#define N_ANTENNA_DL 2
-#define TDD 1
-
-log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
-log_filename: "/tmp/ue.log",
-
-/* Enable remote API and Web interface */
-com_addr: "0.0.0.0:9002",
-
-include "rf_driver/1chan.cfg",
-
-/* If true, allow the simulation of several UEs at the same time and
-allow dynamic UE creation from remote API */
-                    
-  cell_groups: [{
-      group_type: "nr",
-      multi_ue: true,
-      cells: [{
-      rf_port: 0,
-      bandwidth: 20,
-      band: 78,
-      dl_nr_arfcn:627360,
-      ssb_nr_arfcn:627360,
-      subcarrier_spacing: 30,
-      n_antenna_dl: N_ANTENNA_DL,
-      n_antenna_ul: 1,
-      rx_to_tx_latency:2,
-    }],
-  }],
-
-  /* UE capabilities */
-  /* USIM data */     
-  ue_list: [
-    {
-      "ue_id" : 1,
-      "imsi": "208970000000111",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 2,
-      "imsi": "208970000000112",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 3,
-      "imsi": "208970000000113",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 4,
-      "imsi": "208970000000114",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 5,
-      "imsi": "208970000000115",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 6,
-      "imsi": "208970000000116",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 7,
-      "imsi": "208970000000117",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 8,
-      "imsi": "208970000000118",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 9,
-      "imsi": "208970000000119",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 10,
-      "imsi": "208970000000120",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 11,
-      "imsi": "208970000000121",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 12,
-      "imsi": "208970000000122",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 13,
-      "imsi": "208970000000123",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-        {
-      "ue_id" : 14,
-      "imsi": "208970000000124",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 15,
-      "imsi": "208970000000125",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
-    {
-      "ue_id" : 16,
-      "imsi": "208970000000126",
-      "K": "fec86ba6eb707ed08905757b1bb44b8f",
-      "sim_algo":"milenage",
-      "op": "1006020f0a478bf6b699f15c062e42b3",
-
-      as_release: 15,
-      ue_category: "nr",
-      apn:"oai",
-      attach_pdn_type:"ipv4",
-      default_nssai: [ { sst: 1, }, ],
-      default_pdu_session_snssai: { sst: 1, },
-      tun_setup_script: "ue-ifup",
-    },
- ],
-}
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -97,7 +97,7 @@ ltebox-nepes:

 amarisoft_ue:
  Host: amariue
-  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-20897-2x2.cfg &
+  InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_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_1:
  Host: amariue
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -44,6 +44,9 @@ 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", ""]
+

 def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 	if ocUserName == '' or ocPassword == '' or ocProjectName == '':
@@ -65,6 +68,51 @@ def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 def OC_logout(cmd):
 	cmd.run(f'oc logout')

+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')
+	ret = cmd.run(f'helm install --wait --timeout 60s oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.')
+	if ret.returncode != 0:
+		logging.error('OC OAI CN5G: Deployment failed')
+		OC_logout(cmd)
+		return False, CONST.OC_PROJECT_FAIL
+	report = cmd.run('oc get pods')
+	OC_logout(cmd)
+	return True, report
+
+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')
+	cmd.run(f'mkdir -p {path}/logs')
+	logging.debug('OC OAI CN5G: Collecting log files to workspace')
+	cmd.run(f'oc describe pod &> {path}/logs/describe-pods-post-test.log')
+	cmd.run(f'oc get pods.metrics.k8s &> {path}/logs/nf-resource-consumption.log')
+	for ii, ci in zip(CN_IMAGES, CN_CONTAINERS):
+		podName = cmd.run(f"oc get pods | grep {ii} | awk \'{{print $1}}\'").stdout.strip()
+		if not podName:
+			logging.debug(f'{ii} pod not found!')
+		else:
+			cmd.run(f'oc logs -f {podName} {ci} &> {path}/logs/{ii}.log &')
+	cmd.run(f'cd {path}/logs && zip -r -qq test_logs_CN.zip *.log')
+	cmd.copyin(f'{path}/logs/test_logs_CN.zip','test_logs_CN.zip')
+	ret = cmd.run('helm uninstall --wait --timeout 60s oai5gcn')
+	if ret.returncode != 0:
+		logging.error('OC OAI CN5G: Undeployment failed')
+		cmd.run('helm uninstall --wait --timeout 60s oai5gcn')
+		OC_logout(cmd)
+		return False, CONST.OC_PROJECT_FAIL
+	report = cmd.run('oc get pods')
+	OC_logout(cmd)
+	return True, report
+
 class Cluster:
 	def __init__(self):
 		self.eNBIPAddress = ""
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -412,10 +412,10 @@ class Containerize():
 			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.2023.11.28.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2024.05.23.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.2023.11.28.tar.gz')
+				cmd.run('rm -f nvipc_src.2024.05.23.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}/")
@@ -668,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 = 'develop'
+					baseTag = 'ci-temp'
 		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')
@@ -688,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:develop ctest --output-on-failure --no-label-summary -j$(nproc)')
-		cmd.run(f'docker rmi ran-unittests:develop')
+		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}')
 		build_log_name = f'build_log_{self.testCase_id}'
 		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
 		cmd.close()
@@ -897,9 +897,7 @@ class Containerize():
 		mySSH.command(f'docker compose --file ci-docker-compose.yml up -d -- {svcName}', '\$', 30)

 		# Checking Status
-		grep = ''
-		if svcName != '': grep = f' | grep -A3 --color=never {svcName}'
-		mySSH.command(f'docker compose --file ci-docker-compose.yml config {grep}', '\$', 5)
+		mySSH.command(f'docker compose --file ci-docker-compose.yml config {svcName}', '\$', 5)
 		result = re.search('container_name: (?P<container_name>[a-zA-Z0-9\-\_]+)', mySSH.getBefore())
 		unhealthyNb = 0
 		healthyNb = 0
@@ -1021,18 +1019,18 @@ class Containerize():
 		for s in allServices:
 			# outputs the hash if the container is running
 			ret = mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml ps --all --quiet -- {s}')
-			running = ret.stdout.splitlines()
-			logging.debug(f'running services: {running}')
+			c = ret.stdout
+			logging.debug(f'running service {s} with container id {c}')
 			if ret.stdout != "" and ret.returncode == 0: # something is running for that service
-				services.append(s)
-		logging.info(f'stopping services {services}')
+				services.append((s, c))
+		logging.info(f'stopping services {[s for s, _ in services]}')

 		mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml stop -t3')
 		copyin_res = True
-		for svcName in services:
+		for service_name, container_id in services:
 			# head -n -1 suppresses the final "X exited with status code Y"
-			filename = f'{svcName}-{HTML.testCase_id}.log'
-			mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml logs --no-log-prefix -- {svcName} &> {lSourcePath}/cmake_targets/log/{filename}')
+			filename = f'{service_name}-{HTML.testCase_id}.log'
+			mySSH.run(f'docker logs {container_id} &> {lSourcePath}/cmake_targets/log/{filename}')
 			copyin_res = mySSH.copyin(f'{lSourcePath}/cmake_targets/log/{filename}', f'{filename}') and copyin_res

 		mySSH.run(f'docker compose -f {yamlDir}/ci-docker-compose.yml down -v')
@@ -1043,7 +1041,7 @@ class Containerize():
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
 			self.exitStatus = 1
 		# use function for UE log analysis, when oai-nr-ue container is used
-		elif 'oai-nr-ue' in services or 'lte_ue0' in services:
+		elif any(service_name == 'oai-nr-ue' or service_name == 'lte_ue0' for service_name, _ in services):
 			self.exitStatus == 0
 			logging.debug(f'Analyzing UE logfile {filename}')
 			logStatus = cls_oaicitest.OaiCiTest().AnalyzeLogFile_UE(f'{filename}', HTML, RAN)
@@ -1053,12 +1051,12 @@ class Containerize():
 			else:
 				HTML.CreateHtmlTestRow('UE log Analysis', 'OK', CONST.ALL_PROCESSES_OK)
 		else:
-			for svcName in services:
-				if svcName == 'nv-cubb':
+			for service_name, _ in services:
+				if service_name == 'nv-cubb':
 					msg = 'Undeploy PNF/Nvidia CUBB'
 					HTML.CreateHtmlTestRow(msg, 'OK', CONST.ALL_PROCESSES_OK)
 				else:
-					filename = f'{svcName}-{HTML.testCase_id}.log'
+					filename = f'{service_name}-{HTML.testCase_id}.log'
 					logging.debug(f'\u001B[1m Analyzing logfile {filename}\u001B[0m')
 					logStatus = RAN.AnalyzeLogFile_eNB(filename, HTML, self.ran_checkers)
 					if (logStatus < 0):
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -129,10 +129,10 @@ def Iperf_analyzeV3BIDIRJson(filename):
 	with open(filename) as file:
 		filename = json.load(file)
 		try:
-			sender_bitrate_dl   = round(filename['end']['streams'][0]['sender']['bits_per_second']/1000000,2)
-			receiver_bitrate_dl = round(filename['end']['streams'][0]['receiver']['bits_per_second']/1000000,2)
-			sender_bitrate_ul   = round(filename['end']['streams'][1]['sender']['bits_per_second']/1000000,2)
-			receiver_bitrate_ul = round(filename['end']['streams'][1]['receiver']['bits_per_second']/1000000,2)
+			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!')

@@ -818,10 +818,11 @@ class OaiCiTest():
 			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 * 1.5
 				if runIperf3Server:
-					cmd_svr.run(f'{svr.getCmdPrefix()} nohup iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} &', timeout=iperf_time*1.5)
+					cmd_svr.run(f'{svr.getCmdPrefix()} nohup timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} &', timeout=t)
 				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)
+				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)
 				if svr.getHost() == 'localhost':
 					cmd_ue.run(f'mkdir -p {logPath}')
 					cmd_ue.run(f'cp /tmp/{client_filename} {logPath}/{client_filename}')
--- a/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2.100prb.usrpn310.conf
@@ -204,8 +204,8 @@ MACRLCs = (
        bler_target_upper = 20.0;
        bler_target_lower = 10.0;
        max_ul_rb_index   = 27;
-        puSch10xSnr     =  190;
-        puCch10xSnr     =  160;
+        puSch10xSnr     =  250;
+        puCch10xSnr     =  230;
        }  
 );

@@ -224,8 +224,8 @@ RUs = (
       local_rf       = "yes"
         nb_tx          = 2
         nb_rx          = 2
-         att_tx         = 10
-         att_rx         = 5;
+         att_tx         = 12
+         att_rx         = 0;
         bands          = [38];
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
--- a/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2_tm2.100prb.usrpn310.conf
@@ -204,8 +204,8 @@ MACRLCs = (
        bler_target_upper = 20.0;
        bler_target_lower = 10.0;
        max_ul_rb_index   = 27;
-        puSch10xSnr     =  190;
-        puCch10xSnr     =  160;
+        puSch10xSnr     =  280;
+        puCch10xSnr     =  250;
        }  
 );

@@ -224,8 +224,8 @@ RUs = (
       local_rf       = "yes"
         nb_tx          = 2
         nb_rx          = 2
-         att_tx         = 10
-         att_rx         = 5;
+         att_tx         = 18
+         att_rx         = 0;
         bands          = [38];
         max_pdschReferenceSignalPower = -27;
         max_rxgain                    = 75;
--- 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 = "192.168.68.194";
-    remote_s_address = "192.168.68.195";
+    local_s_address = "127.0.0.4";
+    remote_s_address = "127.0.0.5";
    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              = "192.168.68.194";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
        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 = "192.168.68.194";
-    remote_s_address = "192.168.68.195";
+    local_s_address = "127.0.0.4";
+    remote_s_address = "127.0.0.5";
    local_s_portc   = 501;
    local_s_portd   = 2153;
    remote_s_portc  = 500;
@@ -46,16 +46,16 @@ gNBs =
    (
      {
        type = "cp";
-        ipv4_cucp = "192.168.68.194";
+        ipv4_cucp = "127.0.0.4";
        port_cucp = 38462;
-        ipv4_cuup = "192.168.68.196";
+        ipv4_cuup = "127.0.0.6";
        port_cuup = 38462;
      }
    )

    NETWORK_INTERFACES :
    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
    };
  }
 );
--- 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 = "192.168.68.196";
-    remote_s_address = "192.168.68.195";
+    local_s_address = "127.0.0.6";
+    remote_s_address = "127.0.0.5";
    local_s_portc   = 501;
    local_s_portd   = 2153;
    remote_s_portc  = 500;
@@ -40,15 +40,15 @@ gNBs =
    (
      {
        type = "up";
-        ipv4_cucp = "192.168.68.194";
-        ipv4_cuup = "192.168.68.196";
+        ipv4_cucp = "127.0.0.4";
+        ipv4_cuup = "127.0.0.6";
      }
    )

    NETWORK_INTERFACES :
    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.196";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.196";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
  }
--- 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 = "192.168.68.195";
-    remote_n_address = "192.168.68.194";
+    local_n_address = "127.0.0.5";
+    remote_n_address = "127.0.0.4";
    local_n_portc   = 500;
    local_n_portd   = 2153;
    remote_n_portc  = 501;
--- 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 = "192.168.68.195";
-    remote_n_address = "192.168.68.194";
+    local_n_address = "127.0.0.5";
+    remote_n_address = "127.0.0.4";
    local_n_portc   = 500;
    local_n_portd   = 2153;
    remote_n_portc  = 501;
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -195,8 +195,8 @@ gNBs =

    NETWORK_INTERFACES :
    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.131";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.131";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.130";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.130";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };

--- 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 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
+      # this is 2150.43 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 MHz
-      dl_absoluteFrequencyPointA                                    = 430002;
+      # this is 2150.43 MHz
+      dl_absoluteFrequencyPointA                                    = 430086;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
@@ -53,8 +53,8 @@ gNBs =
  #uplinkConfigCommon
     #frequencyInfoUL
      ul_frequencyBand                                              = 66;
-      # this is 1750 MHz
-      ul_absoluteFrequencyPointA                                    = 350002;
+      # this is 1750.43 MHz
+      ul_absoluteFrequencyPointA                                    = 350086;
      #scs-SpecificCarrierList
      ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
--- a/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
@@ -167,19 +167,12 @@ gNBs =


    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.61.132";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    amf_ip_address = ({ ipv4 = "192.168.61.132"; });


    NETWORK_INTERFACES :
    {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.61.129/26";
-        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.61.129/26";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
@@ -164,20 +164,11 @@ gNBs = (


  ////////// AMF parameters:
-  amf_ip_address = (
-  {
-    ipv4       = "192.168.61.132";
-    ipv6       = "192:168:30::17";
-    active     = "yes";
-    preference = "ipv4";
-  }
-  );
+  amf_ip_address = ({ ipv4 = "192.168.61.132"; });

  NETWORK_INTERFACES :
  {
-    GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
    GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.61.129/24";
-    GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
    GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.61.129/24";
    GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
  }
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
@@ -13,7 +13,7 @@ gNBs =
    // 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;}); });
+    plmn_list = ({ mcc = 001; mnc = 02; mnc_length = 2; snssaiList = ({sst = 1;}); });

    nr_cellid = 12345678L

--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
@@ -0,0 +1,321 @@
+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";
+});
+
+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;
+  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.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              = "192.168.68.194";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };

--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -16,7 +16,7 @@ gNBs =

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  0x1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst =0x1; }) });
+    plmn_list = ({ mcc = 001; mnc = 02; mnc_length = 2; snssaiList = ({ sst =0x1; }) });

    nr_cellid = 12345678L

@@ -35,10 +35,10 @@ gNBs =
 #  downlinkConfigCommon
    #frequencyInfoDL
      # this is 3410.4 MHz => 301 REs from PointA 25 PRBs + 1 RE
-      absoluteFrequencySSB                                             = 627360;
+      absoluteFrequencySSB                                             = 630048;
      dl_frequencyBand                                                 = 78;
      # this is 3410.4 - (51*12*30e-3/2) = 3401.22 MHz
-      dl_absoluteFrequencyPointA                                       = 626748;
+      dl_absoluteFrequencyPointA                                       = 629436;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
@@ -30,7 +30,7 @@ gNBs =
      absoluteFrequencySSB                                             = 620736;
      dl_frequencyBand                                                 = 78;
      # this is 3300.30 MHz
-      dl_absoluteFrequencyPointA                                       = 620052;
+      dl_absoluteFrequencyPointA                                       = 620020;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -161,8 +161,8 @@ gNBs =

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

--- a/ci-scripts/conf_files/neighbour-config.conf
+++ b/ci-scripts/conf_files/neighbour-config.conf
@@ -0,0 +1,76 @@
+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/epc.py
+++ b/ci-scripts/epc.py
@@ -298,39 +298,18 @@ class EPCManagement():
 						html_cell += '(' + res4.group('date') + ')'
 					html_cell += '\n'
 		elif re.match('OC-OAI-CN5G', self.Type, re.IGNORECASE):
-			self.testCase_id = HTML.testCase_id
-			imageNames = ["oai-nrf", "oai-amf", "oai-smf", "oai-spgwu-tiny", "oai-ausf", "oai-udm", "oai-udr", "mysql","oai-traffic-server"]
-			logging.debug('Deploying OAI CN5G on Openshift Cluster')
-			lIpAddr = self.IPAddress
-			lSourcePath = "/opt/oai-cn5g-fed-develop-2023-04-28-20897"
-			succeeded = OC.OC_login(mySSH, self.OCUserName, self.OCPassword, OC.CI_OC_CORE_NAMESPACE)
+			succeeded, report = OC.OC_deploy_CN(mySSH, self.OCUserName, self.OCPassword)
 			if not succeeded:
-				logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			for ii in imageNames:
-					mySSH.run(f'helm uninstall {ii}', reportNonZero=False)
-			mySSH.run(f'helm spray {lSourcePath}/ci-scripts/charts/oai-5g-basic/.')
-			ret = mySSH.run(f'oc get pods', silent=True)
-			if ret.stdout.count('Running') != 9:
-				logging.error('\u001B[1m Deploying 5GCN Failed using helm chart on OC Cluster\u001B[0m')
-				for ii in imageNames:
-					mySSH.run('helm uninstall '+ ii)
-				ret = mySSH.run(f'oc get pods')
-				if re.search('No resources found', ret.stdout):
-					logging.debug('All pods uninstalled')
-					OC.OC_logout(mySSH)
-					mySSH.close()
-					HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PROJECT_FAIL)
-					return False
-			ret = mySSH.run(f'oc get pods', silent=True)
-			for line in ret.stdout.split('\n')[1:]:
+				HTML.CreateHtmlTestRow('N/A', 'KO', report)
+				HTML.CreateHtmlTabFooter(False)
+				mySSH.close()
+				sys.exit("OC OAI CN5G: CN deployment failed!")
+			for line in report.stdout.split('\n')[1:]:
 				columns = line.strip().split()
 				name = columns[0]
 				status = columns[2]
 				html_cell += status + '    ' + name
 				html_cell += '\n'
-			OC.OC_logout(mySSH)
 		else:
 			logging.error('This option should not occur!')
 		mySSH.close()
@@ -562,8 +541,6 @@ class EPCManagement():
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)

 	def Terminate5GCN(self, HTML):
-		imageNames = ["mysql", "oai-nrf", "oai-amf", "oai-smf", "oai-spgwu-tiny", "oai-ausf", "oai-udm", "oai-udr", "oai-traffic-server"]
-		containerInPods = ["", "-c nrf", "-c amf", "-c smf", "-c spgwu", "-c ausf", "-c udm", "-c udr", ""]
 		mySSH = cls_cmd.getConnection(self.IPAddress)
 		message = ''
 		if re.match('ltebox', self.Type, re.IGNORECASE):
@@ -598,36 +575,13 @@ 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):
-			logging.debug('Terminating OAI CN5G on Openshift Cluster')
-			lIpAddr = self.IPAddress
-			lSourcePath = self.SourceCodePath
-			mySSH.run(f'rm -Rf {lSourcePath}/logs')
-			mySSH.run(f'mkdir -p {lSourcePath}/logs')
-			logging.debug('OC OAI CN5G - Collecting Log files to workspace')
-			succeeded = OC.OC_login(mySSH, self.OCUserName, self.OCPassword, OC.CI_OC_CORE_NAMESPACE)
+			succeeded, report = OC.OC_undeploy_CN(mySSH, self.OCUserName, self.OCPassword)
 			if not succeeded:
-				logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
-				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
-				return False
-			mySSH.run(f'oc describe pod &> {lSourcePath}/logs/describe-pods-post-test.log')
-			mySSH.run(f'oc get pods.metrics.k8s &> {lSourcePath}/logs/nf-resource-consumption.log')
-			for ii, ci in zip(imageNames, containerInPods):
-			       podName = mySSH.run(f"oc get pods | grep {ii} | awk \'{{print $1}}\'").stdout.strip()
-			       if not podName:
-				       logging.debug(f'{ii} pod not found!')
-				       HTML.CreateHtmlTestRow(self.Type, 'KO', CONST.INVALID_PARAMETER)
-				       HTML.CreateHtmlTabFooter(False)
-			       mySSH.run(f'oc logs -f {podName} {ci} &> {lSourcePath}/logs/{ii}.log &')
-			       mySSH.run(f'helm uninstall {ii}')
-			       podName = ''
-			mySSH.run(f'cd {lSourcePath}/logs && zip -r -qq test_logs_CN.zip *.log')
-			mySSH.copyin(f'{lSourcePath}/logs/test_logs_CN.zip','test_logs_CN.zip')
-			ret = mySSH.run(f'oc get pods', silent=True)
-			res = re.search(f'No resources found in {OC.CI_OC_CORE_NAMESPACE} namespace.', ret.stdout)
-			if res is not None:
-			       logging.debug('OC OAI CN5G components uninstalled')
-			       message = 'OC OAI CN5G components uninstalled'
-			OC.OC_logout(mySSH)
+				HTML.CreateHtmlTestRow('N/A', 'KO', report)
+				HTML.CreateHtmlTabFooter(False)
+				sys.exit("OC OAI CN5G: CN undeployment failed!")
+			else:
+				message = report.stdout
 		else:
 			logging.error('This should not happen!')
 		mySSH.close()
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
@@ -31,15 +31,15 @@
 111111
 100000
 010010
-030101
+031101
 010001
 000001
-050000
-050001
-070000
-070001
+051000
+051001
+071000
+071001
 010010
-030201
+031201

 </TestCaseRequestedList>
  <TestCaseExclusionList></TestCaseExclusionList>
@@ -65,7 +65,7 @@
    <command>sudo cpupower idle-set -E</command>
  </testCase>

-  <testCase id="030101">
+  <testCase id="031101">
    <class>Deploy_Object</class>
    <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>
    <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
@@ -85,7 +85,7 @@
    <id>up2</id>
  </testCase>

-  <testCase id="050000">
+  <testCase id="051000">
    <class>Ping</class>
    <desc>Ping: 20 pings</desc>
    <id>up2</id>
@@ -94,7 +94,7 @@
    <ping_rttavg_threshold>60</ping_rttavg_threshold>
  </testCase>

- <testCase id="050001">
+ <testCase id="051001">
    <class>Ping</class>
    <desc>Ping: 100 pings, size 1024</desc>
    <id>up2</id>
@@ -103,7 +103,7 @@
    <ping_rttavg_threshold>60</ping_rttavg_threshold>
   </testCase>

-  <testCase id="070000">
+  <testCase id="071000">
    <class>Iperf</class>
    <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
    <iperf_args>-u -b 1M -t 60 -R</iperf_args>
@@ -113,7 +113,7 @@
    <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
   </testCase>

-   <testCase id="070001">
+   <testCase id="071001">
     <class>Iperf</class>
     <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 7M -t 60</iperf_args>
@@ -129,7 +129,7 @@
    <id>up2</id>
  </testCase>

-  <testCase id="030201">
+  <testCase id="031201">
    <class>Undeploy_Object</class>
    <desc>Undeploy gNB</desc>
    <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
--- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml
+++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
@@ -48,9 +48,9 @@
    000100
    000010
    000020
-    002016
    000030
    000040
+    002016
    000200
    003000
    004000
--- a/ci-scripts/xml_files/container_sa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml
@@ -165,7 +165,7 @@

  <testCase id="070003">
    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(single-ue profile)</desc>
    <iperf_args>-t 30 -R</iperf_args>
    <id>idefix</id>
    <svr_id>sabox-nepes</svr_id>
@@ -174,7 +174,7 @@

  <testCase id="070004">
    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(single-ue profile)</desc>
    <iperf_args>-t 30</iperf_args>
    <id>idefix</id>
    <svr_id>sabox-nepes</svr_id>
@@ -185,14 +185,14 @@
    <class>Custom_Command</class>
    <desc>Trigger Reestablishment</desc>
    <node>ofqot</node>
-    <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>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_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 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <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_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
@@ -157,7 +157,7 @@

  <testCase id="370003">
    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(single-ue profile)</desc>
    <iperf_args>-t 30 -R</iperf_args>
    <id>idefix</id>
    <svr_id>sabox-nepes</svr_id>
@@ -166,7 +166,7 @@

  <testCase id="370004">
    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(single-ue profile)</desc>
    <iperf_args>-t 30</iperf_args>
    <id>idefix</id>
    <svr_id>sabox-nepes</svr_id>
@@ -177,14 +177,14 @@
    <class>Custom_Command</class>
    <desc>Trigger Reestablishment (on DU)</desc>
    <node>ofqot</node>
-    <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>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_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 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <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_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
@@ -189,7 +189,7 @@

  <testCase id="170003">
    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(single-ue profile)</desc>
    <iperf_args>-t 30 -R</iperf_args>
    <id>idefix</id>
    <svr_id>sabox-nepes</svr_id>
@@ -198,7 +198,7 @@

  <testCase id="170004">
    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(single-ue profile)</desc>
    <iperf_args>-t 30</iperf_args>
    <id>idefix</id>
    <svr_id>sabox-nepes</svr_id>
@@ -209,14 +209,14 @@
    <class>Custom_Command</class>
    <desc>Trigger Reestablishment (on DU)</desc>
    <node>ofqot</node>
-    <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>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_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 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <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_fail>yes</command_fail>
  </testCase>

--- a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
@@ -159,7 +159,7 @@

  <testCase id="270003">
    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (DL/TCP)(30 sec)(single-ue profile)</desc>
    <iperf_args>-t 30 -R</iperf_args>
    <id>idefix</id>
    <svr_id>sabox-nepes</svr_id>
@@ -168,7 +168,7 @@

  <testCase id="270004">
    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc>
+    <desc>iperf (UL/TCP)(30 sec)(single-ue profile)</desc>
    <iperf_args>-t 30</iperf_args>
    <id>idefix</id>
    <svr_id>sabox-nepes</svr_id>
@@ -179,14 +179,14 @@
    <class>Custom_Command</class>
    <desc>Trigger Reestablishment</desc>
    <node>ofqot</node>
-    <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>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_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 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <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_fail>yes</command_fail>
  </testCase>

--- a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    cassandra:
        image: cassandra:2.1
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    cassandra:
        image: cassandra:2.1
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    oai_enb0:
        image: oaisoftwarealliance/oai-enb:develop
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    cassandra:
        image: cassandra:2.1
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    cassandra:
        image: cassandra:2.1
--- a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    oai_enb0:
        image: oaisoftwarealliance/oai-enb:develop
--- a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    oai_enb0:
        image: oaisoftwarealliance/oai-enb:develop
--- a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    cassandra:
        image: cassandra:2.1
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
    mysql:
        container_name: "rfsim5g-mysql"
@@ -85,8 +84,9 @@ 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,8 +105,9 @@ 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
@@ -129,8 +130,12 @@ 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,6 +148,8 @@ services:
        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
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
    mysql:
        container_name: "rfsim5g-mysql"
@@ -83,8 +82,9 @@ 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,8 +102,12 @@ 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:
@@ -111,6 +115,8 @@ 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/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
    mysql:
        container_name: "l2sim-mysql"
@@ -83,8 +82,9 @@ 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,8 +103,9 @@ 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
@@ -119,14 +120,20 @@ 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
@@ -237,12 +237,18 @@ 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:
--- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
    mysql:
        container_name: "rfsim5g-mysql"
@@ -83,8 +82,9 @@ 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,8 +102,12 @@ 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 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
        depends_on:
@@ -111,6 +115,8 @@ 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:
@@ -120,8 +126,12 @@ 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 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
        depends_on:
@@ -129,6 +139,8 @@ services:
        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:
@@ -138,8 +150,12 @@ 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 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
        depends_on:
@@ -147,6 +163,8 @@ services:
        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:
@@ -156,8 +174,12 @@ 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 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
        depends_on:
@@ -165,6 +187,8 @@ services:
        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:
@@ -174,8 +198,12 @@ 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 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
        depends_on:
@@ -183,6 +211,8 @@ services:
        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:
@@ -192,8 +222,12 @@ 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 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
        depends_on:
@@ -201,6 +235,8 @@ services:
        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:
@@ -210,8 +246,12 @@ 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 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
        depends_on:
@@ -219,6 +259,8 @@ services:
        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:
@@ -228,8 +270,12 @@ 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 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
        depends_on:
@@ -237,6 +283,8 @@ services:
        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:
@@ -246,8 +294,12 @@ 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 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
        depends_on:
@@ -255,6 +307,8 @@ services:
        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:
@@ -264,8 +318,12 @@ 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 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
        depends_on:
@@ -273,6 +331,8 @@ services:
        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_24prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
    mysql:
        container_name: "rfsim5g-mysql"
@@ -83,8 +82,9 @@ 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,8 +102,12 @@ 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:
@@ -111,6 +115,8 @@ 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
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
    mysql:
        container_name: "rfsim5g-mysql"
@@ -83,8 +82,9 @@ 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,8 +103,12 @@ 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:
@@ -112,6 +116,8 @@ 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,9 @@
-version: '3.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,13 +16,19 @@ 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
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
    mysql:
        container_name: "rfsim5g-mysql"
@@ -67,8 +66,9 @@ 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,8 +93,9 @@ 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
@@ -121,8 +122,9 @@ 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
@@ -152,8 +154,9 @@ 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
@@ -183,8 +186,9 @@ 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
@@ -211,8 +215,9 @@ 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
@@ -242,8 +247,9 @@ 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
@@ -273,8 +279,12 @@ 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
@@ -285,6 +295,8 @@ 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:
@@ -295,8 +307,12 @@ 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
@@ -307,6 +323,8 @@ 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:
@@ -317,8 +335,12 @@ 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
@@ -330,6 +352,8 @@ 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,15 +1,20 @@
-version: '3.8'
 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/
@@ -21,11 +26,17 @@ 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
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
    mysql:
        container_name: "rfsim5g-mysql"
@@ -84,8 +83,9 @@ 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,13 +102,19 @@ 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,15 +1,20 @@
-version: '3.8'
 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/
@@ -21,11 +26,17 @@ 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_u0_25prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
    mysql:
        container_name: "rfsim5g-mysql"
@@ -83,8 +82,9 @@ 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,15 +103,21 @@ 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 2152260000 --CO -400000000 --ssb 76 --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 2152680000 --CO -400000000 --ssb 48 --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,9 +1,13 @@
 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,9 +1,13 @@
 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,14 +1,18 @@
 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 45 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --tune-offset 20000000 -A 90 --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,16 +1,23 @@
-version: '3.8'
 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 45 --log_config.global_log_options level,nocolor,time --uicc0.imsi 208970000000111 --uicc0.nssai_sd 16777215
+            USE_ADDITIONAL_OPTIONS: --usrp-args type=n3xx,name=ni-n3xx-31641B9,addr=192.168.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
        volumes:
            - ../../conf_files/ue.sa.conf:/opt/oai-nr-ue/etc/nr-ue.conf
        healthcheck:
--- a/ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml
+++ b/ci-scripts/yaml_files/fr1_enb_mono_fdd_tim/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    enb_mono_fdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml
+++ b/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    cassandra:
        image: cassandra:2.1
--- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_if4.5/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    rru_fdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    enb_mono_fdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    enb_mono_fdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    lte_ue0:
        image: oai-lte-ue:latest
--- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    enb_mono_fdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    enb_mono_fdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    enb_mono_fdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    enb_mono_fdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_if4.5/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    rru_tdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm1/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    enb_mono_tdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_tdd_05Mhz_tm2/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    enb_mono_tdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_tdd_10Mhz_tm1/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    enb_mono_tdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    enb_mono_tdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    enb_mono_tdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm1/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
    oai-enb:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml
+++ b/ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
    oai-enb:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/magma_lte_20892/docker-compose.yml
+++ b/ci-scripts/yaml_files/magma_lte_20892/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    cassandra:
        image: cassandra:2.1
--- a/ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml
+++ b/ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    cassandra:
        image: cassandra:2.1
--- a/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml
+++ b/ci-scripts/yaml_files/nsa_b200_enb/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
    enb_mono_fdd:
        image: oai-enb:latest
--- a/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/nsa_b200_gnb/docker-compose.yml
@@ -1,18 +1,21 @@
-version: '3.8'
-
 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,9 +1,13 @@
 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,21 +1,26 @@
-version: '3.8'
-
 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
-            - /dev:/dev
-        networks:
-            public_net:
-                ipv4_address: 192.168.68.194
+        # 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"
        #entrypoint: /bin/bash -c "sleep infinity"
        healthcheck:
            # pgrep does NOT work
@@ -23,12 +28,3 @@ 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,19 +1,22 @@
-version: '3.8'
-
 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.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function
+            USE_ADDITIONAL_OPTIONS: --sa
+                                    --telnetsrv --telnetsrv.listenport 9090 --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
-        networks:
-            public_net:
-                ipv4_address: 192.168.68.194
+        # 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"
        healthcheck:
            # pgrep does NOT work
            test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
@@ -23,17 +26,24 @@ 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
-        networks:
-            public_net:
-                ipv4_address: 192.168.68.196
+        # 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"
        healthcheck:
            # pgrep does NOT work
            test: /bin/bash -c "ps aux | grep -v grep | grep -c nr-cuup"
@@ -43,8 +53,12 @@ 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:
@@ -52,16 +66,19 @@ services:
            USE_ADDITIONAL_OPTIONS: --sa
                                    --RUs.[0].sdr_addrs serial=30C51D4
                                    --continuous-tx -E
-                                    --telnetsrv --telnetsrv.shrmod ci
+                                    --telnetsrv --telnetsrv.listenport 9091 --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
-            - /dev:/dev
-        networks:
-            public_net:
-                ipv4_address: 192.168.68.195
+        # 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"
        #entrypoint: /bin/bash -c "sleep infinity"
        healthcheck:
            # pgrep does NOT work
@@ -69,12 +86,3 @@ 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_f1_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml
@@ -1,19 +1,22 @@
-version: '3.8'
-
 services:
    gnb_cu:
        image: oai-gnb:latest
-        privileged: true
        container_name: sa-cu-gnb
+        cap_drop:
+            - ALL
        ulimits:
          core: -1 # for core dumps
        environment:
-            USE_ADDITIONAL_OPTIONS: --sa --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function
+            USE_ADDITIONAL_OPTIONS: --sa
+                                    --telnetsrv --telnetsrv.listenport 9090 --telnetsrv.shrmod ci
+                                    --log_config.global_log_options level,nocolor,time,line_num,function
        volumes:
            - ../../conf_files/gnb-cu.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
-        networks:
-            public_net:
-                ipv4_address: 192.168.68.194
+        # 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"
        #entrypoint: /bin/bash -c "sleep infinity"
        healthcheck:
            # pgrep does NOT work
@@ -24,19 +27,29 @@ services:

    gnb_du_fdd:
        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:
            USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 0 --L1s.[0].max_ldpc_iterations 20
+            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx
+                                    --telnetsrv --telnetsrv.listenport 9091 --telnetsrv.shrmod ci
+                                    --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 0 --L1s.[0].max_ldpc_iterations 20
+                                    --log_config.global_log_options level,nocolor,time,line_num,function
+        devices:
+            - /dev/bus/usb/:/dev/bus/usb/
        volumes:
            - ../../conf_files/gnb-du.sa.band1.52prb.usrpb210.conf:/opt/oai-gnb/etc/gnb.conf
-            - /dev:/dev
-        networks:
-            public_net:
-                ipv4_address: 192.168.68.195
+        # 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"
        #entrypoint: /bin/bash -c "sleep infinity"
        healthcheck:
            # pgrep does NOT work
@@ -44,12 +57,3 @@ 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_gnb_aerial/aerial_l1_entrypoint.sh
+++ b/ci-scripts/yaml_files/sa_gnb_aerial/aerial_l1_entrypoint.sh
@@ -3,13 +3,10 @@
 # Check if cuBB_SDK is defined, if not, use default path
 cuBB_Path="${cuBB_SDK:-/opt/nvidia/cuBB}"

-# Run gdrcopy insmod
-cd "$cuBB_Path"/cuPHY-CP/external/gdrcopy/ || exit 1
-
-./insmod.sh
 cd "$cuBB_Path" || exit 1
 # Add gdrcopy to LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/opt/mellanox/dpdk/lib/x86_64-linux-gnu:/opt/mellanox/doca/lib/x86_64-linux-gnu:/opt/nvidia/cuBB/cuPHY-CP/external/gdrcopy/build/x86_64/
+export LD_LIBRARY_PATH=$LD_LIBRART_PATH:"$cuBB_Path/gpu-dpdk/build/install/lib/x86_64-linux-gnu:$cuBB_Path/build/cuPHY-CP/cuphydriver/src"

 # Restart MPS
 # Export variables
@@ -21,17 +18,18 @@ export CUDA_MPS_LOG_DIRECTORY=/var
 echo quit | nvidia-cuda-mps-control

 # Start MPS
-nvidia-cuda-mps-control -d
-echo start_server -uid 0 | nvidia-cuda-mps-control
+sudo -E nvidia-cuda-mps-control -d
+sudo -E echo start_server -uid 0 | sudo -E nvidia-cuda-mps-control

 # Start cuphycontroller_scf
 # Check if an argument is provided
 if [ $# -eq 0 ]; then
    # No argument provided, use default value
-    argument="P5G_SCF_FXN"
+    argument="P5G_FXN"
 else
    # Argument provided, use it
    argument="$1"
 fi

-"$cuBB_Path"/build/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
+sudo -E "$cuBB_Path"/build/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
+sudo -E ./build/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect
--- a/ci-scripts/yaml_files/sa_gnb_aerial/docker-compose.yaml
+++ b/ci-scripts/yaml_files/sa_gnb_aerial/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: "3.8"
 services:
  nv-cubb:
    container_name: nv-cubb
@@ -24,10 +23,10 @@ services:
      - ../../../cmake_targets/share:/opt/cuBB/share
    userns_mode: host
    ipc: "shareable"
-    image: cubb-build:23-2
+    image: cubb-build:24-1
    environment:
      - cuBB_SDK=/opt/nvidia/cuBB
-    command: bash -c " rm -rf /tmp/phy.log && chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
+    command: bash -c "sudo rm -rf /tmp/phy.log && sudo chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
    healthcheck:
      test: ["CMD-SHELL",'grep -q "L1 is ready!" /tmp/phy.log && echo 0 || echo 1']
      interval: 20s
@@ -39,7 +38,11 @@ services:
    depends_on:
      nv-cubb:
        condition: service_healthy
-    privileged: true
+    cap_drop:
+      - ALL
+    cap_add:
+      - SYS_NICE
+      - IPC_LOCK
    ipc: "container:nv-cubb"
    environment:
      USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
--- a/ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml
@@ -1,21 +1,26 @@
-version: '3.8'
-
 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 -E
+        devices:
+            - /dev/bus/usb/:/dev/bus/usb/
        volumes:
            - ../../conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf:/opt/oai-gnb/etc/gnb.conf
-            - /dev:/dev
-        networks:
-            public_net:
-                ipv4_address: 192.168.68.194
+        # 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"
        #entrypoint: /bin/bash -c "sleep infinity"
        healthcheck:
            # pgrep does NOT work
@@ -23,12 +28,3 @@ 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/cmake_targets/autotests/run_exec_autotests.bash
+++ b/cmake_targets/autotests/run_exec_autotests.bash
@@ -30,7 +30,6 @@ fi

 source $OPENAIR_DIR/cmake_targets/tools/test_helper

-SUDO="sudo -E"
 tdir=$OPENAIR_DIR/cmake_targets/autotests
 rm -fr $tdir/bin
 mkdir -p $tdir/bin
@@ -178,8 +177,6 @@ RUN_GROUP=0
 test_case_group=""
 test_case_group_array=()
 test_case_array=()
-echo_info "Note that the user should be sudoer for executing certain commands, for example loading kernel modules"
-

 until [ -z "$1" ]; do
  case "$1" in
@@ -207,15 +204,6 @@ until [ -z "$1" ]; do
  esac
 done

-tmpfile=`mktemp`
-$SUDO echo $HOME > $tmpfile
-tstsudo=`cat $tmpfile`
-if [ "$tstsudo" != "$HOME" ]; then
-  echo_error "$USER does not have sudo privileges. Exiting"
-  exit
-fi
-rm -fr $tmpfile
-
 test_case_excl_list=`xmlstarlet sel -t -v "/testCaseList/TestCaseExclusionList" $xml_conf`
 test_case_excl_list=`sed "s/\+/\*/g" <<< "$test_case_excl_list" ` # Replace + with * for bash string substituion
 echo "Test Case Exclusion List = $test_case_excl_list "
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -124,6 +124,8 @@ Options:
 --disable-cpu-affinity
   Disables CPU Affinity between UHD/TX/RX Threads (Valid only when deadline scheduler is disabled). By defaulT, CPU Affinity is enabled when not using deadline scheduler. It is enabled only with >2 CPUs. For eNB, CPU_0-> Device library (UHD), CPU_1->TX Threads, CPU_2...CPU_MAX->Rx Threads. For UE, CPU_0->Device Library(UHD), CPU_1..CPU_MAX -> All the UE threads
 --enable-cpu-affinity
+--enable-LTTNG
+   Enable LTTNG log. While lttng is enabled, T-Tracer will be disabled
 --disable-T-Tracer
   Disables the T tracer.
 --disable-hardware-dependency
@@ -353,6 +355,11 @@ function main() {
           BUILD_DOXYGEN=1
           echo_info "Will build doxygen support"
           shift;;     
+       --enable-LTTNG)
+            CMAKE_CMD="$CMAKE_CMD -DENABLE_LTTNG=ON -DT_TRACER=OFF"
+            echo_info "Enable LTTNG tracer"
+            USE_LTTNG=1
+            shift 1;;
       --disable-T-Tracer)
            CMAKE_CMD="$CMAKE_CMD -DT_TRACER=False"
            echo_info "Disabling the T tracer"
@@ -414,21 +421,19 @@ function main() {
            grep -sq "Ubuntu 18.04" /etc/os-release && echo_error "Bug in OS with this option, see CMakeLists.txt"
            CMAKE_CMD="$CMAKE_CMD -DSANITIZE_ADDRESS=True"
            shift;;
-        --sanitize-undefined | -fundefined=address)
+        --sanitize-undefined | -fsanitize=undefined)
            CMAKE_CMD="$CMAKE_CMD -DSANITIZE_UNDEFINED=True"
            shift;;
        --sanitize-memory | -fsanitize=memory)
-            echo_warning "Note: memory sanitizer\n* requires clang (tested: v17)\n* is incompatible with address/undefined behavior sanitizer\n* requires cmake_targets/tools/memsan.patch"
-            sleep 2
            CMAKE_CMD="$CMAKE_CMD -DSANITIZE_MEMORY=ON -DSANITIZE_ADDRESS=OFF -DSANITIZE_UNDEFINED=OFF"
            shift;;
+        --sanitize-thread | -fsanitize=thread)
+            CMAKE_CMD="$CMAKE_CMD -DSANITIZE_THREAD=True"
+            shift;;
       --trace-asn1c-enc-dec)
            CMAKE_CMD="$CMAKE_CMD -DTRACE_ASN1C_ENC_DEC=ON"
            echo_info "Enabling asn1c internal traces via OAI logging system"
            shift 1;;
-        --sanitize-thread | -fthread=address)
-            CMAKE_CMD="$CMAKE_CMD -DSANITIZE_THREAD=True"
-            shift;;
        -h | --help)
            print_help
            exit 1;;
@@ -456,6 +461,10 @@ function main() {
  if [ "$INSTALL_EXTERNAL" = "1" ] ; then
    echo_info "Installing packages"
    check_install_oai_software
+    if [ "$USE_LTTNG" = "1" ] ; then
+      echo_info "installing LTTng"
+      install_lttng $1
+    fi
    if [ "$HW" == "OAI_USRP" ] ; then
      echo_info "installing packages for USRP support"
      check_install_usrp_uhd_driver
@@ -544,22 +553,15 @@ function main() {
  # Auto-tests #
  ##############
  if [ "$OAI_TEST" = "1" ] ; then
-    echo_error "These scripts ASSUME that user is in /etc/sudoers and can execute commands without PASSWORD prompt"
-    echo_error "Add the following lines in /etc/sudoers file to make your __user_name__ sudo without password prompt"
-    echo_error " __your_user_name__ ALL = (ALL:ALL) NOPASSWD: ALL"
-    echo_error " __your_user_name__ ALL = (ALL) NOPASSWD: ALL "
    echo_info "The log file for the autotest script for debugging is located here: $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log "
    echo_info "The results of autotests results is located here: $OPENAIR_DIR/cmake_targets/autotests/log/results_autotests.xml "
    echo_info "You can hit CTRL-C at any time to terminate the autotests..."
-    echo "Current User Name: $USER"
-    read -s -p "Enter Password: " mypassword
-    echo -e "\n"
    rm -fr $OPENAIR_DIR/cmake_targets/autotests/log
    mkdir -p $OPENAIR_DIR/cmake_targets/autotests/log
    if [ "$RUN_GROUP" -eq "1" ]; then
-        $OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash -g "$TEST_CASE_GROUP" -p $mypassword >& $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log &
+        $OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash -g "$TEST_CASE_GROUP" >& $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log
    else
-        $OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash -p $mypassword >& $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log &
+        $OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash >& $OPENAIR_DIR/cmake_targets/autotests/log/autotests.log
    fi
    wait
  else
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -128,6 +128,7 @@ check_supported_distribution() {
        "rhel9.1")     return 0 ;;
        "rhel9.2")     return 0 ;;
        "rhel9.3")     return 0 ;;
+        "rhel9.4")     return 0 ;;
        "centos7")     return 0 ;;
        "centos8")     return 0 ;;
        "rocky8.7")    return 0 ;;
@@ -666,7 +667,10 @@ install_asn1c_from_source(){
    # GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/asn1c.git /tmp/asn1c
    git clone https://github.com/mouse07410/asn1c /tmp/asn1c
    cd /tmp/asn1c
-    git checkout vlm_master
+    #git checkout vlm_master
+    # hotfix: current vlm_master (5fa129cf3161da9ff2d67341e6277e818c0f5d6a)
+    # breaks F1, NG, so use the one before.
+    git checkout 940dd5fa9f3917913fd487b13dfddfacd0ded06e
    # Showing which version is used
    git log -n1
    autoreconf -iv
@@ -700,6 +704,97 @@ install_simde_from_source(){
    $SUDO \cp -rv ../simde /usr/include
 }

+install_lttng() {
+    if [[ "$OS_DISTRO" != "ubuntu" ]]; then
+      echo_info "LTTng is supported only for ubuntu at the moment."
+      echo_info $distribution
+      return
+    fi
+
+    set +e
+    $SUDO apt-add-repository ppa:lttng/stable-2.13 -y && apt-get update
+    $SUDO apt-get install -y lttng-tools lttng-modules-dkms liblttng-ust-dev
+    if [[ $? > 0 ]]; then
+      echo "Failed to install LTTng using apt. Installing from source"
+      install_lttng_deps
+      install_lttng_from_source
+    fi
+    set -e
+}
+
+install_lttng_deps() {
+  echo "installing dependencies of LTTng"
+  $SUDO apt-get install uuid-dev libxml2-dev -y
+}
+
+install_lttng_from_source() {
+    echo "installing LTTng from source"
+    install_popt_1_18_from_source
+    install_userspace_rcu
+    install_lttng_ust_2_13_from_source
+    install_lttng_tools_2_13_from_source
+}
+
+install_popt_1_18_from_source() {
+  $SUDO $INSTALLER -y install wget
+  echo_info "\nInstalling popt_1_18."
+  cd $(mktemp -d) &&
+  wget http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz
+  tar -xf popt-1.18.tar.gz && cd popt-1.18
+  ./configure && make -j16 && $SUDO make install
+}
+
+install_userspace_rcu() {
+    echo_info "\nInstalling U-RCU from source."
+    cd /tmp
+    $SUDO rm -rf /tmp/urcu
+    git clone https://github.com/urcu/userspace-rcu.git /tmp/urcu
+    cd /tmp/urcu
+    git checkout stable-0.12
+    ./bootstrap && ./configure && make
+    $SUDO make install
+    $SUDO ldconfig
+}
+
+
+install_lttng_modules_2_13_from_source() {
+    $SUDO $INSTALLER -y install wget
+    echo_info "\nInstalling LTTng Modules."
+    cd $(mktemp -d) &&
+    wget https://lttng.org/files/lttng-modules/lttng-modules-latest-2.13.tar.bz2 &&
+    tar -xf lttng-modules-latest-2.13.tar.bz2 &&
+    cd lttng-modules-2.13.* &&
+    make &&
+    $SUDO make modules_install &&
+    $SUDO depmod -a
+}
+
+install_lttng_ust_2_13_from_source() {
+    $SUDO $INSTALLER -y install wget
+    echo_info "\nInstalling LTTng UST."
+    cd $(mktemp -d) &&
+    wget https://lttng.org/files/lttng-ust/lttng-ust-latest-2.13.tar.bz2 &&
+    tar -xf lttng-ust-latest-2.13.tar.bz2 &&
+    cd lttng-ust-2.13.* &&
+    ./configure --disable-numa &&
+    make &&
+    $SUDO make install &&
+    $SUDO ldconfig
+}
+
+install_lttng_tools_2_13_from_source() {
+    $SUDO $INSTALLER -y install wget
+    echo_info "\nInstalling LTTng Tools."
+    cd $(mktemp -d) &&
+    wget https://lttng.org/files/lttng-tools/lttng-tools-latest-2.13.tar.bz2 &&
+    tar -xf lttng-tools-latest-2.13.tar.bz2 &&
+    cd lttng-tools-2.13.* &&
+    ./configure &&
+    make &&
+    $SUDO make install &&
+    $SUDO ldconfig
+}
+
 #################################################
 # 2. compile
 ################################################
--- a/cmake_targets/tools/memsan.patch
+++ b/cmake_targets/tools/memsan.patch
@@ -1,53 +0,0 @@
-commit bf7f0c4f0f1bfce586667b50050640b67a7a747a
-Author: Robert Schmidt <robert.schmidt@openairinterface.org>
-Date:   Wed Jun 7 18:24:50 2023 +0200
-
-    Fix dlopen() linker errors in dfts, ldpc, ldpc_parityCheck, and params_libconfig
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c29105d503..3b9e7d1246 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -508,7 +508,7 @@ add_library(CONFIG_LIB
- )
- target_link_libraries(CONFIG_LIB PRIVATE dl UTIL)
- add_library(params_libconfig MODULE ${CONFIG_ROOTDIR}/libconfig/config_libconfig.c)
-target_link_libraries(params_libconfig config)
-+target_link_libraries(params_libconfig config CONFIG_LIB minimal_lib)
- # shared library loader
- set (SHLIB_LOADER_SOURCES
-   ${OPENAIR_DIR}/common/utils/load_module_shlib.c
-@@ -1018,16 +1018,19 @@ if (ENABLE_LDPC_CUDA)
-   endif()
- endif()
- 
-add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
-+add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} ${OPENAIR1_DIR}/PHY/CODING/crc_byte.c)
- target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)
-+target_link_libraries(ldpc PRIVATE UTIL)
- 
- add_library(ldpc_parityCheck MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
- target_compile_definitions(ldpc_parityCheck PUBLIC NR_LDPC_ENABLE_PARITY_CHECK)
- target_link_libraries(ldpc_parityCheck  PRIVATE ldpc_gen_HEADERS)
-+target_link_libraries(ldpc_parityCheck PRIVATE UTIL minimal_lib)
- 
- add_library(coding MODULE ${PHY_TURBOSRC} )
- 
- add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c )
-+target_link_libraries(dfts PRIVATE minimal_lib)
- 
- 
- set(PHY_SRC_COMMON
-diff --git a/common/utils/minimal_stub.c b/common/utils/minimal_stub.c
-index be9c1b399d..7ad0df4d56 100644
--- a/common/utils/minimal_stub.c
-+++ b/common/utils/minimal_stub.c
-@@ -1,6 +1,8 @@
-+#include <stdlib.h>
- #ifndef T_TRACER
- int T_stdout;
- #endif
-+int oai_exit = 0;
- 
- void exit_function(const char *file, const char *function, const int line, const char *s, const int assert)
- {
--- a/common/config/config_common.c
+++ b/common/config/config_common.c
@@ -141,7 +141,7 @@ int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoption
  config_check_valptr(cfg, cfgoptions, sizeof(*cfgoptions->i64ptr), 1);

  if (((cfgoptions->paramflags & PARAMFLAG_MANDATORY) == 0)) {
-    *(cfgoptions->u64ptr) = cfgoptions->defuintval;
+    *(cfgoptions->u64ptr) = cfgoptions->defint64val;
    status=1;
    printf_params(cfg,
                  "[CONFIG] %s.%s set to default value %llu\n",
--- a/common/config/config_load_configmodule.c
+++ b/common/config/config_load_configmodule.c
@@ -208,9 +208,11 @@ int config_cmdlineonly_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions
    }
  } /* for loop on options */

-  printf("[CONFIG] %s: %i/%i parameters successfully set \n",
-         ((prefix == NULL)?"(root)":prefix),
-         numdefvals,numoptions );
+  printf_params(cfg,
+                "[CONFIG] %s: %i/%i parameters successfully set \n",
+                prefix == NULL ? "(root)" : prefix,
+                numdefvals,
+                numoptions);

  if (fatalerror == 1) {
    fprintf(stderr,"[CONFIG] fatal errors found when assigning %s parameters \n",
@@ -341,9 +343,20 @@ configmodule_interface_t *load_configmodule(int argc,
      atoken = strtok_r(NULL,":",&strtokctx);
    }

-    printf("[CONFIG] get parameters from %s ", cfgmode);
    for (i = 0; i < cfgptr->num_cfgP; i++) {
-      printf("%s ", cfgptr->cfgP[i]);
+      /* check if that file actually exists */
+      if (access(cfgptr->cfgP[i], F_OK) != 0) {
+        fprintf(stderr, "error: file %s does not exist\n", cfgptr->cfgP[i]);
+        for (int j = 0; j < cfgptr->num_cfgP; ++j)
+          free(cfgptr->cfgP[j]);
+        free(modeparams);
+        free(cfgptr->cfgmode);
+        free(cfgptr->argv_info);
+        free(cfgptr);
+        if (cfgmode != NULL)
+          free(cfgmode);
+        return NULL;
+      }
    }

  if (cfgptr->rtflags & CONFIG_PRINTPARAMS) {
--- a/common/config/libconfig/config_libconfig.c
+++ b/common/config/libconfig/config_libconfig.c
@@ -70,7 +70,7 @@ int read_strlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, config_s
    str=config_setting_get_string_elem(setting,i);

    if (str==NULL) {
-      printf("[LIBCONFIG] %s%i  not found in config file\n", cfgoptions->optname,i);
+      printf_params(cfg, "[LIBCONFIG] %s%i  not found in config file\n", cfgoptions->optname,i);
    } else {
      snprintf(cfgoptions->strlistptr[i], DEFAULT_EXTRA_SZ, "%s",str);
      st++;
@@ -322,19 +322,16 @@ int config_libconfig_set(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
 int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int numoptions, char *prefix)
 {
  config_setting_t *setting;
-  char *str;
-  int i,u;
-  long long int llu;
-  double dbl;
-  int rst;
-  int status=0;
-  int notfound;
-  int defval;
-  int fatalerror=0;
-  int numdefvals=0;
+  char *str = NULL;
+  int u = 0;
+  long long int llu = 0;
+  double dbl = 0.0f;
+  int status = 0;
+  int fatalerror = 0;
+  int numdefvals = 0;
  char cfgpath[512];  /* 512 should be enough for the sprintf below */

-  for(i=0; i<numoptions; i++) {
+  for(int i=0; i<numoptions; i++) {
    if (prefix != NULL) {
      sprintf(cfgpath,"%s.%s",prefix,cfgoptions[i].optname);
    } else {
@@ -346,8 +343,8 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
      continue;
    }

-    notfound=0;
-    defval=0;
+    int notfound = 0;
+    int defval = 0;

    switch(cfgoptions[i].type) {
      case TYPE_STRING:
@@ -436,7 +433,7 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
        if ( !config_lookup_string(&(libconfig_privdata.cfg),cfgpath, (const char **)&str)) {
          defval = config_setdefault_ipv4addr(cfg, &(cfgoptions[i]), prefix);
        } else {
-          rst = config_assign_ipv4addr(cfg, cfgoptions, str);
+          int rst = config_assign_ipv4addr(cfg, cfgoptions, str);

          if (rst < 0) {
            fprintf(stderr,"[LIBCONFIG] %s not valid for %s \n", str, cfgpath);
@@ -484,9 +481,12 @@ int config_libconfig_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
    }
  } /* for loop on options */

-  printf("[LIBCONFIG] %s: %i/%i parameters successfully set, (%i to default value)\n",
-         ((prefix == NULL)?"(root)":prefix),
-         status,numoptions,numdefvals );
+  printf_params(cfg,
+                "[LIBCONFIG] %s: %i/%i parameters successfully set, (%i to default value)\n",
+                prefix == NULL ? "(root)" : prefix,
+                status,
+                numoptions,
+                numdefvals);

  if (fatalerror == 1) {
    fprintf(stderr,"[LIBCONFIG] fatal errors found when processing  %s \n", libconfig_privdata.configfile );
@@ -520,8 +520,7 @@ int config_libconfig_getlist(configmodule_interface_t *cfg,
    status = ParamList->numelt = config_setting_length(setting);
    printf_params(cfg, "[LIBCONFIG] %i %s in config file %s \n", ParamList->numelt, listpath, libconfig_privdata.configfile);
  } else {
-    printf("[LIBCONFIG] list %s not found in config file %s \n",
-           listpath,libconfig_privdata.configfile );
+    printf_params(cfg, "[LIBCONFIG] list %s not found in config file %s \n", listpath, libconfig_privdata.configfile);
    ParamList->numelt= 0;
    status = -1;
  }
@@ -577,8 +576,10 @@ int config_libconfig_init(configmodule_interface_t *cfg)
   config_set_auto_convert (&(libconfig_privdata.cfg), CONFIG_TRUE);
  /* Read the file. If there is an error, report it and exit. */
  if( config_read_file(&(libconfig_privdata.cfg), libconfig_privdata.configfile) == CONFIG_FALSE) {
-    fprintf(stderr,"[LIBCONFIG] %s %d file %s - line %d: %s\n",__FILE__, __LINE__,
-            libconfig_privdata.configfile, config_error_line(&(libconfig_privdata.cfg)),
+    fprintf(stderr,
+            "[LIBCONFIG] file %s - line %d: %s\n",
+            libconfig_privdata.configfile,
+            config_error_line(&(libconfig_privdata.cfg)),
            config_error_text(&(libconfig_privdata.cfg)));
    config_destroy(&(libconfig_privdata.cfg));
    printf( "\n");
--- a/common/utils/LOG/DOC/log.md
+++ b/common/utils/LOG/DOC/log.md
@@ -15,5 +15,6 @@ By default, this facility is included at build-time and activated at run-time. T
 * [runtime usage](rtusage.md)
 * [developer usage](devusage.md)
 * [module architecture](arch.md)
+* [lttng usage](lttng_logs.md)

 [oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
--- a/common/utils/LOG/DOC/lttng_logs.md
+++ b/common/utils/LOG/DOC/lttng_logs.md
@@ -0,0 +1,153 @@
+# OAI gNB LTTng Tracing Setup Guide
+
+## Overview
+
+This guide will walk you through setting up tracing for an OpenAirInterface (OAI) gNB (gNodeB) using LTTng (Linux Trace Toolkit Next Generation) and Babeltrace.
+### What is LTTng and Why Use It?
+
+LTTng, or Linux Trace Toolkit Next Generation, is a powerful logging framework designed for Linux systems. It provides low-overhead tracing capabilities, allowing developers to monitor and analyze system behavior in real-time without significant performance impact. LTTng offers several advantages:
+
+- **Low Overhead**: LTTng introduces minimal overhead to the system, making it suitable for use in production environments without affecting system performance.
+
+- **Customizable**: LTTng allows users to define custom tracepoints in their applications, providing fine-grained control over what events to trace and collect.
+
+- **Scalability**: It can scale to large distributed systems, making it suitable for tracing complex software stacks across multiple nodes.
+
+## Prerequisites
+
+- Ubuntu system
+
+Note: only LTTng 2.3.8 is supported.
+
+## Building OAI gNB
+
+1. **Clean and Build OAI gNB with LTTng:**
+
+    1.1  Install Dependencies
+
+    ```bash
+    ./build_oai --ninja -I --clean --enable-LTTNG
+    
+    ```
+    1.2  Build gNB and nrUE
+    ```
+    ./build_oai --ninja --gNB --nrUE -w SIMU --enable-LTTNG
+    ```
+## Setting up LTTng
+
+1. **Start LTTng Session and Relay:**
+
+    ```bash
+    sudo lttng-sessiond -d
+    sudo lttng-relayd -d
+    ```
+
+2. **Create Live LTTng Session:**
+
+    ```bash
+    sudo lttng create my-session --live --set-url=net://127.0.0.1
+    ```
+
+3. **Enable gNB Trace Events:**
+
+    ```bash
+    sudo lttng enable-event --userspace OAI:gNB
+    ```
+
+4. **Start LTTng Tracing:**
+
+    ```bash
+    sudo lttng start
+    ```
+
+## Running the gNB
+
+1. **Run gNB:**
+
+    ```bash
+    ./$binary_path -O $configuration_file PARALLEL_SINGLE_THREAD --rfsimulator.serveraddr server --rfsim --sa -E
+    ```
+
+## Verifying Tracepoints
+
+1. **List Active Tracepoints:**
+
+    ```bash
+    sudo lttng list -u
+    ```
+
+    *Possible Output:*
+
+    ```
+    UST events:
+    -------------
+    
+    PID: 1154722 - Name: /home/firecell/Desktop/FirecellRepos/firecellrd-oai5g-ran/cmake_targets/ran_build/build/nr-softmodem
+          OAI:gNB (loglevel: TRACE_DEBUG_FUNCTION (12)) (type: tracepoint)
+    ```
+
+## Analyzing Traces
+
+1. **Install Babeltrace:**
+
+    ```bash
+    sudo apt-get install babeltrace
+    ```
+
+
+2. **Capture Trace Logs Live:**
+
+    - To learn the full path of the trace session:
+    
+        ```bash
+        babeltrace --input-format=lttng-live net://localhost
+        ```
+
+    - Trace logs using the full path:
+    
+        ```bash
+        babeltrace --input-format=lttng-live net://localhost/host/firecell-XPS-15-9530/my-session
+        ```
+
+    *Possible Output:*
+
+    ```
+    [19:35:32.181608002] (+2.664882127) firecell-XPS-15-9530 OAI:gNB: { cpu_id = 10 }, { MODNAME = "OAI-NR_MAC info", EVENTID = -1, SFN = -1, SLOT = -1, FUNCTION = "gNB_dlsch_ulsch_scheduler", LINE = 246, MSG = "Frame.Slot 0.0\n" }
+    ```
+3. **Capture Trace Logs Offline:**
+
+    - Create an offline trace session with a specified output directory:
+
+        ```bash
+        sudo lttng create offline_session --output=/home/trace_offline/
+        ```
+
+    - Enable gNB trace events:
+
+        ```bash
+        sudo lttng enable-event --userspace OAI:gNB
+        ```
+
+    - Start capturing trace logs:
+
+        ```bash
+        sudo lttng start
+        ```
+
+    - Stop the trace capture:
+
+        ```bash
+        sudo lttng stop
+        ```
+
+    - Destroy the trace session:
+
+        ```bash
+        sudo lttng destroy
+        ```
+
+    - Use Babeltrace to analyze the captured trace logs:
+
+        ```bash
+        sudo babeltrace /home/trace_offline/
+        ```
--- a/common/utils/LOG/log.c
+++ b/common/utils/LOG/log.c
@@ -603,6 +603,25 @@ void logRecord_mt(const char *file,
  log_output_memory(c, file,func,line,comp,level,format,args);
  va_end(args);
 }
+#if ENABLE_LTTNG
+void logRecord_lttng(const char *file, const char *func, int line, int comp, int level, const char *format, ...)
+{
+  log_component_t *c = &g_log->log_component[comp];
+  char header[48];
+  char buf[MAX_LOG_TOTAL];
+  va_list args;
+  va_start(args, format);
+  vsnprintf(buf, sizeof(buf) - 1, format, args);
+  va_end(args);
+
+  if (map_int_to_str(log_level_names, level) != NULL)
+    snprintf(header, sizeof(header), "OAI-%s %s", c->name, map_int_to_str(log_level_names, level));
+  else
+    snprintf(header, sizeof(header), "OAI-%s", c->name);
+
+  LOG_FC(header, func, line, buf);
+}
+#endif

 void vlogRecord_mt(const char *file,
 		   const char *func,
--- a/common/utils/LOG/log.h
+++ b/common/utils/LOG/log.h
@@ -52,6 +52,9 @@
 #endif
 #include <pthread.h>
 #include <common/utils/utils.h>
+#if ENABLE_LTTNG
+#include "lttng-log.h"
+#endif
 /*----------------------------------------------------------------------------*/
 #include <assert.h>
 #ifdef NDEBUG
@@ -234,6 +237,10 @@ void logTerm (void);
 int  isLogInitDone (void);
 void logRecord_mt(const char *file, const char *func, int line,int comp, int level, const char *format, ...) __attribute__ ((format (printf, 6, 7)));
 void vlogRecord_mt(const char *file, const char *func, int line, int comp, int level, const char *format, va_list args );
+#if ENABLE_LTTNG
+void logRecord_lttng(const char *file, const char *func, int line, int comp, int level, const char *format, ...)
+    __attribute__((format(printf, 6, 7)));
+#endif
 void log_dump(int component, void *buffer, int buffsize,int datatype, const char *format, ... );
 int  set_log(int component, int level);
 void set_glog(int level);
@@ -425,9 +432,50 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int

 /* define variable only used in LOG macro's */
 #define LOG_VAR(A, B) A B
-
-#else /* no T_TRACER */
-
+#else /* T_TRACER */
+#if ENABLE_LTTNG
+#define LOG_E(c, x...)                                                     \
+  do {                                                                     \
+    if (g_log->log_component[c].level >= OAILOG_ERR) {                     \
+      logRecord_lttng(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_ERR, x); \
+    }                                                                      \
+  } while (0)
+#define LOG_W(c, x...)                                                         \
+  do {                                                                         \
+    if (g_log->log_component[c].level >= OAILOG_WARNING) {                     \
+      logRecord_lttng(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_WARNING, x); \
+    }                                                                          \
+  } while (0)
+#define LOG_A(c, x...)                                                          \
+  do {                                                                          \
+    if (g_log->log_component[c].level >= OAILOG_ANALYSIS) {                     \
+      logRecord_lttng(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_ANALYSIS, x); \
+    }                                                                           \
+  } while (0)
+#define LOG_I(c, x...)                                                      \
+  do {                                                                      \
+    if (g_log->log_component[c].level >= OAILOG_INFO) {                     \
+      logRecord_lttng(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_INFO, x); \
+    }                                                                       \
+  } while (0)
+#define LOG_D(c, x...)                                                       \
+  do {                                                                       \
+    if (g_log->log_component[c].level >= OAILOG_DEBUG) {                     \
+      logRecord_lttng(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_DEBUG, x); \
+    }                                                                        \
+  } while (0)
+#define LOG_T(c, x...)                                                       \
+  do {                                                                       \
+    if (g_log->log_component[c].level >= OAILOG_TRACE) {                     \
+      logRecord_lttng(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_TRACE, x); \
+    }                                                                        \
+  } while (0)
+#define LOG_DDUMP(c, b, s, f, x...)                    \
+  do {                                                 \
+    if (g_log->log_component[c].level >= OAILOG_DEBUG) \
+      log_dump(c, b, s, f, x);                         \
+  } while (0)
+#else
 #define LOG_E(c, x...)                                                  \
  do {                                                                  \
    if (g_log->log_component[c].level >= OAILOG_ERR)                    \
@@ -469,6 +517,7 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int
    if (g_log->log_component[c].level >= OAILOG_TRACE)                    \
      logRecord_mt(__FILE__, __FUNCTION__, __LINE__, c, OAILOG_TRACE, x); \
  } while (0)
+#endif

 #define VLOG(c, l, f, args)                                           \
  do {                                                                \
--- a/common/utils/LOG/lttng-log.h
+++ b/common/utils/LOG/lttng-log.h
@@ -0,0 +1,44 @@
+/*
+ * 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
+ */
+
+/*! \file lttng-log.h
+* \brief LTTng Log interface
+* \author Anurag Asokan
+* \date 2024
+* \version 0.5
+* @ingroup util
+
+*/
+
+#ifndef __LTTNG_LOG_H__
+#define __LTTNG_LOG_H__
+#if ENABLE_LTTNG
+#include "lttng-tp.h"
+
+#define LOG_FC(component, func, line, log)                        \
+  do {                                                            \
+    tracepoint(OAI, gNB, component, -1, -1, -1, func, line, log); \
+  } while (0)
+#else
+#define LOG_FC(component, func, line, log)
+#endif
+
+#endif /** __LTTNG_LOG_H__ */
--- a/Show More
+++ b/Show More