diff --git a/.clang-format b/.clang-format
index 935baeeca2..75ecb89aa7 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,7 +3,7 @@ ColumnLimit: 80
 UseTab: Never
 
 AccessModifierOffset: -2
-AlignAfterOpenBracket: AlwaysBreak
+AlignAfterOpenBracket: BlockIndent
 AlignConsecutiveAssignments: None
 AlignConsecutiveDeclarations: None
 AlignConsecutiveMacros: None
@@ -89,4 +89,4 @@ SpacesInConditionalStatement: false
 SpacesInContainerLiterals: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard: c++14
+Standard: c++17