diff --git a/tools/ci/amd64/gcc/unit_tests.sh b/tools/ci/amd64/gcc/unit_tests.sh
index 25c1196..c64a2a1 100755
--- a/tools/ci/amd64/gcc/unit_tests.sh
+++ b/tools/ci/amd64/gcc/unit_tests.sh
@@ -2,8 +2,7 @@
 
 set -e
 cd $(git rev-parse --show-toplevel)/
-rm -rf ./build
-mkdir build/ && cd build
+rm -rf ./build && mkdir build/ && cd build
 
 Xvfb :99 -screen 0 1024x768x16 &
 export CXX=$(which g++)
diff --git a/tools/ci/static_analysis/clang_tidy.sh b/tools/ci/static_analysis/clang_tidy.sh
index a67569a..95a95d6 100755
--- a/tools/ci/static_analysis/clang_tidy.sh
+++ b/tools/ci/static_analysis/clang_tidy.sh
@@ -2,19 +2,16 @@
 
 set -e
 cd $(git rev-parse --show-toplevel)/
-rm -rf ./build
+rm -rf ./build && mkdir build/ && cd build
 
-echo 'Static analysis is currently disabled as code is filled with failing clang-tidy checks'
-echo 'Runng this would be a waste of CPU cycles and electricty'
-echo 'Fix the checks before removing these lines'
-exit 0
+export CC=$(which clang)
+export CXX=$(which clang++)
 
 cmake .. \
 -G Ninja \
 -DCMAKE_LINKER_TYPE=MOLD \
 -DENABLE_UNIT_TESTS=ON \
--DENABLE_FUZZ_TESTS=ON \
--CMAKE_CXX_CLANG_TIDY=ON \
+-DENABLE_STATIC_ANALYSIS=ON \
 -DCMAKE_BUILD_TYPE=Release \
--DCMAKE_CXX_FLAGS="-std=c++23 -stdlib=libc++ -g -fno-omit-frame-pointer" \
+-DCMAKE_CXX_FLAGS="-std=c++23 -stdlib=libc++" \
 && cmake --build . -j `nproc`