diff --git a/style/cpp/.clang-format b/style/cpp/.clang-format
index edcf98e..c1337a8 100644
--- a/style/cpp/.clang-format
+++ b/style/cpp/.clang-format
@@ -6,7 +6,7 @@
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: Right
-AlignOperands:   true
+AlignOperands:  Align
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: Empty
@@ -93,6 +93,8 @@
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PenaltyIndentedWhitespace: 0
+QualifierAlignment: Left
+ReferenceAlignment: Left
 ReflowComments:  true
 SortIncludes:    true
 SortUsingDeclarations: true