diff --git a/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
index 7396356c63..7d02101d83 100644
--- a/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
@@ -190,15 +190,13 @@ eNBs =
     t_dc_overall      = 2000;      /* unit: millisecond */
 
     NETWORK_INTERFACES :
-    {   # All of these have to be IP addr of eNB
-                # if in CORE container, make it 172.16.0.1
-                # if not launched in CORE, can set to lo (127.0.0.1)
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "ctrl0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.16.0.1";
-        ENB_INTERFACE_NAME_FOR_S1U               = "ctrl0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.16.0.1";
+    {
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "ens3";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1U               = "ens3";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "172.16.0.1";
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
         ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
         
     };
@@ -210,7 +208,7 @@ MACRLCs = (
 	num_cc = 1;
 	local_s_if_name  = "lo";
 	remote_s_address = "127.0.0.1";
-	local_s_address  = "127.0.0.1";
+	local_s_address  = "127.0.0.2";
 	local_s_portc    = 50001;
 	remote_s_portc   = 50000;
 	local_s_portd    = 50011;
diff --git a/openair2/PHY_INTERFACE/phy_stub_UE.c b/openair2/PHY_INTERFACE/phy_stub_UE.c
index d49f18bdaf..d1e9b047fb 100644
--- a/openair2/PHY_INTERFACE/phy_stub_UE.c
+++ b/openair2/PHY_INTERFACE/phy_stub_UE.c
@@ -822,7 +822,7 @@ void dl_config_req_UE_MAC_dci(int sfn,
               sfn, sf, dci->pdu_size,
               dlsch->dlsch_pdu.dlsch_pdu_rel8.pdu_index,
               tx_req_pdu_list->num_pdus);
-        if (!should_drop_transport_block(sf, dci->dci_dl_pdu.dci_dl_pdu_rel8.rnti))
+        if (node_number > 0 || !should_drop_transport_block(sf, dci->dci_dl_pdu.dci_dl_pdu_rel8.rnti))
         {
           ue_send_sdu(ue_id, 0, sfn, sf,
               tx_req_pdu_list->pdus[pdu_index].segments[0].segment_data,