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/extensions/openpower-pels/manager.cpp b/extensions/openpower-pels/manager.cpp
index 5b773c6..2b18d58 100644
--- a/extensions/openpower-pels/manager.cpp
+++ b/extensions/openpower-pels/manager.cpp
@@ -1004,8 +1004,8 @@
     }
 }
 
-void Manager::updateProgressSRC(
-    std::unique_ptr<openpower::pels::PEL>& pel) const
+void
+    Manager::updateProgressSRC(std::unique_ptr<openpower::pels::PEL>& pel) const
 {
     // Check for pel severity of type - 0x51 = critical error, system
     // termination
diff --git a/log_manager.cpp b/log_manager.cpp
index b20443f..a7f4494 100644
--- a/log_manager.cpp
+++ b/log_manager.cpp
@@ -203,10 +203,10 @@
     createEntry(errMsg, errLvl, additionalData);
 }
 
-auto Manager::createEntry(
-    std::string errMsg, Entry::Level errLvl,
-    std::map<std::string, std::string> additionalData,
-    const FFDCEntries& ffdc) -> sdbusplus::message::object_path
+auto Manager::createEntry(std::string errMsg, Entry::Level errLvl,
+                          std::map<std::string, std::string> additionalData,
+                          const FFDCEntries& ffdc)
+    -> sdbusplus::message::object_path
 {
     if (!Extensions::disableDefaultLogCaps())
     {
@@ -268,8 +268,9 @@
     return objPath;
 }
 
-auto Manager::createFromEvent(sdbusplus::exception::generated_event_base&&
-                                  event) -> sdbusplus::message::object_path
+auto
+    Manager::createFromEvent(sdbusplus::exception::generated_event_base&& event)
+        -> sdbusplus::message::object_path
 {
     auto [msg, level, data] = lg2::details::extractEvent(std::move(event));
     return this->createEntry(msg, level, std::move(data));