diff --git a/ci-scripts/xml_files/container_sa_n310_nrue.xml b/ci-scripts/xml_files/container_sa_n310_nrue.xml
index ce7dd26b6d..c4dbb83410 100644
--- a/ci-scripts/xml_files/container_sa_n310_nrue.xml
+++ b/ci-scripts/xml_files/container_sa_n310_nrue.xml
@@ -91,8 +91,8 @@
     <class>Iperf</class>
     <desc>iperf (DL/20Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 20M -t 30 -i 1 -R</iperf_args>
-    <direction>IPERF3</direction>
     <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
@@ -101,8 +101,8 @@
     <class>Iperf</class>
     <desc>iperf (UL/5Mbps/UDP)(30 sec)(single-ue profile)</desc>
     <iperf_args>-u -b 5M -t 30 -i 1 </iperf_args>
-    <direction>IPERF3</direction>
     <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
     <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
   </testCase>
diff --git a/ci-scripts/xml_files/container_sa_n310_nrue_cleanup.xml b/ci-scripts/xml_files/container_sa_n310_nrue_cleanup.xml
index 0bac1e010b..035e38a40d 100644
--- a/ci-scripts/xml_files/container_sa_n310_nrue_cleanup.xml
+++ b/ci-scripts/xml_files/container_sa_n310_nrue_cleanup.xml
@@ -27,16 +27,34 @@
   <TestCaseRequestedList>
     111111
     222222
+    333333
+    444444
   </TestCaseRequestedList>
   <TestCaseExclusionList></TestCaseExclusionList>
 
   <testCase id="111111">
+    <class>Undeploy_Object</class>
+    <desc>Undeploy gNB</desc>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_gnb</yaml_path>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
+  </testCase>
+
+  <testCase id="222222">
+    <class>Undeploy_Object</class>
+    <desc>Undeploy nr UE</desc>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
+    <eNB_instance>1</eNB_instance>
+    <eNB_serverId>1</eNB_serverId>
+  </testCase>
+
+  <testCase id="333333">
     <class>Clean_Test_Server_Images</class>
     <desc>Clean Test Images on Test Server</desc>
     <test_svr_id>0</test_svr_id>
   </testCase>
 
-  <testCase id="222222">
+  <testCase id="444444">
     <class>Clean_Test_Server_Images</class>
     <desc>Clean Test Images on Test Server</desc>
     <test_svr_id>1</test_svr_id>