diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
index 3f3fc5aa3d..a9bd7b761e 100644
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -45,6 +45,10 @@
  040023
  020022
  040024
+ 000024
+ 040025
+ 000031
+ 030021
  100021
  222222
         </TestCaseRequestedList>
@@ -73,9 +77,9 @@
 
         <testCase id="000022">
                 <class>Deploy_Object</class>
-                <desc>Deploy OAI 5G CU+DU+UE RF sim SA</desc>
+                <desc>Deploy OAI 5G CU + DU-PCI0 + UE RF sim SA</desc>
                 <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
-                <services>oai-cu oai-du oai-nr-ue</services>
+                <services>oai-cu oai-du-pci0 oai-nr-ue</services>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>
@@ -86,6 +90,12 @@
                 <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
         </testCase>
 
+        <testCase id="000031">
+                <class>IdleSleep</class>
+                <desc>Sleep</desc>
+                <idle_sleep_time_in_sec>2</idle_sleep_time_in_sec>
+        </testCase>
+
         <testCase id="000023">
                 <class>Attach_UE</class>
                 <desc>Attach OAI UE (Wait for IP)</desc>
@@ -93,6 +103,15 @@
                 <nodes>cacofonix</nodes>
         </testCase>
 
+        <testCase id="000024">
+                <class>Deploy_Object</class>
+                <desc>Deploy OAI 5G (target) DU-PCI1 RF sim SA</desc>
+                <yaml_path>ci-scripts/yaml_files/5g_f1_rfsimulator</yaml_path>
+                <services>oai-du-pci1</services>
+                <eNB_instance>0</eNB_instance>
+                <eNB_serverId>0</eNB_serverId>
+        </testCase>
+
         <testCase id="020021">
                 <class>Ping</class>
                 <desc>Ping ext-dn from all NR-UEs</desc>
@@ -151,6 +170,15 @@
                 <ping_packetloss_threshold>80</ping_packetloss_threshold>
         </testCase>
 
+        <testCase id="020023">
+                <class>Ping</class>
+                <desc>Ping ext-dn from all NR-UEs</desc>
+                <id>rfsim5g_ue</id>
+                <nodes>cacofonix</nodes>
+                <ping_args> -c 5 192.168.72.135 -i0.5 -w25</ping_args>
+                <ping_packetloss_threshold>80</ping_packetloss_threshold>
+        </testCase>
+
         <testCase id="040002">
                 <class>Custom_Command</class>
                 <desc>Verify Reestablishment</desc>
@@ -191,6 +219,14 @@
                 <command_fail>yes</command_fail>
         </testCase>
 
+        <testCase id="040025">
+                <class>Custom_Command</class>
+                <desc>Trigger Handover</desc>
+                <node>cacofonix</node>
+                <command>echo ci trigger_f1_ho | nc 192.168.71.150 9090</command>
+                <command_fail>yes</command_fail>
+        </testCase>
+
         <testCase id="100021">
                 <class>Undeploy_Object</class>
                 <always_exec>true</always_exec>
diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
index df0a9f4b07..d36add6ec3 100644
--- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
@@ -90,6 +90,7 @@ services:
         environment: 
             USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
                                     --rfsimulator.options chanmod
+                                    --gNBs.[0].remote_s_address 0.0.0.0
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.150
                                     --telnetsrv.shrmod ci
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
@@ -106,9 +107,9 @@ services:
             timeout: 5s
             retries: 5
 
-    oai-du:
+    oai-du-pci0:
         image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
-        container_name: rfsim5g-oai-du
+        container_name: rfsim5g-oai-du-pci0
         cap_drop:
             - ALL
         environment:
@@ -117,9 +118,11 @@ services:
                                     --rfsimulator.options chanmod
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.171
                                     --telnetsrv.shrmod ci
+                                    --rfsimulator.serveraddr 192.168.71.181
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
             - oai-cu
+            - oai-nr-ue
         networks:
             public_net:
                 ipv4_address: 192.168.71.171
@@ -131,6 +134,37 @@ services:
             timeout: 5s
             retries: 5
 
+    oai-du-pci1:
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        container_name: rfsim5g-oai-du-pci1
+        cap_drop:
+            - ALL
+        environment:
+            USE_ADDITIONAL_OPTIONS: --rfsim
+                                    --log_config.global_log_options level,nocolor,time
+                                    --gNBs.[0].gNB_DU_ID 3585
+                                    --gNBs.[0].nr_cellid 11111111
+                                    --gNBs.[0].servingCellConfigCommon.[0].physCellId 1
+                                    --gNBs.[0].servingCellConfigCommon.[0].absoluteFrequencySSB 643296
+                                    --gNBs.[0].servingCellConfigCommon.[0].dl_absoluteFrequencyPointA 642024
+                                    --gNBs.[0].servingCellConfigCommon.[0].ssb_PositionsInBurst_Bitmap 3
+                                    --MACRLCs.[0].local_n_address 192.168.71.172
+                                    --rfsimulator.serveraddr 192.168.71.181
+            ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
+        depends_on:
+            - oai-cu
+            - oai-nr-ue
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.172
+        volumes:
+            - ../../conf_files/gnb-du.sa.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
     oai-nr-ue:
         image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
@@ -143,12 +177,12 @@ services:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
                                     --uicc0.imsi 208990100001100
-                                    --rfsimulator.serveraddr 192.168.71.171
                                     --rfsimulator.options chanmod
+                                    --rfsimulator.serveraddr server
                                     --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.181 --telnetsrv.listenport 8091
+                                    --channelmod.modellist_rfsimu_1.[0].model_name rfsimu_channel_ue0
+                                    --channelmod.modellist_rfsimu_1.[1].model_name rfsimu_channel_ue1
             ASAN_OPTIONS: detect_odr_violation=0
-        depends_on:
-            - oai-du
         networks:
             public_net:
                 ipv4_address: 192.168.71.181