diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py
index 929dd29021..ae4e718ecf 100644
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -70,7 +70,6 @@ def OC_logout(cmd):
 class Cluster:
 	def __init__(self):
 		self.eNBSourceCodePath = ""
-		self.forcedWorkspaceCleanup = False
 		self.OCUserName = ""
 		self.OCPassword = ""
 		self.OCProjectName = ""
diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index 920f08f75c..b91b857521 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -231,7 +231,6 @@ class Containerize():
 		self.ranCommitID = ''
 		self.ranTargetBranch = ''
 		self.eNBSourceCodePath = ''
-		self.forcedWorkspaceCleanup = False
 		self.imageKind = ''
 		self.proxyCommit = None
 		self.yamlPath = ''
@@ -544,9 +543,6 @@ class Containerize():
 			raise Exception("Can build unit tests only on Ubuntu server")
 		logging.debug('running on Ubuntu as expected')
 
-		if self.forcedWorkspaceCleanup:
-			cmd.run(f'sudo -S rm -Rf {lSourcePath}')
-	
 		# check that ran-base image exists as we expect it
 		baseImage = 'ran-base'
 		baseTag = 'develop'
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 76fe64c2f6..cbc03a47d5 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -102,14 +102,6 @@ def ExecuteActionWithParam(action, ctx):
 	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
-		forced_workspace_cleanup = test.findtext('forced_workspace_cleanup')
-		RAN.Build_eNB_forced_workspace_cleanup=False
-		CONTAINERS.forcedWorkspaceCleanup=False
-		CLUSTER.forcedWorkspaceCleanup = False
-		if forced_workspace_cleanup is not None and re.match('true', forced_workspace_cleanup, re.IGNORECASE):
-			RAN.Build_eNB_forced_workspace_cleanup = True
-			CONTAINERS.forcedWorkspaceCleanup = True
-			CLUSTER.forcedWorkspaceCleanup = True
 		node = test.findtext('node')
 		proxy_commit = test.findtext('proxy_commit')
 		if proxy_commit is not None:
diff --git a/ci-scripts/xml_files/container_image_build.xml b/ci-scripts/xml_files/container_image_build.xml
index 33f29cf087..afd58d4d6d 100644
--- a/ci-scripts/xml_files/container_image_build.xml
+++ b/ci-scripts/xml_files/container_image_build.xml
@@ -41,7 +41,6 @@
 		<desc>Build all Images</desc>
 		<node>obelix</node>
 		<kind>all</kind>
-		<forced_workspace_cleanup>True</forced_workspace_cleanup>
 	</testCase>
 
 	<testCase id="000010">
diff --git a/ci-scripts/xml_files/container_image_build_cross.xml b/ci-scripts/xml_files/container_image_build_cross.xml
index ddaeac3602..ab94d847c8 100644
--- a/ci-scripts/xml_files/container_image_build_cross.xml
+++ b/ci-scripts/xml_files/container_image_build_cross.xml
@@ -39,7 +39,6 @@
 		<desc>Cross-Compile for ARM64</desc>
 		<kind>build_cross_arm64</kind>
 		<node>alambix</node>
-		<forced_workspace_cleanup>True</forced_workspace_cleanup>
 	</testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_l2sim_proxy.xml b/ci-scripts/xml_files/container_l2sim_proxy.xml
index 88026f077d..c2f19f9471 100644
--- a/ci-scripts/xml_files/container_l2sim_proxy.xml
+++ b/ci-scripts/xml_files/container_l2sim_proxy.xml
@@ -33,7 +33,6 @@
                 <class>Build_Proxy</class>
                 <desc>Build L2sim Proxy Image</desc>
                 <node>localhost</node>
-                <forced_workspace_cleanup>True</forced_workspace_cleanup>
                 <proxy_commit>b64d9bce986b38ca59e8582864ade3fcdd05c0dc</proxy_commit>
         </testCase>
 
diff --git a/ci-scripts/xml_files/gnb_usrp_build.xml b/ci-scripts/xml_files/gnb_usrp_build.xml
index 4e763678a7..42d567cd15 100644
--- a/ci-scripts/xml_files/gnb_usrp_build.xml
+++ b/ci-scripts/xml_files/gnb_usrp_build.xml
@@ -43,7 +43,6 @@
 		<desc>Build gNB (USRP)</desc>
 		<node>caracal</node>
 		<Build_eNB_args>--gNB -w USRP --ninja -c -P --build-lib ldpc_cuda --build-lib ldpc_aal --cmake-opt -DASN1C_EXEC=/opt/asn1c/bin/asn1c</Build_eNB_args>
-		<forced_workspace_cleanup>True</forced_workspace_cleanup>
 	</testCase>
 
 	<testCase id="100000">