diff --git a/.github/workflows/job-cmakebuild-linux.yml b/.github/workflows/job-cmakebuild-linux.yml
index 86c5e3cd..ce547a19 100644
--- a/.github/workflows/job-cmakebuild-linux.yml
+++ b/.github/workflows/job-cmakebuild-linux.yml
@@ -25,17 +25,17 @@ jobs:
     - name: Register the Microsoft repository GPG keys
       run: sudo dpkg -i packages-microsoft-prod.deb
 
-    - name: Install LLVM-20
+    - name: Install LLVM-21
       run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 20
+          sudo ./llvm.sh 21
 
     - name: Update the list of packages
       run: sudo apt-get update
 
     - name: Install Dependencies
-      run: sudo apt-get install libasound2-dev libgl1-mesa-dev libpulse-dev libdbus-1-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxrandr-dev libxss-dev libxt-dev libxxf86vm-dev cmake apt-transport-https software-properties-common gcc g++ powershell clang-format-20 glslang-tools libwayland-dev libxkbcommon-dev
+      run: sudo apt-get install libasound2-dev libgl1-mesa-dev libpulse-dev libdbus-1-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxrandr-dev libxss-dev libxt-dev libxxf86vm-dev cmake apt-transport-https software-properties-common gcc g++ powershell clang-format-21 glslang-tools libwayland-dev libxkbcommon-dev
 
     - name: CMake Build
       run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}}
diff --git a/Scripts/Shared.ps1 b/Scripts/Shared.ps1
index f5b3f502..1ba48dd8 100644
--- a/Scripts/Shared.ps1
+++ b/Scripts/Shared.ps1
@@ -201,6 +201,7 @@ function Find-ClangFormat () {
         }
         if ($IsLinux) {
             '/usr/bin/clang-format'
+            '/usr/bin/clang-format-21'
             '/usr/bin/clang-format-20'
         }
         'clang-format'
diff --git a/ZEngine/ZEngine/Core/CoroutineScheduler.h b/ZEngine/ZEngine/Core/CoroutineScheduler.h
index 6ffa8952..6f37c2d0 100644
--- a/ZEngine/ZEngine/Core/CoroutineScheduler.h
+++ b/ZEngine/ZEngine/Core/CoroutineScheduler.h
@@ -14,11 +14,12 @@ namespace ZEngine::Core
 
         ReadyCallback   Ready  = nullptr;
         ExecuteCallback Action = nullptr;
-
+        // clang-format off
         operator bool() noexcept
         {
             return (Ready && Action);
         }
+        // clang-format on
     };
 
     struct CoroutineScheduler
diff --git a/ZEngine/ZEngine/Hardwares/VulkanDevice.h b/ZEngine/ZEngine/Hardwares/VulkanDevice.h
index 5b200fea..7f2137f5 100644
--- a/ZEngine/ZEngine/Hardwares/VulkanDevice.h
+++ b/ZEngine/ZEngine/Hardwares/VulkanDevice.h
@@ -75,11 +75,12 @@ namespace ZEngine::Hardwares
         BufferType    Type       = BufferType::UNKNOWN;
         VkBuffer      Handle     = VK_NULL_HANDLE;
         VmaAllocation Allocation = nullptr;
-
+        // clang-format off
         operator bool() const
         {
             return (Handle != VK_NULL_HANDLE);
         }
+        // clang-format on
     };
 
     struct BufferImage
@@ -89,11 +90,12 @@ namespace ZEngine::Hardwares
         VkImageView   ViewHandle{VK_NULL_HANDLE};
         VkSampler     Sampler{VK_NULL_HANDLE};
         VmaAllocation Allocation{nullptr};
-
+        // clang-format off
         operator bool() const
         {
             return (Handle != VK_NULL_HANDLE);
         }
+        // clang-format on
     };
 
     struct IGraphicBuffer
diff --git a/repoConfiguration.json b/repoConfiguration.json
index b279be33..28511529 100644
--- a/repoConfiguration.json
+++ b/repoConfiguration.json
@@ -6,13 +6,13 @@
         "ShaderC": {
             "MinimumVersion": "11.1.0",
             "Windows": {
-                "Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/windows/continuous_release_2019/26/20230810-123915/install.zip"
+                "Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/windows/vs2022_amd64_release_continuous/29/20260112-140346/install.zip"
             },
             "macOS": {
-                "Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/macos/continuous_clang_release/472/20240708-061139/install.tgz"
+            "Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/macos/continuous_clang_release/519/20260112-140351/install.tgz" 
             },
             "Linux": {
-                "Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/linux/continuous_gcc_release/500/20250807-100822/install.tgz"
+                "Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/linux/continuous_clang_release/510/20260112-140346/install.tgz"
             }
         },
         "GlslangValidator": {
@@ -24,7 +24,7 @@
         },
         "LLVM": {
             "Version": "20.1.7",
-            "MaximumVersion": "20.2.0"
+            "MaximumVersion": "22.0.0"
         }
     }
 }