diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
index 8ab0422eeb..ff787e4a95 100644
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.2x2.conf
@@ -256,6 +256,7 @@ MACRLCs = (
   #pucch_TargetSNRx10         = 200;
   ulsch_max_frame_inactivity  = 0;
   dl_max_mcs                  = 16; # there are retransmissions if more
+  min_grant_prb               = 10;
 }
 );
 
diff --git a/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210_5gcn.conf b/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210_5gcn.conf
index ac7203786f..26b2d1654e 100644
--- a/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210_5gcn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210_5gcn.conf
@@ -5,8 +5,8 @@ Asn1_verbosity = "none";
 e2_agent = {
   enabled = "yes";
   near_ric_ip_addr = "192.168.71.21";
+  e2ap_server_port =  36422;
   sm_dir = "/usr/local/lib/flexric/"
-  e2ap_server_port: 36422
 };
 
 gNBs =
@@ -92,7 +92,7 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
+        # ra_ResponseWindow                                           = 8;
 #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;
@@ -169,14 +169,18 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "192.168.71.132";});
+    amf_ip_address      = ( { ipv4       = "192.168.71.132";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
 
 
     NETWORK_INTERFACES :
     {
         GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
         GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/24";
-        GNB_PORT_FOR_S1U                         = 2152;
+        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
   }
diff --git a/docker/Dockerfile.nakaolab.test b/docker/Dockerfile.nakaolab.test
index a2466f74f3..ece71ca748 100644
--- a/docker/Dockerfile.nakaolab.test
+++ b/docker/Dockerfile.nakaolab.test
@@ -11,7 +11,7 @@ RUN /bin/sh oaienv && \
     mkdir -p log && \
     ./build_oai -c --ninja \
       --gNB --RU --nrUE -w SIMU\
-      --build-lib "telnetsrv enbscope uescope nrscope" \
+      --build-lib "telnetsrv" \
       -w USRP -t Ethernet \
       --build-e2 --cmake-opt -DKPM_VERSION=KPM_V3_00 --cmake-opt -DE2AP_VERSION=E2AP_V3 \
       --noavx512 \
diff --git a/flexric/etc/flexric/flexric.conf b/flexric/etc/flexric/flexric.conf
index 5e4bd65bd1..0b33741f76 100644
--- a/flexric/etc/flexric/flexric.conf
+++ b/flexric/etc/flexric/flexric.conf
@@ -1,6 +1,6 @@
 [NEAR-RIC]
 NEAR_RIC_IP = 192.168.71.21
-NEAR_RIC_PORT = 36422
+NEAR_RIC_PORT = 36421
 E2AP_SERVER_PORT = 36422
 
 [XAPP]
diff --git a/openair2/E2AP/flexric b/openair2/E2AP/flexric
index cea0e5d9ed..8f449513c5 160000
--- a/openair2/E2AP/flexric
+++ b/openair2/E2AP/flexric
@@ -1 +1 @@
-Subproject commit cea0e5d9ed2d5d8284c9af36492c427749724a4b
+Subproject commit 8f449513c52d0796e9d2e404858bd12d4f881326
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
index a1814d5715..c81602bf70 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
@@ -793,7 +793,7 @@ static void pf_dl(gNB_MAC_INST *mac,
     while (rbStart < rbStop && (rballoc_mask[rbStart + bwp_start] & slbitmap))
       rbStart++;
 
-    uint16_t max_rbSize = 5;
+    uint16_t max_rbSize = 10;
 
     /* while (rbStart + max_rbSize <= rbStop && !(rballoc_mask[rbStart + max_rbSize + bwp_start] & slbitmap)) */
     /*   max_rbSize++; */
diff --git a/tools/scripts/traffic_runner.sh b/tools/scripts/traffic_runner.sh
index 58a70ec0d3..01f9d859df 100755
--- a/tools/scripts/traffic_runner.sh
+++ b/tools/scripts/traffic_runner.sh
@@ -41,7 +41,7 @@ iperf_udp_ul_forever() { ( iperf -u -c "$IPERF_HOST_UDP" -B "$OAITUN_IP" -p "$IP
 
 # ---------------- profiles ----------------
 do_boring() {
-    iperf_udp_dl_forever 200M
+    iperf_udp_dl_forever 10M
     wait
   # iperf -c "$IPERF_HOST" -p "$IPERF_PORT" -B "$OAITUN_IP"    -u -b 25M -t "$LONG_T"
 }