diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb3d48b83..67d07501f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,7 @@ if(FSFW_BUILD_UNITTESTS)
         FetchContent_Declare(
             Catch2
             GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-            GIT_TAG        v3.0.0-preview3
+            GIT_TAG        v3.0.0-preview4
         )
 
         FetchContent_MakeAvailable(Catch2)
diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile
index d4a8e2ab8..e7f85e28e 100644
--- a/automation/Jenkinsfile
+++ b/automation/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
     agent any
     environment {
-        BUILDDIR = 'build-unittests'
+        BUILDDIR = 'build-tests'
     }
     stages {
         stage('Create Docker') {
@@ -16,6 +16,18 @@ pipeline {
                 sh 'rm -rf $BUILDDIR'
             }
         }
+        stage('Clean') {
+            when {
+                anyOf {
+                    changelog 'cleanCI'
+                    changeset '*.cmake'
+                    changeset 'CMakeLists.txt'
+                }
+            }
+            steps {
+                sh 'rm -rf $BUILDDIR'
+            }
+        }
         stage('Configure') {
             agent {
                 dockerfile {