diff --git a/ci-scripts/xml_files/cluster_image_build.xml b/ci-scripts/xml_files/cluster_image_build.xml
index 769320e9d4..b389fa7e21 100644
--- a/ci-scripts/xml_files/cluster_image_build.xml
+++ b/ci-scripts/xml_files/cluster_image_build.xml
@@ -29,10 +29,10 @@
 	000001
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
-    <testCase id="000002">
-        <class>Create_Workspace</class>
-        <desc>Creating new Workspace</desc>
-    </testCase>
+	<testCase id="000002">
+		<class>Create_Workspace</class>
+		<desc>Creating new Workspace</desc>
+	</testCase>
 	<testCase id="000001">
 		<class>Build_Cluster_Image</class>
 		<desc>Build Images on OpenShift Cluster</desc>
diff --git a/ci-scripts/xml_files/container_image_build.xml b/ci-scripts/xml_files/container_image_build.xml
index 7ee075544f..cde7c7ce60 100644
--- a/ci-scripts/xml_files/container_image_build.xml
+++ b/ci-scripts/xml_files/container_image_build.xml
@@ -31,12 +31,12 @@
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 
-    <testCase id="800813">
-        <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
+	<testCase id="800813">
+		<class>Create_Workspace</class>
+		<desc>Creating new Workspace for server 0</desc>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+	</testCase>
 	<testCase id="000001">
 		<class>Build_Image</class>
 		<desc>Build all Images</desc>
diff --git a/ci-scripts/xml_files/container_image_build_cross.xml b/ci-scripts/xml_files/container_image_build_cross.xml
index 9fc2ab68b3..c8bc67e51f 100644
--- a/ci-scripts/xml_files/container_image_build_cross.xml
+++ b/ci-scripts/xml_files/container_image_build_cross.xml
@@ -29,12 +29,12 @@
  000001
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
-    <testCase id="100001">
-        <class>Create_Workspace</class>
-        <desc>Creating new Workspace</desc>
-        <eNB_instance>0</eNB_instance>
-        <eNB_serverId>0</eNB_serverId>
-    </testCase>
+	<testCase id="100001">
+		<class>Create_Workspace</class>
+		<desc>Creating new Workspace</desc>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+	</testCase>
 	<testCase id="000001">
 		<class>Build_Image</class>
 		<desc>Cross-Compile for ARM64</desc>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
index 0cd2d8335a..a512156ff5 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
@@ -60,10 +60,10 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     </testCase>
 
     <testCase id="300000">
-	<class>Custom_Command</class>
-	<desc>Reset USRP</desc>
-	<node>starsky</node>
-	<command>sudo -S b2xx_fx3_utils --reset-device</command>
+        <class>Custom_Command</class>
+        <desc>Reset USRP</desc>
+        <node>starsky</node>
+        <command>sudo -S b2xx_fx3_utils --reset-device</command>
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
index e7ede0ff49..827675f3fb 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
@@ -59,10 +59,10 @@
     </testCase>
 
     <testCase id="300000">
-    <class>Custom_Command</class>
-    <desc>Reset USRP</desc>
-    <node>starsky</node>
-    <command>sudo -S b2xx_fx3_utils --reset-device</command>
+        <class>Custom_Command</class>
+        <desc>Reset USRP</desc>
+        <node>starsky</node>
+        <command>sudo -S b2xx_fx3_utils --reset-device</command>
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
index eccb2ce64d..e7f7549a46 100644
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
@@ -66,10 +66,10 @@
     <command>sudo cpupower idle-set -E</command>
   </testCase>
   <testCase id="800833">
-      <class>Create_Workspace</class>
-      <desc>Creating new Workspace</desc>
-      <eNB_instance>0</eNB_instance>
-      <eNB_serverId>0</eNB_serverId>
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
   </testCase>
   <testCase id="030101">
     <class>Deploy_Object</class>
diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
index b9b86cb297..3792b673d5 100644
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
@@ -66,10 +66,10 @@
     <command>sudo cpupower idle-set -E</command>
   </testCase>
   <testCase id="800833">
-      <class>Create_Workspace</class>
-      <desc>Creating new Workspace</desc>
-      <eNB_instance>0</eNB_instance>
-      <eNB_serverId>0</eNB_serverId>
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
   </testCase>
   <testCase id="031101">
     <class>Deploy_Object</class>
diff --git a/ci-scripts/xml_files/container_nsa_b200_quectel.xml b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
index 1336b3c74d..037ca1dc8c 100644
--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
@@ -113,7 +113,7 @@
 		<class>Attach_UE</class>
 		<desc>Attach UE</desc>
 		<id>idefix</id>
-  </testCase>
+  	</testCase>
 	<testCase id= "010010">
 		<class>Detach_UE</class>
 		<desc>Detach UE</desc>
diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue.xml b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
index b77645385e..0f96abaee8 100644
--- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml
+++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
@@ -67,10 +67,10 @@
     <images_to_pull>oai-gnb-aw2s</images_to_pull>
   </testCase>
   <testCase id="800813">
-      <class>Create_Workspace</class>
-      <desc>Creating new Workspace</desc>
-      <eNB_instance>0</eNB_instance>
-      <eNB_serverId>0</eNB_serverId>
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
   </testCase>
   <testCase id="020000">
     <class>Deploy_Object</class>
diff --git a/ci-scripts/xml_files/container_sa_b200_quectel.xml b/ci-scripts/xml_files/container_sa_b200_quectel.xml
index dfa38c90a7..4b6575df5f 100644
--- a/ci-scripts/xml_files/container_sa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml
@@ -97,10 +97,10 @@
     <id>idefix</id>
   </testCase>
   <testCase id="800813">
-      <class>Create_Workspace</class>
-      <desc>Creating new Workspace for server 0</desc>
-      <eNB_instance>0</eNB_instance>
-      <eNB_serverId>0</eNB_serverId>
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace for server 0</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
   </testCase>
   <testCase id="030101">
     <class>Deploy_Object</class>
diff --git a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
index a2b7ab425e..963ab9981f 100644
--- a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
@@ -81,10 +81,10 @@
     <id>idefix</id>
   </testCase>
   <testCase id="800813">
-      <class>Create_Workspace</class>
-      <desc>Creating new Workspace</desc>
-      <eNB_instance>0</eNB_instance>
-      <eNB_serverId>0</eNB_serverId>
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
   </testCase>
   <testCase id="330101">
     <class>Deploy_Object</class>
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 821367cd3f..5f4a09dd83 100644
--- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
@@ -81,10 +81,10 @@
     <id>idefix</id>
   </testCase>
   <testCase id="800813">
-      <class>Create_Workspace</class>
-      <desc>Creating new Workspace</desc>
-      <eNB_instance>0</eNB_instance>
-      <eNB_serverId>0</eNB_serverId>
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
   </testCase>
   <testCase id="130101">
     <class>Deploy_Object</class>
diff --git a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml
index 6839be5e2d..2b3b02fb2b 100644
--- a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml
+++ b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml
@@ -58,10 +58,10 @@
     <images_to_pull>oai-gnb-fhi72</images_to_pull>
   </testCase>
   <testCase id="800813">
-      <class>Create_Workspace</class>
-      <desc>Creating new Workspace for server 0</desc>
-      <eNB_instance>0</eNB_instance>
-      <eNB_serverId>0</eNB_serverId>
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace for server 0</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
   </testCase>
   <testCase id="120000">
     <class>Deploy_Object</class>
diff --git a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml b/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml
index 9a6ce659de..643f0a0ab0 100644
--- a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml
@@ -76,10 +76,10 @@
     <id>up2</id>
   </testCase>
   <testCase id="800813">
-      <class>Create_Workspace</class>
-      <desc>Creating new Workspace</desc>
-      <eNB_instance>0</eNB_instance>
-      <eNB_serverId>0</eNB_serverId>
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
   </testCase>
   <testCase id="040101">
     <class>Deploy_Object</class>
diff --git a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml
index 9d6dcec899..c5b12e7ac3 100644
--- a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml
@@ -82,11 +82,11 @@
       <eNB_serverId>0</eNB_serverId>
   </testCase>
   <testCase id="030101">
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB (TDD/Band77/60MHz/N310) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz</yaml_path>
-    <eNB_instance>0</eNB_instance>
-    <eNB_serverId>0</eNB_serverId>
+      <class>Deploy_Object</class>
+      <desc>Deploy gNB (TDD/Band77/60MHz/N310) in a container</desc>
+      <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz</yaml_path>
+      <eNB_instance>0</eNB_instance>
+      <eNB_serverId>0</eNB_serverId>
   </testCase>
 
   <testCase id="000001">
diff --git a/ci-scripts/xml_files/container_sa_n310_nrue.xml b/ci-scripts/xml_files/container_sa_n310_nrue.xml
index a414dc1143..92be5590b3 100644
--- a/ci-scripts/xml_files/container_sa_n310_nrue.xml
+++ b/ci-scripts/xml_files/container_sa_n310_nrue.xml
@@ -68,10 +68,10 @@
     <command>ssh root@192.168.20.2 reboot ; sleep 45</command>
   </testCase>
   <testCase id="800813">
-      <class>Create_Workspace</class>
-      <desc>Creating new Workspace</desc>
-      <eNB_instance>0</eNB_instance>
-      <eNB_serverId>0</eNB_serverId>
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
   </testCase>
   <testCase id="020000">
     <class>Deploy_Object</class>
@@ -81,10 +81,10 @@
     <eNB_serverId>0</eNB_serverId>
   </testCase>
   <testCase id="800814">
-      <class>Create_Workspace</class>
-      <desc>Creating new Workspace</desc>
-      <eNB_instance>1</eNB_instance>
-      <eNB_serverId>1</eNB_serverId>
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>1</eNB_instance>
+    <eNB_serverId>1</eNB_serverId>
   </testCase>
   <testCase id="020001">
     <class>Deploy_Object</class>
diff --git a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
index a08e938268..fd59e20574 100644
--- a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
@@ -91,10 +91,10 @@
     <id>idefix</id>
   </testCase>
   <testCase id="800813">
-      <class>Create_Workspace</class>
-      <desc>Creating new Workspace</desc>
-      <eNB_instance>0</eNB_instance>
-      <eNB_serverId>0</eNB_serverId>
+    <class>Create_Workspace</class>
+    <desc>Creating new Workspace</desc>
+    <eNB_instance>0</eNB_instance>
+    <eNB_serverId>0</eNB_serverId>
   </testCase>
   <testCase id="230101">
     <class>Deploy_Object</class>