diff --git a/.github/workflows/clang-tidy-review.yaml b/.github/workflows/clang-tidy-review.yaml
index 50c0ad37..b2bde92d 100644
--- a/.github/workflows/clang-tidy-review.yaml
+++ b/.github/workflows/clang-tidy-review.yaml
@@ -14,7 +14,7 @@ jobs:
 
     - uses: ZedThree/clang-tidy-review@v0.10.1
       with:
-        clang_tidy_checks: '-*,performance-*,bugprone-*,clang-analyzer-*,cppcoreguidelines-*,mpi-*,misc-*,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-avoid-magic-numbers'
+        clang_tidy_checks: '-*,performance-*,bugprone-*,clang-analyzer-*,cppcoreguidelines-*,mpi-*,misc-*,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-avoid-magic-numbers,-clang-diagnostic-error,-misc-no-recursion'
         split_workflow: true
 
     - uses: actions/upload-artifact@v3
diff --git a/.github/workflows/cmake.yaml b/.github/workflows/tests.yaml
similarity index 100%
rename from .github/workflows/cmake.yaml
rename to .github/workflows/tests.yaml
diff --git a/additional_tasks/CMakeLists.txt b/additional_tasks/CMakeLists.txt
index e298bd2e..ad72f75c 100644
--- a/additional_tasks/CMakeLists.txt
+++ b/additional_tasks/CMakeLists.txt
@@ -2,4 +2,17 @@ cmake_minimum_required(VERSION 3.10)
 
 project(additional_tasks)
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/temperature)
+file(GLOB_RECURSE tasks_dirs LIST_DIRECTORIES true ".")
+
+MESSAGE("dirs: ${task_dirs}")
+
+foreach(dir ${tasks_dirs})
+    IF(IS_DIRECTORY ${dir})
+        IF(NOT ${dir} MATCHES ".*src.*")
+            MESSAGE("additional task: ${dir}")
+            add_subdirectory(${dir})
+        ENDIF()
+    ELSE()
+        CONTINUE()
+    ENDIF()
+endforeach()
diff --git a/additional_tasks/find_sum_numbers/CMakeLists.txt b/additional_tasks/find_sum_numbers/CMakeLists.txt
index 7eac3977..28c5cb5a 100644
--- a/additional_tasks/find_sum_numbers/CMakeLists.txt
+++ b/additional_tasks/find_sum_numbers/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(PROJECT_NAME find_number_sum)
-project(${PROJECT_NAME})
+get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
+string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
+project(${PROJECT_NAME} C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/additional_tasks/temperature/CMakeLists.txt b/additional_tasks/temperature/CMakeLists.txt
index 70332489..28c5cb5a 100644
--- a/additional_tasks/temperature/CMakeLists.txt
+++ b/additional_tasks/temperature/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(PROJECT_NAME days_before_warmup)
-project(${PROJECT_NAME})
+get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
+string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
+project(${PROJECT_NAME} C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/sandbox/CMakeLists.txt b/sandbox/CMakeLists.txt
index 0105689d..28c5cb5a 100644
--- a/sandbox/CMakeLists.txt
+++ b/sandbox/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(PROJECT_NAME sandbox)
-project(${PROJECT_NAME})
+get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
+string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
+project(${PROJECT_NAME} C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -24,11 +25,11 @@ find_package(GTest REQUIRED)
 include_directories(${GTEST_INCLUDE_DIRS})
 
 # Link runTests with what we want to test and the GTest and pthread library
-add_executable(sandbox_tests ${test_source_list})
+add_executable(${PROJECT_NAME}_tests ${test_source_list})
 target_link_libraries(
-  sandbox_tests
+  ${PROJECT_NAME}_tests
   GTest::gtest_main
 )
 
 include(GoogleTest)
-gtest_discover_tests(sandbox_tests)
+gtest_discover_tests(${PROJECT_NAME}_tests)
diff --git a/task_01/CMakeLists.txt b/task_01/CMakeLists.txt
index 0d13e1cf..28c5cb5a 100644
--- a/task_01/CMakeLists.txt
+++ b/task_01/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(PROJECT_NAME task_01)
-project(${PROJECT_NAME})
+get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
+string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
+project(${PROJECT_NAME} C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/task_02/CMakeLists.txt b/task_02/CMakeLists.txt
index 08b6e047..28c5cb5a 100644
--- a/task_02/CMakeLists.txt
+++ b/task_02/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(PROJECT_NAME task_02)
-project(${PROJECT_NAME})
+get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
+string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
+project(${PROJECT_NAME} C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/task_05/CMakeLists.txt b/task_05/CMakeLists.txt
index b217db8f..28c5cb5a 100644
--- a/task_05/CMakeLists.txt
+++ b/task_05/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(PROJECT_NAME task_05)
-project(${PROJECT_NAME})
+get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
+string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
+project(${PROJECT_NAME} C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/task_06/CMakeLists.txt b/task_06/CMakeLists.txt
index f3f54c2a..28c5cb5a 100644
--- a/task_06/CMakeLists.txt
+++ b/task_06/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(PROJECT_NAME task_06)
-project(${PROJECT_NAME})
+get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
+string(REPLACE " " "_" PROJECT_NAME ${PROJECT_NAME})
+project(${PROJECT_NAME} C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)