diff --git a/.clang-format b/.clang-format
index 1eb0867e1..997ad379b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -6,7 +6,7 @@ AllowAllParametersOfDeclarationOnNextLine: 'false'
 AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: 'false'
 AllowShortLoopsOnASingleLine: 'false'
-AlwaysBreakAfterDefinitionReturnType: All
+AlwaysBreakAfterReturnType: TopLevelDefinitions
 AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: 'false'
 BinPackParameters: 'false'
@@ -19,7 +19,7 @@ FixNamespaceComments: 'true'
 IncludeBlocks: Preserve
 IndentWidth: '4'
 MaxEmptyLinesToKeep: '2'
-NamespaceIndentation: Inner
+NamespaceIndentation: None
 PointerAlignment: Left
 ReflowComments: 'false'
 SortIncludes: 'true'