diff --git a/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf b/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf
index 28a6bc0779..a3ecffb9be 100644
--- a/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/du.band7.tm1.100PRB.usrpb210.conf
@@ -12,7 +12,7 @@ eNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code = 1;
-    plmn_list = ( { mcc = 450; mnc = 05; mnc_length = 2; } )
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
 
     nr_cellid = 12345678L
 
diff --git a/ci-scripts/conf_files/gNB_SA_DU.conf b/ci-scripts/conf_files/gNB_SA_DU.conf
index 61ebcc1f09..cc20066721 100644
--- a/ci-scripts/conf_files/gNB_SA_DU.conf
+++ b/ci-scripts/conf_files/gNB_SA_DU.conf
@@ -233,9 +233,9 @@ MACRLCs = (
     local_n_if_name = "lo";
     local_n_address = "127.0.0.3";
     remote_n_address = "127.0.0.4";
-    local_n_portc   = 601;
+    local_n_portc   = 500;
     local_n_portd   = 2152;
-    remote_n_portc  = 600;
+    remote_n_portc  = 501;
     remote_n_portd  = 2152;
 
   }
diff --git a/openair2/F1AP/f1ap_du_ue_context_management.c b/openair2/F1AP/f1ap_du_ue_context_management.c
index 35251ec248..ce1743b349 100644
--- a/openair2/F1AP/f1ap_du_ue_context_management.c
+++ b/openair2/F1AP/f1ap_du_ue_context_management.c
@@ -157,7 +157,8 @@ int DU_handle_UE_CONTEXT_SETUP_REQUEST(instance_t       instance,
       F1AP_GTPTunnel_t *ul_up_tnl0 = ul_up_tnl_info_p->uLUPTNLInformation.choice.gTPTunnel;
       BIT_STRING_TO_TRANSPORT_LAYER_ADDRESS_IPv4(&ul_up_tnl0->transportLayerAddress, drb_p->up_ul_tnl[0].tl_address);
       OCTET_STRING_TO_INT32(&ul_up_tnl0->gTP_TEID, drb_p->up_ul_tnl[0].teid);
-      
+      // 3GPP assumes GTP-U is on port 2152, but OAI is configurable
+      drb_p->up_ul_tnl[0].port=getCxt(false,instance)->setupReq.CUport;
       switch (drbs_tobesetup_item_p->rLCMode) {
       case F1AP_RLCMode_rlc_am:
 	drb_p->rlc_mode = RLC_MODE_AM;
@@ -177,7 +178,7 @@ int DU_handle_UE_CONTEXT_SETUP_REQUEST(instance_t       instance,
 						     drb_p->drb_id,
 						     drb_p->up_ul_tnl[0].teid,
 						     addr,
-						     2152,
+						     drb_p->up_ul_tnl[0].port,
 						     lteDURecvCb);
 	drb_p->up_dl_tnl_length++;
       }
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index d2132b4e30..b034825bab 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -3210,7 +3210,7 @@ static void rrc_DU_process_ue_context_setup_request(MessageDef *msg_p, const cha
           drb_p.drb_id,
           drb_p.up_ul_tnl[0].teid,
           addr,
-          2152,
+          drb_p.up_ul_tnl[0].port,
           DURecvCb);
     }
   }