diff --git a/ci-scripts/conf_files/neighbour-config-ho.conf b/ci-scripts/conf_files/neighbour-config-ho.conf
index 2b5bbb02bd..07d58e14e5 100644
--- a/ci-scripts/conf_files/neighbour-config-ho.conf
+++ b/ci-scripts/conf_files/neighbour-config-ho.conf
@@ -47,8 +47,8 @@ nr_measurement_configuration = {
 
   A3 = ({
     physCellId = -1; #Default
-    offset = 16;
-    hysteresis = 1;
-    time_to_trigger = 10;
+    offset = 10;
+    hysteresis = 0;
+    time_to_trigger = 1
   })
 };
diff --git a/ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml b/ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml
index 53f7e006d9..2804e3c14e 100644
--- a/ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_ho_b210_quectel.xml
@@ -59,9 +59,9 @@
 
   <testCase>
     <class>Custom_Command</class>
-    <desc>Set attenuator to 0 for DU0 and 22 for DU1</desc>
+    <desc>Set attenuator to 0 for DU0 and 17 for DU1</desc>
     <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1,2 0 -s 3,4 22</command>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1,2 0 -s 3,4 25</command>
   </testCase>
 
   <testCase>
@@ -76,8 +76,8 @@
     <class>Deploy_Object</class>
     <desc>Deploy gNB-DU0 (TDD/Band77/20MHz/B210) in a container</desc>
     <yaml_path>ci-scripts/yaml_files/5g_sa_f1_b210_ho</yaml_path>
-    <node>groot</node>
     <services>oai-du0</services>
+    <node>groot</node>
   </testCase>
 
   <testCase>
@@ -94,34 +94,26 @@
     <id>raspix</id>
   </testCase>
 
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>UE connected to DU0?</desc>
-    <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3584"</command>
-  </testCase>
-
   <testCase>
     <class>Ping</class>
-    <desc>Ping: 50pings in 10sec</desc>
+    <desc>Ping: 100pings in 20sec</desc>
     <id>raspix</id>
     <svr_id>oc-cn5g-00103-ho</svr_id>
-    <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>30</ping_packetloss_threshold>
+    <ping_args>-c 100 -i 0.2</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
   </testCase>
 
   <testCase>
     <class>Custom_Command</class>
-    <desc>Set attenuation 5 on DU 0 and remove attenuation on DU 1 to test Reestablishment on a different DU (DU 1)</desc>
+    <desc>Attenuate DU0 by 15 and remove the attenuation on DU1 to trigger Handover</desc>
     <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 5 -r 3,4 0 -d 5</command>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>Trigger Reestablishment (on DU 0)</desc>
-    <node>groot</node>
-    <command>echo ci force_reestab | ncat 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
   </testCase>
 
   <testCase>
@@ -130,7 +122,7 @@
     <id>raspix</id>
     <svr_id>oc-cn5g-00103-ho</svr_id>
     <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>30</ping_packetloss_threshold>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
   <testCase>
@@ -142,23 +134,9 @@
 
   <testCase>
     <class>Custom_Command</class>
-    <desc>Verify Reestablishment (on CU)</desc>
-    <node>groot</node>
-    <command>echo ci get_reestab_count | ncat 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>Remove attenuation on DU 0 and set attenuation on DU 1 to 5 to test Reestablishment on a different DU (DU 0)</desc>
+    <desc>Attenuate DU1 by 17dB and remove attenuation on DU0 to trigger Handover</desc>
     <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 0 -r 3,4 5 -d 5</command>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>Trigger Reestablishment (on DU 1)</desc>
-    <node>rocket</node>
-    <command>echo ci force_reestab | ncat 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 0 -r 3,4 25 -d 5</command>
   </testCase>
 
   <testCase>
@@ -167,7 +145,7 @@
     <id>raspix</id>
     <svr_id>oc-cn5g-00103-ho</svr_id>
     <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>30</ping_packetloss_threshold>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
   <testCase>
@@ -179,16 +157,9 @@
 
   <testCase>
     <class>Custom_Command</class>
-    <desc>Verify Reestablishment (on CU)</desc>
-    <node>groot</node>
-    <command>echo ci get_reestab_count | ncat 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 2'</command>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>Attenuate DU0 by 22 and remove the attenuation on DU1 to trigger Handover</desc>
+    <desc>Attenuate DU0 by 15 and remove the attenuation on DU1 to trigger Handover</desc>
     <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 22 -r 3,4 0 -d 5</command>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
   </testCase>
 
   <testCase>
@@ -197,53 +168,7 @@
     <id>raspix</id>
     <svr_id>oc-cn5g-00103-ho</svr_id>
     <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>30</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>UE connected to DU1?</desc>
-    <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3585"</command>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>Attenuate DU1 by 22dB and remove attenuation on DU0 to trigger Handover</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 0 -r 3,4 22 -d 5</command>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping: 50pings in 10sec</desc>
-    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
-    <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>30</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>UE connected to DU0?</desc>
-    <node>groot</node>
-    <command>echo ci fetch_du_by_ue_id | ncat 127.0.0.1 9090 | grep "3584"</command>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>Attenuate DU0 by 22 and remove the attenuation on DU1 to trigger Handover</desc>
-    <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 22 -r 3,4 0 -d 5</command>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping: 50pings in 10sec</desc>
-    <id>raspix</id>
-    <svr_id>oc-cn5g-00103-ho</svr_id>
-    <ping_args>-c 50 -i 0.2</ping_args>
-    <ping_packetloss_threshold>30</ping_packetloss_threshold>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
   <testCase>
diff --git a/ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml b/ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml
index 06fff38745..1f4c7c1981 100644
--- a/ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_n2_ho_b210_quectel.xml
@@ -55,7 +55,7 @@
     <class>Custom_Command</class>
     <desc>Set initial attenuation on target gNB</desc>
     <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1,2 0 -s 3,4 22</command>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -s 1,2 0 -s 3,4 25</command>
   </testCase>
 
   <testCase>
@@ -103,9 +103,9 @@
 
   <testCase>
     <class>Custom_Command</class>
-    <desc>Gradually attenuate gNB-PCI0 (ch1-2=22dB) and gNB-PCI1 (ch3-4=0dB) over 5s to trigger N2 Handover to gNB-PCI1</desc>
+    <desc>Gradually attenuate gNB-PCI0 (ch1-2=15dB) and gNB-PCI1 (ch3-4=0dB) over 5s to trigger N2 Handover to gNB-PCI1</desc>
     <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 22 -r 3,4 0 -d 5</command>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 15 -r 3,4 0 -d 5</command>
   </testCase>
 
   <testCase>
@@ -126,9 +126,9 @@
 
   <testCase>
     <class>Custom_Command</class>
-    <desc>Gradually attenuate gNB-PCI0 (ch1-2=0dB) and gNB-PCI1 (ch3-4=22dB) over 5s to trigger N2 Handover back to gNB-PCI0</desc>
+    <desc>Gradually attenuate gNB-PCI0 (ch1-2=0dB) and gNB-PCI1 (ch3-4=15dB) over 5s to trigger N2 Handover back to gNB-PCI0</desc>
     <node>rocket</node>
-    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 0 -r 3,4 22 -d 5</command>
+    <command>python3 %%workspace%%/ci-scripts/attenuatorctl.py -r 1,2 0 -r 3,4 25 -d 5</command>
   </testCase>
 
   <testCase>