diff --git a/tests/regression-tests/multigpu_test/rocket4GPU.yml b/tests/regression-tests/multigpu_test/rocket4GPU.yml
index 4598ce862b3f4e470f83c181e077e8478c2ab25b..05007739fc561eea7d9eead7472619f2d1b049d0 100755
--- a/tests/regression-tests/multigpu_test/rocket4GPU.yml
+++ b/tests/regression-tests/multigpu_test/rocket4GPU.yml
@@ -6,47 +6,47 @@ private_keyfile: $PHOENIX_PRIVATE_KEY
 
 copy:
   - from: "CMake/"
-    to: "multigpu_test/CMake/"
+    to: "multigpu_test_4_gpu/CMake/"
     overwrite: true
 
   - from: "3rdParty/"
-    to: "multigpu_test/3rdParty/"
+    to: "multigpu_test_4_gpu/3rdParty/"
     overwrite: true
 
   - from: "CMakeLists.txt"
-    to: "multigpu_test/CMakeLists.txt"
+    to: "multigpu_test_4_gpu/CMakeLists.txt"
     overwrite: true
 
   - from: "gpu.cmake"
-    to: "multigpu_test/gpu.cmake"
+    to: "multigpu_test_4_gpu/gpu.cmake"
     overwrite: true
 
   - from: "src/"
-    to: "multigpu_test/src/"
+    to: "multigpu_test_4_gpu/src/"
     overwrite: true
 
   - from: "CMakePresets.json"
-    to: "multigpu_test/CMakePresets.json"
+    to: "multigpu_test_4_gpu/CMakePresets.json"
     overwrite: true
 
   - from: "apps/gpu/"
-    to: "multigpu_test/apps/gpu/"
+    to: "multigpu_test_4_gpu/apps/gpu/"
     overwrite: true
 
 collect:
-  - from: multigpu_test/output/4GPU/
+  - from: multigpu_test_4_gpu/output/4GPU/
     to: output/4GPU/
     overwrite: true
 
-  - from: multigpu_test/slurm4GPU.out
+  - from: multigpu_test_4_gpu/slurm4GPU.out
     to: output/4GPU/slurm4GPU.out
     overwrite: true
 
 clean:
-  - multigpu_test/*
+  - multigpu_test_4_gpu/*
 
 sbatch:
-  script: multigpu_test/slurm4GPU.job
+  script: multigpu_test_4_gpu/slurm4GPU.job
   from: tests/regression-tests/multigpu_test/slurm4GPU.job
   overwrite: true
 
diff --git a/tests/regression-tests/multigpu_test/rocket8GPU.yml b/tests/regression-tests/multigpu_test/rocket8GPU.yml
index b28fc30d6a11335e592cbe3d1da7e10e76efd9b9..c2a308a8937da4b398803b1f80763f47940501b1 100755
--- a/tests/regression-tests/multigpu_test/rocket8GPU.yml
+++ b/tests/regression-tests/multigpu_test/rocket8GPU.yml
@@ -6,47 +6,47 @@ private_keyfile: $PHOENIX_PRIVATE_KEY
 
 copy:
   - from: "CMake/"
-    to: "multigpu_test/CMake/"
+    to: "multigpu_test_8_gpu/CMake/"
     overwrite: true
 
   - from: "3rdParty/"
-    to: "multigpu_test/3rdParty/"
+    to: "multigpu_test_8_gpu/3rdParty/"
     overwrite: true
 
   - from: "CMakeLists.txt"
-    to: "multigpu_test/CMakeLists.txt"
+    to: "multigpu_test_8_gpu/CMakeLists.txt"
     overwrite: true
 
   - from: "gpu.cmake"
-    to: "multigpu_test/gpu.cmake"
+    to: "multigpu_test_8_gpu/gpu.cmake"
     overwrite: true
 
   - from: "src/"
-    to: "multigpu_test/src/"
+    to: "multigpu_test_8_gpu/src/"
     overwrite: true
 
   - from: "CMakePresets.json"
-    to: "multigpu_test/CMakePresets.json"
+    to: "multigpu_test_8_gpu/CMakePresets.json"
     overwrite: true
 
   - from: "apps/gpu/"
-    to: "multigpu_test/apps/gpu/"
+    to: "multigpu_test_8_gpu/apps/gpu/"
     overwrite: true
 
 collect:
-  - from: multigpu_test/output/8GPU/
+  - from: multigpu_test_8_gpu/output/8GPU/
     to: output/8GPU/
     overwrite: true
 
-  - from: multigpu_test/slurm8GPU.out
+  - from: multigpu_test_8_gpu/slurm8GPU.out
     to: output/8GPU/slurm8GPU.out
     overwrite: true
 
 clean:
-  - multigpu_test/*
+  - multigpu_test_8_gpu/*
 
 sbatch:
-  script: multigpu_test/slurm8GPU.job
+  script: multigpu_test_8_gpu/slurm8GPU.job
   from: tests/regression-tests/multigpu_test/slurm8GPU.job
   overwrite: true
 
diff --git a/tests/regression-tests/multigpu_test/slurm4GPU.job b/tests/regression-tests/multigpu_test/slurm4GPU.job
index 4dd47677774698f074d3af1507a813c45ac72f15..a11bfa4cc8aed3ea5354b7693b19250569d8abe4 100755
--- a/tests/regression-tests/multigpu_test/slurm4GPU.job
+++ b/tests/regression-tests/multigpu_test/slurm4GPU.job
@@ -9,7 +9,7 @@
 #SBATCH --job-name=Regr4GPU
 #SBATCH --ntasks-per-node=4
 #SBATCH --gres=gpu:4
-#SBATCH --output=multigpu_test/slurm4GPU.out
+#SBATCH --output=multigpu_test_4_gpu/slurm4GPU.out
 ##SBATCH --exclusive
 
 echo "SLURM_JOBID="$SLURM_JOBID
@@ -26,7 +26,7 @@ PATH=/home/irmb/tools/cmake-3.26.4-linux-x86_64/bin:$PATH
 
 module list
 
-cd multigpu_test
+cd multigpu_test_4_gpu
 rm -rf build && mkdir -p build
 cd build
 cmake .. -DVF_ENABLE_GPU=ON -DCMAKE_CUDA_ARCHITECTURES=60 -DUSER_APPS=apps/gpu/DrivenCavityMultiGPU\;apps/gpu/SphereMultiGPU
diff --git a/tests/regression-tests/multigpu_test/slurm8GPU.job b/tests/regression-tests/multigpu_test/slurm8GPU.job
index 8df184d0ee9e42d9744262220cfd47c6800266c9..ea40c60b0f7f518d7de26344d57f73f2ca3f17bb 100755
--- a/tests/regression-tests/multigpu_test/slurm8GPU.job
+++ b/tests/regression-tests/multigpu_test/slurm8GPU.job
@@ -9,7 +9,7 @@
 #SBATCH --job-name=Regr8GPU
 #SBATCH --ntasks-per-node=4
 #SBATCH --gres=gpu:4
-#SBATCH --output=multigpu_test/slurm8GPU.out
+#SBATCH --output=multigpu_test_8_gpu/slurm8GPU.out
 ##SBATCH --exclusive
 
 echo "SLURM_JOBID="$SLURM_JOBID
@@ -26,7 +26,7 @@ PATH=/home/irmb/tools/cmake-3.26.4-linux-x86_64/bin:$PATH
 
 module list
 
-cd multigpu_test
+cd multigpu_test_8_gpu
 rm -rf build && mkdir -p build
 cd build
 cmake .. -DVF_ENABLE_GPU=ON -DCMAKE_CUDA_ARCHITECTURES=60 -DUSER_APPS=apps/gpu/DrivenCavityMultiGPU\;apps/gpu/SphereMultiGPU