diff --git a/src/.clang-format b/src/.clang-format
index 1cfe795befe..beeff13a96d 100644
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -1,15 +1,15 @@
 
-AlignAfterOpenBracket: true
-AlignConsecutiveMacros: true
+AlignAfterOpenBracket: Align
+AlignConsecutiveMacros: Consecutive
 
 AllowAllArgumentsOnNextLine: false
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
 
 AlwaysBreakAfterReturnType: TopLevelDefinitions
 
 BraceWrapping:
-  AfterControlStatement: false
+  AfterControlStatement: Never
   AfterEnum: false
   AfterFunction: true
   AfterStruct: false
diff --git a/src/amd/compiler/.clang-format b/src/amd/compiler/.clang-format
index 6db4906beba..9b5a44ffd95 100644
--- a/src/amd/compiler/.clang-format
+++ b/src/amd/compiler/.clang-format
@@ -24,7 +24,7 @@ AllowShortLambdasOnASingleLine: All
 
 # Wrap before LambdaBody and disable SplitEmptyFunction
 BraceWrapping:
-  AfterControlStatement: false
+  AfterControlStatement: Never
   AfterEnum: false
   AfterFunction: true
   AfterStruct: false
diff --git a/src/asahi/.clang-format b/src/asahi/.clang-format
index d974a0547a6..6fc36ba4cca 100644
--- a/src/asahi/.clang-format
+++ b/src/asahi/.clang-format
@@ -2,7 +2,7 @@
 BasedOnStyle: InheritParentConfig
 DisableFormat: false
 
-AlignConsecutiveBitFields: true
+AlignConsecutiveBitFields: Consecutive
 ColumnLimit: 80
 BreakStringLiterals: false
 SpaceBeforeParens: ControlStatementsExceptControlMacros
diff --git a/src/etnaviv/common/.clang-format b/src/etnaviv/common/.clang-format
index b1a43d91fe2..f342781101a 100644
--- a/src/etnaviv/common/.clang-format
+++ b/src/etnaviv/common/.clang-format
@@ -2,6 +2,6 @@
 BasedOnStyle: InheritParentConfig
 DisableFormat: false
 
-AlignConsecutiveBitFields: true
+AlignConsecutiveBitFields: Consecutive
 ColumnLimit: 100
 BreakStringLiterals: false
diff --git a/src/etnaviv/hwdb/.clang-format b/src/etnaviv/hwdb/.clang-format
index b1a43d91fe2..f342781101a 100644
--- a/src/etnaviv/hwdb/.clang-format
+++ b/src/etnaviv/hwdb/.clang-format
@@ -2,6 +2,6 @@
 BasedOnStyle: InheritParentConfig
 DisableFormat: false
 
-AlignConsecutiveBitFields: true
+AlignConsecutiveBitFields: Consecutive
 ColumnLimit: 100
 BreakStringLiterals: false
diff --git a/src/etnaviv/isa/.clang-format b/src/etnaviv/isa/.clang-format
index b1a43d91fe2..f342781101a 100644
--- a/src/etnaviv/isa/.clang-format
+++ b/src/etnaviv/isa/.clang-format
@@ -2,6 +2,6 @@
 BasedOnStyle: InheritParentConfig
 DisableFormat: false
 
-AlignConsecutiveBitFields: true
+AlignConsecutiveBitFields: Consecutive
 ColumnLimit: 100
 BreakStringLiterals: false
diff --git a/src/freedreno/.clang-format b/src/freedreno/.clang-format
index b4a930c1104..13e3a491d2d 100644
--- a/src/freedreno/.clang-format
+++ b/src/freedreno/.clang-format
@@ -2,7 +2,7 @@
 BasedOnStyle: InheritParentConfig
 DisableFormat: false
 
-AlignConsecutiveBitFields: true
+AlignConsecutiveBitFields: Consecutive
 ColumnLimit: 80
 BreakStringLiterals: false
 
diff --git a/src/gallium/drivers/d3d12/.clang-format b/src/gallium/drivers/d3d12/.clang-format
index df404228853..ac439c6d713 100644
--- a/src/gallium/drivers/d3d12/.clang-format
+++ b/src/gallium/drivers/d3d12/.clang-format
@@ -3,10 +3,10 @@ BasedOnStyle: InheritParentConfig
 DisableFormat: false
 
 ColumnLimit: 120
-SortIncludes: false
+SortIncludes: Never
 
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
+AlignConsecutiveAssignments: None
+AlignConsecutiveDeclarations: None
 AlignTrailingComments: true
 
 PenaltyExcessCharacter: 75
@@ -51,7 +51,7 @@ SpaceBeforeCtorInitializerColon: true
 SpacesInContainerLiterals: true
 SpaceBeforeParens: ControlStatements
 SpacesBeforeTrailingComments: 3
-SpacesInAngles: false
+SpacesInAngles: Never
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 SpacesInCStyleCastParentheses: false
diff --git a/src/gallium/drivers/r600/sfn/.clang-format b/src/gallium/drivers/r600/sfn/.clang-format
index 3d5df918319..dca9d814280 100644
--- a/src/gallium/drivers/r600/sfn/.clang-format
+++ b/src/gallium/drivers/r600/sfn/.clang-format
@@ -2,7 +2,7 @@
 BasedOnStyle: InheritParentConfig
 DisableFormat: false
 
-AllowShortFunctionsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
 AlwaysBreakAfterReturnType: TopLevel
 AllowShortEnumsOnASingleLine: false
 BinPackParameters: false
diff --git a/src/gallium/frontends/mediafoundation/.clang-format b/src/gallium/frontends/mediafoundation/.clang-format
index 4cb6aab39af..135b6252431 100644
--- a/src/gallium/frontends/mediafoundation/.clang-format
+++ b/src/gallium/frontends/mediafoundation/.clang-format
@@ -3,10 +3,10 @@ BasedOnStyle: InheritParentConfig
 DisableFormat: false
 
 ColumnLimit: 132
-SortIncludes: true
+SortIncludes: CaseSensitive
 
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
+AlignConsecutiveAssignments: None
+AlignConsecutiveDeclarations: None
 AlignTrailingComments: true
 
 PenaltyExcessCharacter: 75
@@ -23,7 +23,7 @@ BreakBeforeBraces: Custom
 BraceWrapping:
   AfterCaseLabel: true
   AfterClass: true
-  AfterControlStatement: true
+  AfterControlStatement: Always
   AfterEnum: true
   AfterNamespace: true
   AfterObjCDeclaration: true
@@ -54,7 +54,7 @@ SpaceBeforeParens: Custom
 SpaceBeforeParensOptions:
   AfterControlStatements: false
 SpacesBeforeTrailingComments: 3
-SpacesInAngles: false
+SpacesInAngles: Never
 SpacesInParentheses: true
 SpacesInSquareBrackets: false
 SpacesInCStyleCastParentheses: false
diff --git a/src/imagination/.clang-format b/src/imagination/.clang-format
index c02a623d687..76f0598d808 100644
--- a/src/imagination/.clang-format
+++ b/src/imagination/.clang-format
@@ -66,10 +66,10 @@ Cpp11BracedListStyle: false
 ########################
 # Whitespace Alignment #
 ########################
-AlignConsecutiveAssignments: false
+AlignConsecutiveAssignments: None
 #AlignConsecutiveBitFields: false  # Requires clang-11
-AlignConsecutiveDeclarations: false
-AlignConsecutiveMacros: false
+AlignConsecutiveDeclarations: None
+AlignConsecutiveMacros: None
 AlignTrailingComments: false
 
 AlignEscapedNewlines: Left
@@ -93,7 +93,7 @@ SpaceBeforeRangeBasedForLoopColon: true
 SpaceBeforeSquareBrackets: false
 SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false
-SpacesInAngles: false
+SpacesInAngles: Never
 SpacesInCStyleCastParentheses: false
 SpacesInConditionalStatement: false
 SpacesInContainerLiterals: false
@@ -158,7 +158,7 @@ SortUsingDeclarations: true
 ############
 # TODO: Temporary config
 IncludeBlocks: Preserve
-SortIncludes: false
+SortIncludes: Never
 # TODO: This requires additional work to clean up headers & includes first
 #IncludeBlocks: Regroup
 #SortIncludes: true
diff --git a/src/intel/ds/.clang-format b/src/intel/ds/.clang-format
index 41203078b2b..b08c6c75ceb 100644
--- a/src/intel/ds/.clang-format
+++ b/src/intel/ds/.clang-format
@@ -1,21 +1,21 @@
 BasedOnStyle: WebKit
-AlignTrailingComments: 'true'
-AllowAllParametersOfDeclarationOnNextLine: 'false'
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortFunctionsOnASingleLine: None
-AlwaysBreakBeforeMultilineStrings: 'true'
-BinPackArguments: 'false'
-BinPackParameters: 'false'
+AlwaysBreakBeforeMultilineStrings: true
+BinPackArguments: false
+BinPackParameters: false
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Linux
-ColumnLimit: '100'
-Cpp11BracedListStyle: 'true'
-KeepEmptyLinesAtTheStartOfBlocks: 'false'
+ColumnLimit: 100
+Cpp11BracedListStyle: true
+KeepEmptyLinesAtTheStartOfBlocks: false
 NamespaceIndentation: None
 PointerAlignment: Right
-SortIncludes: 'true'
-SpaceAfterTemplateKeyword: 'false'
-Standard: Cpp11
-TabWidth: '3'
-IndentWidth: '3'
-ConstructorInitializerIndentWidth: '3'
-ContinuationIndentWidth: '3'
+SortIncludes: CaseSensitive
+SpaceAfterTemplateKeyword: false
+Standard: c++11
+TabWidth: 3
+IndentWidth: 3
+ConstructorInitializerIndentWidth: 3
+ContinuationIndentWidth: 3
diff --git a/src/panfrost/.clang-format b/src/panfrost/.clang-format
index de6ae574573..c700275b7d3 100644
--- a/src/panfrost/.clang-format
+++ b/src/panfrost/.clang-format
@@ -2,7 +2,7 @@
 BasedOnStyle: InheritParentConfig
 DisableFormat: false
 
-AlignConsecutiveBitFields: true
+AlignConsecutiveBitFields: Consecutive
 ColumnLimit: 80
 BreakStringLiterals: false
 SpaceBeforeParens: ControlStatementsExceptControlMacros
diff --git a/src/tool/pps/.clang-format b/src/tool/pps/.clang-format
index 41203078b2b..b08c6c75ceb 100644
--- a/src/tool/pps/.clang-format
+++ b/src/tool/pps/.clang-format
@@ -1,21 +1,21 @@
 BasedOnStyle: WebKit
-AlignTrailingComments: 'true'
-AllowAllParametersOfDeclarationOnNextLine: 'false'
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortFunctionsOnASingleLine: None
-AlwaysBreakBeforeMultilineStrings: 'true'
-BinPackArguments: 'false'
-BinPackParameters: 'false'
+AlwaysBreakBeforeMultilineStrings: true
+BinPackArguments: false
+BinPackParameters: false
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Linux
-ColumnLimit: '100'
-Cpp11BracedListStyle: 'true'
-KeepEmptyLinesAtTheStartOfBlocks: 'false'
+ColumnLimit: 100
+Cpp11BracedListStyle: true
+KeepEmptyLinesAtTheStartOfBlocks: false
 NamespaceIndentation: None
 PointerAlignment: Right
-SortIncludes: 'true'
-SpaceAfterTemplateKeyword: 'false'
-Standard: Cpp11
-TabWidth: '3'
-IndentWidth: '3'
-ConstructorInitializerIndentWidth: '3'
-ContinuationIndentWidth: '3'
+SortIncludes: CaseSensitive
+SpaceAfterTemplateKeyword: false
+Standard: c++11
+TabWidth: 3
+IndentWidth: 3
+ConstructorInitializerIndentWidth: 3
+ContinuationIndentWidth: 3
diff --git a/src/virtio/virtgpu_kumquat_ffi/include/.clang-format b/src/virtio/virtgpu_kumquat_ffi/include/.clang-format
index fffb6d3242c..e5728982792 100644
--- a/src/virtio/virtgpu_kumquat_ffi/include/.clang-format
+++ b/src/virtio/virtgpu_kumquat_ffi/include/.clang-format
@@ -3,7 +3,7 @@
 
 BasedOnStyle: LLVM
 AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
 BreakBeforeBraces: Linux
 ColumnLimit: 100
diff --git a/src/virtio/vulkan/.clang-format b/src/virtio/vulkan/.clang-format
index 7cc1349ccc3..8896e7351d1 100644
--- a/src/virtio/vulkan/.clang-format
+++ b/src/virtio/vulkan/.clang-format
@@ -25,4 +25,4 @@ IncludeCategories:
 ForEachMacros:
   - vk_outarray_append_typed
 
-SpaceBeforeParens: ControlStatementsExceptForEachMacros
+SpaceBeforeParens: ControlStatementsExceptControlMacros
diff --git a/src/vulkan/vram-report-limit-layer/.clang-format b/src/vulkan/vram-report-limit-layer/.clang-format
index 043703f9a3f..b20aa1c7614 100644
--- a/src/vulkan/vram-report-limit-layer/.clang-format
+++ b/src/vulkan/vram-report-limit-layer/.clang-format
@@ -1,6 +1,6 @@
 BasedOnStyle: InheritParentConfig
 DisableFormat: false
 
-AlignConsecutiveBitFields: true
+AlignConsecutiveBitFields: Consecutive
 ColumnLimit: 80
 BreakStringLiterals: false