diff --git a/openair2/F1AP/f1ap_cu_task.c b/openair2/F1AP/f1ap_cu_task.c
index 24aec70b57..4e4ade111c 100644
--- a/openair2/F1AP/f1ap_cu_task.c
+++ b/openair2/F1AP/f1ap_cu_task.c
@@ -72,11 +72,16 @@ void cu_task_handle_sctp_association_resp(instance_t instance, sctp_new_associat
   f1ap_du_data_from_du->sctp_out_streams = sctp_new_association_resp->out_streams;
 
   /* setup parameters for F1U and start the server */
-  const cudu_params_t params = {
+  const cudu_params_t params = RC.nrrrc[instance]->node_type == ngran_gNB_CU ? (cudu_params_t){
     .local_ipv4_address  = RC.nrrrc[instance]->eth_params_s.my_addr,
     .local_port          = RC.nrrrc[instance]->eth_params_s.my_portd,
     .remote_ipv4_address = RC.nrrrc[instance]->eth_params_s.remote_addr,
     .remote_port         = RC.nrrrc[instance]->eth_params_s.remote_portd
+  } : (cudu_params_t){
+    .local_ipv4_address  = RC.rrc[instance]->eth_params_s.my_addr,
+    .local_port          = RC.rrc[instance]->eth_params_s.my_portd,
+    .remote_ipv4_address = RC.rrc[instance]->eth_params_s.remote_addr,
+    .remote_port         = RC.rrc[instance]->eth_params_s.remote_portd
   };
   AssertFatal(proto_agent_start(instance, &params) == 0,
               "could not start PROTO_AGENT for F1U on instance %ld!\n", instance);
diff --git a/openair2/F1AP/f1ap_du_task.c b/openair2/F1AP/f1ap_du_task.c
index 934e8d4210..3e50e7816b 100644
--- a/openair2/F1AP/f1ap_du_task.c
+++ b/openair2/F1AP/f1ap_du_task.c
@@ -102,11 +102,16 @@ void du_task_handle_sctp_association_resp(instance_t instance, sctp_new_associat
   f1ap_du_data->default_sctp_stream_id = 0;
 
   /* setup parameters for F1U and start the server */
-  const cudu_params_t params = {
+  const cudu_params_t params = RC.nrrrc[instance]->node_type == ngran_gNB_DU ? (cudu_params_t){
     .local_ipv4_address  = RC.nrmac[instance]->eth_params_n.my_addr,
     .local_port          = RC.nrmac[instance]->eth_params_n.my_portd,
     .remote_ipv4_address = RC.nrmac[instance]->eth_params_n.remote_addr,
     .remote_port         = RC.nrmac[instance]->eth_params_n.remote_portd
+  } : (cudu_params_t){
+    .local_ipv4_address  = RC.mac[instance]->eth_params_n.my_addr,
+    .local_port          = RC.mac[instance]->eth_params_n.my_portd,
+    .remote_ipv4_address = RC.mac[instance]->eth_params_n.remote_addr,
+    .remote_port         = RC.mac[instance]->eth_params_n.remote_portd
   };
   AssertFatal(proto_agent_start(instance, &params) == 0,
               "could not start PROTO_AGENT for F1U on instance %ld!\n", instance);