diff --git a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
index 419ede8cbb..22f4a8be3a 100644
--- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
@@ -89,19 +89,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping trf-gen from LTE-UE 1</desc>
-                <container_name>l2sim4g-oai-lte-ue1</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.61.11</options>
-                <loss_threshold>0</loss_threshold>
+                <id>l2sim4g_ue</id>
+                <ping_args> -c 20 192.168.61.11</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping LTE-UE 1 from trf-gen</desc>
-                <container_name>l2sim4g-trf-gen</container_name>
-                <options>-c 20 12.0.0.2</options>
-                <loss_threshold>0</loss_threshold>
+                <id>l2sim4g_ext_dn</id>
+                <ping_args>-c 20 12.0.0.2</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
index a776b85c2c..37d53e09e4 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
@@ -95,19 +95,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <container_name>rfsim4g-oai-lte-ue0</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.61.11</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ue</id>
+                <ping_args> -c 20 192.168.61.11</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
-                <container_name>rfsim4g-trf-gen</container_name>
-                <options>-c 20 12.0.0.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ext_dn</id>
+                <ping_args>-c 20 12.0.0.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
index e70d954a22..5a6189dced 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
@@ -75,19 +75,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <container_name>rfsim4g-oai-lte-ue0</container_name>
-                <options>-I oaitun_ue1 -c 20 10.0.1.1</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ue</id>
+                <ping_args> -c 20 10.0.1.1</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping LTE-UE from eNB</desc>
-                <container_name>rfsim4g-oai-enb</container_name>
-                <options>-I oaitun_enb1 -c 20 10.0.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_enb_nos1</id>
+                <ping_args> -c 20 10.0.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
index 6b88816c4a..e6c3e1f965 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
@@ -95,19 +95,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <container_name>rfsim4g-oai-lte-ue0</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.61.11</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ue</id>
+                <ping_args> -c 20 192.168.61.11</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
-                <container_name>rfsim4g-trf-gen</container_name>
-                <options>-c 20 12.0.0.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ext_dn</id>
+                <ping_args>-c 20 12.0.0.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
index e33554c8ce..86b217a2a4 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
@@ -95,19 +95,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <container_name>rfsim4g-oai-lte-ue0</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.61.11</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ue</id>
+                <ping_args> -c 20 192.168.61.11</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
-                <container_name>rfsim4g-trf-gen</container_name>
-                <options>-c 20 12.0.0.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ext_dn</id>
+                <ping_args>-c 20 12.0.0.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">
diff --git a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
index c39679e063..862e9cca52 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
@@ -96,19 +96,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping Traffic-Gen from LTE-UE</desc>
-                <container_name>rfsim4g-oai-lte-ue0</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.61.11</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ue</id>
+                <ping_args> -c 20 192.168.61.11</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping LTE-UE from Traffic-Gen</desc>
-                <container_name>rfsim4g-trf-gen</container_name>
-                <options>-c 20 12.0.0.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim4g_ext_dn</id>
+                <ping_args>-c 20 12.0.0.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">
diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim.xml b/ci-scripts/xml_files/container_5g_e1_rfsim.xml
index 7130976dad..e37ba4cf96 100644
--- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml
@@ -87,19 +87,19 @@
         </testCase>
 
         <testCase id="020021">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.73.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.73.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020022">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030021">
diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
index 8a7549da91..86d369e526 100644
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -87,19 +87,19 @@
         </testCase>
 
         <testCase id="020021">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020022">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030021">
diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
index e1dc8f0d60..e2d1e3c287 100644
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
@@ -80,19 +80,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">
diff --git a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
index e2631d6e05..6abadf2f4c 100644
--- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
@@ -87,19 +87,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>l2sim-oai-nr-ue0</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>l2sim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>l2sim-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>l2sim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100001">
diff --git a/ci-scripts/xml_files/container_5g_rfsim.xml b/ci-scripts/xml_files/container_5g_rfsim.xml
index 86e5159264..4923177ee5 100644
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -91,35 +91,35 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020003">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from Second NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue2</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020004">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping Second NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.3</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.3</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">
diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
index fea7e03e5e..f124176209 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
@@ -80,19 +80,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 -i0.2 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 -i0.2 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2 -i0.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2 -i0.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">
diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
index 5c5b5a8d8b..b178fe0df7 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
@@ -80,19 +80,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">
diff --git a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
index d727fdfd1e..d1433db738 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
@@ -58,11 +58,11 @@
         </testCase>
 
         <testCase id="020021">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Test Connectivity (ping)</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 12.1.1.1</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args>-c 20 12.1.1.1</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100022">
diff --git a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
index 4d86cd69ef..1ad3158d20 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
@@ -62,19 +62,19 @@
         </testCase>
 
         <testCase id="020011">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-c20 -i0.2 10.0.1.1</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args>-c20 -i0.2 10.0.1.1</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020012">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
-                <container_name>rfsim5g-oai-gnb</container_name>
-                <options>-c20 -i0.2 10.0.1.2</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_gnb_nos1</id>
+                <ping_args>-c20 -i0.2 10.0.1.2</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030011">
diff --git a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
index b6209e871c..19bb89518a 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
@@ -60,19 +60,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-c20 -i0.2 10.0.1.1</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args>-c20 -i0.2 10.0.1.1</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
-                <container_name>rfsim5g-oai-gnb</container_name>
-                <options>-c20 -i0.2 10.0.1.2</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_gnb_nos1</id>
+                <ping_args>-c20 -i0.2 10.0.1.2</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100001">
diff --git a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
index 095986b751..e7b0e7903d 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
@@ -60,19 +60,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping gNB from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-c20 -i0.2 10.0.1.1</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args>-c20 -i0.2 10.0.1.1</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from gNB</desc>
-                <container_name>rfsim5g-oai-gnb</container_name>
-                <options>-c20 -i0.2 10.0.1.2</options>
-                <loss_threshold>0</loss_threshold>
+                <id>rfsim5g_gnb_nos1</id>
+                <ping_args>-c20 -i0.2 10.0.1.2</ping_args>
+                <ping_packetloss_threshold>0</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="100001">
diff --git a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
index b030f5d423..e9e9374cf1 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
@@ -80,19 +80,19 @@
         </testCase>
 
         <testCase id="020001">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping ext-dn from NR-UE</desc>
-                <container_name>rfsim5g-oai-nr-ue</container_name>
-                <options>-I oaitun_ue1 -c 20 192.168.72.135</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ue</id>
+                <ping_args> -c 20 192.168.72.135</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="020002">
-                <class>PingFromContainer</class>
+                <class>Ping</class>
                 <desc>Ping NR-UE from ext-dn</desc>
-                <container_name>rfsim5g-oai-ext-dn</container_name>
-                <options>-c 20 12.1.1.2</options>
-                <loss_threshold>5</loss_threshold>
+                <id>rfsim5g_ext_dn</id>
+                <ping_args>-c 20 12.1.1.2</ping_args>
+                <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
 
         <testCase id="030001">