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/update_manager.cpp b/update_manager.cpp
index 6ced2ca..37bbb85 100644
--- a/update_manager.cpp
+++ b/update_manager.cpp
@@ -54,8 +54,8 @@
 // NOLINTNEXTLINE(readability-static-accessed-through-instance)
 auto Manager::processImage(sdbusplus::message::unix_fd image,
                            ApplyTimeIntf::RequestedApplyTimes applyTime,
-                           std::string id,
-                           std::string objPath) -> sdbusplus::async::task<>
+                           std::string id, std::string objPath)
+    -> sdbusplus::async::task<>
 {
     debug("Processing image {FD}", "FD", image.fd);
     fs::path tmpDirPath(std::string{IMG_UPLOAD_DIR});
diff --git a/update_manager.hpp b/update_manager.hpp
index 5214335..59c185f 100644
--- a/update_manager.hpp
+++ b/update_manager.hpp
@@ -55,8 +55,8 @@
     /* @brief Process the image supplied via image fd */
     auto processImage(sdbusplus::message::unix_fd image,
                       ApplyTimeIntf::RequestedApplyTimes applyTime,
-                      std::string id,
-                      std::string objPath) -> sdbusplus::async::task<>;
+                      std::string id, std::string objPath)
+        -> sdbusplus::async::task<>;
 
     /* @brief The handler for the image processing failure  */
     void processImageFailed(sdbusplus::message::unix_fd image, std::string& id);