diff --git a/.clang-format b/.clang-format
index d68699c2c5..03aca80a67 100644
--- a/.clang-format
+++ b/.clang-format
@@ -77,6 +77,7 @@ IncludeCategories:
     Priority: 3
 IndentCaseLabels: false
 IndentWidth: 8
+InsertBraces: true
 # SpaceBeforeParens: ControlStatementsExceptControlMacros # clang-format >= 13.0
 SortIncludes: false
 UseTab: Always
diff --git a/scripts/requirements-extras.txt b/scripts/requirements-extras.txt
index 53225eddd3..aef6d1d549 100644
--- a/scripts/requirements-extras.txt
+++ b/scripts/requirements-extras.txt
@@ -10,7 +10,7 @@ gitlint
 junit2html
 
 # helper for developers - code formatter
-clang-format>=1.13x
+clang-format>=15.0.0
 
 # Script used to build firmware images for NXP LPC MCUs.
 lpc_checksum