Add SRS flag in the aerial gNB Docker image build

2026-07-13 12:40:28 +00:00 · 2025-09-30 14:17:05 +02:00
547 changed files with 16467 additions and 22477 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -62,7 +62,6 @@ ForEachMacros:
  - BOOST_FOREACH
  - RB_FOREACH
  - UE_iterator
-  - FOR_EACH_SEQ_ARR
 IncludeBlocks:   Preserve
 IncludeCategories:
  - Regex:           '^<ext/.*\.h>'
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,51 +1,5 @@
 # RELEASE NOTES: #

-## [v2.3.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.3.0) -> July 2025. ##
-
-General new features and improvements (both RAN and UE):
- Preliminary support for RedCap UEs
- Support for NTN LEO scenarios including SIB19 and channel emulation (see
-  doc/RUNMODEM.md)
- VRTSIM: new shared memory realtime radio (see develop/radio/vrtsim/README.md)
- Support for TDD pattern 2
- Support for long PRACH
- Support for SIB2
- Add unit tests using ctest (see doc/UnitTests.md)
-
-Stability and bug fixes:
- Improve various procedures (e.g., RRC reestablishment, RRC Reject, ...)
- Add improvements for ImScope
- Bugfixes in the entire stack (e.g., #803, #805, #810, #812, #818, #852, #878,
-  #884, #890, #895, #901, #907, #932, #939 ...)
- Documentation updates
- And many other small fixes, like memory leaks, crashes, ...
-
-RAN changes (gNB/CU/CU-CP/CU-UP/DU/DU-high/DU-low):
- Stability and performance improvements when running with 4-layer DL MIMO
- Stability and performance improvements when running with 2-layer UL MIMO
- Interoperability testing with Metanoia Jura and Foxconn RUs
- Support of O-RAN 7.2 M-plane (Start-up procedure including configuration
-  management, see also doc/ORAN_FHI7.2_Tutorial.md)
- Upgrade OSC FHI (xran) from E to F release
- Refactoring of LDPC interface and performance improvements
- Support for nFAPI in all scenarios for FR1 (see doc/nfapi.md)
- Support at least 32 UEs concurrently
- Improve robustness when running in split modes (F1, E1)
- Add basic support for beam management in FR2
- Add support for O1 on DU (see also https://gitlab.eurecom.fr/oai/o1-adapter)
- E2 agent: Support for multiple E2SM-RC report service styles
-
-nrUE changes:
- Refactoring of threading towards better code and performance
- Add or rework various procedures (e.g., RA with C-RNTI, Going to Idle, RA, ...)
- Refactor and extend NAS implementation (e.g., Service Request, Registration
-  Request, Service Acept, Service Reject, ...)
- Support for continuous frequency offset compensation
- Reduce minimum RX-to-TX time to 3
-
-Regression:
- Multiple BWPs do not work reliably on gNB; use tag 2025.w17
-
 ## [v2.2.0](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tags/v2.2.0) -> November 2024. ##

 General 5G improvements (both gNB and UE):
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,8 @@
 # *      contact@openairinterface.org
 # */

+# Author: laurent THOMAS, Lionel GAUTHIER
+
 cmake_minimum_required (VERSION 3.16)
 project (OpenAirInterface LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 17)
@@ -171,6 +173,9 @@ else ()
  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -march=armv8.2-a")
 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)
+
 # 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
@@ -464,6 +469,9 @@ target_include_directories(f1ap PUBLIC F1AP_DIR)
 target_link_libraries(f1ap PUBLIC asn1_f1ap GTPV1U)
 target_link_libraries(f1ap PRIVATE ngap nr_rrc HASHTABLE f1ap_lib)
 target_include_directories(f1ap PRIVATE ${F1AP_DIR}/lib)
+if(E2_AGENT)
+  target_compile_definitions(f1ap PRIVATE E2_AGENT)
+endif()

 # LPP
 ##############
@@ -541,6 +549,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories("${OPENAIR_DIR}/executables")
 include_directories("${OPENAIR2_DIR}/COMMON")
 include_directories("${OPENAIR2_DIR}/UTIL")
+include_directories("${OPENAIR2_DIR}/UTIL/LOG")
 include_directories("${OPENAIR3_DIR}/COMMON")
 include_directories("${OPENAIR3_DIR}/UTILS")
 include_directories("${NFAPI_DIR}/nfapi/public_inc")
@@ -581,7 +590,12 @@ include_directories("${OPENAIR3_DIR}/ocp-gtpu")
 include_directories("${OPENAIR3_DIR}/M3AP")
 include_directories("${OPENAIR3_DIR}/MME_APP")
 include_directories("${OPENAIR_DIR}/radio/COMMON")
+include_directories("${OPENAIR2_DIR}/UTIL/OSA")
+include_directories("${OPENAIR2_DIR}/UTIL/MEM")
+include_directories("${OPENAIR2_DIR}/UTIL/LISTS")
+include_directories("${OPENAIR2_DIR}/UTIL/FIFO")
 include_directories("${OPENAIR2_DIR}/UTIL/MATH")
+include_directories("${OPENAIR2_DIR}/UTIL/TIMER")
 include_directories("${OPENAIR2_DIR}/UTIL/OTG")
 include_directories("${OPENAIR2_DIR}/UTIL/OPT")
 include_directories("${OPENAIR_DIR}")
@@ -609,6 +623,11 @@ add_library(UTIL
  ${OPENAIR_DIR}/common/utils/LOG/vcd_signal_dumper.c
  ${OPENAIR2_DIR}/UTIL/OPT/probe.c
 )
+if (ENABLE_LTTNG)
+  find_package(LTTngUST 2.3.8 EXACT REQUIRED)
+else()
+  message(STATUS "LTTNG support disabled")
+endif()

 pkg_check_modules(cap libcap)
 if (cap_FOUND)
@@ -652,6 +671,7 @@ add_library(SCHED_LIB ${SCHED_SRC})
 target_link_libraries(SCHED_LIB PRIVATE asn1_lte_rrc_hdrs)

 set(SCHED_NR_SRC
+  ${OPENAIR1_DIR}/SCHED_NR/fapi_nr_l1.c
  ${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_gNB.c
  ${OPENAIR1_DIR}/SCHED_NR/nr_prach_procedures.c
  ${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
@@ -938,6 +958,7 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dci_tools.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_tools.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
@@ -980,8 +1001,6 @@ set(PHY_SRC_UE
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pbch.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_rx.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch_tx.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psfch_tx.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pscch_tx.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -1184,6 +1203,7 @@ set(NR_L2_SRC_UE
  ${NR_UE_RRC_DIR}/L2_interface_ue.c
  ${NR_UE_RRC_DIR}/main_ue.c
  ${NR_UE_RRC_DIR}/rrc_UE.c
+  ${NR_UE_RRC_DIR}/rrc_nsa.c
  ${NR_UE_RRC_DIR}/rrc_timers_and_constants.c
  ${NR_UE_RRC_DIR}/rrc_sl_preconfig.c
  )
@@ -1215,6 +1235,7 @@ set (MAC_SRC

 set (MAC_NR_SRC
  ${NR_PHY_INTERFACE_DIR}/NR_IF_Module.c
+  ${NR_PHY_INTERFACE_DIR}/nr_sched_response.c
  ${NR_GNB_MAC_DIR}/main.c
  ${NR_GNB_MAC_DIR}/config.c
  ${NR_GNB_MAC_DIR}/gNB_scheduler.c
@@ -1255,10 +1276,7 @@ set (MAC_NR_SRC_UE
  ${NR_UE_MAC_DIR}/nr_ue_procedures_sl.c
  ${NR_UE_MAC_DIR}/nr_ue_scheduler.c
  ${NR_UE_MAC_DIR}/nr_ue_scheduler_sl.c
-  ${NR_UE_MAC_DIR}/nr_ue_scheduler_sl_v2x.c
  ${NR_UE_MAC_DIR}/nr_ue_dci_configuration.c
-  ${NR_UE_MAC_DIR}/nr_ue_sci_slsch.c
-  ${NR_UE_MAC_DIR}/nr_slsch_scheduler.c 
 )

 set (ENB_APP_SRC
@@ -1285,6 +1303,12 @@ set (MISC_NFAPI_LTE

 add_library(MISC_NFAPI_LTE_LIB ${MISC_NFAPI_LTE})

+set (MISC_NFAPI_NR
+ ${OPENAIR1_DIR}/SCHED/nfapi_nr_dummy.c
+ )
+
+add_library(MISC_NFAPI_NR_LIB ${MISC_NFAPI_NR})
+
 add_library(L2
  ${L2_SRC}
  ${MAC_SRC}
@@ -1294,6 +1318,12 @@ add_library(L2
 target_link_libraries(L2 PRIVATE x2ap s1ap lte_rrc m2ap)
 target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

+if(E2_AGENT)
+  target_link_libraries(L2 PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
+  target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+endif()
+
+
 add_library(MAC_UE_NR ${MAC_NR_SRC_UE})
 target_link_libraries(MAC_UE_NR PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs PUBLIC nr_ue_power_procedures nr_ue_ra_procedures)

@@ -1320,6 +1350,10 @@ target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc nr_co
 if(OAI_AERIAL)
    target_compile_definitions(L2_NR PRIVATE ENABLE_AERIAL)
 endif()
+if(E2_AGENT)
+  target_link_libraries(L2_NR PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
+  target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
+endif()

 add_library(L2_LTE_NR
  # temporary solution until 4G/5G code completely untangled (as evidenced by deletion of the following file)
@@ -1649,6 +1683,13 @@ include_directories(${NAS_SRC}UE/EMM/SAP)
 include_directories(${NAS_SRC}UE/ESM)
 include_directories(${NAS_SRC}UE/ESM/SAP)

+# nbiot
+add_definitions("-DNUMBER_OF_UE_MAX_NB_IoT=16")
+set (NBIOT_SOURCES
+  ${OPENAIR2_DIR}/ENB_APP/NB_IoT_config.c
+  )
+add_library(NB_IoT MODULE ${NBIOT_SOURCES} )
+
 # Simulation library
 ##########################
 set (SIMUSRC
@@ -1674,8 +1715,9 @@ include_directories("${NFAPI_DIR}/nfapi/inc")
 include_directories("${NFAPI_DIR}/sim_common/inc")
 include_directories("${NFAPI_DIR}/pnf_sim/inc")

-add_library(oai_iqplayer MODULE ${OPENAIR_DIR}/radio/iqplayer/iqplayer_lib.c)
-target_link_libraries(oai_iqplayer PRIVATE log_headers)
+add_library(oai_iqplayer MODULE
+	${OPENAIR_DIR}/radio/iqplayer/iqplayer_lib.c
+	)

 #################################
 # add executables for operation
@@ -1685,6 +1727,10 @@ add_library(minimal_lib
  )
 target_link_libraries(minimal_lib PUBLIC pthread dl ${T_LIB} LOG)

+add_executable(nfapi_test
+  ${OPENAIR_DIR}/openair2/NR_PHY_INTERFACE/nfapi_5g_test.c
+  )
+
 add_executable(measurement_display
  ${OPENAIR_DIR}/common/utils/threadPool/measurement_display.c)
 target_link_libraries (measurement_display minimal_lib)
@@ -1724,7 +1770,6 @@ target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 target_link_libraries(lte-softmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})

 if(E2_AGENT)
-  target_link_libraries(lte-softmodem PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
  target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()

@@ -1828,7 +1873,6 @@ if (OAI_AERIAL)
  target_link_libraries(nr-softmodem PUBLIC aerial_lib)
 endif()
 if(E2_AGENT)
-  target_link_libraries(nr-softmodem PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup)
  target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
 endif()

@@ -1903,14 +1947,14 @@ target_link_libraries(nr-uesoftmodem PRIVATE
 #####################################

 #special case for dlim TM4, which uses its own version of phy_scope code
-#add_executable(dlsim_tm4
-#  ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/dlsim_tm4.c
-#  ${OPENAIR1_DIR}/PHY/TOOLS/lte_phy_scope_tm4.c
-#  )
-#target_link_libraries (dlsim_tm4
-#  -Wl,--start-group SIMU UTIL SCHED_LIB SCHED_RU_LIB PHY ITTI -Wl,--end-group
-#  pthread m rt CONFIG_LIB ${T_LIB}
-#  )
+add_executable(dlsim_tm4
+  ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/dlsim_tm4.c
+  ${OPENAIR1_DIR}/PHY/TOOLS/lte_phy_scope_tm4.c
+  )
+target_link_libraries (dlsim_tm4
+  -Wl,--start-group SIMU UTIL SCHED_LIB SCHED_RU_LIB PHY ITTI -Wl,--end-group
+  pthread m rt CONFIG_LIB ${T_LIB}
+  )

 add_executable(rftest
  ${OPENAIR_DIR}/openair1/PHY/TOOLS/calibration_test.c
@@ -1972,6 +2016,7 @@ target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_psbchsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${NR_UE_RRC_DIR}/rrc_nsa.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
  ${PHY_INTERFACE_DIR}/queue_t.c
@@ -1992,6 +2037,7 @@ target_link_libraries(nr_pucchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_dlsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${NR_UE_RRC_DIR}/rrc_nsa.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
  ${PHY_INTERFACE_DIR}/queue_t.c
@@ -2021,6 +2067,7 @@ target_link_libraries(nr_ulschsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 add_executable(nr_ulsim
  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/ulsim.c
  ${OPENAIR_DIR}/executables/softmodem-common.c
+  ${NR_UE_RRC_DIR}/rrc_nsa.c
  ${NFAPI_USER_DIR}/nfapi.c
  ${NFAPI_USER_DIR}/gnb_ind_vars.c
  ${PHY_INTERFACE_DIR}/queue_t.c
@@ -2032,9 +2079,7 @@ target_link_libraries(nr_ulsim PRIVATE
  )
 target_link_libraries(nr_ulsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

-# these simulators do not compile:
-# dlsim_tm7 pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
-foreach(myExe dlsim ulsim)
+foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)

  add_executable(${myExe}
    ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/${myExe}.c
@@ -2054,23 +2099,22 @@ endforeach(myExe)

 #unitary tests for Core NEtwork pieces
 #################################
-#foreach(myExe
-#    s1ap
-#    secu_knas_encrypt_eia1
-#    secu_kenb
-#    aes128_ctr
-#    secu_knas_encrypt_eea2
-#    secu_knas secu_knas_encrypt_eea1
-#    kdf
-#    aes128_cmac_encrypt
-#    secu_knas_encrypt_eia2)
-#  add_executable(test_${myExe}
-#    ${OPENAIR3_DIR}/TEST/test_${myExe}.c
-#    )
-#  target_link_libraries (test_${myExe}
-#    -Wl,--start-group SECURITY UTIL -Wl,--end-group m rt CONFIG_LIB
-#    )
-#endforeach(myExe)
+foreach(myExe s1ap
+    secu_knas_encrypt_eia1
+    secu_kenb
+    aes128_ctr
+    secu_knas_encrypt_eea2
+    secu_knas secu_knas_encrypt_eea1
+    kdf
+    aes128_cmac_encrypt
+    secu_knas_encrypt_eia2)
+  add_executable(test_${myExe}
+    ${OPENAIR3_DIR}/TEST/test_${myExe}.c
+    )
+  target_link_libraries (test_${myExe}
+    -Wl,--start-group SECURITY UTIL -Wl,--end-group m rt CONFIG_LIB
+    )
+endforeach(myExe)

 #ensure that the T header files are generated before targets depending on them
 if (${T_TRACER})
@@ -2080,17 +2124,17 @@ if (${T_TRACER})
        nr-uesoftmodem dlsim dlsim_tm4 dlsim_tm7
        ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim
        syncsim nr_ulsim nr_dlsim nr_dlschsim nr_pbchsim nr_pucchsim
-        nr_ulschsim ldpctest polartest smallblocktest
+        nr_ulschsim ldpctest polartest smallblocktest cu_test du_test
        #all "add_library" definitions
        ITTI lte_rrc nr_rrc s1ap x2ap m2ap m3ap f1ap
-        params_libconfig
-        oai_eth_transpro HASHTABLE UTIL
-        SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
+        params_libconfig oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
+        oai_eth_transpro oai_mobipass HASHTABLE UTIL OMG_SUMO
+        SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
        NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
-        MISC_NFAPI_LTE_LIB
+        MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU
        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE MAC_NR_COMMON MAC_UE_NR ngap
-        GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE SIMU
+        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU OPENAIR0_LIB
        dfts config_internals nr_common crc_byte)
    if (TARGET ${i})
      add_dependencies(${i} generate_T)
@@ -2098,6 +2142,8 @@ if (${T_TRACER})
  endforeach(i)
 endif (${T_TRACER})

+include(${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/CMakeLists.txt)
+
 set(ENABLE_TESTS OFF CACHE STRING "Activate build of tests")
 set_property(CACHE ENABLE_TESTS PROPERTY TYPE BOOL)
 set(ENABLE_PHYSIM_TESTS OFF CACHE STRING "Activate build of physim tests")
--- a/ci-scripts/Jenkinsfile
+++ b/ci-scripts/Jenkinsfile
@@ -1,233 +0,0 @@
-#!/bin/groovy
-/*
- * 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
- */
-
-def pythonExecutor = params.pythonExecutor
-def testXMLFile = params.pythonTestXmlFile
-def mainPythonAllXmlFiles = ""
-def buildStageStatus = true
-def JOB_TIMESTAMP
-
-// Choose test stage name or fallback default
-def testStageName = params.pipelineTestStageName != null ? params.pipelineTestStageName : 'Template Test Stage'
-
-// Name of the resource
-def lockResources = []
-if (params.LockResources != null && params.LockResources.trim().length() > 0)
-  params.LockResources.trim().split(",").each{lockResources += [resource: it.trim()]}
-
-// Global Parameters. Normally they should be populated when the master job
-// triggers the slave job with parameters
-
-def sourceRepository = params.eNB_Repository ?: env.GIT_URL
-def sourceBranch = params.eNB_Branch ?: env.GIT_BRANCH
-def targetRepository = params.Target_Repository ?: sourceRepository
-def targetBranch = params.eNB_TargetBranch ?: 'develop'
-def commitID = params.eNB_CommitID ?: env.GIT_COMMIT
-def is_MR = params.eNB_mergeRequest ?: false
-
-def flexricOption = ""
-def runWithOC = false
-
-//-------------------------------------------------------------------------------
-// Pipeline start
-pipeline {
-  agent {
-    label pythonExecutor
-  }
-  options {
-    timestamps()
-    ansiColor('xterm')
-    lock(extra: lockResources)
-  }
-
-  stages {
-    stage("Build Init") {
-      steps {
-        script {
-          echo '\u2705 \u001B[94mBuild Init\u001B[0m'
-          JOB_TIMESTAMP = sh(returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"').trim()
-        }
-        // update the build name and description
-        buildName "${params.eNB_MR}"
-        buildDescription "Branch : ${sourceBranch}"
-      }
-    }
-    stage ('Verify Parameters') {
-      steps {
-        script {
-          echo '\u2705 \u001B[94mVerify Parameters\u001B[0m'
-          def allParametersPresent = true
-
-          if (params.LockResources == null) {
-            echo "no LockResources given"
-            allParametersPresent = false
-          }
-          if (params.eNB_SourceCodePath == null) {
-            echo "no eNB_SourceCodePath given"
-            allParametersPresent = false
-          }
-          if (params.OC_Credentials != null) {
-            echo "This pipeline is configured to run with Opensift Cluster."
-            runWithOC = true
-            if (params.OC_ProjectName == null) {
-              echo "no OC_ProjectName given"
-              allParametersPresent = false
-            }
-          }
-          if (params.Flexric_Tag != null) {
-            echo "This pipeline is configured to run with a FlexRIC deployment."
-            echo "Appending FlexRicTag option to the list of options"
-            flexricOption = "--FlexRicTag=${params.Flexric_Tag}"
-            echo "Using new Flexric option: ${flexricOption}"
-          }
-
-          echo "CI executor node    :   ${pythonExecutor}"
-          echo "Source Repository   :   ${sourceRepository}"
-          echo "Source Branch       :   ${sourceBranch}"
-          echo "Target Repository   :   ${targetRepository}"
-          echo "Target Branch       :   ${targetBranch}"
-          echo "Commit ID           :   ${commitID}"
-
-          if (allParametersPresent) {
-            echo '\u2705 \u001B[94m All parameters are present\u001B[0m'
-            if (is_MR) {
-              sh "git fetch"
-              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${sourceBranch} --src-commit ${commitID} --target-branch ${targetBranch} --target-commit latest"
-            } else {
-              sh "git fetch"
-              sh "git checkout -f ${commitID}"
-            }
-          } else {
-            echo "\u274C Some parameters are missing"
-            sh "./ci-scripts/fail.sh"
-          }
-        }
-      }
-    }
-    stage ("Deploy and Test") {
-      steps {
-        script {
-          dir ('ci-scripts') {
-            echo "\u2705 \u001B[94m Deploy and Test: ${testStageName}\u001B[0m"
-            String[] myXmlTestSuite = testXMLFile.split("\\r?\\n")
-            for (xmlFile in myXmlTestSuite) {
-              if (fileExists(xmlFile)) {
-                mainPythonAllXmlFiles += "--XMLTestFile=" + xmlFile + " "
-                echo "Test XML file         :   ${xmlFile}"
-              } else {
-                echo "Test XML file ${xmlFile}: no such file"
-              }
-            }
-            sh """
-              python3 main.py --mode=InitiateHtml --ranRepository=${targetRepository} \
-                              --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
-                              --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
-                              ${flexricOption} ${mainPythonAllXmlFiles}
-            """
-            if (runWithOC) {
-              withCredentials([usernamePassword(credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password')]) {
-                sh """
-                  python3 main.py --mode=InitiateHtml --ranRepository=${targetRepository} \
-                                  --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
-                                  --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
-                                  ${flexricOption} ${mainPythonAllXmlFiles}
-                """
-                for (xmlFile in myXmlTestSuite) {
-                  if (fileExists(xmlFile)) {
-                    try {
-                      timeout (time: 60, unit: 'MINUTES') {
-                        sh """
-                          python3 main.py --mode=TesteNB --ranRepository=${targetRepository} \
-                                          --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
-                                          --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
-                                          --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} \
-                                          --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName} \
-                                          ${flexricOption}
-                        """
-                      }
-                    } catch (Exception e) {
-                      currentBuild.result = 'FAILURE'
-                      buildStageStatus = false
-                    }
-                  }
-                }
-              }
-            } else {
-              for (xmlFile in myXmlTestSuite) {
-                if (fileExists(xmlFile)) {
-                  try {
-                    timeout (time: 60, unit: 'MINUTES') {
-                      sh """
-                        python3 main.py --mode=TesteNB --ranRepository=${targetRepository} \
-                                        --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
-                                        --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
-                                        --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} \
-                                        ${flexricOption}
-                      """
-                    }
-                  } catch (Exception e) {
-                    currentBuild.result = 'FAILURE'
-                    buildStageStatus = false
-                  }
-                }
-              }
-            }
-          sh "python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus}"
-          }
-        }
-      }
-    }
-    stage ("Log Collection") {
-      steps {
-        script {
-	  echo '\u2705 \u001B[94mLog Collection\u001B[0m'
-          dir ('ci-scripts') {
-            // Zipping all archived log files
-              sh "mkdir test_logs"
-              sh "mv *.log* test_logs || true"
-              // Zip all log files matching cmake_targets/{*.log*,log/*} into test_logs_XXXX.zip
-              if (fileExists('../cmake_targets/log')) {
-                sh "mv ../cmake_targets/log/* test_logs || true"
-              }
-              sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *test_log*/"
-              sh "rm -rf *test_log*/"
-              if (fileExists("test_logs_${env.BUILD_ID}.zip")) {
-                archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip"
-              }
-            if (fileExists("test_results.html")) {
-              def reportName = "test_results-${env.JOB_NAME}.html"
-              sh "mv test_results.html ${reportName}"
-              sh """
-                sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' \
-                       -e 's#TEMPLATE_JOB_NAME#${JOB_NAME}#' \
-		       -e 's@build #TEMPLATE_BUILD_ID@build #${BUILD_ID}@' \
-                       -e 's#Build-ID: TEMPLATE_BUILD_ID#Build-ID: <a href=\"${BUILD_URL}\">${BUILD_ID}</a>#' \
-                       -e 's#TEMPLATE_STAGE_NAME#${testStageName}#' ${reportName}
-	      """
-              archiveArtifacts artifacts: "${reportName}"
-            }
-          }
-        }
-      }
-    }
-  }
-}
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -267,24 +267,6 @@ pipeline {
        }
      }
    }
-    stage ("DockerHub-Push") {
-      when { expression {doBuild && "PUSH".equals(env.gitlabActionType)} }
-      steps {
-        script {
-          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-            triggerSlaveJob ('RAN-DockerHub-Push', 'DockerHub-Push')
-          }
-        }
-      }
-      post {
-        failure {
-          script {
-            echo "Push to Docker-Hub KO"
-            failingStages += '\n * RAN-DockerHub-Push'
-          }
-        }
-      }
-    }
    stage ("Image Test Processes") {
      when { expression {doBuild} }
      parallel {
@@ -774,6 +756,23 @@ pipeline {
        }
      }
    }
+    stage ("DockerHub-Push") {
+      when { expression {doBuild && "PUSH".equals(env.gitlabActionType)} }
+      steps {
+        script {
+          triggerSlaveJob ('RAN-DockerHub-Push', 'DockerHub-Push')
+        }
+      }
+      post {
+        failure {
+          script {
+            echo "Push to Docker-Hub KO"
+            currentBuild.result = 'FAILURE'
+            failingStages += '\n * RAN-DockerHub-Push'
+          }
+        }
+      }
+    }
  }
  post {
    success {
--- a/ci-scripts/Jenkinsfile-push-registry
+++ b/ci-scripts/Jenkinsfile-push-registry
@@ -84,20 +84,12 @@ pipeline {
            sh "docker login -u ${DH_Username} -p ${DH_Password} > /dev/null 2>&1"
            sh "docker login -u oaicicd -p oaicicd ${OAI_Registry} > /dev/null 2>&1"
            listOfImages.eachWithIndex { item, iindex ->
-              if (["oai-gnb", "oai-nr-ue", "oai-nr-cuup"].contains(item)) {
-                // For images built on AMD64 and ARMv8 Jetson
-                echo "Pushing image '${item}' for both AMD64 and ARM64 architectures with tags: ${WEEK_TAG} and develop"
-                sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop || true"
-                sh "docker buildx imagetools create --tag ${DH_Account}/${item}:${WEEK_TAG} ${OAI_Registry}/${item}:armv8_develop-${WEEK_SHA} ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
-                sh "docker buildx imagetools create --tag ${DH_Account}/${item}:develop ${OAI_Registry}/${item}:armv8_develop-${WEEK_SHA} ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
-              } else {
-                sh "docker pull --quiet ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
-                sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:develop"
-                sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:${WEEK_TAG}"
-                sh "docker push --quiet ${DH_Account}/${item}:develop"
-                sh "docker push --quiet ${DH_Account}/${item}:${WEEK_TAG}"
-              }
-              sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop ${OAI_Registry}/${item}:develop-${WEEK_SHA} || true"
+              sh "docker pull --quiet ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
+              sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:develop"
+              sh "docker image tag ${OAI_Registry}/${item}:develop-${WEEK_SHA} ${DH_Account}/${item}:${WEEK_TAG}"
+              sh "docker push --quiet ${DH_Account}/${item}:${WEEK_TAG}"
+              sh "docker push --quiet ${DH_Account}/${item}:develop"
+              sh "docker rmi ${DH_Account}/${item}:${WEEK_TAG} ${DH_Account}/${item}:develop ${OAI_Registry}/${item}:develop-${WEEK_SHA}"
            }
            // Proxy is not following the same pattern.
            sh "docker image tag proxy:develop ${DH_Account}/proxy:develop"
--- a/ci-scripts/args_parse.py
+++ b/ci-scripts/args_parse.py
@@ -43,6 +43,10 @@ import constants as CONST

 def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):

+
+    py_param_file_present = False
+    py_params={}
+
    force_local = False
    while len(argvs) > 1:
        myArgv = argvs.pop(1)	# 0th is this file's name
@@ -168,4 +172,4 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER):
            HELP.GenericHelp(CONST.Version)
            sys.exit('Invalid Parameter: ' + myArgv)

-    return mode, force_local
+    return py_param_file_present, py_params, mode, force_local
--- a/ci-scripts/as_ue/config.cfg
+++ b/ci-scripts/as_ue/config.cfg
@@ -44,4 +44,4 @@ rf_driver: {
 #endif

 tx_gain: 75.0, /* TX gain (in dB) */
-rx_gain: 52.0, /* RX gain (in dB) */
+rx_gain: 55.0, /* RX gain (in dB) */
--- a/ci-scripts/attenuatorctl.py
+++ b/ci-scripts/attenuatorctl.py
@@ -1,175 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import logging
-import itertools
-import usb.core
-import usb.util
-import sys
-import time
-
-logging.basicConfig(
-    level=logging.DEBUG,
-    stream=sys.stdout,
-    format="%(message)s"
-)
-
-# helper class parsing command line options for channels and attenuators
-class ValidateChAtt(argparse.Action):
-    def _parse_channels(s):
-        if len(s.split("-")) == 2:
-            s, e = [int(x) for x in s.split("-")]
-            chs = [x for x in range(s, e+1)]
-            if len(chs) == 0:
-                raise Exception(f"empty range")
-        elif len(s.split(",")) > 1:
-            chs = [int(x) for x in s.split(",")]
-        elif s.isdigit():
-            chs = [int(s)]
-        else:
-            raise Exception(f"could not parse channel expression")
-        for c in chs:
-            if not 1 <= c <= 4:
-                raise Exception(f"channel number must be within [1,4], but have {c}")
-        return chs
-
-    def __call__(self, parse, args, values, option_string=None):
-        ch, att = values
-        try:
-            chs = ValidateChAtt._parse_channels(ch)
-        except Exception as e:
-            parse.exit(1, f"while parsing channel expression {ch}: {e}\n")
-        if not att.isdigit():
-            parse.exit(1, f'expected number for attenuation, but got {att}\n')
-        if not 0 <= int(att) <= 63:
-            parse.exit(1, f'attenuation must be within [0,63], but is {att}\n')
-        opts = getattr(args, self.dest) or {}
-        for c in chs:
-            opts[c] = int(att)
-        setattr(args, self.dest, opts)
-
-def _parse_args() -> argparse.Namespace:
-    epilog = '''
-[CHs] can have the following forms:
-  (1) single channel number w (within [1-4])
-  (2) a range of channels in the form x-y (x <= y)
-  (3) a list of channels in the form a,b,c
-[ATT] must be within [0,63] (dB)
-
--set and --reach are mutually exclusive
-
-Examples:
- reset all channels to 0: -s 1-4 0
- set channels 3 and 4 to attenuation 60: -s 3,4 60
- perform attenuation sweep during 10s, reaching ch. 1+2 to 60: -r 1,2 60 -d 10
-'''
-    parser = argparse.ArgumentParser(description='Mini-Circuit RC*DAT attenuator controller',
-                                     epilog=epilog,
-                                     formatter_class=argparse.RawDescriptionHelpFormatter)
-
-    parser.add_argument('--info', '-i', action='store_true', default=False,
-                        help='Get Infos for all connected Mini-Circuits RC*DAT',)
-    parser.add_argument('--set', '-s', nargs=2, metavar=("[CHs]","[ATT]"),
-                        action=ValidateChAtt, help="Set a fixed attenuation ATT on channels CHs")
-    parser.add_argument('--reach', '-r', nargs=2, metavar=("[CHs]","[ATT]"),
-                        action=ValidateChAtt, help="Perform an \"attenuation sweep\": reach attenuation ATT on channels CHs")
-    parser.add_argument('--duration', '-d', action='store', type=float, default=5.0,
-                        help='DURATION for attenuation sweep to --reach given attenuation (Default: 5)',)
-    parser.add_argument('--progress', '-p', action='store_true', default=False,
-                        help='If provided, will show progress during attenuation sweep',)
-    return parser.parse_args()
-
-def _exec(dev, cmd):
-    dev.write(1, cmd)
-    ans = dev.read(0x81,64)
-    # take from ans(wer) while valid bytes
-    sn = itertools.takewhile(lambda x: x < 255 and x > 0, ans)
-    # turn bytes into characters and accumulate into string
-    return "".join(map(chr, sn))
-
-def devId(dev):
-    return f"{dev.idVendor:04x}:{dev.idProduct:04x}"
-
-def _info(dev):
-    ident = devId(dev)
-    SerialN = _exec(dev, "*:SN?")
-    ModelN = _exec(dev, "*:MN?")
-    Fw = _exec(dev, "*:FIRMWARE?")
-
-    logging.info(f'{ident}: model is {ModelN}')
-    logging.info(f'{ident}: serial number is {SerialN}')
-    logging.info(f'{ident}: FW version is {Fw}')
-
-def _get_attenuation(dev):
-    ident = devId(dev)
-    att = _exec(dev, "*:ATT?")
-    # remove leading "*" and split by channels
-    return [float(n) for n in att[1:].split(" ")]
-
-def _set_attenuation(dev, ch_att):
-    ident = devId(dev)
-    for ch, att in ch_att:
-        #logging.debug(f"{ident}: Set attenuation channel {ch}: {att} dB")
-        att = round(4 * att) / 4 # round to closest 0.25dB
-        resp = _exec(dev, f"*:CHAN:{ch}:SETATT:{att};" )
-
-def _continuous_set_attenuation(dev, ch_att_end, duration, show_progress=False, step_duration=0.25):
-    ident = devId(dev)
-
-    current = _get_attenuation(dev)
-    steps = duration / step_duration
-    ch_att_step = [(ch, (att_end - current[ch - 1]) / steps) for ch, att_end in ch_att_end]
-    logging.info(f"{ident}: sweep attenuation during {duration} s in {steps} steps: increments {ch_att_step}")
-    for i in range(1, int(steps)+1):
-        next_att = [(ch, current[ch - 1] + i * att_step) for ch, att_step in ch_att_step]
-        _set_attenuation(dev, next_att)
-        if show_progress:
-            logging.debug(f"{ident}: attenuation for channel(s): {next_att}")
-        time.sleep(step_duration)
-    _set_attenuation(dev, ch_att_end)
-
-def _get_usb_devs(idVendor, idProduct):
-    devs = []
-    for dev in usb.core.find(idVendor=idVendor, idProduct=idProduct, find_all=True):
-        for configuration in dev:
-            for interface in configuration:
-                ifnum = interface.bInterfaceNumber
-                if not dev.is_kernel_driver_active(ifnum):
-                    continue
-                try:
-                    dev.detach_kernel_driver(ifnum)
-                except e:
-                    pass
-        devs.append(dev)
-    return devs
-
-if __name__ == '__main__':
-    # Parse the arguments
-    args = _parse_args()
-    if args.set and args.reach:
-        logging.error("--set and --reach are mutually exclusive")
-        sys.exit(1)
-
-    # 20ce:0023 is Mini-Circuit RC*DAT device
-    devs = _get_usb_devs(idVendor=0x20ce, idProduct=0x0023)
-    if len(devs) == 0:
-        logging.error('no Mini-Circuits RC*DAT device detected')
-        sys.exit(-1)
-    if len(devs) > 1:
-        logging.error('more than one Mini-Circuits RC*DAT device detected')
-        sys.exit(-1)
-    dev = devs[0]
-
-    if args.info:
-        _info(dev)
-
-    if args.set:
-        _set_attenuation(dev, [(k,v) for k,v in args.set.items()])
-
-    if args.reach:
-        _continuous_set_attenuation(dev, [(k,v) for k,v in args.reach.items()], args.duration, args.progress)
-
-    ident = devId(dev)
-    for i, a in enumerate(_get_attenuation(dev)):
-        logging.info(f"{ident}: Attenuation channel {i+1}: {a} dB")
-    sys.exit(0)
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -85,7 +85,7 @@ oc-cn5g-20897:
  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72 %%log_dir%%"

-oc-cn5g-00103-ho:
+oc-cn5g-00102-ho:
  Host: groot
  NetworkScript: echo "inet 172.21.6.111"
  RunIperf3Server: False
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -47,7 +47,6 @@ import helpreadme as HELP
 import constants as CONST
 import cls_oaicitest
 from cls_ci_helper import archiveArtifact
-from collections import deque

 #-----------------------------------------------------------
 # Helper functions used here and in other classes
@@ -120,7 +119,7 @@ def ExistEnvFilePrint(ssh, wd, prompt='env vars in existing'):

 def WriteEnvFile(ssh, services, wd, tag, flexric_tag):
 	ret = ssh.run(f'cat {wd}/.env', silent=True, reportNonZero=False)
-	registry = "oai-ci/" # pull_images() gives us this registry path
+	registry = "oai-ci" # pull_images() gives us this registry path
 	envs = {"REGISTRY":registry, "TAG": tag, "FLEXRIC_TAG": flexric_tag}
 	if ret.returncode == 0: # it exists, we have to update
 		# transforms env file to dictionary
@@ -135,8 +134,7 @@ def WriteEnvFile(ssh, services, wd, tag, flexric_tag):
 		# or -asan images. We need to detect which kind we did pull.
 		fullImageName = GetImageName(ssh, svc, f"{wd}/docker-compose.y*ml")
 		image = fullImageName.split("/")[-1].split(":")[0]
-		# registry now includes the trailing slash ("oai-ci/")
-		checkimg = f"{registry}{image}-asan:{tag}"
+		checkimg = f"{registry}/{image}-asan:{tag}"
 		ret = ssh.run(f'docker image inspect {checkimg}', reportNonZero=False)
 		if ret.returncode == 0:
 			logging.info(f"detected pulled image {checkimg}")
@@ -166,26 +164,25 @@ def CopyinServiceLog(ssh, lSourcePath, svcName, wd_yaml, ctx):
 	ssh.run(f'docker compose -f {wd_yaml} logs {svcName} --no-log-prefix &> {remote_filename}')
 	return archiveArtifact(ssh, ctx, remote_filename)

-def GetDeployedServices(ssh, file):
+def GetRunningServices(ssh, file):
 	ret = ssh.run(f'docker compose -f {file} config --services')
 	if ret.returncode != 0:
-		logging.error("could not get services")
 		return None
 	allServices = ret.stdout.splitlines()
-	deployed_services = []
+	running_services = []
 	for s in allServices:
-		# outputs the hash if the container has been deployed (but might be stopped)
-		ret = ssh.run(f'docker compose -f {file} ps --all --quiet -- {s}', silent=True)
+		# outputs the hash if the container is running
+		ret = ssh.run(f'docker compose -f {file} ps --all --quiet -- {s}')
 		if ret.returncode != 0:
-			# error: should not happen as we iterate over docker-provided service list
-			logging.error(f"service {s}: {ret.stdout}")
+			logging.info(f"service {s}: {ret.stdout}")
 		elif ret.stdout == "":
-			logging.info(f"service {s} not deployed")
+			logging.warning(f"could not retrieve information for service {s}")
 		else:
 			c = ret.stdout
-			logging.info(f'service {s} with container id {c}')
-			deployed_services.append(s)
-	return deployed_services
+			logging.debug(f'running service {s} with container id {c}')
+			running_services.append((s, c))
+	logging.info(f'stopping services: {running_services}')
+	return running_services

 def CheckLogs(self, filename, HTML, RAN):
 	success = True
@@ -217,24 +214,6 @@ def CheckLogs(self, filename, HTML, RAN):
 		else:
 			HTML.CreateHtmlTestRowQueue(opt, 'OK', [HTML.htmleNBFailureMsg])
 		HTML.htmleNBFailureMsg = ""
-	elif 'xapp' in name:
-		opt = f"Undeploy {name}"
-		with open(f'{filename}', "r") as f:
-			last_line = deque(f, maxlen=1).pop()
-		if ('Test xApp run SUCCESSFULLY' in last_line):
-			HTML.CreateHtmlTestRowQueue(opt, 'OK', ["xApp run successfully"])
-		else:
-			HTML.CreateHtmlTestRowQueue(opt, 'KO', ["xApp didn't run successfully"])
-			success = False
-	elif 'RIC' in name:
-		opt = f"Undeploy {name}"
-		with open(f'{filename}', 'r') as f:
-			last_line = deque(f, maxlen=1).pop()
-		if ('Removing E2 Node' in last_line):
-			HTML.CreateHtmlTestRowQueue(opt, 'OK', ["nearRT-RIC run successfully"])
-		else:
-			HTML.CreateHtmlTestRowQueue(opt, 'KO', ["nearRT-RIC didn't run successfully"])
-			success = False
 	else:
 		logging.info(f"Skipping analysis of log '{filename}': no submatch for xNB/UE")
 	logging.debug(f"log check: file {filename} passed analysis {success}")
@@ -416,13 +395,13 @@ 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.2025.10.09.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2025.08.27.tar.gz .')
 			logfile = f'{lSourcePath}/cmake_targets/log/{name}.docker.log'
 			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > {logfile} 2>&1', timeout=1200)
 			t = (name, archiveArtifact(cmd, ctx, logfile))
 			log_files.append(t)
 			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc_src.2025.10.09.tar.gz')
+				cmd.run('rm -f nvipc_src.2025.08.27.tar.gz')
 			# check the status of the build
 			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
 			if ret.returncode != 0:
@@ -735,6 +714,7 @@ class Containerize():
 	def DeployObject(self, ctx, node, HTML):
 		num_attempts = self.num_attempts
 		lSourcePath = self.eNBSourceCodePath
+		logging.debug(f'Deploying OAI Object on server: {node}')
 		yaml = self.yamlPath.strip('/')
 		wd = f'{lSourcePath}/{yaml}'
 		wd_yaml = f'{wd}/docker-compose.y*ml'
@@ -745,7 +725,6 @@ class Containerize():
 				logging.error(msg)
 				HTML.CreateHtmlTestRowQueue('N/A', 'KO', [msg])
 				return False
-			logging.info(f'\u001B[1mDeploying object(s) "{services}" on server {node}\u001B[0m')
 			ExistEnvFilePrint(ssh, wd)
 			WriteEnvFile(ssh, services, wd, self.deploymentTag, self.flexricTag)
 			if num_attempts <= 0:
@@ -770,68 +749,36 @@ class Containerize():
 		imagesInfo = info.stdout.splitlines()[1:]
 		logging.debug(f'{info.stdout.splitlines()[1:]}')
 		if deployed:
-			HTML.CreateHtmlTestRowQueue(self.services, 'OK', ['\n'.join(imagesInfo)])
-			logging.info('\u001B[1m Deploying objects Pass\u001B[0m')
+			HTML.CreateHtmlTestRowQueue('N/A', 'OK', ['\n'.join(imagesInfo)])
 		else:
-			HTML.CreateHtmlTestRowQueue(self.services, 'KO', ['\n'.join(imagesInfo)])
-			logging.error('\u001B[1m Deploying objects Failed\u001B[0m')
+			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['\n'.join(imagesInfo)])
 		return deployed

-	def StopObject(self, ctx, node, HTML):
-		lSourcePath = self.eNBSourceCodePath
-		if not self.services:
-			raise ValueError(f'no services provided')
-		logging.info(f'\u001B[1m Stopping objects "{self.services}" from server: {node}\u001B[0m')
-		reqServices = self.services.split()
-		yaml = self.yamlPath.strip('/')
-		wd = f'{lSourcePath}/{yaml}'
-		wd_yaml = f'{wd}/docker-compose.y*ml'
-		with cls_cmd.getConnection(node) as ssh:
-			ExistEnvFilePrint(ssh, wd)
-			services = GetDeployedServices(ssh, wd_yaml)
-			success = []
-			fail = []
-			for s in reqServices:
-				if s in services:
-					ssh.run(f'docker compose -f {wd_yaml} stop -- {s}')
-					success.append(s)
-				else:
-					logging.error(f"no such service {s}")
-					fail.append(s)
-		if success == reqServices:
-			logging.info('\u001B[1m Stopping object Pass\u001B[0m')
-			HTML.CreateHtmlTestRowQueue(self.services, 'OK', [f'Stopped {self.services}'])
-		else:
-			logging.error('\u001B[1m Stopping object Failed\u001B[0m')
-			HTML.CreateHtmlTestRowQueue(self.services, 'KO', [f'Failed stopping {" ".join(fail)}, succeeded {" ".join(success)}'])
-		return success
-
 	def UndeployObject(self, ctx, node, HTML, RAN):
 		lSourcePath = self.eNBSourceCodePath
-		logging.info(f'\u001B[1m Undeploying all objects from server {node}\u001B[0m')
+		logging.debug(f'\u001B[1m Undeploying OAI Object from server: {node}\u001B[0m')
 		yaml = self.yamlPath.strip('/')
 		wd = f'{lSourcePath}/{yaml}'
-		wd_yaml = f'{wd}/docker-compose.y*ml'
 		with cls_cmd.getConnection(node) as ssh:
 			ExistEnvFilePrint(ssh, wd)
-			services = GetDeployedServices(ssh, wd_yaml)
+			services = GetRunningServices(ssh, f"{wd}/docker-compose.y*ml")
 			copyin_res = None
-			ssh.run(f'docker compose -f {wd_yaml} stop')
 			if services is not None:
-				copyin_res = [CopyinServiceLog(ssh, lSourcePath, s, wd_yaml, ctx) for s in services]
+				all_serv = " ".join([s for s, _ in services])
+				ssh.run(f'docker compose -f {wd}/docker-compose.y*ml stop -- {all_serv}')
+				copyin_res = [CopyinServiceLog(ssh, lSourcePath, s, f"{wd}/docker-compose.y*ml", ctx) for s, _ in services]
 			else:
 				logging.warning('could not identify services to stop => no log file')
-			ssh.run(f'docker compose -f {wd_yaml} down -v')
+			ssh.run(f'docker compose -f {wd}/docker-compose.y*ml down -v')
 			ssh.run(f'rm {wd}/.env')
 		if not copyin_res:
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ['Could not copy logfile(s)'])
-			logging.error(f"could not copy all files: {copyin_res=} {services=}")
-			success = False
+			return False
 		else:
 			log_results = [CheckLogs(self, f, HTML, RAN) for f in copyin_res]
 			success = all(log_results)
 		if success:
-			logging.info('\u001B[1m Undeploying objects Pass\u001B[0m')
+			logging.info('\u001B[1m Undeploying OAI Object Pass\u001B[0m')
 		else:
-			logging.error('\u001B[1m Undeploying objects Failed\u001B[0m')
+			logging.error('\u001B[1m Undeploying OAI Object Failed\u001B[0m')
 		return success
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -233,10 +233,10 @@ def Custom_Command(HTML, node, command):
    HTML.CreateHtmlTestRowQueue(command, status, message)
    return status == 'OK' or status == 'Warning'

-def Custom_Script(HTML, node, script, args):
+def Custom_Script(HTML, node, script):
 	logging.info(f"Executing custom script on {node}")
 	with cls_cmd.getConnection(node) as c:
-		ret = c.exec_script(script, 90, args)
+		ret = c.exec_script(script, 90)
 	logging.debug(f"Custom_Script: {script} on node: {node} - return code {ret.returncode}, output:\n{ret.stdout}")
 	status = 'OK'
 	message = [ret.stdout]
@@ -255,7 +255,7 @@ def Deploy_Physim(ctx, HTML, node, workdir, script, options):
 	logging.debug(f'Running physims on server {node} workdir {workdir}')
 	with cls_cmd.getConnection(node) as c:
 		sys_info = c.exec_script("scripts/sys-info.sh", 5)
-		ret = c.exec_script(script, 1000, options)
+		ret = c.exec_script(script, 600, options)
 	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
 	HTML.CreateHtmlTestRowQueue('Query system info', 'OK', [sys_info.stdout])
 	with cls_cmd.getConnection(node) as ssh:
@@ -299,16 +299,18 @@ class OaiCiTest():
 		self.iperf_packetloss_threshold = ''
 		self.iperf_bitrate_threshold = ''
 		self.iperf_profile = ''
+		self.iperf_options = ''
 		self.iperf_tcp_rate_target = ''
 		self.finalStatus = False
 		self.air_interface=''
 		self.ue_ids = []
+		self.nodes = []
 		self.svr_node = None
 		self.svr_id = None
 		self.cmd_prefix = '' # prefix before {lte,nr}-uesoftmodem

-	def InitializeUE(self, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def InitializeUE(self, HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.initialize) for ue in ues]
@@ -319,8 +321,8 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('N/A', 'OK', messages)
 		return True

-	def AttachUE(self, node, HTML):
-		ues = [cls_module.Module_UE(ue_id, node) for ue_id in self.ue_ids]
+	def AttachUE(self, HTML):
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.attach) for ue in ues]
 			attached = [f.result() for f in futures]
@@ -335,8 +337,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not retrieve UE IP address(es) or MTU(s) wrong!"])
 		return success

-	def DetachUE(self, node, HTML):
-		ues = [cls_module.Module_UE(ue_id, node) for ue_id in self.ue_ids]
+	def DetachUE(self, HTML):
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.detach) for ue in ues]
 			[f.result() for f in futures]
@@ -344,8 +346,8 @@ class OaiCiTest():
 		HTML.CreateHtmlTestRowQueue('NA', 'OK', messages)
 		return True

-	def DataDisableUE(self, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def DataDisableUE(self, HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.dataDisable) for ue in ues]
 			status = [f.result() for f in futures]
@@ -358,8 +360,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not disable UE data!"])
 		return success

-	def DataEnableUE(self, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def DataEnableUE(self, HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(f'disabling data for UEs {ues}')
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.dataEnable) for ue in ues]
@@ -373,8 +375,8 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["Could not enable UE data!"])
 		return success

-	def CheckStatusUE(self, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def CheckStatusUE(self,HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		logging.debug(f'checking status of UEs {ues}')
 		messages = []
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
@@ -444,10 +446,10 @@ class OaiCiTest():

 		return (True, message)

-	def Ping(self, ctx, node, HTML, infra_file="ci_infra.yaml"):
+	def Ping(self, ctx, HTML, infra_file="ci_infra.yaml"):
 		if self.ue_ids == [] or self.svr_id == None:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
-		ues = [cls_module.Module_UE(ue_id, node, infra_file) for ue_id in self.ue_ids]
+		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(self.Ping_common, ctx, cn, ue) for ue in ues]
@@ -501,11 +503,6 @@ class OaiCiTest():
 			t = iperf_time * 2.5
 			cmd_ue.run(f'rm {client_filename}', reportNonZero=False, silent=True)
 			if cn.runIperf3Server():
-				# Clean up any existing iperf3 server processes on this port.
-				ret = cmd_svr.run(f"{cn.getCmdPrefix()} pkill -f '.*iperf3.*{port}'", reportNonZero=False)
-				# If pkill succeeds, it means there was a leftover iperf3 server.
-				if ret.returncode == 0:
-					logging.warning(f'Iperf3 server on port {port} detected and terminated')
 				cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} >> /dev/null &', timeout=t)
 			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> {client_filename}', timeout=t)
 			dest_filename = archiveArtifact(cmd_ue, ctx, client_filename)
@@ -518,12 +515,12 @@ class OaiCiTest():

 		return (status, f'{ue_header}\n{msg}')

-	def Iperf(self, ctx, node, HTML, infra_file="ci_infra.yaml"):
-		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}"')
+	def Iperf(self, ctx, HTML, infra_file="ci_infra.yaml"):
+		logging.debug(f'Iperf: iperf_args "{self.iperf_args}" iperf_packetloss_threshold "{self.iperf_packetloss_threshold}" iperf_bitrate_threshold "{self.iperf_bitrate_threshold}" iperf_profile "{self.iperf_profile}" iperf_options "{self.iperf_options}"')

 		if self.ue_ids == [] or self.svr_id == None:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
-		ues = [cls_module.Module_UE(ue_id, node, infra_file) for ue_id in self.ue_ids]
+		ues = [cls_module.Module_UE(ue_id, server_name, infra_file) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(self.Iperf_Module, ctx, cn, ue, i, len(ues)) for i, ue in enumerate(ues)]
@@ -547,10 +544,10 @@ class OaiCiTest():
 			HTML.CreateHtmlTestRowQueue(self.iperf_args, 'KO', messages)
 		return success

-	def Iperf2_Unidir(self, ctx, node, HTML, infra_file="ci_infra.yaml"):
+	def Iperf2_Unidir(self, ctx, HTML, infra_file="ci_infra.yaml"):
 		if self.ue_ids == [] or self.svr_id == None or len(self.ue_ids) != 1:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided, multi UE scenario not supported")
-		ue = cls_module.Module_UE(self.ue_ids[0].strip(), node, infra_file)
+		ue = cls_module.Module_UE(self.ue_ids[0].strip(),self.nodes[0].strip(), infra_file)
 		cn = cls_corenetwork.CoreNetwork(self.svr_id, self.svr_node, filename=infra_file)
 		ueIP = ue.getIP()
 		if not ueIP:
@@ -850,8 +847,8 @@ class OaiCiTest():
 				global_status = CONST.OAI_UE_PROCESS_COULD_NOT_SYNC
 		return global_status

-	def TerminateUE(self, ctx, node, HTML):
-		ues = [cls_module.Module_UE(n.strip(), node) for n in self.ue_ids]
+	def TerminateUE(self, ctx, HTML):
+		ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
 		with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:
 			futures = [executor.submit(ue.terminate, ctx) for ue in ues]
 			archives = [f.result() for f in futures]
--- a/ci-scripts/conf_files/gnb-cu.sa.f1.ho.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.f1.ho.conf
@@ -1,4 +1,4 @@
-Active_gNBs = ( "CU-OAI");
+Active_gNBs = ( "oai-cu");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

@@ -10,7 +10,7 @@ gNBs =

 #     cell_type =  "CELL_MACRO_GNB";

-    gNB_name  =  "CU-OAI";
+    gNB_name  =  "oai-cu";

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code =  1;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
@@ -23,6 +23,7 @@ gNBs =
    ////////// Physical parameters:

    min_rxtxtime = 2;
+    do_CSIRS     = 1;
    do_SRS       = 1;

    servingCellConfigCommon = (
@@ -134,11 +135,11 @@ gNBs =
      # pattern1 
      # dl_UL_TransmissionPeriodicity
      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 10;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 2;
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 7;
+      nrofDownlinkSymbols                                           = 6;
+      nrofUplinkSlots                                               = 2;
+      nrofUplinkSymbols                                             = 4;

      ssPBCH_BlockPower                                             = -25;
     }
--- a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf
@@ -1,4 +1,4 @@
-Active_gNBs = ( "DU0-OAI");
+Active_gNBs = ( "oai-du0");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

@@ -8,7 +8,7 @@ gNBs =
    ////////// Identification parameters:
    gNB_ID    = 0xe88;
    gNB_DU_ID = 0xe00;
-    gNB_name  = "DU0-OAI";
+    gNB_name  = "oai-du0";

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  = 1 ;
@@ -26,11 +26,11 @@ gNBs =

 #  downlinkConfigCommon
    #frequencyInfoDL
-      # 4186.56 MHz
-      absoluteFrequencySSB                                          = 679104;
-      dl_frequencyBand                                              = 77;
-      # 4175.82 MHz
-      dl_absoluteFrequencyPointA                                    = 678388;
+      # 4.01 GHz
+      absoluteFrequencySSB                                          = 629376;
+      dl_frequencyBand                                              = 78;
+      # 4 GHz
+      dl_absoluteFrequencyPointA                                    = 628720;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
@@ -50,7 +50,7 @@ gNBs =

  #uplinkConfigCommon
     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
+      ul_frequencyBand                                              = 78;
      #scs-SpecificCarrierList
      ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
@@ -107,7 +107,7 @@ gNBs =
        pucchGroupHopping                                           = 0;
        hoppingId                                                   = 40;
        p0_nominal                                                  = -90;
-
+# ssb_PositionsInBurs_BitmapPR
      ssb_PositionsInBurst_Bitmap                                   = 1;

 # ssb_periodicityServingCell
@@ -159,7 +159,9 @@ MACRLCs = (
  tr_n_preference       = "f1";
  local_n_address       = "172.21.19.98";
  remote_n_address      = "172.21.19.98";
+  local_n_portc         = 500;
  local_n_portd         = 2154;
+  remote_n_portc        = 501;
  remote_n_portd        = 2153;
  pusch_TargetSNRx10    = 200;
  pucch_TargetSNRx10    = 230;
@@ -174,6 +176,7 @@ L1s = (
  prach_dtx_threshold   = 100;
  pucch0_dtx_threshold  = 10;
  max_ldpc_iterations   = 20;
+  sl_ahead              = 3;
  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
 }
 );
@@ -185,8 +188,7 @@ RUs = (
  nb_rx            = 1
  att_tx           = 0;
  att_rx           = 0;
-  sl_ahead         = 3;
-  bands            = [77];
+  bands            = [78];
  max_pdschReferenceSignalPower = -27;
  max_rxgain       = 114;
  eNB_instances    = [0];
--- a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf
@@ -1,4 +1,4 @@
-Active_gNBs = ( "DU1-OAI");
+Active_gNBs = ( "oai-du1");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";

@@ -8,7 +8,7 @@ gNBs =
    ////////// Identification parameters:
    gNB_ID    = 0xe88;
    gNB_DU_ID = 0xe01;
-    gNB_name  = "DU1-OAI";
+    gNB_name  = "oai-du1";

    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  = 1 ;
@@ -26,11 +26,11 @@ gNBs =

 #  downlinkConfigCommon
    #frequencyInfoDL
-      # 4186.56 MHz
-      absoluteFrequencySSB                                          = 679104;
-      dl_frequencyBand                                              = 77;
-      # 4175.82 MHz
-      dl_absoluteFrequencyPointA                                    = 678388;
+      # 4.01 GHz
+      absoluteFrequencySSB                                          = 629376;
+      dl_frequencyBand                                              = 78;
+      # 4 GHz
+      dl_absoluteFrequencyPointA                                    = 628720;
      #scs-SpecificCarrierList
        dl_offstToCarrier                                           = 0;
 # subcarrierSpacing
@@ -50,7 +50,7 @@ gNBs =

  #uplinkConfigCommon
     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
+      ul_frequencyBand                                              = 78;
      #scs-SpecificCarrierList
      ul_offstToCarrier                                             = 0;
 # subcarrierSpacing
@@ -107,8 +107,8 @@ gNBs =
        pucchGroupHopping                                           = 0;
        hoppingId                                                   = 40;
        p0_nominal                                                  = -90;
-
-      ssb_PositionsInBurst_Bitmap                                   = 2;
+# ssb_PositionsInBurs_BitmapPR
+      ssb_PositionsInBurst_Bitmap                                   = 1;

 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
@@ -159,7 +159,9 @@ MACRLCs = (
  tr_n_preference       = "f1";
  local_n_address       = "172.21.19.99";
  remote_n_address      = "172.21.19.98";
+  local_n_portc         = 500;
  local_n_portd         = 2154;
+  remote_n_portc        = 501;
  remote_n_portd        = 2153;
  pusch_TargetSNRx10    = 200;
  pucch_TargetSNRx10    = 230;
@@ -174,6 +176,7 @@ L1s = (
  prach_dtx_threshold   = 100;
  pucch0_dtx_threshold  = 10;
  max_ldpc_iterations   = 20;
+  sl_ahead              = 3;
  ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
 }
 );
@@ -185,8 +188,7 @@ RUs = (
  nb_rx            = 1
  att_tx           = 0;
  att_rx           = 0;
-  sl_ahead         = 3;
-  bands            = [77];
+  bands            = [78];
  max_pdschReferenceSignalPower = -27;
  max_rxgain       = 114;
  eNB_instances    = [0];
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -32,7 +32,7 @@ gNBs =
    pdsch_AntennaPorts_N1 = 2;
    pusch_AntennaPorts    = 2;
    do_CSIRS              = 1;
-    do_SRS                = 1;
+    do_SRS                = 0;
    min_rxtxtime          = 2;

    servingCellConfigCommon = (
@@ -155,7 +155,7 @@ gNBs =
      nrofUplinkSlots                                               = 3;  #1;
      nrofUplinkSymbols                                             = 0;

-      ssPBCH_BlockPower                                             = -15;
+      ssPBCH_BlockPower                                             = -25;
  }

  );
@@ -176,8 +176,8 @@ gNBs =

    NETWORK_INTERFACES :
    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.53";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.53";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.202";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.202";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };

@@ -195,7 +195,7 @@ MACRLCs = (
  remote_s_portd   = 50010; // pnf p7 port [!]
  tr_s_preference             = "aerial";
  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 280; # 150;
+  pusch_TargetSNRx10          = 200; # 150;
  pucch_TargetSNRx10          = 200; #200;
  dl_max_mcs = 28;
  ul_max_mcs = 28;
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf
@@ -1,227 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-nfapi = "AERIAL";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1; }); });
-
-    nr_cellid = 12345678L;
-    uess_agg_levels = [0,6,0,0,0];
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 2;
-    pusch_AntennaPorts    = 2;
-    do_CSIRS              = 1;
-    do_SRS                = 1;
-    min_rxtxtime          = 2;
-    force_UL256qam_off    = 1;
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # center frequency = 3350.01 MHz
-      # selected SSB frequency = 3349.92 MHz
-      absoluteFrequencySSB                                          = 623328;
-      dl_frequencyBand                                              = 78;
-      # frequency point A = 3300.87 MHz
-      dl_absoluteFrequencyPointA                                    = 620058;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       # this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
-       initialDLBWPlocationAndBandwidth                             = 1099;
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 12;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 159;# testMAC 158; OAI gNB 98
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 12;
-          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;
-#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;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-        msg3_DeltaPreamble                                          = 1;
-        p0_NominalWithGrant                                         = -90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 40;
-        p0_nominal                                                  = -90;
-
-      ssb_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                                 = 5;
-      nrofDownlinkSlots                                             = 1;
-      nrofDownlinkSymbols                                           = 10;
-      nrofUplinkSlots                                               = 3;
-      nrofUplinkSymbols                                             = 0;
-
-      ssPBCH_BlockPower                                             = -10;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.103"; });
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.53";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.53";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc           = 1;
-  remote_s_address = "127.0.0.1"; // pnf addr [!]
-  local_s_address  = "127.0.0.2"; // vnf addr
-  local_s_portc    = 50001; // vnf p5 port
-  remote_s_portc   = 50000; // pnf p5 port [!]
-  local_s_portd    = 50011; // vnf p7 port [!]
-  remote_s_portd   = 50010; // pnf p7 port [!]
-  tr_s_preference             = "aerial";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 260; # 150;
-  pucch_TargetSNRx10          = 200; #200;
-  dl_max_mcs = 28;
-  ul_max_mcs = 28;
-  ul_min_mcs = 16;
-}
-);
-
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
-};
--- a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf
@@ -16,7 +16,7 @@ gNBs =

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

-    CSI_report_type = "ssb_sinr";
+    do_SINR                                                   = 1;
    min_rxtxtime                                              = 6;
    disable_harq                                              = 1;
    cu_sibs = [2];
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4.2L-metanoia.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4.2L-metanoia.conf
@@ -106,7 +106,8 @@ gNBs =
        pucchGroupHopping                                           = 0;
        hoppingId                                                   = 40;
        p0_nominal                                                  = -90;
-
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
      ssb_PositionsInBurst_Bitmap                                   = 1;
 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
--- a/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf
@@ -1,237 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 001; mnc = 03; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
-
-    // Include neighbour configuration for N2 handover
-    @include "neighbour-config-ho.conf"
-
-    nr_cellid = 12345678L;
-
-    ////////// Physical parameters:
-
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3610.56 MHz
-      absoluteFrequencySSB                                             = 679104;
-      dl_frequencyBand                                                 = 77;
-      # this is 3599.94 MHz
-      dl_absoluteFrequencyPointA                                       = 678388;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                           = 1;
-        dl_carrierBandwidth                                            = 51;
-     #initialDownlinkBWP
-      #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 13750;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                   = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 12;
-        initialDLBWPsearchSpaceZero                                     = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 77;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 51;
-      pMax                                                          = 20;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 13750;
-# 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;
-#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;
-#one (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_PositionsInBurst_Bitmap                                   = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 6;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
-
-      ssPBCH_BlockPower                                             = -25;
-  }
-
-  );
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.109"; });
-
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.19.98";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.19.98";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc                      = 1;
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
-  pucch_TargetSNRx10          = 200;
-  ul_prbblack_SNR_threshold   = 10;
-}
-);
-
-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          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 114;
-  eNB_instances  = [0];
-  clock_src = "external";
-  time_src = "external";
-}
-);
-
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level                      ="info";
-  hw_log_level                          ="info";
-  phy_log_level                         ="info";
-  mac_log_level                         ="info";
-  rlc_log_level                         ="info";
-  pdcp_log_level                        ="info";
-  rrc_log_level                         ="info";
-  ngap_log_level                        ="debug";
-  f1ap_log_level                        ="debug";
-};
-
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
@@ -184,7 +184,7 @@ L1s = (
 {
  num_cc = 1;
  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 150;
+  prach_dtx_threshold = 130;
  #pucch0_dtx_threshold = 150;
 }
 );
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
@@ -18,6 +18,8 @@ gNBs =

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

+    do_CSIRS                                                  = 0;
+    do_SRS                                                    = 0;
    min_rxtxtime = 6;

    servingCellConfigCommon = (
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf
@@ -1,256 +0,0 @@
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID = 0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-
-    plmn_list = ({mcc = 208; mnc = 97; mnc_length = 2;});
-
-    ////////// Physical parameters:
-
-    min_rxtxtime                                              = 6;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-
-# downlinkConfigCommon
-    #frequencyInfoDL
-      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
-      absoluteFrequencySSB                                           = 621312;
-      # this is 3300.60 MHz
-      dl_absoluteFrequencyPointA                                     = 620040;
-      #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=0,L=106 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                             = 28875;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                                = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                           = 11;
-        initialDLBWPsearchSpaceZero                                  = 0;
-
-#uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                               = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                              = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                           = 1;
-      ul_carrierBandwidth                                            = 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                                  = 12;
-          preambleReceivedTargetPower                                = -104;
-#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;
-#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;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                    = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                 = 7;
-        rsrp_ThresholdSSB                                            = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                   = 2;
-        prach_RootSequenceIndex                                      = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                       = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                          = 0,
-
-        msg3_DeltaPreamble                                           = 1;
-        p0_NominalWithGrant                                          =-90;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                            = 0;
-        hoppingId                                                    = 40;
-        p0_nominal                                                   = -90;
-
-      ssb_PositionsInBurst_Bitmap                                    = 1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spar e1
-      ssb_periodicityServingCell                                     = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                            = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                              = 1;
-
-
-#tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                     = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                  = 6;
-      nrofDownlinkSlots                                              = 7;
-      nrofDownlinkSymbols                                            = 6;
-      nrofUplinkSlots                                                = 2;
-      nrofUplinkSymbols                                              = 4;
-
-      ssPBCH_BlockPower                                              = -25;
-  }
-
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "CI_MME_IP_ADDR"; });
-
-        NETWORK_INTERFACES :
-        {
-
-           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
-           GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
-           GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        };
-
-  }
-);
-
-MACRLCs = (
-{
-  num_cc           = 1;
-  tr_s_preference  = "local_L1";
-  tr_n_preference  = "local_RRC";
-  pusch_TargetSNRx10 = 200;
-  pucch_TargetSNRx10 = 200;
-}
-);
-
-prs_config = (
-{
-  NumPRSResources       = 1;
-  PRSResourceSetPeriod  = [20, 2];
-  SymbolStart           = [7];
-  NumPRSSymbols         = [6];
-  NumRB                 = 106;
-  RBOffset              = 0;
-  CombSize              = 4;
-  REOffset              = [0];
-  PRSResourceOffset     = [0];
-  PRSResourceRepetition = 1;
-  PRSResourceTimeGap    = 1;
-  NPRS_ID               = [0];
-  MutingPattern1        = [];
-  MutingPattern2        = [];
-  MutingBitRepetition   = 1;
-}
-);
-
-L1s = (
-{
-  num_cc              = 1;
-  tr_n_preference     = "local_mac";
-  prach_dtx_threshold = 120;
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 1
-  nb_rx          = 1
-  att_tx         = 0
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain     = 75;
-  sf_extension   = 0;
-  eNB_instances  = [0];
-}
-);
-
-
-rfsimulator :
-{
-  serveraddr = "server";
-  serverport = 4043;
-  options    = (); #("saviq"); or/and "chanmod"
-  modelname  = "AWGN";
-  IQfile     = "/tmp/rfsimulator.iqs";
-};
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level = "info";
-  hw_log_level     = "info";
-  phy_log_level    = "info";
-  mac_log_level    = "info";
-  rlc_log_level    = "info";
-  pdcp_log_level   = "info";
-  rrc_log_level    = "info";
-  f1ap_log_level   = "debug";
-};
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
@@ -146,7 +146,6 @@ MACRLCs:
    tr_n_preference: local_RRC
    pusch_TargetSNRx10: 200
    pucch_TargetSNRx10: 200
-    stats_max_ue: 17

 L1s:
  - num_cc: 1
--- a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
@@ -196,7 +196,6 @@ RUs = (
  att_tx         = 0
  att_rx         = 0;
  bands          = [78];
-  sl_ahead=3;
  max_pdschReferenceSignalPower = -27;
  max_rxgain                    = 114;
  sf_extension                  = 0;
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -21,6 +21,10 @@ gNBs =
    nr_cellid = 12345678L

    ////////// Physical parameters:
+    pdsch_AntennaPorts_XP                                     = 1;
+    pusch_AntennaPorts                                        = 1;
+    do_CSIRS                                                  = 1;
+    do_SRS                                                    = 0;
    uess_agg_levels = [2, 2, 2, 0, 0];

    servingCellConfigCommon = (
@@ -182,7 +186,6 @@ MACRLCs = (
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
    pucch_TargetSNRx10 = 200;
-    stats_max_ue = 17;
  }
 );

--- a/ci-scripts/conf_files/neighbour-config-ho.conf
+++ b/ci-scripts/conf_files/neighbour-config-ho.conf
@@ -6,9 +6,9 @@ neighbour_list = (
        gNB_ID = 0xe01;
        nr_cellid = 11111111;
        physical_cellId = 1;
-        absoluteFrequencySSB = 679104;
+        absoluteFrequencySSB = 629376;
        subcarrierSpacing = 1; #30 KHz
-        band = 77;
+        band = 78;
        plmn = { mcc = 001; mnc = 03; mnc_length = 2};
        tracking_area_code = 1;
      }
@@ -21,9 +21,9 @@ neighbour_list = (
        gNB_ID = 0xe00;
        nr_cellid = 12345678;
        physical_cellId = 0;
-        absoluteFrequencySSB = 679104;
+        absoluteFrequencySSB = 629376;
        subcarrierSpacing = 1; #30 KHz
-        band = 77;
+        band = 78;
        plmn = { mcc = 001; mnc = 03; mnc_length = 2};
        tracking_area_code = 1;
      }
--- a/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf
+++ b/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf
@@ -14,6 +14,7 @@ key = "fec86ba6eb707ed08905757b1bb44b8f";
 opc= "C42449363BBAD02B66D16BC975D77CC1";
 dnn= "oai";
 nssai_sst=1;
+nssai_sd=16777215;
 }

 MACRLCs = (
--- a/ci-scripts/conf_files/nrue.band78.106prb.prs.conf
+++ b/ci-scripts/conf_files/nrue.band78.106prb.prs.conf
@@ -1,89 +0,0 @@
-PRSs =
-(
-  {
-    Active_gNBs = 1;
-    prs_config0 = (
-    {
-      gNB_id = 0;
-      NumPRSResources       = 1;
-      PRSResourceSetPeriod  = [20, 2];
-      SymbolStart           = [7];
-      NumPRSSymbols         = [6];
-      NumRB                 = 106;
-      RBOffset              = 0;
-      CombSize              = 4;
-      REOffset              = [0];
-      PRSResourceOffset     = [0];
-      PRSResourceRepetition = 1;
-      PRSResourceTimeGap    = 1;
-      NPRS_ID               = [0];
-      MutingPattern1        = [];
-      MutingPattern2        = [];
-      MutingBitRepetition   = 1;
-    }
-    );
-
-    prs_config1 = (
-    {
-      gNB_id = 1;
-      NumPRSResources       = 1;
-      PRSResourceSetPeriod  = [20, 2];
-      SymbolStart           = [7];
-      NumPRSSymbols         = [6];
-      NumRB                 = 106;
-      RBOffset              = 0;
-      CombSize              = 4;
-      REOffset              = [0];
-      PRSResourceOffset     = [1];
-      PRSResourceRepetition = 1;
-      PRSResourceTimeGap    = 1;
-      NPRS_ID               = [1];
-      MutingPattern1        = [];
-      MutingPattern2        = [];
-      MutingBitRepetition   = 1;
-    }
-    );
-
-    prs_config2 = (
-    {
-      gNB_id = 2;
-      NumPRSResources       = 1;
-      PRSResourceSetPeriod  = [20, 2];
-      SymbolStart           = [7];
-      NumPRSSymbols         = [6];
-      NumRB                 = 106;
-      RBOffset              = 0;
-      CombSize              = 4;
-      REOffset              = [0];
-      PRSResourceOffset     = [2];
-      PRSResourceRepetition = 1;
-      PRSResourceTimeGap    = 1;
-      NPRS_ID               = [2];
-      MutingPattern1        = [];
-      MutingPattern2        = [];
-      MutingBitRepetition   = 1;
-    }
-    );
-
-    prs_config3 = (
-    {
-      gNB_id = 3;
-      NumPRSResources       = 1;
-      PRSResourceSetPeriod  = [20, 2];
-      SymbolStart           = [7];
-      NumPRSSymbols         = [6];
-      NumRB                 = 106;
-      RBOffset              = 0;
-      CombSize              = 4;
-      REOffset              = [0];
-      PRSResourceOffset     = [3];
-      PRSResourceRepetition = 1;
-      PRSResourceTimeGap    = 1;
-      NPRS_ID               = [3];
-      MutingPattern1        = [];
-      MutingPattern2        = [];
-      MutingBitRepetition   = 1;
-    }
-    );
-  }
-);
--- a/ci-scripts/conf_files/ue.sa.conf
+++ b/ci-scripts/conf_files/ue.sa.conf
@@ -4,6 +4,7 @@ uicc0 = {
  opc= "c42449363bbad02b66d16bc975d77cc1";
  dnn= "oai";
  nssai_sst=1;
+  nssai_sd=66051;
 }

 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
@@ -17,6 +17,9 @@ gNBs =

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

+    do_CSIRS                                                  = 0;
+    do_SRS                                                    = 0;
+
    servingCellConfigCommon = (
    {
 #spCellConfigCommon
--- a/ci-scripts/datalog_rt_stats.100.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.100.2x2.yaml
@@ -15,6 +15,7 @@ Ref :
  DLSCH encoding : 200.0
  L1 Rx processing : 530.0
  PUSCH inner-receiver : 360.0
+  Schedule Response : 1.0
  DL & UL scheduling timing : 17.0
  UL Indication : 1.0
  Slot Indication : 13.0
@@ -30,6 +31,7 @@ DeviationThreshold :
  DLSCH encoding : 0.25
  L1 Rx processing : 0.25
  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
  DL & UL scheduling timing : 0.25
  UL Indication : 1.00
  Slot Indication : 0.50
--- a/ci-scripts/datalog_rt_stats.1x1.60.yaml
+++ b/ci-scripts/datalog_rt_stats.1x1.60.yaml
@@ -15,6 +15,7 @@ Ref :
  DLSCH encoding : 110.0
  L1 Rx processing : 345.0
  PUSCH inner-receiver : 150.0
+  Schedule Response : 1.0
  DL & UL scheduling timing : 5.0
  UL Indication : 1.0
  Slot Indication : 6.0
@@ -30,6 +31,7 @@ DeviationThreshold :
  DLSCH encoding : 0.25
  L1 Rx processing : 0.25
  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
  DL & UL scheduling timing : 0.50
  UL Indication : 1.00
  Slot Indication : 0.50
--- a/ci-scripts/datalog_rt_stats.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.2x2.yaml
@@ -15,6 +15,7 @@ Ref :
  DLSCH encoding : 230.0
  L1 Rx processing : 175.0
  PUSCH inner-receiver : 100.0
+  Schedule Response : 3.0
  DL & UL scheduling timing : 11.0
  UL Indication : 3.0
  Slot Indication : 14.0
@@ -27,6 +28,7 @@ DeviationThreshold :
  DLSCH encoding : 0.25
  L1 Rx processing : 0.25
  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
  DL & UL scheduling timing : 0.50
  UL Indication : 1.00
  Slot Indication : 0.25
--- a/ci-scripts/datalog_rt_stats.60.2x2.yaml
+++ b/ci-scripts/datalog_rt_stats.60.2x2.yaml
@@ -15,6 +15,7 @@ Ref :
  DLSCH encoding : 140.0
  L1 Rx processing : 345.0
  PUSCH inner-receiver : 155.0
+  Schedule Response : 1.0
  DL & UL scheduling timing : 8.0
  UL Indication : 3.0
  Slot Indication : 9.0
@@ -30,6 +31,7 @@ DeviationThreshold :
  DLSCH encoding : 0.25
  L1 Rx processing : 0.25
  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
  DL & UL scheduling timing : 0.35
  UL Indication : 1.00
  Slot Indication : 0.35
--- a/ci-scripts/datalog_rt_stats.default.yaml
+++ b/ci-scripts/datalog_rt_stats.default.yaml
@@ -15,6 +15,7 @@ Ref :
  DLSCH encoding : 90.0
  L1 Rx processing : 290.0
  PUSCH inner-receiver : 115.0
+  Schedule Response : 1.0
  DL & UL scheduling timing : 4.0
  UL Indication : 2.0
  Slot Indication : 5.0
@@ -30,6 +31,7 @@ DeviationThreshold :
  DLSCH encoding : 0.25
  L1 Rx processing : 0.25
  PUSCH inner-receiver : 0.25
+  Schedule Response : 1.00
  DL & UL scheduling timing : 0.50
  UL Indication : 1.00
  Slot Indication : 0.50
--- a/ci-scripts/docker/Dockerfile.physim.ubuntu
+++ b/ci-scripts/docker/Dockerfile.physim.ubuntu
@@ -42,6 +42,5 @@ WORKDIR /oai-ran/build
 RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON \
        -DSANITIZE_UNDEFINED=OFF -DSANITIZE_ADDRESS=OFF \
        -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
-        -DPHYSIM_CHECK_FILES="ThresholdsGracehopper.cmake" \
        .. && \
    ninja ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim nr_psbchsim
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -85,7 +85,15 @@ def CheckClassValidity(xml_class_list,action,id):
 		resp=True
 	return resp

-def ExecuteActionWithParam(action, ctx, node):
+#assigning parameters to object instance attributes (even if the attributes do not exist !!)
+def AssignParams(params_dict):
+
+	for key,value in params_dict.items():
+		setattr(CiTestObj, key, value)
+		setattr(RAN, key, value)
+		setattr(HTML, key, value)
+
+def ExecuteActionWithParam(action, ctx):
 	global RAN
 	global HTML
 	global CONTAINERS
@@ -94,6 +102,7 @@ def ExecuteActionWithParam(action, ctx, node):
 	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
+		node = test.findtext('node')
 		proxy_commit = test.findtext('proxy_commit')
 		if proxy_commit is not None:
 			CONTAINERS.proxyCommit = proxy_commit
@@ -109,6 +118,7 @@ def ExecuteActionWithParam(action, ctx, node):
 			success = CONTAINERS.BuildRunTests(ctx, node, HTML)

 	elif action == 'Initialize_eNB':
+		node = test.findtext('node')
 		datalog_rt_stats_file=test.findtext('rt_stats_cfg')
 		if datalog_rt_stats_file is None:
 			RAN.datalog_rt_stats_file='datalog_rt_stats.default.yaml'
@@ -129,6 +139,7 @@ def ExecuteActionWithParam(action, ctx, node):
 		success = RAN.InitializeeNB(ctx, node, HTML)

 	elif action == 'Terminate_eNB':
+		node = test.findtext('node')
 		#retx checkers
 		string_field = test.findtext('d_retx_th')
 		if (string_field is not None):
@@ -147,35 +158,68 @@ def ExecuteActionWithParam(action, ctx, node):

 	elif action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Terminate_UE' or action == 'CheckStatusUE' or action == 'DataEnable_UE' or action == 'DataDisable_UE':
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
+		if force_local:
+			# Change all execution targets to localhost
+			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
+		else:
+			if test.findtext('nodes'):
+				CiTestObj.nodes = test.findtext('nodes').split(' ')
+				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
+					logging.error('Number of Nodes are not equal to the total number of UEs')
+					sys.exit("Mismatch in number of Nodes and UIs")
+			else:
+				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		if action == 'Initialize_UE':
-			success = CiTestObj.InitializeUE(node, HTML)
+			success = CiTestObj.InitializeUE(HTML)
 		elif action == 'Attach_UE':
-			success = CiTestObj.AttachUE(node, HTML)
+			success = CiTestObj.AttachUE(HTML)
 		elif action == 'Detach_UE':
-			success = CiTestObj.DetachUE(node, HTML)
+			success = CiTestObj.DetachUE(HTML)
 		elif action == 'Terminate_UE':
-			success = CiTestObj.TerminateUE(ctx, node, HTML)
+			success = CiTestObj.TerminateUE(ctx, HTML)
 		elif action == 'CheckStatusUE':
-			success = CiTestObj.CheckStatusUE(node, HTML)
+			success = CiTestObj.CheckStatusUE(HTML)
 		elif action == 'DataEnable_UE':
-			success = CiTestObj.DataEnableUE(node, HTML)
+			success = CiTestObj.DataEnableUE(HTML)
 		elif action == 'DataDisable_UE':
-			success = CiTestObj.DataDisableUE(node, HTML)
+			success = CiTestObj.DataDisableUE(HTML)

 	elif action == 'Ping':
 		CiTestObj.ping_args = test.findtext('ping_args')
 		CiTestObj.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		CiTestObj.svr_id = test.findtext('svr_id')
+		CiTestObj.svr_id = test.findtext('svr_id') or None
 		if test.findtext('svr_node'):
 			CiTestObj.svr_node = test.findtext('svr_node') if not force_local else 'localhost'
+		if force_local:
+			# Change all execution targets to localhost
+			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
+		else:
+			if test.findtext('nodes'):
+				CiTestObj.nodes = test.findtext('nodes').split(' ')
+				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
+					logging.error('Number of Nodes are not equal to the total number of UEs')
+					sys.exit("Mismatch in number of Nodes and UIs")
+			else:
+				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		ping_rttavg_threshold = test.findtext('ping_rttavg_threshold') or ''
-		success = CiTestObj.Ping(ctx, node, HTML)
+		success = CiTestObj.Ping(ctx, HTML)

 	elif action == 'Iperf' or action == 'Iperf2_Unidir':
 		CiTestObj.iperf_args = test.findtext('iperf_args')
 		CiTestObj.ue_ids = test.findtext('id').split(' ')
-		CiTestObj.svr_id = test.findtext('svr_id')
+		CiTestObj.svr_id = test.findtext('svr_id') or None
+		if force_local:
+			# Change all execution targets to localhost
+			CiTestObj.nodes = ['localhost'] * len(CiTestObj.ue_ids)
+		else:
+			if test.findtext('nodes'):
+				CiTestObj.nodes = test.findtext('nodes').split(' ')
+				if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
+					logging.error('Number of Nodes are not equal to the total number of UEs')
+					sys.exit("Mismatch in number of Nodes and UIs")
+			else:
+				CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		if test.findtext('svr_node'):
 			CiTestObj.svr_node = test.findtext('svr_node') if not force_local else 'localhost'
 		CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
@@ -185,10 +229,14 @@ def ExecuteActionWithParam(action, ctx, node):
 		if CiTestObj.iperf_profile != 'balanced' and CiTestObj.iperf_profile != 'unbalanced' and CiTestObj.iperf_profile != 'single-ue':
 			logging.error(f'test-case has wrong profile {CiTestObj.iperf_profile}, forcing balanced')
 			CiTestObj.iperf_profile = 'balanced'
+		CiTestObj.iperf_options = test.findtext('iperf_options') or 'check'
+		if CiTestObj.iperf_options != 'check' and CiTestObj.iperf_options != 'sink':
+			logging.error('test-case has wrong option ' + CiTestObj.iperf_options)
+			CiTestObj.iperf_options = 'check'
 		if action == 'Iperf':
-			success = CiTestObj.Iperf(ctx, node, HTML)
+			success = CiTestObj.Iperf(ctx, HTML)
 		elif action == 'Iperf2_Unidir':
-			success = CiTestObj.Iperf2_Unidir(ctx, node, HTML)
+			success = CiTestObj.Iperf2_Unidir(ctx, HTML)

 	elif action == 'IdleSleep':
 		st = test.findtext('idle_sleep_time_in_sec') or "5"
@@ -196,6 +244,7 @@ def ExecuteActionWithParam(action, ctx, node):

 	elif action == 'Deploy_Run_OC_PhySim':
 		oc_release = test.findtext('oc_release')
+		node = test.findtext('node') or None
 		script = "scripts/oc-deploy-physims.sh"
 		image_tag = cls_containerize.CreateTag(CLUSTER.ranCommitID, CLUSTER.ranBranch, CLUSTER.ranAllowMerge)
 		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {CLUSTER.eNBSourceCodePath}"
@@ -203,6 +252,7 @@ def ExecuteActionWithParam(action, ctx, node):
 		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)

 	elif action == 'Build_Deploy_Docker_PhySim' or action == 'Build_Deploy_Source_PhySim':
+		node = test.findtext('node') or None
 		ctest_opt = test.findtext('ctest-opt') or ''
 		script = "scripts/docker-build-and-deploy-physims.sh" if action == 'Build_Deploy_Docker_PhySim' else 'scripts/source-deploy-physims.sh'
 		options = f"{CONTAINERS.eNBSourceCodePath} {ctest_opt}"
@@ -214,7 +264,8 @@ def ExecuteActionWithParam(action, ctx, node):
 		core_op = getattr(cls_oaicitest.OaiCiTest, action)
 		success = core_op(cn_id, ctx, HTML)

-	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace" or action == "Stop_Object":
+	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace":
+		node = test.findtext('node')
 		CONTAINERS.yamlPath = test.findtext('yaml_path')
 		string_field=test.findtext('d_retx_th')
 		if (string_field is not None):
@@ -227,8 +278,6 @@ def ExecuteActionWithParam(action, ctx, node):
 		CONTAINERS.deploymentTag = cls_containerize.CreateTag(CONTAINERS.ranCommitID, CONTAINERS.ranBranch, CONTAINERS.ranAllowMerge)
 		if action == 'Deploy_Object':
 			success = CONTAINERS.DeployObject(ctx, node, HTML)
-		elif action == 'Stop_Object':
-			success = CONTAINERS.StopObject(ctx, node, HTML)
 		elif action == 'Undeploy_Object':
 			success = CONTAINERS.UndeployObject(ctx, node, HTML, RAN)
 		elif action == 'Create_Workspace':
@@ -238,12 +287,15 @@ def ExecuteActionWithParam(action, ctx, node):
 			success = CONTAINERS.Create_Workspace(node, HTML)

 	elif action == 'LicenceAndFormattingCheck':
+		node = test.findtext('node')
 		success = SCA.LicenceAndFormattingCheck(ctx, node, HTML)

 	elif action == 'Cppcheck_Analysis':
+		node = test.findtext('node')
 		success = SCA.CppCheckAnalysis(ctx, node, HTML)

 	elif action == 'Push_Local_Registry':
+		node = test.findtext('node')
 		tag_prefix = test.findtext('tag_prefix') or ""
 		success = CONTAINERS.Push_Image_to_Local_Registry(node, HTML, tag_prefix)

@@ -251,6 +303,7 @@ def ExecuteActionWithParam(action, ctx, node):
 		if force_local:
 			# Do not pull or remove images when running locally. User is supposed to handle image creation & cleanup
 			return True
+		node = test.findtext('node')
 		tag_prefix = test.findtext('tag_prefix') or ""
 		images = test.findtext('images').split()
 		# hack: for FlexRIC, we need to overwrite the tag to use
@@ -263,21 +316,22 @@ def ExecuteActionWithParam(action, ctx, node):
 			success = CONTAINERS.Clean_Test_Server_Images(HTML, node, images, tag=tag)

 	elif action == 'Custom_Command':
+		node = test.findtext('node')
+		if force_local:
+			# Change all execution targets to localhost
+			node = 'localhost'
 		command = test.findtext('command')
-		# Allow referencing repository workspace path in XML via %%workspace%%
-		command = command.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
 		success = cls_oaicitest.Custom_Command(HTML, node, command)

 	elif action == 'Custom_Script':
+		node = test.findtext('node')
 		script = test.findtext('script')
-		args = test.findtext('args')
-		# Allow referencing repository workspace path in XML via %%workspace%%
-		script = script.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
-		success = cls_oaicitest.Custom_Script(HTML, node, script, args)
+		success = cls_oaicitest.Custom_Script(HTML, node, script)

 	elif action == 'Pull_Cluster_Image':
 		tag_prefix = test.findtext('tag_prefix') or ""
 		images = test.findtext('images').split()
+		node = test.findtext('node')
 		success = CLUSTER.PullClusterImage(HTML, node, images, tag_prefix=tag_prefix)

 	else:
@@ -295,16 +349,8 @@ def test_in_list(test, list):
 			return True
 	return False

-test_runner_abort = False
 def receive_signal(signum, frame):
-    global test_runner_abort
-    if not test_runner_abort:
-        logging.warning("received signal, canceling steps")
-        logging.info("send signal again to exit immediately")
-        test_runner_abort = True
-    else:
-        logging.warning("received signal again, exiting")
-        sys.exit(1)
+	sys.exit(1)

 def ShowTestID(ctx, desc):
    logging.info(f'\u001B[1m----------------------------------------\u001B[0m')
@@ -349,7 +395,16 @@ CLUSTER = cls_cluster.Cluster()
 import args_parse
 # Force local execution, move all execution targets to localhost
 force_local = False
-mode, force_local = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER)
+py_param_file_present, py_params, mode, force_local = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,CONTAINERS,HELP,SCA,CLUSTER)
+
+
+
+#-----------------------------------------------------------
+# TEMPORARY params management (UNUSED)
+#-----------------------------------------------------------
+#temporary solution for testing:
+if py_param_file_present == True:
+	AssignParams(py_params)

 #-----------------------------------------------------------
 # mode amd XML class (action) analysis
@@ -495,7 +550,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 			#logging.info('test will be run: ' + test)
 			todo_tests.append(test)

-	signal.signal(signal.SIGINT, receive_signal)
+	signal.signal(signal.SIGUSR1, receive_signal)

 	HTML.CreateHtmlTabHeader()

@@ -505,8 +560,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	i = 0
 	for test_case_id in todo_tests:
 		for test in all_tests:
-			if test_runner_abort:
-				task_set_succeeded = False
 			id = test.get('id')
 			if test_case_id != id:
 				continue
@@ -515,7 +568,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 			ctx = TestCaseCtx(i, int(id), logPath)
 			HTML.testCase_id=CiTestObj.testCase_id
 			desc = test.findtext('desc')
-			node = test.findtext('node') if not force_local else 'localhost'
 			always_exec = test.findtext('always_exec') in ['True', 'true', 'Yes', 'yes']
 			may_fail = test.findtext('may_fail') in ['True', 'true', 'Yes', 'yes']
 			HTML.desc = desc
@@ -530,7 +582,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 				HTML.CreateHtmlTestRowQueue(msg, "SKIP", [])
 				break
 			try:
-				test_succeeded = ExecuteActionWithParam(action, ctx, node)
+				test_succeeded = ExecuteActionWithParam(action, ctx)
 				if not test_succeeded and may_fail:
 					logging.warning(f"test ID {test_case_id} action {action} may or may not fail, proceeding despite error")
 				elif not test_succeeded:
--- a/ci-scripts/scripts/create_workspace.sh
+++ b/ci-scripts/scripts/create_workspace.sh
@@ -22,5 +22,5 @@ git config user.name "OAI Jenkins"
 git config advice.detachedHead false
 mkdir -p cmake_targets/log
 git checkout -f ${ref}
-[ -n "${merge}" ] && git fetch origin ${merge} && git merge --ff FETCH_HEAD -m "Temporary merge for CI"
+[ -n "${merge}" ] && git merge --ff ${merge} -m "Temporary merge for CI"
 exit 0
--- a/ci-scripts/scripts/oc-deploy-physims.sh
+++ b/ci-scripts/scripts/oc-deploy-physims.sh
@@ -1,5 +1,7 @@
 #!/bin/bash

+set -e
+
 function die() { echo $@; exit 1; }
 [ $# -eq 4 ] || die "usage: $0 <namespace> <release> <image tag> <oai directory>"

@@ -9,17 +11,11 @@ IMG_TAG=${3}
 OAI_DIR=${4}

 cat /opt/oc-password | oc login -u oaicicd --server https://api.oai.cs.eurecom.fr:6443 > /dev/null
-set -x
 oc project ${OC_NS} > /dev/null
 oc tag oaicicd-ran/oai-physim:${IMG_TAG} ${OC_NS}/oai-physim:${IMG_TAG}
 helm install ${OC_RELEASE} ${OAI_DIR}/charts/${OC_RELEASE} --set global.image.version=${IMG_TAG} --wait --timeout 120s
-set +x
 POD_ID=$(oc get pods | grep oai-${OC_RELEASE} | awk '{print $1}')
-wait_creating=30
-while [[ $(oc describe pod "$POD_ID" | grep "ContainerCreating") && ${wait_creating} > 0 ]]; do
-  sleep 1;
-  let wait_creating=$wait_creating-1
-done
+sleep 10
 echo "Monitoring logs for 'FINISHED' in pod '$POD_ID'"
 oc logs -f -n ${OC_NS} "$POD_ID" | while read -r line; do
  if [[ "$line" == *"FINISHED"* ]]; then
@@ -31,7 +27,6 @@ oc logs -f -n ${OC_NS} "$POD_ID" | while read -r line; do
    break
  fi
 done
-set -x
 oc logs -n ${OC_NS} "$POD_ID" >> ${OAI_DIR}/physim_log.txt
 oc describe pod $POD_ID >> ${OAI_DIR}/physim_log.txt
 helm uninstall ${OC_RELEASE} --wait
--- a/ci-scripts/scripts/set-and-verify-distance-prs.sh
+++ b/ci-scripts/scripts/set-and-verify-distance-prs.sh
@@ -1,89 +0,0 @@
-#!/bin/bash
-
-[[ $# -lt 1 ]] && { echo "Usage: $0 <distance_in_meters...>"; exit 1; }
-DISTANCES=("$@")
-
-IP=192.168.71.150
-PORT=8091
-NCAT_TIMEOUT=1 #s
-SLEEP_WAIT=4 #s
-MAX_RETRIES=3
-
-set_and_verify_distance() {
-  local distance=$1
-  echo "Testing PRS ToA estimation for distance: $distance m"
-
-  # it seems that grep returns immediately with this syntax, but not echo | ncat | grep
-  # so prefer this to receive new distance immediately. We use --idle to keep
-  # ncat open for some additional time
-  local setdist_resp="$(grep --max-count 1 new_offset <(echo rfsimu setdistance rfsimu_channel_enB0 $distance | ncat --idle ${NCAT_TIMEOUT} ${IP} ${PORT}))"
-  echo "> response: ${setdist_resp}"
-
-  local gettoa_resp="$(echo "ciUE get_max_dl_toa" | ncat ${IP} ${PORT} | grep "UE max PRS DL ToA")"
-  echo "> response: ${gettoa_resp}"
-
-  [[ -z "$setdist_resp" || -z "$gettoa_resp" ]] && return 1
-
-  # Extract ToA values 
-  [[ "$setdist_resp" =~ new_offset\ ([0-9]+) ]] && local set_toa="${BASH_REMATCH[1]}" || { echo "> Set ToA extraction failed for distance: $distance m"; return 1; }
-
-  [[ "$gettoa_resp" =~ UE\ max\ PRS\ DL\ ToA\ ([0-9]+) ]] && local est_toa="${BASH_REMATCH[1]}" || { echo "> Estimated ToA extraction failed for distance: $distance m"; return 1; }
-
-  # Compare extracted ToA values
-  [[ $set_toa == $est_toa ]] && echo "PRS SUCCESS for distance: $distance m" || { echo "PRS FAILURE for distance: $distance m (Actual ToA=$set_toa, Estimated ToA=$est_toa)" ; return 1; }
-
-}
-
-test_distance() {
-  local distance=$1 retries=0
-
-  # retry loop incase we didn't receive the response
-  while (( retries < MAX_RETRIES )); do
-    echo "  Attempt $((retries + 1))/$MAX_RETRIES"
-
-    # Always reset to 0 m before testing target distance
-    if ! set_and_verify_distance 0; then
-      echo " Set distance 0 m failed during attempt $((retries + 1))"
-    else
-      sleep "$SLEEP_WAIT"
-      # Now test the actual target distance
-      if set_and_verify_distance "$distance"; then
-        return 0
-      fi
-    fi
-
-    ((retries++))
-    if (( retries < MAX_RETRIES )); then
-      sleep "$SLEEP_WAIT"
-    else
-      echo " ERROR: No valid response after $MAX_RETRIES retries for distance: $distance m"
-      return 1
-    fi
-  done
-}
-
-num_success=0
-num_fail=0
-
-for d in "${DISTANCES[@]}"; do
-  if test_distance "$d"; then
-    ((num_success++))
-  else
-    ((num_fail++))
-  fi
-  sleep "$SLEEP_WAIT"
-done
-
-# ---- Summary ----
-echo
-echo "==================== SUMMARY ===================="
-echo "Total tests run : ${#DISTANCES[@]}"
-echo "Successful tests: ${num_success}"
-echo "Failed tests    : ${num_fail}"
-echo "================================================="
-
-if [ $num_success -gt 0 ]; then
-  exit 0
-else
-  exit 1
-fi
--- a/ci-scripts/tests/deployment.py
+++ b/ci-scripts/tests/deployment.py
@@ -60,33 +60,6 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.assertTrue(deploy)
 		self.assertTrue(undeploy)

-	def test_stop_services(self):
-		self.cont.yamlPath = 'tests/simple-undep/'
-		self.cont.deploymentTag = "noble"
-		# should deploy both testA and testB
-		deploy = self.cont.DeployObject(self.ctx, self.node, self.html)
-		# should fail (no such service)
-		self.cont.services = "testC"
-		stopC = self.cont.StopObject(self.ctx, self.node, self.html)
-		# should stop testA
-		self.cont.services = "testA"
-		stopA = self.cont.StopObject(self.ctx, self.node, self.html)
-		# should (re-)stop testA (no-op)
-		self.cont.services = "testA"
-		stopA2 = self.cont.StopObject(self.ctx, self.node, self.html)
-		# should deploy testB
-		self.cont.services = "testB"
-		stopB = self.cont.StopObject(self.ctx, self.node, self.html)
-		# should not undeploy anything (everything already stopped)
-		self.cont.services = None
-		undeployAll = self.cont.UndeployObject(self.ctx, self.node, self.html, self.ran)
-		self.assertTrue(deploy)
-		self.assertFalse(stopC)
-		self.assertTrue(stopA)
-		self.assertTrue(stopA2)
-		self.assertTrue(stopB)
-		self.assertTrue(undeployAll)
-
 	def test_deployfails(self):
 		# fails reliably
 		old = self.cont.yamlPath
--- a/ci-scripts/tests/ping-iperf.py
+++ b/ci-scripts/tests/ping-iperf.py
@@ -23,7 +23,7 @@ class TestPingIperf(unittest.TestCase):
 		self.html.testCaseId = "000000"
 		self.ci = cls_oaicitest.OaiCiTest()
 		self.ci.ue_ids = ["test"]
-		self.node = "localhost"
+		self.ci.nodes = ["localhost"]
 		self.ctx = TestCaseCtx.Default(tempfile.mkdtemp())
 	def tearDown(self):
 		with cls_cmd.LocalCmd() as c:
@@ -35,7 +35,7 @@ class TestPingIperf(unittest.TestCase):
 		self.ci.svr_id = "test"
 		infra_file = "tests/config/infra_ping_iperf.yaml"
 		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Ping(self.ctx, self.node, self.html, infra_file=infra_file)
+		success = self.ci.Ping(self.ctx, self.html, infra_file=infra_file)
 		self.assertTrue(success)

 	def test_iperf(self):
@@ -50,7 +50,7 @@ class TestPingIperf(unittest.TestCase):
 		self.ci.iperf_profile = "balanced"
 		infra_file = "tests/config/infra_ping_iperf.yaml"
 		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Iperf(self.ctx, self.node, self.html, infra_file=infra_file)
+		success = self.ci.Iperf(self.ctx, self.html, infra_file=infra_file)
 		self.assertTrue(success)

 	def test_iperf2_unidir(self):
@@ -62,7 +62,7 @@ class TestPingIperf(unittest.TestCase):
 		self.ci.iperf_profile = "balanced"
 		infra_file = "tests/config/infra_ping_iperf.yaml"
 		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Iperf2_Unidir(self.ctx, self.node, self.html, infra_file=infra_file)
+		success = self.ci.Iperf2_Unidir(self.ctx, self.html, infra_file=infra_file)
 		self.assertTrue(success)

 	def test_iperf_highrate(self):
@@ -77,7 +77,7 @@ class TestPingIperf(unittest.TestCase):
 		self.ci.iperf_profile = "balanced"
 		infra_file = "tests/config/infra_ping_iperf.yaml"
 		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Iperf(self.ctx, self.node, self.html, infra_file=infra_file)
+		success = self.ci.Iperf(self.ctx, self.html, infra_file=infra_file)
 		self.assertTrue(success)

 if __name__ == '__main__':
--- a/ci-scripts/tests/simple-undep/docker-compose.yml
+++ b/ci-scripts/tests/simple-undep/docker-compose.yml
@@ -1,23 +0,0 @@
-services:
-  testA:
-    image: ubuntu:${TAG:-jammy}
-    container_name: test_container_A
-    cap_drop:
-      - ALL
-    entrypoint: /bin/bash -c "sleep infinity"
-    healthcheck:
-      test: /bin/bash -c "true"
-      interval: 1s
-      timeout: 1s
-      retries: 1
-  testB:
-    image: ubuntu:${TAG:-jammy}
-    container_name: test_container_B
-    cap_drop:
-      - ALL
-    entrypoint: /bin/bash -c "sleep infinity"
-    healthcheck:
-      test: /bin/bash -c "true"
-      interval: 1s
-      timeout: 1s
-      retries: 1
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -20,7 +20,6 @@
  - Build_Image
  - Build_Run_Tests
  - Deploy_Object
-  - Stop_Object
  - Undeploy_Object
  - Cppcheck_Analysis
  - Deploy_Run_OC_PhySim
--- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
@@ -44,7 +44,7 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
+                <node>obelix</node>
                <images>oai-enb oai-lte-ue</images>
        </testCase>
        <testCase id="800813">
@@ -88,16 +88,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE</desc>
                <id>l2sim4g_ue</id>
-                <node>localhost</node>
+                <nodes>obelix</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping trf-gen from LTE-UE 1</desc>
                <id>l2sim4g_ue</id>
-                <node>localhost</node>
+                <nodes>obelix</nodes>
                <svr_id>l2sim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>obelix</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
@@ -106,9 +106,9 @@
                <class>Ping</class>
                <desc>Ping LTE-UE 1 from trf-gen</desc>
                <id>l2sim4g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>obelix</nodes>
                <svr_id>l2sim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>obelix</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
@@ -117,9 +117,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP Downlink</desc>
                <id>l2sim4g_ue</id>
-                <node>localhost</node>
+                <nodes>obelix</nodes>
                <svr_id>l2sim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>obelix</svr_node>
                <iperf_args>-u -t 30 -b 1M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -129,9 +129,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP Uplink</desc>
                <id>l2sim4g_ue</id>
-                <node>localhost</node>
+                <nodes>obelix</nodes>
                <svr_id>l2sim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>obelix</svr_node>
                <iperf_args>-u -t 30 -b 3M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -149,7 +149,7 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
+                <node>obelix</node>
                <images>oai-enb oai-lte-ue</images>
        </testCase>

--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
@@ -103,16 +103,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020011">
                <class>Ping</class>
                <desc>Ping Traffic-Gen from LTE-UE</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -121,9 +121,9 @@
                <class>Ping</class>
                <desc>Ping LTE-UE from Traffic-Gen</desc>
                <id>rfsim4g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -136,8 +136,8 @@
                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-                <node>localhost</node>
-                <svr_node>localhost</svr_node>
+                <nodes>acamas</nodes>
+                <svr_node>acamas</svr_node>
        </testCase>

        <testCase id="030011">
@@ -148,8 +148,8 @@
                <iperf_args>-u -t 30 -b 1M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-                <node>localhost</node>
-                <svr_node>localhost</svr_node>
+                <nodes>acamas</nodes>
+                <svr_node>acamas</svr_node>
        </testCase>

        <testCase id="100011">
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
@@ -83,9 +83,9 @@
                <class>Ping</class>
                <desc>Ping Traffic-Gen from LTE-UE</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -94,9 +94,9 @@
                <class>Ping</class>
                <desc>Ping LTE-UE from eNB</desc>
                <id>rfsim4g_enb_nos1</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -105,9 +105,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP DL</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -117,9 +117,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP UL</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 1M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
@@ -103,16 +103,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020011">
                <class>Ping</class>
                <desc>Ping Traffic-Gen from LTE-UE</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -121,9 +121,9 @@
                <class>Ping</class>
                <desc>Ping LTE-UE from Traffic-Gen</desc>
                <id>rfsim4g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -132,9 +132,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP DL</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -144,9 +144,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP UL</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 1M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
@@ -103,16 +103,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020011">
                <class>Ping</class>
                <desc>Ping Traffic-Gen from LTE-UE</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -121,9 +121,9 @@
                <class>Ping</class>
                <desc>Ping LTE-UE from Traffic-Gen</desc>
                <id>rfsim4g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -132,9 +132,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP DL</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -144,9 +144,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP UL</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 1M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
--- a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml
@@ -80,9 +80,9 @@
                <class>Iperf2_Unidir</class>
                <desc>Iperf2 UDP DL</desc>
                <id>rfsim4g_ue_fembms</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_enb_fembms</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 2M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
--- a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml
@@ -80,9 +80,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP DL</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_enb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
--- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
@@ -103,9 +103,9 @@
                <class>Ping</class>
                <desc>Ping Traffic-Gen from LTE-UE</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -114,9 +114,9 @@
                <class>Ping</class>
                <desc>Ping LTE-UE from Traffic-Gen</desc>
                <id>rfsim4g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -125,9 +125,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP DL</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 2M -R</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -137,9 +137,9 @@
                <class>Iperf</class>
                <desc>Iperf UDP UL</desc>
                <id>rfsim4g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim4g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_args>-u -t 30 -b 1M</iperf_args>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
--- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml
@@ -76,16 +76,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <node>localhost</node>
+                <nodes>acamas acamas acamas</nodes>
        </testCase>

        <testCase id="020021">
                <class>Ping</class>
                <desc>Ping ext-dn from all NR-UEs</desc>
                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3</id>
-                <node>localhost</node>
+                <nodes>acamas acamas acamas</nodes>
                <svr_id>rfsim5g_5gc_fixed_ip</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -55,10 +55,6 @@
 000031
 020022
 040026
- 040025
- 000031
- 020022
- 040027
 100021
 222222
        </TestCaseRequestedList>
@@ -68,7 +64,7 @@
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
+                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
@@ -107,7 +103,7 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="000024">
@@ -122,9 +118,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from all NR-UEs</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -132,30 +128,30 @@
        <testCase id="030020">
                <class>Custom_Command</class>
                <desc>Simulate a DL radio channel with noise (3 dB)</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo channelmod modify 0 noise_power_dB 3 | ncat --send-only 192.168.71.181 8091</command>
        </testCase>

        <testCase id="030021">
                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
-                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
+                <desc>Iperf (DL/5Mbps/UDP)(30 sec)</desc>
+                <iperf_args>-u -b 5M -t 20 -R</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030022">
                <class>Iperf</class>
-                <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 20</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
@@ -163,7 +159,7 @@
        <testCase id="040001">
                <class>Custom_Command</class>
                <desc>Trigger Reestablishment</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci force_reestab | ncat 192.168.71.171 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
        </testCase>

@@ -171,9 +167,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.5 -w25</ping_args>
                <ping_packetloss_threshold>80</ping_packetloss_threshold>
        </testCase>
@@ -181,56 +177,56 @@
        <testCase id="040002">
                <class>Custom_Command</class>
                <desc>Verify Reestablishment</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci get_reestab_count | ncat 192.168.71.150 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
        </testCase>

        <testCase id="040021">
                <class>Custom_Command</class>
                <desc>Simulate a disruption of DL radio channel (ploss 55)</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo channelmod modify 0 ploss 55 | ncat 192.168.71.181 8091</command>
        </testCase>

        <testCase id="040022">
                <class>Custom_Command</class>
                <desc>Get UE sync state (UE ID 0)</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
        </testCase>

        <testCase id="040023">
                <class>Custom_Command</class>
                <desc>Restoration of the original DL channel conditions (ploss 20)</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo channelmod modify 0 ploss 20 | ncat 192.168.71.181 8091</command>
        </testCase>

        <testCase id="040024">
                <class>Custom_Command</class>
                <desc>Get UE sync state (UE ID 0)</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ciUE sync_state 0 | ncat 192.168.71.181 8091 | grep -E UE_CONNECTED</command>
        </testCase>

        <testCase id="040025">
                <class>Custom_Command</class>
                <desc>Trigger Handover</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci trigger_f1_ho | ncat 192.168.71.150 9090</command>
        </testCase>

        <testCase id="040026">
                <class>Custom_Command</class>
                <desc>UE (1) connected to DU-PCI 0?</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
        </testCase>

        <testCase id="040027">
                <class>Custom_Command</class>
                <desc>UE (1) connected to DU-PCI 1?</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3585"</command>
        </testCase>

@@ -249,7 +245,7 @@
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
+                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
@@ -70,16 +70,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020011">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -88,9 +88,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -100,9 +100,9 @@
                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 30 -R</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
@@ -112,9 +112,9 @@
                <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 30</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_flexric_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_flexric_rfsim.xml
@@ -42,13 +42,6 @@
 002006
 444444
 100002
- 100003
- 100004
- 100005
- 100006
- 100007
- 100008
- 100009
 100001
 222221
 222222
@@ -102,10 +95,10 @@

        <testCase id="000002">
                <class>Deploy_Object</class>
-                <desc>Deploy OAI nearRT-RIC</desc>
+                <desc>Deploy OAI FlexRIC</desc>
                <node>localhost</node>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>nearRT-RIC</services>
+                <services>oai-flexric</services>
        </testCase>

        <testCase id="000003">
@@ -128,7 +121,7 @@
                <class>Ping</class>
                <desc>Ping ext-dn from both UEs</desc>
                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>carabe</node>
+                <nodes>carabe carabe</nodes>
                <svr_id>oai_ext_dn</svr_id>
                <svr_node>carabe</svr_node>
                <ping_args>-c 20</ping_args>
@@ -139,14 +132,14 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE 1 and 2</desc>
                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>carabe</node>
+                <nodes>carabe carabe</nodes>
        </testCase>

        <testCase id="444444">
                <class>Detach_UE</class>
                <desc>Detach OAI UE 1 and 2</desc>
                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>carabe</node>
+                <nodes>carabe carabe</nodes>
        </testCase>

        <testCase id="100001">
@@ -158,72 +151,16 @@
        </testCase>

        <testCase id="100002">
-                <class>Stop_Object</class>
-                <desc>Stop RC monitoring xApp</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-rc-moni</services>
-        </testCase>
-
-        <testCase id="100003">
-                <class>Stop_Object</class>
-                <desc>Stop KPM monitoring xApp</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-moni</services>
-        </testCase>
-
-        <testCase id="100004">
-                <class>Stop_Object</class>
-                <desc>Stop KPM monitoring and RC control xApp</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-kpm-rc</services>
-        </testCase>
-
-        <testCase id="100005">
-                <class>Stop_Object</class>
-                <desc>Stop custom SMs monitoring xApp</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>xapp-gtp-mac-rlc-pdcp-moni</services>
-        </testCase>
-
-        <testCase id="100006">
-                <class>Stop_Object</class>
-                <desc>Stop OAI UEs</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>oai-nr-ue oai-nr-ue2</services>
-        </testCase>
-
-        <testCase id="100007">
-                <class>Stop_Object</class>
-                <desc>Stop OAI gNB</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>oai-gnb</services>
-        </testCase>
-
-        <testCase id="100008">
-                <class>Stop_Object</class>
-                <desc>Stop nearRT-RIC</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
-                <services>nearRT-RIC</services>
-        </testCase>
-
-        <testCase id="100009">
                <class>Undeploy_Object</class>
-                <desc>Undeploy RAN and FlexRIC</desc>
+                <desc>Undeploy RAN and Flexric</desc>
                <node>localhost</node>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                <always_exec>true</always_exec>
-	</testCase>
+        </testCase>

        <testCase id="010000">
                <class>Deploy_Object</class>
-                <desc>Deploy RC monitoring</desc>
+                <desc>RC monitoring</desc>
                <node>localhost</node>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                <services>xapp-rc-moni</services>
@@ -231,7 +168,7 @@

        <testCase id="010001">
                <class>Deploy_Object</class>
-                <desc>Deploy KPM monitoring</desc>
+                <desc>KPM monitoring</desc>
                <node>localhost</node>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                <services>xapp-kpm-moni</services>
@@ -239,7 +176,7 @@

        <testCase id="010002">
                <class>Deploy_Object</class>
-                <desc>Deploy KPM monitoring and RC control</desc>
+                <desc>KPM monitoring and RC control</desc>
                <node>localhost</node>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                <services>xapp-kpm-rc</services>
@@ -247,7 +184,7 @@

        <testCase id="010003">
                <class>Deploy_Object</class>
-                <desc>Deploy custom SMs monitoring</desc>
+                <desc>Custom SMs monitoring</desc>
                <node>localhost</node>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_flexric</yaml_path>
                <services>xapp-gtp-mac-rlc-pdcp-moni</services>
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -125,16 +125,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <node>localhost</node>
+                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -143,9 +143,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -154,9 +154,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from Second NR-UE</desc>
                <id>rfsim5g_ue2</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -165,9 +165,9 @@
                <class>Ping</class>
                <desc>Ping Second NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue2</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -176,9 +176,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from both UEs</desc>
                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>localhost</node>
+                <nodes>acamas acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -187,33 +187,33 @@
                <class>Ping</class>
                <desc>Ping ext-dn from all UEs</desc>
                <id>rfsim5g_ue rfsim5g_ue2 rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <node>localhost</node>
+                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

        <testCase id="030001">
                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030002">
                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 1M -t 20</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
@@ -222,21 +222,21 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE 1 and 2</desc>
                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>localhost</node>
+                <nodes>acamas acamas</nodes>
        </testCase>

        <testCase id="444444">
                <class>Detach_UE</class>
                <desc>Detach OAI UE 1 and 2</desc>
                <id>rfsim5g_ue rfsim5g_ue2</id>
-                <node>localhost</node>
+                <nodes>acamas acamas</nodes>
        </testCase>

        <testCase id="444445">
                <class>Detach_UE</class>
                <desc>Detach OAI UE 3 to 10</desc>
                <id>rfsim5g_ue3 rfsim5g_ue4 rfsim5g_ue5 rfsim5g_ue6 rfsim5g_ue7 rfsim5g_ue8 rfsim5g_ue9 rfsim5g_ue10</id>
-                <node>localhost</node>
+                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
        </testCase>

        <testCase id="100001">
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
@@ -88,7 +88,7 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="000004">
@@ -101,9 +101,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args> -c 20 -i0.5</ping_args>
                <ping_packetloss_threshold>80</ping_packetloss_threshold>
        </testCase>
@@ -112,33 +112,33 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.2</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

        <testCase id="030001">
                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030002">
                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 1M -t 20</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
@@ -146,14 +146,14 @@
        <testCase id="040001">
                <class>Custom_Command</class>
                <desc>Force Msg3 C-RNTI RA</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ciUE force_crnti_ra | ncat 192.168.71.150 8091</command>
        </testCase>

        <testCase id="040002">
                <class>Custom_Command</class>
                <desc>Force RRC_IDLE (UE ID 0)</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ciUE force_RRC_IDLE | ncat 192.168.71.150 8091</command>
        </testCase>

--- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
@@ -70,16 +70,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -88,33 +88,33 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

        <testCase id="030001">
                <class>Iperf</class>
-                <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (DL/10Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 10M -t 20 -R</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030002">
                <class>Iperf</class>
-                <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 20</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
@@ -49,7 +49,7 @@
        <testCase id="004000">
            <class>Custom_Command</class>
            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
+            <node>acamas</node>
            <command>docker volume rm 5g_rfsimulator_fdd_phytest_rrc.config -f</command>
        </testCase>
        <testCase id="800813">
@@ -77,9 +77,9 @@
                <class>Ping</class>
                <desc>Ping gNB from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c20 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
@@ -88,33 +88,33 @@
                <class>Ping</class>
                <desc>Ping NR-UE from gNB</desc>
                <id>rfsim5g_gnb_nos1</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c20 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>

        <testCase id="030011">
                <class>Iperf</class>
-                <desc>Iperf (DL/30kbps/UDP)(20 sec)</desc>
+                <desc>Iperf (DL/30kbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 0.03M -t 20 -R -c 10.0.1.1</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030012">
                <class>Iperf</class>
-                <desc>Iperf (UL/30kbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/30kbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 0.03M -t 20 -c 10.0.1.1</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
@@ -70,16 +70,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
@@ -88,9 +88,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_multiue.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_multiue.xml
@@ -48,52 +48,56 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
+                <svr_id>0</svr_id>
                <images>oai-gnb-asan oai-nr-ue</images>
        </testCase>
        <testCase id="800813">
                <class>Create_Workspace</class>
                <desc>Create new Workspace</desc>
-                <node>localhost</node>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
        </testCase>
        <testCase id="000001">
                <class>Deploy_Object</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
        </testCase>

        <testCase id="000002">
                <class>Deploy_Object</class>
                <desc>Deploy OAI 5G gNB RF sim SA</desc>
-                <node>localhost</node>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
                <services>oai-gnb</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
        </testCase>

        <testCase id="000003">
                <class>Deploy_Object</class>
                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
-                <node>localhost</node>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
                <services>oai-nr-ue</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
        </testCase>

        <testCase id="000008">
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
-                <node>localhost</node>
+                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_multiue1</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -102,9 +106,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_multiue1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -113,9 +117,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from Second NR-UE</desc>
                <id>rfsim5g_multiue2</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -124,9 +128,9 @@
                <class>Ping</class>
                <desc>Ping Second NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_multiue2</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -135,9 +139,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from both UEs</desc>
                <id>rfsim5g_multiue1 rfsim5g_multiue2</id>
-                <node>localhost</node>
+                <nodes>acamas acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -146,33 +150,33 @@
                <class>Ping</class>
                <desc>Ping ext-dn from all UEs</desc>
                <id>rfsim5g_multiue1 rfsim5g_multiue2 rfsim5g_multiue3 rfsim5g_multiue4 rfsim5g_multiue5 rfsim5g_multiue6 rfsim5g_multiue7 rfsim5g_multiue8 rfsim5g_multiue9 rfsim5g_multiue10</id>
-                <node>localhost</node>
+                <nodes>acamas acamas acamas acamas acamas acamas acamas acamas acamas acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25 -s 1016</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

        <testCase id="030001">
                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                <id>rfsim5g_multiue1</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030002">
                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 1M -t 20</iperf_args>
                <id>rfsim5g_multiue1</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
@@ -181,7 +185,7 @@
                <class>Detach_UE</class>
                <desc>Detach OAI UEs</desc>
                <id>rfsim5g_multiue1</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="100001">
@@ -191,14 +195,15 @@
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_multiue</yaml_path>
                <d_retx_th>1,0,0,0</d_retx_th>
                <u_retx_th>1,0,0,0</u_retx_th>
-                <node>localhost</node>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
        </testCase>

        <testCase id="222222">
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
+                <svr_id>0</svr_id>
                <images>oai-gnb-asan oai-nr-ue</images>
        </testCase>

--- a/ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml
@@ -31,6 +31,9 @@
 000002
 000003
 020001
+ 020002
+ 030001
+ 030002
 000004
 040001
 050001
@@ -55,55 +58,59 @@
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
+                <svr_id>0</svr_id>
                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
        </testCase>

        <testCase id="800813">
                <class>Create_Workspace</class>
                <desc>Create new Workspace</desc>
-                <node>localhost</node>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
        </testCase>

        <testCase id="000001">
                <class>Deploy_Object</class>
                <desc>Deploy OAI 5G CoreNetwork</desc>
-                <node>localhost</node>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
                <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
        </testCase>

        <testCase id="000002">
                <class>Deploy_Object</class>
                <desc>Deploy OAI 5G CU-CP/CU-UP/DU 0 + UE RFsim SA</desc>
-                <node>localhost</node>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
                <services>oai-cucp-0 oai-cuup-0 oai-du-0 oai-nr-ue</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
        </testCase>

        <testCase id="000003">
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="000004">
                <class>Deploy_Object</class>
                <desc>Deploy OAI 5G CU-CP/CU-UP/DU 1 RFsim SA</desc>
-                <node>localhost</node>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
                <services>oai-cucp-1 oai-cuup-1 oai-du-1</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 50 -i 0.25</ping_args>
+                <svr_node>acamas</svr_node>
+                <ping_args>-c 100 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

@@ -111,33 +118,33 @@
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
-                <ping_args>-c 50 -i 0.25</ping_args>
+                <svr_node>acamas</svr_node>
+                <ping_args>-c 100 -i 0.25</ping_args>
                <ping_packetloss_threshold>10</ping_packetloss_threshold>
        </testCase>

        <testCase id="030001">
                <class>Iperf</class>
-                <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (DL/10Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030002">
                <class>Iperf</class>
-                <desc>Iperf (UL/4Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/4Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 1M -t 20</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>
@@ -151,7 +158,7 @@
        <testCase id="050001">
                <class>Custom_Command</class>
                <desc>Trigger N2 Handover</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci trigger_n2_ho 1,1 | ncat 192.168.71.150 9090</command>
                <command_fail>yes</command_fail>
        </testCase>
@@ -159,14 +166,14 @@
        <testCase id="050002">
                <class>Custom_Command</class>
                <desc>UE (1) connected to DU-PCI 1?</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.180 9090 | grep "1234"</command>
        </testCase>

        <testCase id="050003">
                <class>Custom_Command</class>
                <desc>Trigger N2 Handover</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci trigger_n2_ho 0,1 | ncat 192.168.71.180 9090</command>
                <command_fail>yes</command_fail>
        </testCase>
@@ -174,7 +181,7 @@
        <testCase id="050004">
                <class>Custom_Command</class>
                <desc>UE (1) connected to DU-PCI 0?</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci fetch_du_by_ue_id 1 | ncat 192.168.71.150 9090 | grep "3584"</command>
        </testCase>

@@ -182,8 +189,9 @@
                <class>Undeploy_Object</class>
                <always_exec>true</always_exec>
                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_n2_ho</yaml_path>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
                <d_retx_th>10,100,100,100</d_retx_th>
                <u_retx_th>10,100,100,100</u_retx_th>
        </testCase>
@@ -192,7 +200,7 @@
                <class>Clean_Test_Server_Images</class>
                <always_exec>true</always_exec>
                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
+                <svr_id>0</svr_id>
                <images>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images>
        </testCase>

--- a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml
@@ -74,16 +74,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -92,9 +92,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -102,7 +102,7 @@
        <testCase id="040001">
                <class>Custom_Command</class>
                <desc>Trigger Reestablishment</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci force_reestab | ncat 192.168.71.140 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
                <command_fail>yes</command_fail>
        </testCase>
@@ -111,9 +111,9 @@
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i0.5 -w25</ping_args>
                <ping_packetloss_threshold>80</ping_packetloss_threshold>
        </testCase>
@@ -121,7 +121,7 @@
        <testCase id="040002">
                <class>Custom_Command</class>
                <desc>Verify Reestablishment</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>echo ci get_reestab_count | ncat 192.168.71.140 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
                <command_fail>yes</command_fail>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_ntn_leo.xml
@@ -69,16 +69,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -87,9 +87,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_prs.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_prs.xml
@@ -1,100 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-        <htmlTabRef>rfsim-5gnr-prs</htmlTabRef>
-        <htmlTabName>Monolithic gNB with PRS</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
- 111111
- 800813
- 000012
- 000013
- 040001
- 040023
- 100011
- 222222
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-	</testCase>
-
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-	</testCase>
-
-        <testCase id="000012">
-                <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_prs</yaml_path>
-                <services>oai-gnb oai-nr-ue</services>
-        </testCase>
-
-        <testCase id="000013">
-                <class>Attach_UE</class>
-                <desc>Attach OAI UE (Wait for IP)</desc>
-                <id>rfsim5g_ue</id>
-                <node>localhost</node>
-	</testCase>
-
-        <testCase id="040001">
-                <class>IdleSleep</class>
-                <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
-        </testCase>
-
-	<testCase id="040023">
-		<class>Custom_Script</class>
-		<always_exec>true</always_exec>
-		<desc>Set and verify distance at 50, 100, 150 m</desc>
-		<node>localhost</node>
-		<script>scripts/set-and-verify-distance-prs.sh</script>
-		<args>50 100 150</args>
-	</testCase>
-
-        <testCase id="100011">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy all OAI 5G stack</desc>
-                <node>localhost</node>
-                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_prs</yaml_path>
-                <d_retx_th>30,100,100,100</d_retx_th>
-                <u_retx_th>30,100,100,100</u_retx_th>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>localhost</node>
-                <images>oai-gnb-asan oai-nr-ue-asan</images>
-        </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml
@@ -74,7 +74,7 @@
        <testCase id="000005">
                <class>Custom_Command</class>
                <desc>Check that UE synched</desc>
-                <node>localhost</node>
+                <node>acamas</node>
                <command>docker logs rfsim5g-oai-nr-ue-2 | grep -m 1 "PSBCH RX:OK"</command>
        </testCase>

--- a/ci-scripts/xml_files/container_5g_rfsim_simple.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_simple.xml
@@ -63,14 +63,14 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
                <svr_node>localhost</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
@@ -81,7 +81,7 @@
                <class>Detach_UE</class>
                <desc>Detach OAI UE 1</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>localhost</nodes>
        </testCase>

        <testCase id="100001">
--- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
@@ -49,7 +49,7 @@
        <testCase id="004000">
            <class>Custom_Command</class>
            <desc>Clean-Up any residual volume</desc>
-            <node>localhost</node>
+            <node>acamas</node>
            <command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config -f</command>
        </testCase>
        <testCase id="800813">
@@ -83,9 +83,9 @@
                <class>Ping</class>
                <desc>Ping gNB from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_gnb_nos1</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c20 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
@@ -94,9 +94,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from gNB</desc>
                <id>rfsim5g_gnb_nos1</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c20 -i0.2</ping_args>
                <ping_packetloss_threshold>0</ping_packetloss_threshold>
        </testCase>
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
@@ -36,11 +36,6 @@
 020003
 030001
 030002
- 050001
- 050002
- 050003
- 020001
- 020002
 100001
 222222
        </TestCaseRequestedList>
@@ -77,16 +72,16 @@
                <class>Attach_UE</class>
                <desc>Attach OAI UE (Wait for IP)</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020001">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE</desc>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -95,9 +90,9 @@
                <class>Ping</class>
                <desc>Ping NR-UE from ext-dn</desc>
                <id>rfsim5g_ext_dn</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ue</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>
@@ -106,70 +101,50 @@
                <class>Attach_UE</class>
                <desc>Verify 2nd PDU session is up</desc>
                <id>rfsim5g_ue_pdu_2</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
        </testCase>

        <testCase id="020003">
                <class>Ping</class>
                <desc>Ping ext-dn from NR-UE on PDU session ID 2</desc>
                <id>rfsim5g_ue_pdu_2</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <ping_args>-c 20 -i 0.25</ping_args>
                <ping_packetloss_threshold>5</ping_packetloss_threshold>
        </testCase>

        <testCase id="030001">
                <class>Iperf</class>
-                <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 3M -t 20 -R</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

        <testCase id="030002">
                <class>Iperf</class>
-                <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
+                <desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc>
                <iperf_args>-u -b 1M -t 20</iperf_args>
                <id>rfsim5g_ue</id>
-                <node>localhost</node>
+                <nodes>acamas</nodes>
                <svr_id>rfsim5g_ext_dn</svr_id>
-                <svr_node>localhost</svr_node>
+                <svr_node>acamas</svr_node>
                <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
        </testCase>

-        <testCase id="050001">
-                <class>Custom_Command</class>
-                <desc>Trigger PDU Session Release via gNB telnet</desc>
-                <node>acamas</node>
-                <command>echo ci pdu_session_release 2 | ncat 192.168.71.140 9090</command>
-        </testCase>
-
-        <testCase id="050002">
-                <class>Custom_Command</class>
-                <desc>Add PDU Session via UE telnet</desc>
-                <node>acamas</node>
-                <command>echo ci add_pdu_session 6,7 | ncat 192.168.71.150 8091</command>
-        </testCase>
-
-        <testCase id="050003">
-                <class>Custom_Command</class>
-                <desc>Trigger PDU Session Release via gNB telnet</desc>
-                <node>acamas</node>
-                <command>echo ci pdu_session_release 6 | ncat 192.168.71.140 9090</command>
-        </testCase>
-
        <testCase id="100001">
                <class>Undeploy_Object</class>
                <always_exec>true</always_exec>
                <desc>Undeploy all OAI 5G stack</desc>
                <node>localhost</node>
+                <services>oai-vnf oai-pnf</services>
                <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
                <d_retx_th>1,0,0,0</d_retx_th>
                <u_retx_th>1,0,0,0</u_retx_th>
--- a/ci-scripts/xml_files/container_sa_aerial_cn_start.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_cn_start.xml
@@ -1,37 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-        <htmlTabRef>TEST-AERIAL-SA-CN-START</htmlTabRef>
-        <htmlTabName>Deploy 5GC</htmlTabName>
-        <htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                555000
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="555000">
-                <class>DeployCoreNetwork</class>
-                <desc>Initialize 5G Core</desc>
-                <cn_id>oc-cn5g-20897-aerial</cn_id>
-        </testCase>
-</testCaseList>
-
--- a/ci-scripts/xml_files/container_sa_aerial_cn_stop.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_cn_stop.xml
@@ -1,38 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-        <htmlTabRef>TEST-AERIAL-SA-CN-STOP</htmlTabRef>
-        <htmlTabName>Undeploy 5GC</htmlTabName>
-        <htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                000555
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="000555">
-                <class>UndeployCoreNetwork</class>
-                <always_exec>true</always_exec>
-                <desc>Terminate 5G Core</desc>
-                <cn_id>oc-cn5g-20897-aerial</cn_id>
-        </testCase>
-</testCaseList>
-
--- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_quectel.xml
@@ -25,6 +25,7 @@
        <htmlTabName>AERIAL 100 MHz TDD SA</htmlTabName>
        <htmlTabIcon>tasks</htmlTabIcon>
        <TestCaseRequestedList>
+                555000
                111111
                000222
                800813
@@ -39,8 +40,15 @@
                000222
                222222
                333333
+                000555
        </TestCaseRequestedList>
        <TestCaseExclusionList></TestCaseExclusionList>
+        <testCase id="555000">
+                <class>DeployCoreNetwork</class>
+                <desc>Initialize 5G Core</desc>
+                <cn_id>oc-cn5g-20897-aerial</cn_id>
+        </testCase>
+
        <testCase id="111111">
                <class>Pull_Local_Registry</class>
                <desc>Pull Images from Local Registry</desc>
@@ -88,8 +96,8 @@

        <testCase id="000022">
                <class>Iperf</class>
-                <desc>iperf (DL/UDP/800M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 800M -t 30 -R</iperf_args>
+                <desc>iperf (DL/UDP/500M)(30 sec)(single-ue profile)</desc>
+                <iperf_args>-u -b 500M -t 30 -R</iperf_args>
                <svr_id>oc-cn5g-20897-aerial</svr_id>
                <id>up2-aerial</id>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -98,8 +106,8 @@

        <testCase id="000033">
                <class>Iperf</class>
-                <desc>iperf (UL/UDP/150M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 150M -t 30 -l 1428</iperf_args>
+                <desc>iperf (UL/UDP/40M)(30 sec)(single-ue profile)</desc>
+                <iperf_args>-u -b 40M -t 30 -l 1428</iperf_args>
                <svr_id>oc-cn5g-20897-aerial</svr_id>
                <id>up2-aerial</id>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -119,9 +127,9 @@

        <testCase id="300033">
                <class>Iperf</class>
-                <desc>Optional iperf (UL/UDP/200M)(30 sec)(single-ue profile)</desc>
+                <desc>Optional iperf (UL/UDP/90M)(30 sec)(single-ue profile)</desc>
                <may_fail>true</may_fail>
-                <iperf_args>-u -b 200M -t 30 -l 1428</iperf_args>
+                <iperf_args>-u -b 90M -t 30 -l 1428</iperf_args>
                <svr_id>oc-cn5g-20897-aerial</svr_id>
                <id>up2-aerial</id>
                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -152,5 +160,12 @@
                <node>gracehopper1-oai</node>
                <images>oai-gnb-aerial</images>
        </testCase>
+
+        <testCase id="000555">
+                <class>UndeployCoreNetwork</class>
+                <always_exec>true</always_exec>
+                <desc>Terminate 5G Core</desc>
+                <cn_id>oc-cn5g-20897-aerial</cn_id>
+        </testCase>
 </testCaseList>

--- a/ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml
@@ -1,144 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-        <htmlTabRef>TEST-AERIAL-SA-UL-Heavy</htmlTabRef>
-        <htmlTabName>AERIAL 100 MHz DSUUU SA</htmlTabName>
-        <htmlTabIcon>tasks</htmlTabIcon>
-        <TestCaseRequestedList>
-                111111
-                000222
-                800813
-                002222
-                002223
-                000111
-                000011
-                000032
-                000033
-                000022
-                000222
-                222222
-                333333
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-        <testCase id="111111">
-                <class>Pull_Local_Registry</class>
-                <desc>Pull Images from Local Registry</desc>
-                <node>gracehopper1-oai</node>
-                <images>oai-gnb-aerial</images>
-                <tag_prefix>arm_</tag_prefix>
-        </testCase>
-
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace for server 0</desc>
-                <node>gracehopper1-oai</node>
-        </testCase>
-
-        <testCase id="002222">
-                <class>Deploy_Object</class>
-                <desc>Deploy PNF/Nvidia CUBB in a container</desc>
-                <node>gracehopper1-oai</node>
-                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_ul</yaml_path>
-                <services>nv-cubb</services>
-        </testCase>
-
-        <testCase id="002223">
-                <class>Deploy_Object</class>
-                <desc>Deploy VNF in a container</desc>
-                <node>gracehopper1-oai</node>
-                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_ul</yaml_path>
-                <services>oai-gnb-aerial</services>
-        </testCase>
-
-        <testCase id="000111">
-                <class>Attach_UE</class>
-                <desc>Attach Quectel</desc>
-                <id>up2-aerial</id>
-        </testCase>
-
-        <testCase id="000011">
-                <class>Ping</class>
-                <desc>Ping: 100pings in 20sec</desc>
-                <id>up2-aerial</id>
-                <svr_id>oc-cn5g-20897-aerial</svr_id>
-                <ping_args>-c 100 -i 0.2</ping_args>
-                <ping_packetloss_threshold>5</ping_packetloss_threshold>
-        </testCase>
-
-        <testCase id="000022">
-                <class>Iperf</class>
-                <desc>iperf (DL/UDP/200M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 200M -t 30 -R</iperf_args>
-                <svr_id>oc-cn5g-20897-aerial</svr_id>
-                <id>up2-aerial</id>
-                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="000032">
-                <class>Iperf</class>
-                <desc>iperf (UL/UDP/300M)(30 sec)(single-ue profile)</desc>
-                <iperf_args>-u -b 300M -t 30 -l 1428</iperf_args>
-                <svr_id>oc-cn5g-20897-aerial</svr_id>
-                <id>up2-aerial</id>
-                <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="000033">
-                <class>Iperf</class>
-                <desc>iperf (UL/UDP/380M)(30 sec)(single-ue profile)</desc>
-                <may_fail>true</may_fail>
-                <iperf_args>-u -b 380M -t 30 -l 1428</iperf_args>
-                <svr_id>oc-cn5g-20897-aerial</svr_id>
-                <id>up2-aerial</id>
-                <iperf_packetloss_threshold>10</iperf_packetloss_threshold>
-                <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-        </testCase>
-
-        <testCase id="000222">
-                <class>Detach_UE</class>
-                <always_exec>true</always_exec>
-                <desc>Detach Quectel</desc>
-                <id>up2-aerial</id>
-        </testCase>
-
-        <testCase id="222222">
-                <class>Undeploy_Object</class>
-                <always_exec>true</always_exec>
-                <desc>Undeploy gNB</desc>
-                <node>gracehopper1-oai</node>
-                <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_ul</yaml_path>
-                <d_retx_th>20,100,100,100</d_retx_th>
-                <u_retx_th>20,100,100,100</u_retx_th>
-        </testCase>
-
-        <testCase id="333333">
-                <class>Clean_Test_Server_Images</class>
-                <always_exec>true</always_exec>
-                <desc>Clean Test Images on Test Server</desc>
-                <node>gracehopper1-oai</node>
-                <images>oai-gnb-aerial</images>
-        </testCase>
-</testCaseList>
-
--- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml
+++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
@@ -36,6 +36,18 @@
    102002
    302002
    102003
+    102004
+    102005
+    102006
+    102007
+    102008
+    102009
+    102010
+    102011
+    102012
+    102013
+    102014
+    102015
    100100
    100010
    100020
@@ -106,8 +118,80 @@

  <testCase id="102003">
    <class>Attach_UE</class>
-    <desc>Attach UE 3 - 15</desc>
-    <id>amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
+    <desc>Attach UE 3</desc>
+    <id>amarisoft_ue_3</id>
+  </testCase>
+
+  <testCase id="102004">
+    <class>Attach_UE</class>
+    <desc>Attach UE 4</desc>
+    <id>amarisoft_ue_4</id>
+  </testCase>
+
+  <testCase id="102005">
+    <class>Attach_UE</class>
+    <desc>Attach (RedCap) UE 5</desc>
+    <id>amarisoft_ue_5</id>
+  </testCase>
+
+  <testCase id="102006">
+    <class>Attach_UE</class>
+    <desc>Attach (RedCap) UE 6</desc>
+    <id>amarisoft_ue_6</id>
+  </testCase>
+
+  <testCase id="102007">
+    <class>Attach_UE</class>
+    <desc>Attach UE 7</desc>
+    <id>amarisoft_ue_7</id>
+  </testCase>
+
+  <testCase id="102008">
+    <class>Attach_UE</class>
+    <desc>Attach UE 8</desc>
+    <id>amarisoft_ue_8</id>
+  </testCase>
+
+  <testCase id="102009">
+    <class>Attach_UE</class>
+    <desc>Attach UE 9</desc>
+    <id>amarisoft_ue_9</id>
+  </testCase>
+
+  <testCase id="102010">
+    <class>Attach_UE</class>
+    <desc>Attach (RedCap) UE 10</desc>
+    <id>amarisoft_ue_10</id>
+  </testCase>
+
+  <testCase id="102011">
+    <class>Attach_UE</class>
+    <desc>Attach (RedCap) UE 11</desc>
+    <id>amarisoft_ue_11</id>
+  </testCase>
+
+  <testCase id="102012">
+    <class>Attach_UE</class>
+    <desc>Attach (RedCap) UE 12</desc>
+    <id>amarisoft_ue_12</id>
+  </testCase>
+
+  <testCase id="102013">
+    <class>Attach_UE</class>
+    <desc>Attach UE 13</desc>
+    <id>amarisoft_ue_13</id>
+  </testCase>
+
+  <testCase id="102014">
+    <class>Attach_UE</class>
+    <desc>Attach UE 14</desc>
+    <id>amarisoft_ue_14</id>
+  </testCase>
+
+  <testCase id="102015">
+    <class>Attach_UE</class>
+    <desc>Attach (RedCap) UE 15</desc>
+    <id>amarisoft_ue_15</id>
  </testCase>

  <testCase id="100010">
--- a/ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml
@@ -51,8 +51,6 @@
    000024
    000025
    000026
-    000027
-    000028

  </TestCaseRequestedList>
  <TestCaseExclusionList></TestCaseExclusionList>
@@ -60,7 +58,7 @@
  <testCase id="000001">
    <class>DeployCoreNetwork</class>
    <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g-00103-ho</cn_id>
+    <cn_id>oc-cn5g-00102-ho</cn_id>
  </testCase>

  <testCase id="000002">
@@ -90,134 +88,127 @@
  </testCase>

  <testCase id="000006">
-    <class>Custom_Command</class>
-    <desc>Set attenuator to 0 for DU0 and 17 for DU1</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1,2 0 -s 3,4 25</command>
-  </testCase>
-
-  <testCase id="000007">
    <class>Deploy_Object</class>
    <desc>Deploy gNB-CU in a container</desc>
    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
    <node>groot</node>
-    <services>oai-cu</services>
+    <services>oai_cu</services>
  </testCase>

-  <testCase id="000008">
+  <testCase id="000007">
    <class>Deploy_Object</class>
    <desc>Deploy gNB-DU0 (TDD/Band77/20MHz/B210) in a container</desc>
    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
-    <services>oai-du0</services>
+    <services>oai_du0</services>
    <node>groot</node>
  </testCase>

-  <testCase id="000009">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB-DU1 (TDD/Band77/20MHz/B210) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
-    <node>rocket</node>
-    <services>oai-du1</services>
-  </testCase>
-
-  <testCase id="000010">
+  <testCase id="000008">
    <class>Attach_UE</class>
    <desc>Attach Quectel</desc>
    <id>raspix</id>
  </testCase>

-  <testCase id="000011">
+  <testCase id="000009">
    <class>Ping</class>
    <desc>Ping: 100pings in 20sec</desc>
    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
+    <svr_id>oc-cn5g-00102-ho</svr_id>
    <ping_args>-c 100 -i 0.2</ping_args>
    <ping_packetloss_threshold>5</ping_packetloss_threshold>
  </testCase>

-  <testCase id="000012">
+  <testCase id="000010">
+    <class>Deploy_Object</class>
+    <desc>Deploy gNB-DU1 (TDD/Band77/20MHz/B210) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
+    <node>rocket</node>
+    <services>oai_du1</services>
+  </testCase>
+
+  <testCase id="000011">
    <class>IdleSleep</class>
    <desc>Sleep</desc>
    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
  </testCase>

-  <testCase id="000013">
+  <testCase id="000012">
    <class>Custom_Command</class>
-    <desc>Attenuate DU0 by 15 and remove the attenuation on DU1 to trigger Handover</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
+    <desc>Trigger Handover</desc>
+    <node>groot</node>
+    <command>echo ci trigger_f1_ho | ncat 127.0.0.1 9090</command>
  </testCase>

-  <testCase id="000014">
+  <testCase id="000013">
    <class>Ping</class>
    <desc>Ping: 50pings in 10sec</desc>
    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
+    <svr_id>oc-cn5g-00102-ho</svr_id>
    <ping_args>-c 50 -i 0.2</ping_args>
    <ping_packetloss_threshold>5</ping_packetloss_threshold>
  </testCase>

-  <testCase id="000015">
+  <testCase id="000014">
    <class>Custom_Command</class>
    <desc>UE connected to DU1?</desc>
    <node>groot</node>
    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
  </testCase>

-  <testCase id="000016">
-   <class>Custom_Command</class>
-    <desc>Attenuate DU1 by 17dB and remove attenuation on DU0 to trigger Handover</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 0 -r 3,4 25 -d 5</command>
+  <testCase id="000015">
+    <class>Custom_Command</class>
+    <desc>Trigger Handover</desc>
+    <node>groot</node>
+    <command>echo ci trigger_f1_ho | ncat 127.0.0.1 9090</command>
  </testCase>

-  <testCase id="000017">
+  <testCase id="000016">
    <class>Ping</class>
    <desc>Ping: 50pings in 10sec</desc>
    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
+    <svr_id>oc-cn5g-00102-ho</svr_id>
    <ping_args>-c 50 -i 0.2</ping_args>
    <ping_packetloss_threshold>5</ping_packetloss_threshold>
  </testCase>

-  <testCase id="000018">
+  <testCase id="000017">
    <class>Custom_Command</class>
    <desc>UE connected to DU0?</desc>
    <node>groot</node>
    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
  </testCase>

-  <testCase id="000019">
-   <class>Custom_Command</class>
-    <desc>Attenuate DU0 by 15 and remove the attenuation on DU1 to trigger Handover</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
+  <testCase id="000018">
+    <class>Custom_Command</class>
+    <desc>Trigger Handover</desc>
+    <node>groot</node>
+    <command>echo ci trigger_f1_ho | ncat 127.0.0.1 9090</command>
  </testCase>

-  <testCase id="000020">
+  <testCase id="000019">
    <class>Ping</class>
    <desc>Ping: 50pings in 10sec</desc>
    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
+    <svr_id>oc-cn5g-00102-ho</svr_id>
    <ping_args>-c 50 -i 0.2</ping_args>
    <ping_packetloss_threshold>5</ping_packetloss_threshold>
  </testCase>

-  <testCase id="000021">
+  <testCase id="000020">
    <class>Custom_Command</class>
    <desc>UE connected to DU1?</desc>
    <node>groot</node>
    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
  </testCase>

-  <testCase id="000022">
+  <testCase id="000021">
    <class>Detach_UE</class>
    <always_exec>true</always_exec>
    <desc>Detach Quectel</desc>
    <id>raspix</id>
  </testCase>

-  <testCase id="000023">
+  <testCase id="000022">
    <class>Undeploy_Object</class>
    <always_exec>true</always_exec>
    <desc>Undeploy CU-DU0</desc>
@@ -225,7 +216,7 @@
    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
  </testCase>

-  <testCase id="000024">
+  <testCase id="000023">
    <class>Undeploy_Object</class>
    <always_exec>true</always_exec>
    <desc>Undeploy DU1 </desc>
@@ -233,15 +224,7 @@
    <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
  </testCase>

-  <testCase id="000025">
-   <class>Custom_Command</class>
-    <desc>Reset all channels on the attenuator to 0</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1-4 0</command>
-    <always_exec>true</always_exec>
-  </testCase>
-
-  <testCase id="000026">
+  <testCase id="000024">
    <class>Clean_Test_Server_Images</class>
    <always_exec>true</always_exec>
    <desc>Clean Test Images on Test Server</desc>
@@ -249,7 +232,7 @@
    <images>oai-gnb</images>
  </testCase>

-  <testCase id="000027">
+  <testCase id="000025">
    <class>Clean_Test_Server_Images</class>
    <always_exec>true</always_exec>
    <desc>Clean Test Images on Test Server</desc>
@@ -257,11 +240,11 @@
    <images>oai-gnb</images>
  </testCase>

-  <testCase id="000028">
+  <testCase id="000026">
    <class>UndeployCoreNetwork</class>
    <always_exec>true</always_exec>
    <desc>Terminate 5G Core</desc>
-    <cn_id>oc-cn5g-00103-ho</cn_id>
+    <cn_id>oc-cn5g-00102-ho</cn_id>
  </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml
@@ -1,230 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-  <htmlTabRef>TEST-MONO-N2-HO-B210</htmlTabRef>
-  <htmlTabName>Monolithic N2 Handover 20 MHz TDD SA</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    000001
-    000002
-    000023
-    000003
-    000004
-    000005
-    000006
-    000007
-    000008
-    000009
-    000010
-    000011
-    000012
-    000013
-    000014
-    000015
-    000017
-    000018
-    000019
-    000016
-    000020
-    000021
-    000022
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-	
-  <testCase id="000001">
-    <class>DeployCoreNetwork</class>
-    <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g-00103-ho</cn_id>
-  </testCase>
-
-  <testCase id="000002">
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <images>oai-gnb</images>
-    <node>groot</node>
-  </testCase>
-
-  <testCase id="000023">
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <images>oai-gnb</images>
-    <node>rocket</node>
-  </testCase>
-
-  <testCase id="000003">
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace for groot</desc>
-    <node>groot</node>
-  </testCase>
-
-  <testCase id="000005">
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace on rocket</desc>
-    <node>rocket</node>
-  </testCase>
-
-  <testCase id="000004">
-    <class>Custom_Command</class>
-    <desc>Set initial attenuation on target gNB</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1,2 0 -s 3,4 25</command>
-  </testCase>
-
-  <testCase id="000005">
-    <class>Deploy_Object</class>
-    <desc>Deploy Monolithic gNB-PCI0 (TDD/Band77/20MHz/B210) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
-    <node>groot</node>
-    <services>oai-gnb-pci0</services>
-  </testCase>
-
-  <testCase id="000006">
-    <class>Deploy_Object</class>
-    <desc>Deploy Monolithic gNB-PCI1 (TDD/Band77/20MHz/B210) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
-    <node>rocket</node>
-    <services>oai-gnb-pci1</services>
-  </testCase>
-
-  <testCase id="000007">
-    <class>Attach_UE</class>
-    <desc>Attach Quectel</desc>
-    <id>raspix</id>
-  </testCase>
-
-  <testCase id="000008">
-    <class>Ping</class>
-    <desc>Ping: 100pings in 20sec</desc>
-    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
-    <ping_args>-c 100 -i 0.2</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase id="000009">
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase id="000010">
-    <class>Custom_Command</class>
-    <desc>Gradually attenuate gNB-PCI0 (ch1-2=15dB) and gNB-PCI1 (ch3-4=0dB) over 5s to trigger N2 Handover to gNB-PCI1</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
-  </testCase>
-
-  <testCase id="000011">
-    <class>Ping</class>
-    <desc>Ping: 50pings in 10sec</desc>
-    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
-    <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase id="000012">
-    <class>Custom_Command</class>
-    <desc>UE connected to gNB-PCI1?</desc>
-    <node>rocket</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3585"</command>
-  </testCase>
-
-  <testCase id="000013">
-    <class>Custom_Command</class>
-    <desc>Gradually attenuate gNB-PCI0 (ch1-2=0dB) and gNB-PCI1 (ch3-4=15dB) over 5s to trigger N2 Handover back to gNB-PCI0</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 0 -r 3,4 25 -d 5</command>
-  </testCase>
-
-  <testCase id="000014">
-    <class>Ping</class>
-    <desc>Ping: 50pings in 10sec</desc>
-    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
-    <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase id="000015">
-    <class>Custom_Command</class>
-    <desc>UE connected to gNB-PCI0?</desc>
-    <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id 1 | ncat 127.0.0.1 9090 | grep "3584"</command>
-  </testCase>
-
-  <testCase id="000016">
-    <class>Custom_Command</class>
-    <always_exec>true</always_exec>
-    <desc>Reset all attenuators to 0dB</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1-4 0</command>
-  </testCase>
-
-  <testCase id="000017">
-    <class>Detach_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Detach Quectel</desc>
-    <id>raspix</id>
-  </testCase>
-
-  <testCase id="000018">
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy Monolithic gNB-PCI0</desc>
-    <node>groot</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
-  </testCase>
-
-  <testCase id="000019">
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy Monolithic gNB-PCI1</desc>
-    <node>rocket</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n2_ho_b210</yaml_path>
-  </testCase>
-
-  <testCase id="000020">
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>groot</node>
-    <images>oai-gnb</images>
-  </testCase>
-
-  <testCase id="000021">
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>rocket</node>
-    <images>oai-gnb</images>
-  </testCase>
-
-  <testCase id="000022">
-    <class>UndeployCoreNetwork</class>
-    <always_exec>true</always_exec>
-    <desc>Terminate 5G Core</desc>
-    <cn_id>oc-cn5g-00103-ho</cn_id>
-  </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml
@@ -146,6 +146,7 @@
    <desc>Undeploy gNB</desc>
    <node>matix</node>
    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz</yaml_path>
+    <services>oai-gnb</services>
    <d_retx_th>10,100,100,100</d_retx_th>
    <u_retx_th>10,100,100,100</u_retx_th>
  </testCase>
--- a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml
@@ -146,6 +146,7 @@
    <desc>Undeploy gNB</desc>
    <node>matix</node>
    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz</yaml_path>
+    <services>oai-gnb</services>
    <d_retx_th>15,100,100,100</d_retx_th>
    <u_retx_th>20,100,100,100</u_retx_th>
  </testCase>
--- a/ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml
@@ -146,6 +146,7 @@
    <desc>Undeploy VNF-PNF</desc>
    <node>matix</node>
    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_4x4_60MHz</yaml_path>
+    <services>oai-vnf oai-pnf</services>
    <d_retx_th>10,100,100,100</d_retx_th>
    <u_retx_th>10,100,100,100</u_retx_th>
  </testCase>
--- a/ci-scripts/xml_files/container_sa_n310_nrue_longrun.xml
+++ b/ci-scripts/xml_files/container_sa_n310_nrue_longrun.xml
@@ -1,179 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-  <htmlTabRef>LONGRUN-5G-NRUE</htmlTabRef>
-  <htmlTabName>Longrun 40 MHz TDD SA</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-  <TestCaseRequestedList>
-    060000
-    010000 010001
-    800813
-    020000
-    800814
-    020001
-    000001
-    001000
-    000100
-    001000
-    000100
-    001000
-    000100
-    001000
-    000200
-    001000
-    000200
-    001000
-    000200
-    040001 040000
-    333333
-    444444
-    060001
-  </TestCaseRequestedList>
-  <TestCaseExclusionList></TestCaseExclusionList>
-
-  <testCase id="060000">
-    <class>DeployCoreNetwork</class>
-    <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g</cn_id>
-  </testCase>
-
-  <testCase id="010000">
-    <class>Pull_Cluster_Image</class>
-    <desc>Pull Images from Cluster</desc>
-    <images>oai-gnb</images>
-    <node>avra</node>
-  </testCase>
-
-  <testCase id="010001">
-    <class>Pull_Cluster_Image</class>
-    <desc>Pull Images from Cluster</desc>
-    <images>oai-nr-ue</images>
-    <node>caracal</node>
-  </testCase>
-
-  <testCase id="800813">
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>avra</node>
-  </testCase>
-
-  <testCase id="020000">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB (TDD/Band78/40MHz/N310) in a container</desc>
-    <node>avra</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_gnb</yaml_path>
-    <num_attempts>3</num_attempts>
-  </testCase>
-
-  <testCase id="800814">
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>caracal</node>
-  </testCase>
-
-  <testCase id="020001">
-    <class>Deploy_Object</class>
-    <desc>Deploy nrUE (TDD/Band78/40MHz/N310) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
-    <node>caracal</node>
-    <num_attempts>3</num_attempts>
-  </testCase>
-
-  <testCase id="000001">
-    <class>Attach_UE</class>
-    <desc>Attach OAIUE</desc>
-    <id>oai_ue_caracal</id>
-  </testCase>
-
-  <testCase id="000100">
-    <class>Iperf</class>
-    <desc>iperf (DL/10Mbps/UDP)(10 min)</desc>
-    <iperf_args>-u -b 10M -t 600 -i 1 -R</iperf_args>
-    <id>oai_ue_caracal</id>
-    <svr_id>oc-cn5g</svr_id>
-    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase id="000200">
-    <class>Iperf</class>
-    <desc>iperf (UL/2Mbps/UDP)(10 min)</desc>
-    <iperf_args>-u -b 2M -t 600 -i 1 </iperf_args>
-    <id>oai_ue_caracal</id>
-    <svr_id>oc-cn5g</svr_id>
-    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase id="001000">
-    <class>Ping</class>
-    <desc>Ping: 20pings in 20sec</desc>
-    <id>oai_ue_caracal</id>
-    <svr_id>oc-cn5g</svr_id>
-    <ping_args>-c 20</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>25</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase id="040000">
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy gNB</desc>
-    <node>avra</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_gnb</yaml_path>
-    <d_retx_th>20,100,100,100</d_retx_th>
-    <u_retx_th>20,100,100,100</u_retx_th>
-  </testCase>
-
-  <testCase id="040001">
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy nr UE</desc>
-    <node>caracal</node>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
-  </testCase>
-
-  <testCase id="333333">
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>avra</node>
-    <images>oai-gnb</images>
-  </testCase>
-
-  <testCase id="444444">
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>caracal</node>
-    <images>oai-nr-ue</images>
-  </testCase>
-
-  <testCase id="060001">
-    <class>UndeployCoreNetwork</class>
-    <desc>Terminate 5G Core</desc>
-    <always_exec>true</always_exec>
-    <cn_id>oc-cn5g</cn_id>
-  </testCase>
-
-</testCaseList>
--- a/ci-scripts/xml_files/gnb_usrp_build.xml
+++ b/ci-scripts/xml_files/gnb_usrp_build.xml
@@ -42,7 +42,7 @@
 		<class>Build_eNB</class>
 		<desc>Build gNB (USRP)</desc>
 		<node>caracal</node>
-		<Build_eNB_args>--gNB -w USRP --ninja -c -P --build-lib ldpc_cuda --build-lib ldpc_aal --cmake-opt -DASN1C_EXEC=/opt/asn1c/bin/asn1c --cmake-opt -DPHYSIM_CHECK_FILES="ThresholdsOffload.cmake"</Build_eNB_args>
+		<Build_eNB_args>--gNB -w USRP --ninja -c -P --build-lib ldpc_cuda --build-lib ldpc_aal --cmake-opt -DASN1C_EXEC=/opt/asn1c/bin/asn1c</Build_eNB_args>
 	</testCase>

 	<testCase id="100000">
--- a/ci-scripts/xml_files/physim_gracehopper.xml
+++ b/ci-scripts/xml_files/physim_gracehopper.xml
@@ -21,7 +21,7 @@

 -->
 <testCaseList>
-        <htmlTabRef>physim-tab</htmlTabRef>
+        <htmlTabRef>build-tab</htmlTabRef>
        <htmlTabName>PhySim</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
        <TestCaseRequestedList>
@@ -38,9 +38,9 @@

        <testCase id="010201">
                <class>Build_Deploy_Docker_PhySim</class>
-                <desc>Build and Deploy PhySim</desc>
+                <desc>Deploy and Deploy PhySim</desc>
                <node>localhost</node>
-                <ctest-opt>-R 5g -E "nr_dlsim|nr_ulsim|ldpctest" -j32</ctest-opt> <!-- one nr_dlsim test fails on ARM -->
-	</testCase>
+                <ctest-opt>-R 5g -E physim.5g.nr_dlsim.mcs.mimo.test9 -j16</ctest-opt> <!-- one nr_dlsim test fails on ARM -->
+        </testCase>

 </testCaseList>
--- a/ci-scripts/xml_files/physim_timed_gracehopper.xml
+++ b/ci-scripts/xml_files/physim_timed_gracehopper.xml
@@ -1,46 +0,0 @@
-<!--
-
- Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The OpenAirInterface Software Alliance licenses this file to You under
- the OAI Public License, Version 1.1  (the "License"); you may not use this file
- except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.openairinterface.org/?page_id=698
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- For more information about the OpenAirInterface (OAI) Software Alliance:
-      contact@openairinterface.org
-
-->
-<testCaseList>
-        <htmlTabRef>physim-timed-tab</htmlTabRef>
-        <htmlTabName>PhySim with timing check</htmlTabName>
-        <htmlTabIcon>wrench</htmlTabIcon>
-        <TestCaseRequestedList>
-          800813
-	  010202
-        </TestCaseRequestedList>
-        <TestCaseExclusionList></TestCaseExclusionList>
-
-        <testCase id="800813">
-                <class>Create_Workspace</class>
-                <desc>Create new Workspace</desc>
-                <node>localhost</node>
-        </testCase>
-
-	<testCase id="010202">
-		<class>Build_Deploy_Docker_PhySim</class>
-		<desc>Build and Deploy PhySim with timing check</desc>
-		<node>localhost</node>
-		<ctest-opt>-R 5g -R "nr_dlsim|nr_ulsim|ldpctest" -E physim.5g.nr_dlsim.mcs.mimo.test9 -j1</ctest-opt> <!-- one nr_dlsim test fails on ARM -->
-	</testCase>
-
-</testCaseList>
--- a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
@@ -178,7 +178,7 @@ services:
            retries: 5

    oai_enb:
-        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
        privileged: true
        container_name: l2sim4g-oai-enb
        network_mode: "host"
@@ -210,7 +210,7 @@ services:
            retries: 5

    oai_ue1:
-        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
        privileged: true
        container_name: l2sim4g-oai-lte-ue1
        network_mode: "host"
@@ -229,7 +229,7 @@ services:
            retries: 5

    oai_ue2:
-        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
        privileged: true
        container_name: l2sim4g-oai-lte-ue2
        network_mode: "host"
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
@@ -178,7 +178,7 @@ services:
            retries: 5

    oai_enb0:
-        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-enb
        networks:
@@ -197,7 +197,7 @@ services:
            retries: 5

    oai_ue0:
-        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-lte-ue0
        networks:
--- 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,6 +1,6 @@
 services:
    oai_enb0:
-        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-enb
        networks:
@@ -19,7 +19,7 @@ services:
            retries: 5

    oai_ue0:
-        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-lte-ue0
        networks:
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
@@ -178,7 +178,7 @@ services:
            retries: 5

    oai_enb0:
-        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-enb
        networks:
@@ -197,7 +197,7 @@ services:
            retries: 5

    oai_ue0:
-        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-lte-ue0
        networks:
--- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
@@ -178,7 +178,7 @@ services:
            retries: 5

    oai_enb0:
-        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-enb
        networks:
@@ -197,7 +197,7 @@ services:
            retries: 5

    oai_ue0:
-        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-lte-ue0
        networks:
--- a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
    oai_enb0:
-        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-enb
        networks:
@@ -19,7 +19,7 @@ services:
            retries: 5

    oai_ue0:
-        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-lte-ue0
        networks:
--- a/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
    oai_enb0:
-        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-enb
        networks:
@@ -19,7 +19,7 @@ services:
            retries: 5

    oai_ue0:
-        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-lte-ue0
        networks:
--- a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
@@ -178,7 +178,7 @@ services:
            retries: 5

    oai_enb0:
-        image: ${REGISTRY-oaisoftwarealliance/}${ENB_IMG:-oai-enb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${ENB_IMG:-oai-enb}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-enb
        networks:
@@ -197,7 +197,7 @@ services:
            retries: 5

    oai_ue0:
-        image: ${REGISTRY-oaisoftwarealliance/}${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${LTEUE_IMG:-oai-lte-ue}:${TAG:-develop}
        privileged: true
        container_name: rfsim4g-oai-lte-ue0
        networks:
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
@@ -92,7 +92,7 @@ services:
            retries: 5

    oai-cu:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
        container_name: rfsim5g-oai-cu
        cap_drop:
            - ALL
@@ -121,7 +121,7 @@ services:
            retries: 5

    oai-du-pci0:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
        container_name: rfsim5g-oai-du-pci0
        cap_drop:
            - ALL
@@ -152,7 +152,7 @@ services:
            retries: 5

    oai-du-pci1:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
        container_name: rfsim5g-oai-du-pci1
        cap_drop:
            - ALL
@@ -187,7 +187,7 @@ services:
            retries: 5

    oai-nr-ue:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue
        cap_drop:
            - ALL
--- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
@@ -90,7 +90,7 @@ services:
            start_period: 10s
            start_interval: 500ms
    oai-gnb:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
        container_name: rfsim5g-oai-gnb
        cap_drop:
            - ALL
@@ -113,7 +113,7 @@ services:
            retries: 5
        ipc: host
    oai-nr-ue:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue
        cap_drop:
            - ALL
--- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
@@ -90,7 +90,7 @@ services:
            timeout: 5s
            retries: 5
    oai-gnb:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
        container_name: rfsim5g-oai-gnb
        cap_add:
            - SYS_NICE
@@ -114,7 +114,7 @@ services:
            timeout: 5s
            retries: 5
    oai-nr-ue:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue
        cap_drop:
            - ALL
@@ -141,7 +141,7 @@ services:
            timeout: 5s
            retries: 5
    oai-nr-ue2:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue2
        cap_drop:
            - ALL
@@ -168,7 +168,7 @@ services:
            timeout: 5s
            retries: 5
    oai-nr-ue3:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue3
        cap_drop:
            - ALL
@@ -195,7 +195,7 @@ services:
            timeout: 5s
            retries: 5
    oai-nr-ue4:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue4
        cap_drop:
            - ALL
@@ -222,7 +222,7 @@ services:
            timeout: 5s
            retries: 5
    oai-nr-ue5:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue5
        cap_drop:
            - ALL
@@ -249,7 +249,7 @@ services:
            timeout: 5s
            retries: 5
    oai-nr-ue6:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue6
        cap_drop:
            - ALL
@@ -276,7 +276,7 @@ services:
            timeout: 5s
            retries: 5
    oai-nr-ue7:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue7
        cap_drop:
            - ALL
@@ -303,7 +303,7 @@ services:
            timeout: 5s
            retries: 5
    oai-nr-ue8:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue8
        cap_drop:
            - ALL
@@ -330,7 +330,7 @@ services:
            timeout: 5s
            retries: 5
    oai-nr-ue9:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue9
        cap_drop:
            - ALL
@@ -357,7 +357,7 @@ services:
            timeout: 5s
            retries: 5
    oai-nr-ue10:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue10
        cap_drop:
            - ALL
--- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
@@ -90,7 +90,7 @@ services:
            timeout: 5s
            retries: 5
    oai-gnb:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
        container_name: rfsim5g-oai-gnb
        cap_drop:
            - ALL
@@ -112,7 +112,7 @@ services:
            timeout: 5s
            retries: 5
    oai-nr-ue:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue
        cap_drop:
            - ALL
--- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
@@ -90,7 +90,7 @@ services:
            timeout: 5s
            retries: 5
    oai-gnb:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
        container_name: rfsim5g-oai-gnb
        cap_drop:
            - ALL
@@ -115,7 +115,7 @@ services:
            retries: 5

    oai-nr-ue:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue
        cap_drop:
            - ALL
--- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
@@ -71,7 +71,7 @@ services:
                interface_name: eth1

    oai-cucp:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
        container_name: rfsim5g-oai-cucp
        cap_drop:
            - ALL
@@ -100,7 +100,7 @@ services:
            retries: 5

    oai-cuup:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
        container_name: rfsim5g-oai-cuup
        cap_drop:
            - ALL
@@ -131,7 +131,7 @@ services:
            retries: 5

    oai-cuup2:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
        container_name: rfsim5g-oai-cuup2
        cap_drop:
            - ALL
@@ -165,7 +165,7 @@ services:
            retries: 5

    oai-cuup3:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRCUUP_IMG:-oai-nr-cuup}:${TAG:-develop}
        container_name: rfsim5g-oai-cuup3
        cap_drop:
            - ALL
@@ -199,7 +199,7 @@ services:
            retries: 5

    oai-du:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
        container_name: rfsim5g-oai-du
        cap_drop:
            - ALL
@@ -230,7 +230,7 @@ services:
            retries: 5

    oai-du2:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
        container_name: rfsim5g-oai-du2
        cap_drop:
            - ALL
@@ -264,7 +264,7 @@ services:
            retries: 5

    oai-du3:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
        container_name: rfsim5g-oai-du3
        cap_drop:
            - ALL
@@ -298,7 +298,7 @@ services:
            retries: 5

    oai-nr-ue:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue
        cap_drop:
            - ALL
@@ -328,7 +328,7 @@ services:
            retries: 5

    oai-nr-ue2:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue2
        cap_drop:
            - ALL
@@ -358,7 +358,7 @@ services:
            retries: 5

    oai-nr-ue3:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
        container_name: rfsim5g-oai-nr-ue3
        cap_drop:
            - ALL
--- a/Show More
+++ b/Show More