diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 1995ff545b..d86af05871 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -202,9 +202,9 @@ def ExecuteActionWithParam(action, ctx, node):
 		workdir = CLUSTER.eNBSourceCodePath
 		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)
 
-	elif action == 'Build_Deploy_Docker_PhySim' or action == 'Build_Deploy_Source_PhySim':
+	elif action == 'Build_Deploy_PhySim':
 		ctest_opt = test.findtext('ctest-opt') or ''
-		script = "scripts/docker-build-and-deploy-physims.sh" if action == 'Build_Deploy_Docker_PhySim' else 'scripts/source-deploy-physims.sh'
+		script = test.findtext('script')
 		options = f"{CONTAINERS.eNBSourceCodePath} {ctest_opt}"
 		workdir = CONTAINERS.eNBSourceCodePath
 		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)
diff --git a/ci-scripts/xml_class_list.yml b/ci-scripts/xml_class_list.yml
index a20b78fc99..e8fa42dcd3 100755
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -24,8 +24,7 @@
   - Undeploy_Object
   - Cppcheck_Analysis
   - Deploy_Run_OC_PhySim
-  - Build_Deploy_Docker_PhySim
-  - Build_Deploy_Source_PhySim
+  - Build_Deploy_PhySim
   - LicenceAndFormattingCheck
   - Push_Local_Registry
   - Pull_Local_Registry
diff --git a/ci-scripts/xml_files/physim_gracehopper.xml b/ci-scripts/xml_files/physim_gracehopper.xml
index 533696d28c..bebdb3a9c2 100644
--- a/ci-scripts/xml_files/physim_gracehopper.xml
+++ b/ci-scripts/xml_files/physim_gracehopper.xml
@@ -32,8 +32,9 @@
   </testCase>
 
   <testCase>
-    <class>Build_Deploy_Docker_PhySim</class>
-    <desc>Build and Deploy PhySim</desc>
+    <class>Build_Deploy_PhySim</class>
+    <desc>Build and Deploy PhySim in Docker</desc>
+    <script>scripts/docker-build-and-deploy-physims.sh</script>
     <node>localhost</node>
     <ctest-opt>-R 5g -E "nr_dlsim|nr_ulsim|ldpctest" -j32</ctest-opt>
   </testCase>
diff --git a/ci-scripts/xml_files/physim_timed_gracehopper.xml b/ci-scripts/xml_files/physim_timed_gracehopper.xml
index 9844f6ebb3..c6772fa216 100644
--- a/ci-scripts/xml_files/physim_timed_gracehopper.xml
+++ b/ci-scripts/xml_files/physim_timed_gracehopper.xml
@@ -32,8 +32,9 @@
   </testCase>
 
   <testCase>
-    <class>Build_Deploy_Docker_PhySim</class>
+    <class>Build_Deploy_PhySim</class>
     <desc>Build and Deploy PhySim with timing check</desc>
+    <script>scripts/source-deploy-physims.sh</script>
     <node>localhost</node>
     <ctest-opt>-R 5g -R "nr_dlsim|nr_ulsim|ldpctest" -E physim.5g.nr_dlsim.mcs.mimo.test9 -j1</ctest-opt>
   </testCase>
diff --git a/ci-scripts/xml_files/t2_offload_physim_enc_dec.xml b/ci-scripts/xml_files/t2_offload_physim_enc_dec.xml
index afac50ba16..80b933aa4a 100644
--- a/ci-scripts/xml_files/t2_offload_physim_enc_dec.xml
+++ b/ci-scripts/xml_files/t2_offload_physim_enc_dec.xml
@@ -32,8 +32,9 @@
   </testCase>
 
   <testCase>
-    <class>Build_Deploy_Source_PhySim</class>
+    <class>Build_Deploy_PhySim</class>
     <desc>Build and Deploy PhySim T2 Offload tests</desc>
+    <script>scripts/source-deploy-physims.sh</script>
     <node>caracal</node>
     <ctest-opt>-R 5g-offload -j1</ctest-opt>
   </testCase>