diff --git a/.clang-format b/.clang-format
index 28e3328..a75a2c2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -17,9 +17,7 @@
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: true
 AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: true
 BinPackParameters: true
 BitFieldColonSpacing: None
@@ -43,12 +41,14 @@
   SplitEmptyRecord:     false
   SplitEmptyNamespace:  false
 BreakAfterAttributes: Never
+BreakAfterReturnType: Automatic
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: AfterColon
 BreakInheritanceList: AfterColon
 BreakStringLiterals: false
+BreakTemplateDeclarations: Yes
 ColumnLimit:     80
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
diff --git a/test/buffer_test.cpp b/test/buffer_test.cpp
index 3c8007a..9207c2d 100644
--- a/test/buffer_test.cpp
+++ b/test/buffer_test.cpp
@@ -51,8 +51,7 @@
     static constexpr size_t bufferHeaderSize =
         sizeof(struct CircularBufferHeader);
 
-    struct CircularBufferHeader testInitializationHeader
-    {};
+    struct CircularBufferHeader testInitializationHeader{};
 
     std::unique_ptr<DataInterfaceMock> dataInterfaceMock;
     DataInterfaceMock* dataInterfaceMockPtr;
@@ -594,8 +593,7 @@
         (testSequenceId ^ testEntrySize ^ testRdeCommandType);
     size_t testOffset = 0x0;
 
-    struct QueueEntryHeader testEntryHeader
-    {};
+    struct QueueEntryHeader testEntryHeader{};
 };
 
 TEST_F(BufferEntryTest, ReadEntryHeaderPass)