diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py
index 16bec1389c..5ddf3872b2 100644
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -301,10 +301,7 @@ class Cluster:
 		self.testCase_id = HTML.testCase_id
 
 		# Workaround for some servers, we need to erase completely the workspace
-		if self.forcedWorkspaceCleanup:
-			self.cmd.run(f'rm -Rf {lSourcePath}')
-		cls_containerize.CreateWorkspace(self.cmd, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
-
+		self.cmd.cd(lSourcePath)
 		# to reduce the amount of data send to OpenShift, we
 		# manually delete all generated files in the workspace
 		self.cmd.run(f'rm -rf {lSourcePath}/cmake_targets/ran_build');
diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index 958c511fe2..0cd382ac26 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -83,7 +83,9 @@ def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTarge
 	sshSession.command(f'git checkout -f {ranCommitID}', '\$', 30)
 	if sshSession.getBefore().count(f'HEAD is now at {ranCommitID[:6]}') != 1:
 		sshSession.command('git log --oneline | head -n5', '\$', 5)
-		logging.warning(f'problems during checkout, is at: {sshSession.getBefore()}')
+		logging.error(f'problems during checkout, is at: {sshSession.getBefore()}')
+		self.exitStatus = 1
+		HTML.CreateHtmlTestRowQueue('N/A', 'KO', "could not checkout correctly")
 	else:
 		logging.debug('successful checkout')
 	# if the branch is not develop, then it is a merge request and we need to do
@@ -325,14 +327,8 @@ class Containerize():
 		if result is not None:
 			self.dockerfileprefix = '.ubuntu22.cross-arm64'
 		
-		# Workaround for some servers, we need to erase completely the workspace
-		if self.forcedWorkspaceCleanup:
-			cmd.run(f'sudo -S rm -Rf {lSourcePath}')
-	
 		self.testCase_id = HTML.testCase_id
-	
-		CreateWorkspace(cmd, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
-
+		cmd.cd(lSourcePath)
 		# if asterix, copy the entitlement and subscription manager configurations
 		if self.host == 'Red Hat':
 			cmd.run('mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca')
@@ -532,7 +528,7 @@ class Containerize():
 		self.ranRepository = 'https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy.git'
 		self.ranAllowMerge = False
 		self.ranTargetBranch = 'master'
-		CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+		mySSH.command('cd ' +lSourcePath, '\$', 3)
 		# to prevent accidentally overwriting data that might be used later
 		self.ranCommitID = oldRanCommidID
 		self.ranRepository = oldRanRepository
@@ -862,6 +858,31 @@ class Containerize():
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 		return True
 
+	def Create_Workspace(self):
+		if self.eNB_serverId[self.eNB_instance] == '0':
+			lIpAddr = self.eNBIPAddress
+			lUserName = self.eNBUserName
+			lPassWord = self.eNBPassword
+			lSourcePath = self.eNBSourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '1':
+			lIpAddr = self.eNB1IPAddress
+			lUserName = self.eNB1UserName
+			lPassWord = self.eNB1Password
+			lSourcePath = self.eNB1SourceCodePath
+		elif self.eNB_serverId[self.eNB_instance] == '2':
+			lIpAddr = self.eNB2IPAddress
+			lUserName = self.eNB2UserName
+			lPassWord = self.eNB2Password
+			lSourcePath = self.eNB2SourceCodePath
+		if lIpAddr == '' or lUserName == '' or lPassWord == '' or lSourcePath == '':
+			HELP.GenericHelp(CONST.Version)
+			sys.exit('Insufficient Parameter')
+		
+		logging.info(f"Running on server {lIpAddr}")
+		sshSession = cls_cmd.getConnection(lIpAddr)
+
+		CreateWorkspace(sshSession, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+
 	def DeployObject(self, HTML, EPC):
 		if self.eNB_serverId[self.eNB_instance] == '0':
 			lIpAddr = self.eNBIPAddress
@@ -885,7 +906,6 @@ class Containerize():
 		self.deployKind[self.eNB_instance] = True
 
 		mySSH = cls_cmd.getConnection(lIpAddr)
-		CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
 
 		mySSH.cd(lSourcePath + '/' + self.yamlPath[self.eNB_instance])
 		mySSH.run('cp docker-compose.y*ml ci-docker-compose.yml', 5)
diff --git a/ci-scripts/cls_static_code_analysis.py b/ci-scripts/cls_static_code_analysis.py
index cf1cb04597..55c479c16a 100644
--- a/ci-scripts/cls_static_code_analysis.py
+++ b/ci-scripts/cls_static_code_analysis.py
@@ -105,8 +105,7 @@ class StaticCodeAnalysis():
 		else:
 			full_ran_repo_name = self.ranRepository + '.git'
 
-		CreateWorkspace(cmd, lSourcePath, full_ran_repo_name, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
-
+		cmd.cd(lSourcePath)
 		logDir = f'{lSourcePath}/cmake_targets/build_log_{self.testCase_id}'
 		cmd.run(f'mkdir -p {logDir}')
 		cmd.run('docker image rm oai-cppcheck:bionic oai-cppcheck:focal')
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index bc526072d5..499d003acf 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -353,7 +353,7 @@ def GetParametersFromXML(action):
 			EPC.cfgUnDeploy = string_field	
 		EPC.cnID = test.findtext('cn_id')
 
-	elif action == 'Deploy_Object' or action == 'Undeploy_Object':
+	elif action == 'Deploy_Object' or action == 'Undeploy_Object' or action == "Create_Workspace":
 		eNB_instance=test.findtext('eNB_instance')
 		if (eNB_instance is None):
 			CONTAINERS.eNB_instance=0
@@ -860,6 +860,8 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 						success = CONTAINERS.Clean_Test_Server_Images(HTML)
 						if not success:
 							RAN.prematureExit = True
+					elif action == 'Create_Workspace':
+						CONTAINERS.Create_Workspace()
 					elif action == 'Deploy_Object':
 						CONTAINERS.DeployObject(HTML, EPC)
 						if CONTAINERS.exitStatus==1:
diff --git a/ci-scripts/xml_class_list.yml b/ci-scripts/xml_class_list.yml
index 6a3908004d..18c2c4632d 100755
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -48,3 +48,4 @@
   - Pull_Local_Registry
   - Clean_Test_Server_Images
   - Custom_Command
+  - Create_Workspace
diff --git a/ci-scripts/xml_files/cluster_image_build.xml b/ci-scripts/xml_files/cluster_image_build.xml
index 057d49da86..769320e9d4 100644
--- a/ci-scripts/xml_files/cluster_image_build.xml
+++ b/ci-scripts/xml_files/cluster_image_build.xml
@@ -24,9 +24,15 @@
 	<htmlTabRef>build-tab</htmlTabRef>
 	<htmlTabName>Build Images on Cluster</htmlTabName>
 	<htmlTabIcon>wrench</htmlTabIcon>
-	<TestCaseRequestedList>000001</TestCaseRequestedList>
+	<TestCaseRequestedList>
+	000002
+	000001
+	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
-
+    <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_4g_l2sim_proxy.xml b/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
index 795bce6bef..1d59868855 100644
--- a/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
@@ -26,10 +26,16 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
+ 100001
  000001
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
-
+        <testCase id="100001">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>1</eNB_instance>
+                <eNB_serverId>1</eNB_serverId>
+        </testCase>
         <testCase id="000001">
                 <class>Build_Proxy</class>
                 <desc>Build L2sim Proxy Image</desc>
diff --git a/ci-scripts/xml_files/container_image_build.xml b/ci-scripts/xml_files/container_image_build.xml
index 7684e0f997..7ee075544f 100644
--- a/ci-scripts/xml_files/container_image_build.xml
+++ b/ci-scripts/xml_files/container_image_build.xml
@@ -25,11 +25,18 @@
 	<htmlTabName>Build Container Images</htmlTabName>
 	<htmlTabIcon>wrench</htmlTabIcon>
 	<TestCaseRequestedList>
+ 800813
  000001
  000010
 	</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="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 2cc12f5a15..9fc2ab68b3 100644
--- a/ci-scripts/xml_files/container_image_build_cross.xml
+++ b/ci-scripts/xml_files/container_image_build_cross.xml
@@ -25,10 +25,16 @@
 	<htmlTabName>Build Container Images</htmlTabName>
 	<htmlTabIcon>wrench</htmlTabIcon>
 	<TestCaseRequestedList>
+ 100001
  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="000001">
 		<class>Build_Image</class>
 		<desc>Cross-Compile for ARM64</desc>
diff --git a/ci-scripts/xml_files/container_l2sim_proxy.xml b/ci-scripts/xml_files/container_l2sim_proxy.xml
index 81ee7c1bfa..2f938ab8e5 100644
--- a/ci-scripts/xml_files/container_l2sim_proxy.xml
+++ b/ci-scripts/xml_files/container_l2sim_proxy.xml
@@ -26,10 +26,17 @@
         <htmlTabIcon>wrench</htmlTabIcon>
         <repeatCount>1</repeatCount>
         <TestCaseRequestedList>
+ 100001
  000001
         </TestCaseRequestedList>
         <TestCaseExclusionList></TestCaseExclusionList>
 
+        <testCase id="100001">
+                <class>Create_Workspace</class>
+                <desc>Creating new Workspace</desc>
+                <eNB_instance>1</eNB_instance>
+                <eNB_serverId>1</eNB_serverId>
+        </testCase>
         <testCase id="000001">
                 <class>Build_Proxy</class>
                 <desc>Build L2sim Proxy Image</desc>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
index ffdf7317f1..268be0974c 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
@@ -31,6 +31,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
 111110
 300000
 040101 
+800813
 030101
 040301 040501 040603 040604 040605 040606 040607 040641 040642 040643 040644 040401 040201
 030201
@@ -63,7 +64,12 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <node>hutch</node>
         <command>sudo -S b2xx_fx3_utils --reset-device</command>
     </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="030101">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
index 711d685bad..e40cc6f80a 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
@@ -29,7 +29,10 @@
 111110
 300000
 040101
-030131 030132
+800813
+030131
+800814
+030132
 040301 040531 040633 040634 040636 040671 040672 040673 040401 040201
 030231
 200000
@@ -61,7 +64,12 @@
         <node>hutch</node>
         <command>sudo -S b2xx_fx3_utils --reset-device</command>
     </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="030131">
         <class>Deploy_Object</class>
         <desc>Deploy RRU (FDD/Band7/5MHz/B200) in a container</desc>
@@ -70,7 +78,12 @@
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>
-
+    <testCase id="800814">
+        <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="030132">
         <class>Deploy_Object</class>
         <desc>Deploy RCC (FDD/Band7/5MHz) in a container</desc>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
index b305f56a2f..673bf65609 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
 100000
 111110
 040101
+800813
 030102
 000010 040301 040502 000011 040302 000001 000012 040303 000002 000013 040503 040401 040201
 030202
@@ -55,7 +56,12 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
         <node>hutch</node>
         <command>sudo cpupower idle-set -E</command>
     </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="030102">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
index 5d9eb0c13f..472122d2e4 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
@@ -31,6 +31,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 100000
 111110
 040101
+800813
 030111
 000001
 040301 040511 040613 040614 040615 040651 040652 040653 040654 040401 040201
@@ -57,7 +58,12 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
         <node>hutch</node>
         <command>sudo cpupower idle-set -E</command>
     </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="030111">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
index 358eeb20cc..1534150b01 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 100000
 111110
 040101
+800813
 030112
 040301 040302 040512 040612 040650 040401
 040201
@@ -56,7 +57,12 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
             <node>hutch</node>
             <command>sudo cpupower idle-set -E</command>
     </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="030112">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
index 7b8a06e51c..0e58e6b6ed 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
@@ -29,8 +29,10 @@
 100001
 111110
 111111
+800813
 030111
 000001
+800814
 030311
 000002
 040511 040613 040616 040651
@@ -78,7 +80,12 @@
         <node>carabe</node>
         <command>sudo cpupower idle-set -E</command>
     </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="030111">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/10MHz/B200) in a container</desc>
@@ -86,7 +93,12 @@
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>
-
+    <testCase id="800814">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace for server 1</desc>
+        <eNB_instance>1</eNB_instance>
+        <eNB_serverId>1</eNB_serverId>
+    </testCase>
     <testCase id="030311">
         <class>Deploy_Object</class>
         <desc>Deploy LTE-UE (FDD/Band7/10MHz/B200) in a container</desc>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
index c526cd9786..48aa606fa4 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
 100000
 111110
 040101
+800813
 030121
 000001
 040301 040521 040623 040624 040625 040662 040401 040201
@@ -56,7 +57,12 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
             <node>hutch</node>
             <command>sudo cpupower idle-set -E</command>
     </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="030121">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (FDD/Band7/20MHz/B200) in a container</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 7928cccbe1..0cd2d8335a 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
@@ -31,6 +31,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
 100000
 111110
 040101
+800813
 030104
 040301 040501 040602 040601 040603 040604 040605 040642 040641 040643 040644 040645 040401 040201
 030204
@@ -64,7 +65,12 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
 	<node>starsky</node>
 	<command>sudo -S b2xx_fx3_utils --reset-device</command>
     </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="030104">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (TDD/Band40/5MHz/B200) in a container</desc>
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 ce4ce3346c..8d67c23efd 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
@@ -28,7 +28,10 @@
 300000
 100000
 111110
-030134 030135
+800813
+030134
+800814
+030135
 040301 040532 040631 040632 040634 040635 040681 040682 040684 040685 040401 040201
 030231
 040101
@@ -62,7 +65,12 @@
     <node>starsky</node>
     <command>sudo -S b2xx_fx3_utils --reset-device</command>
     </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="030134">
         <class>Deploy_Object</class>
         <desc>Deploy RRU (TDD/Band40/5MHz/B200) in a container</desc>
@@ -71,7 +79,12 @@
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>
-
+    <testCase id="800814">
+        <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="030135">
         <class>Deploy_Object</class>
         <desc>Deploy RCC (TDD/Band40/5MHz) in a container</desc>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
index d79c668b58..77a13d9407 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
 100000
 111110
 040101
+800813
 030105
 040301 040502 040606 040608 040646 040648 040401 040201
 030205
@@ -55,6 +56,12 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
             <node>starsky</node>
             <command>sudo cpupower idle-set -E</command>
     </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="030105">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (TDD/Band40/5MHz/B200) in a container</desc>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
index 2487163e20..ed37d24eae 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
 100000
 111110
 040101
+800813
 030114
 040301 040511 040612 040611 040613 040614 040615 040652 040651 040653 040654 040655 040401 040201
 030214
@@ -55,6 +56,12 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
         <node>starsky</node>
         <command>sudo cpupower idle-set -E</command>
     </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="030114">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (TDD/Band40/10MHz/B200) in a container</desc>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
index 476f159ea2..1a9983e67e 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
 100000
 111110
 040101
+800813
 030124
 040301 040521 040622 040621 040623 040662 040401 040201
 030224
@@ -55,6 +56,12 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
             <node>starsky</node>
             <command>sudo cpupower idle-set -E</command>
     </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="030124">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
index b8c6d2c09f..e3f0f49140 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
+++ b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
@@ -30,6 +30,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
 100000
 111110
 040101
+800813
 030125
 040301 040522 040627 040626 040628 040629 040630 040667 040666 040668 040669 040670 040401 040201
 030225
@@ -56,7 +57,12 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
         <node>starsky</node>
         <command>sudo cpupower idle-set -E</command>
     </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="030125">
         <class>Deploy_Object</class>
         <desc>Deploy eNB (TDD/Band40/20MHz/B200) in a container</desc>
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 8334ca49d1..eccb2ce64d 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
@@ -31,6 +31,7 @@
 111111
 100000
 010010
+800833
 030101
 010001
 000001
@@ -64,7 +65,12 @@
     <node>obelix</node>
     <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>
+  </testCase>
   <testCase id="030101">
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>
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 b518f98bdb..b9b86cb297 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
@@ -31,6 +31,7 @@
 111111
 100000
 010010
+800833
 031101
 010001
 000001
@@ -64,7 +65,12 @@
     <node>obelix</node>
     <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>
+  </testCase>
   <testCase id="031101">
     <class>Deploy_Object</class>
     <desc>Deploy eNB (TDD/Band38/2.6Ghz/N3XX) in a container</desc>
diff --git a/ci-scripts/xml_files/container_nsa_b200_quectel.xml b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
index 98eb70a808..1336b3c74d 100644
--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
@@ -32,7 +32,9 @@
  111110
  111111
  010000
+ 800833
  030101
+ 800834
  030102
  010001
  050000
@@ -117,7 +119,12 @@
 		<desc>Detach UE</desc>
 		<id>idefix</id>
 	</testCase>
-
+	<testCase id="800833">
+		<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>
 		<desc>Deploy eNB (FDD/Band7/5MHz/B200) in a container</desc>
@@ -125,7 +132,12 @@
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 	</testCase>
-
+	<testCase id="800834">
+		<class>Create_Workspace</class>
+		<desc>Creating new Workspace</desc>
+		<eNB_instance>1</eNB_instance>
+		<eNB_serverId>1</eNB_serverId>
+	</testCase>
 	<testCase id="030102">
 		<class>Deploy_Object</class>
 		<desc>Deploy gNB (TDD/Band78/40MHz/B200) in a container</desc>
diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel.xml b/ci-scripts/xml_files/container_sa_aerial_quectel.xml
index 66df677b13..49f09ed669 100644
--- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_quectel.xml
@@ -29,7 +29,9 @@
                 111111
                 000222
                 001111
+                800813
                 002222
+                800814
                 002223
                 000111
                 100000
@@ -54,7 +56,12 @@
                 <desc>Initialize Quectel</desc>
                 <id>sphex_quectel</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>
+        </testCase>
         <testCase id="002222">
                 <class>Deploy_Object</class>
                 <desc>Deploy PNF/Nvidia CUBB in a container</desc>
@@ -63,7 +70,12 @@
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>
-
+        <testCase id="800814">
+                <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="002223">
                 <class>Deploy_Object</class>
                 <desc>Deploy VNF in a container</desc>
diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue.xml b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
index 820e414ffb..b77645385e 100644
--- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml
+++ b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
@@ -28,6 +28,7 @@
   <TestCaseRequestedList>
     010000
     001000
+    800813
     020000
     002000
     002001
@@ -65,7 +66,12 @@
     <oc_project>oaicicd-ran</oc_project>
     <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>
+  </testCase>
   <testCase id="020000">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/20MHz/aw2s) in a container</desc>
diff --git a/ci-scripts/xml_files/container_sa_b200_quectel.xml b/ci-scripts/xml_files/container_sa_b200_quectel.xml
index db4c9d1d67..dfa38c90a7 100644
--- a/ci-scripts/xml_files/container_sa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml
@@ -29,6 +29,7 @@
     100000
     111111
     010000
+    800813
     030101
     010001
     050000
@@ -95,7 +96,12 @@
     <desc>Detach UE</desc>
     <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>
+  </testCase>
   <testCase id="030101">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/40MHz/B200) in a container</desc>
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 92577c3abc..afa27629a4 100644
--- a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
@@ -29,6 +29,7 @@
     333333
     300000
     310000
+    800813
     330101
     330102
     330103
@@ -77,7 +78,12 @@
     <desc>Detach Quectel</desc>
     <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>
+  </testCase>
   <testCase id="330101">
     <class>Deploy_Object</class>
     <desc>Deploy gNB-CU-CP in a container</desc>
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 6989c8fc26..821367cd3f 100644
--- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
@@ -28,6 +28,7 @@
   <TestCaseRequestedList>
     100000
     110002
+    800813
     130101
     130102
     100001
@@ -79,7 +80,12 @@
     <desc>Detach Quectel</desc>
     <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>
+  </testCase>
   <testCase id="130101">
     <class>Deploy_Object</class>
     <desc>Deploy gNB-CU in a container</desc>
@@ -88,7 +94,6 @@
     <eNB_serverId>0</eNB_serverId>
     <services>gnb_cu</services>
   </testCase>
-
   <testCase id="130102">
     <class>Deploy_Object</class>
     <desc>Deploy gNB-DU (FDD/Band1/10MHz/B200) in a container</desc>
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 6c39802bc9..9a6ce659de 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
@@ -29,6 +29,7 @@
     100000
     111111
     010010
+    800813
     040101
     010001
     051001
@@ -74,7 +75,12 @@
     <desc>Detach UE</desc>
     <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>
+  </testCase>
   <testCase id="040101">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band77/100MHz/N310) in a container</desc>
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 607e17f05b..9d6dcec899 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
@@ -29,6 +29,7 @@
     100000
     111111
     010010
+    800813
     030101
     010001
     050001
@@ -74,7 +75,12 @@
     <desc>Detach UE</desc>
     <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>
+  </testCase>
   <testCase id="030101">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band77/60MHz/N310) in a container</desc>
diff --git a/ci-scripts/xml_files/container_sa_n310_nrue.xml b/ci-scripts/xml_files/container_sa_n310_nrue.xml
index c4dbb83410..a414dc1143 100644
--- a/ci-scripts/xml_files/container_sa_n310_nrue.xml
+++ b/ci-scripts/xml_files/container_sa_n310_nrue.xml
@@ -27,7 +27,10 @@
   <repeatCount>1</repeatCount>
   <TestCaseRequestedList>
     010000 010001
-    020000 020001
+    800813
+    020000
+    800814
+    020001
     000001
     001000
     002000
@@ -64,7 +67,12 @@
     <node>caracal</node>
     <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>
+  </testCase>
   <testCase id="020000">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/40MHz/N310) in a container</desc>
@@ -72,7 +80,12 @@
     <eNB_instance>0</eNB_instance>
     <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>
+  </testCase>
   <testCase id="020001">
     <class>Deploy_Object</class>
     <desc>Deploy nrUE (TDD/Band78/40MHz/N310) in a container</desc>
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 09720f422a..a08e938268 100644
--- a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
@@ -29,6 +29,7 @@
     300000
     311111
     210000
+    800813
     230101
     210001
     250000
@@ -89,7 +90,12 @@
     <desc>Detach UE</desc>
     <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>
+  </testCase>
   <testCase id="230101">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/40MHz/B200) with SC-FDMA in a container</desc>
diff --git a/ci-scripts/xml_files/cppcheck.xml b/ci-scripts/xml_files/cppcheck.xml
index dd90d88f7e..6ec7a58e55 100644
--- a/ci-scripts/xml_files/cppcheck.xml
+++ b/ci-scripts/xml_files/cppcheck.xml
@@ -25,10 +25,14 @@
 	<htmlTabName>CPPCHECK Analysis</htmlTabName>
 	<htmlTabIcon>wrench</htmlTabIcon>
 	<TestCaseRequestedList>
+ 000002
  000001
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
-
+    <testCase id="000002">
+        <class>Create_Workspace</class>
+        <desc>Creating new Workspace</desc>
+    </testCase>
 	<testCase id="000001">
 		<class>Cppcheck_Analysis</class>
 		<desc>Static Code Analysis with cppcheck</desc>