diff --git a/tools/base/requirements.in b/tools/base/requirements.in
index b6671515eadb4..8596aafab030b 100644
--- a/tools/base/requirements.in
+++ b/tools/base/requirements.in
@@ -6,7 +6,7 @@ aiodocker>=0.22.2
 aiohttp>=3.11.6
 aioquic>=0.9.21
 cffi>=1.15.0
-clang-format==18.1.8
+clang-format==21.1.6
 clang-tidy==18.1.8
 colorama
 coloredlogs
diff --git a/tools/base/requirements.txt b/tools/base/requirements.txt
index ee61adbf2ea95..460b9c10b8afe 100644
--- a/tools/base/requirements.txt
+++ b/tools/base/requirements.txt
@@ -458,22 +458,25 @@ charset-normalizer==3.3.2 \
     --hash=sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519 \
     --hash=sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561
     # via requests
-clang-format==18.1.8 \
-    --hash=sha256:03e0a762b4b504750ce4999174fa50a3c4d6b83d7999481e1b6a1b3bc2915121 \
-    --hash=sha256:065ddb7fdd0cb329976115fa03500dd560d9753dd50c25a269776648e6e6bf35 \
-    --hash=sha256:2a73a50e17c94325712631c15e5b210e374841bbeefb915f12934b902310df7b \
-    --hash=sha256:2de122b8aa78ba49e326f974131caab2c79f4ae877c227cd4e3e5d82a98d21e5 \
-    --hash=sha256:310206c21fa8177c019a3871de8c5400e51867376cae630ee3d1610aa6c93816 \
-    --hash=sha256:4762e95ea887d522bf664c1411d93d4d41fc9eb059835dd88b9ad54bc3cb08e0 \
-    --hash=sha256:4be2b5d983a0cc1ef90a224b599f5928d82ce31154ba69accfdcb670aea62f40 \
-    --hash=sha256:6ca6768270e291495174faa6d8c082aa0181722b29ef8e36558b397069fa4a2d \
-    --hash=sha256:7c41e2521b7e6ba706cc5d1c3e95eed9a41c1522244e23624e1518991f02a604 \
-    --hash=sha256:7d71869103d0f27be3c4930bea59dc6325177a259ba321a04663a231432ec343 \
-    --hash=sha256:82c5dd546efa80a838bb9fd4cf6f6e37d85301c0bca13cd79ab5749422ca35a1 \
-    --hash=sha256:c11ecdae9cd9068ed010b7cc5fa9d3d2ae08de8bbfa493df865774ad63fd7d76 \
-    --hash=sha256:d2db077523bd4517b41fa6adb2e5ee63fc91bc7b641dc6e28b959fa8050cf41b \
-    --hash=sha256:d3a41b7c7c3e65fa56763f5712f919111b35d7a8e857f8bef4ad5a4cdc1be131 \
-    --hash=sha256:ea103b3ae5b0941152cd29c67eab086aafc98675370ac13581005807680132aa
+clang-format==21.1.6 \
+    --hash=sha256:06c525faa3d07a2030faa2793376c5b9d22b4e08853d08473c2129523f7f980a \
+    --hash=sha256:072e0d611dfc7431d744dc90389aaaa626c26507581e692df60f2000695a92f6 \
+    --hash=sha256:0cba3e2522d138c9924ad52901558f9285fc5da80725b88eb3cbb80f7d388dd6 \
+    --hash=sha256:20102f69df02282280d5c7dac682987cb82fee9ff89c034c653154019b17a5ef \
+    --hash=sha256:2dde6f5841baab6525e12fd5d9f3520465429be74921f6780abb031a48fb278c \
+    --hash=sha256:2ecd3e1c58efa9d994cc053e82dd25d8482f5b28cc2a90876b9e11a8ce7a6c7b \
+    --hash=sha256:2f89387587b534bd24aa28c08fb42ec101a79b0402da8b7d281afb44a779e597 \
+    --hash=sha256:5b1e0b514233724e9deb787e125f2729a80fa8a7c12ae01f27febbf40fdf472e \
+    --hash=sha256:62da4d100f07618f28a943396001fc37d3b0ebaaee59c011b5e8373cd15aaf99 \
+    --hash=sha256:74880cb25886c1bb4a95307efeb40f19eba3f1fd86ddee88166814b9ed2600ef \
+    --hash=sha256:8a9d82d1d67ffdc491a0a1ce04d7740b6e7ccb1d9b6d2ab90b009040614030e9 \
+    --hash=sha256:90b1d5e6734cb0b4c048c73299db698ecf25ed52649c10a61f1f5147bec23e2b \
+    --hash=sha256:a0cea6afea00448396eaff4e10a569631a4b06582553e3c44c5c040ec83c6b01 \
+    --hash=sha256:a999a1ffd4dce4e753d8f3668f3a4bf954da658b67ca9449448c2bc7dc7d2d87 \
+    --hash=sha256:b5c559badbf9750b915a37a961896db811819fc040f84f7498cec8ede0435fc2 \
+    --hash=sha256:b95ebeb1d177c4d3e00018a26a6e01a4319648bc1fe33e8632d89addbc5faf24 \
+    --hash=sha256:d4e534a8823d0496f70e65c7de30f18899db91bd442db35aeb6265f2a14d631d \
+    --hash=sha256:f36fe3e2f08ea1d97e56d8b31a8bc4ed2001bb4e68ddbec95081daf0f3360955
     # via -r requirements.in
 clang-tidy==18.1.8 \
     --hash=sha256:1f832286035f9df3be3b41ba29493ca9e67bf61a8636177da756d89b6313bbca \