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/src/fru_device.cpp b/src/fru_device.cpp
index f2452f5..403f6eb 100644
--- a/src/fru_device.cpp
+++ b/src/fru_device.cpp
@@ -247,8 +247,7 @@
 
     constexpr size_t smbusWriteThenReadMsgCount = 2;
     std::array<struct i2c_msg, smbusWriteThenReadMsgCount> msgs{};
-    struct i2c_rdwr_ioctl_data rdwr
-    {};
+    struct i2c_rdwr_ioctl_data rdwr{};
 
     msgs[0].addr = address;
     msgs[0].flags = 0;
@@ -1151,8 +1150,7 @@
         return false;
     }
 
-    struct FruArea fruAreaParams
-    {};
+    struct FruArea fruAreaParams{};
 
     if (!findFruAreaLocationAndField(fruData, propertyName, fruAreaParams))
     {
diff --git a/src/perform_scan.cpp b/src/perform_scan.cpp
index 91372e4..f866b32 100644
--- a/src/perform_scan.cpp
+++ b/src/perform_scan.cpp
@@ -46,10 +46,10 @@
     std::string interface;
 };
 
-void getInterfaces(
-    const DBusInterfaceInstance& instance,
-    const std::vector<std::shared_ptr<PerformProbe>>& probeVector,
-    const std::shared_ptr<PerformScan>& scan, size_t retries = 5)
+void
+    getInterfaces(const DBusInterfaceInstance& instance,
+                  const std::vector<std::shared_ptr<PerformProbe>>& probeVector,
+                  const std::shared_ptr<PerformScan>& scan, size_t retries = 5)
 {
     if (retries == 0U)
     {