diff --git a/ci-scripts/conf_files/gnb-cu.sa.f1.conf b/ci-scripts/conf_files/gnb-cu.sa.f1.conf
index 1cd2d76318..2126aac17f 100644
--- a/ci-scripts/conf_files/gnb-cu.sa.f1.conf
+++ b/ci-scripts/conf_files/gnb-cu.sa.f1.conf
@@ -22,8 +22,8 @@ gNBs =
 
     tr_s_preference = "f1";
 
-    local_s_address = "192.168.68.194";
-    remote_s_address = "192.168.68.195";
+    local_s_address = "127.0.0.4";
+    remote_s_address = "127.0.0.5";
     local_s_portc   = 501;
     local_s_portd   = 2153;
     remote_s_portc  = 500;
@@ -44,8 +44,8 @@ gNBs =
     NETWORK_INTERFACES :
     {
 
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.68.194";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.68.194";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.109";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.109";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
   }
diff --git a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
index 5afadb781a..7c4550b346 100644
--- a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
@@ -162,8 +162,8 @@ MACRLCs = (
     num_cc           = 1;
     tr_s_preference  = "local_L1";
     tr_n_preference  = "f1";
-    local_n_address = "192.168.68.195";
-    remote_n_address = "192.168.68.194";
+    local_n_address = "127.0.0.5";
+    remote_n_address = "127.0.0.4";
     local_n_portc   = 500;
     local_n_portd   = 2153;
     remote_n_portc  = 501;
diff --git a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
index df69f4c32c..6989c8fc26 100644
--- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
@@ -209,14 +209,14 @@
     <class>Custom_Command</class>
     <desc>Trigger Reestablishment (on DU)</desc>
     <node>ofqot</node>
-    <command>echo ci force_reestab | nc -N 192.168.68.195 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
     <command_fail>yes</command_fail>
   </testCase>
   <testCase id="160002">
     <class>Custom_Command</class>
     <desc>Verify Reestablishment (on CU)</desc>
     <node>ofqot</node>
-    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
     <command_fail>yes</command_fail>
   </testCase>
 
diff --git a/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml
index 97438eb67e..b2f682aada 100644
--- a/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_f1_b200_gnb/docker-compose.yml
@@ -6,12 +6,16 @@ services:
         ulimits:
           core: -1 # for core dumps
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function
+            USE_ADDITIONAL_OPTIONS: --sa
+                                    --telnetsrv --telnetsrv.listenport 9090 --telnetsrv.shrmod ci
+                                    --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
             - ../../conf_files/gnb-cu.sa.f1.conf:/opt/oai-gnb/etc/gnb.conf
-        networks:
-            public_net:
-                ipv4_address: 192.168.68.194
+        # for performance reasons, we use host mode: in bridge mode, we have
+        # unacceptable DL TCP performance. However, the whole point of
+        # containerization is to not be in host mode, so update this to macvlan
+        # later.
+        network_mode: "host"
         #entrypoint: /bin/bash -c "sleep infinity"
         healthcheck:
             # pgrep does NOT work
@@ -28,13 +32,18 @@ services:
           core: -1 # for core dumps
         environment:
             USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 0 --L1s.[0].max_ldpc_iterations 20
+            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx
+                                    --telnetsrv --telnetsrv.listenport 9091 --telnetsrv.shrmod ci
+                                    --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 0 --L1s.[0].max_ldpc_iterations 20
+                                    --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
             - ../../conf_files/gnb-du.sa.band1.52prb.usrpb210.conf:/opt/oai-gnb/etc/gnb.conf
             - /dev:/dev
-        networks:
-            public_net:
-                ipv4_address: 192.168.68.195
+        # for performance reasons, we use host mode: in bridge mode, we have
+        # unacceptable DL TCP performance. However, the whole point of
+        # containerization is to not be in host mode, so update this to macvlan
+        # later.
+        network_mode: "host"
         #entrypoint: /bin/bash -c "sleep infinity"
         healthcheck:
             # pgrep does NOT work
@@ -42,12 +51,3 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
-
-networks:
-    public_net:
-        name: sa-b200-gnb-net
-        ipam:
-            config:
-                - subnet: 192.168.68.192/26
-        driver_opts:
-            com.docker.network.bridge.name: "sa-gnb-net"