diff --git a/.clang-format b/.clang-format
index cab3139..79a474d 100644
--- a/.clang-format
+++ b/.clang-format
@@ -49,6 +49,7 @@
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
+DeriveLineEnding: false
 DerivePointerAlignment: false
 PointerAlignment: Left
 DisableFormat:   false
@@ -76,7 +77,7 @@
 IndentCaseLabels: true
 IndentWidth:     4
 IndentWrappedFunctionNames: true
-KeepEmptyLinesAtTheStartOfBlocks: true
+KeepEmptyLinesAtTheStartOfBlocks: false
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
@@ -110,6 +111,6 @@
 SpacesInSquareBrackets: false
 Standard:        Latest
 TabWidth:        4
+UseCRLF: false
 UseTab:          Never
 ...
-
diff --git a/bmc_state_manager.cpp b/bmc_state_manager.cpp
index 49aaf36..85eb3cf 100644
--- a/bmc_state_manager.cpp
+++ b/bmc_state_manager.cpp
@@ -91,7 +91,6 @@
 
 void BMC::discoverInitialState()
 {
-
     // First look to see if the BMC quiesce target is active
     auto currentStateStr = getUnitState(obmcQuiesceTarget);
     if (currentStateStr == activeState)
@@ -249,7 +248,6 @@
 
 BMC::BMCState BMC::currentBMCState(BMCState value)
 {
-
     info("Setting the BMCState field to {CURRENT_BMC_STATE}",
          "CURRENT_BMC_STATE", value);
 
diff --git a/chassis_state_manager.cpp b/chassis_state_manager.cpp
index 743727f..0e962c1 100644
--- a/chassis_state_manager.cpp
+++ b/chassis_state_manager.cpp
@@ -100,7 +100,6 @@
 //        has read property function
 void Chassis::determineInitialState()
 {
-
     // Monitor for any properties changed signals on UPower device path
     uPowerPropChangeSignal = std::make_unique<sdbusplus::bus::match_t>(
         bus,
@@ -594,7 +593,6 @@
 
 Chassis::Transition Chassis::requestedPowerTransition(Transition value)
 {
-
     info("Change to Chassis Requested Power State: {REQ_POWER_TRAN}",
          "REQ_POWER_TRAN", value);
     startUnit(systemdTargetTable.find(value)->second);
diff --git a/chassis_state_manager.hpp b/chassis_state_manager.hpp
index e282463..9053951 100644
--- a/chassis_state_manager.hpp
+++ b/chassis_state_manager.hpp
@@ -60,7 +60,6 @@
                          std::bind(&Chassis::pohCallback, this),
                          std::chrono::hours{1}, std::chrono::minutes{1})
     {
-
         subscribeToSystemdSignals();
 
         createSystemdTargetTable();
diff --git a/host_state_manager.cpp b/host_state_manager.cpp
index c35412d..e3b04ac 100644
--- a/host_state_manager.cpp
+++ b/host_state_manager.cpp
@@ -77,7 +77,6 @@
 
 void Host::determineInitialState()
 {
-
     if (stateActive(getTarget(server::Host::HostState::Running)) ||
         isHostRunning(id))
     {
diff --git a/secure_boot_check.cpp b/secure_boot_check.cpp
index 7316d1d..877b318 100644
--- a/secure_boot_check.cpp
+++ b/secure_boot_check.cpp
@@ -97,7 +97,6 @@
 
     if (std::filesystem::exists(SYSFS_ABR_IMAGE_PATH))
     {
-
         try
         {
             dbgFile.open(SYSFS_ABR_IMAGE_PATH);
diff --git a/test/systemd_signal.cpp b/test/systemd_signal.cpp
index 7f7ce55..630d57c 100644
--- a/test/systemd_signal.cpp
+++ b/test/systemd_signal.cpp
@@ -11,7 +11,6 @@
 
 TEST(TargetSignalData, BasicPaths)
 {
-
     // Create default data structure for testing
     TargetErrorData targetData = {
         {"multi-user.target",
diff --git a/utils.cpp b/utils.cpp
index 18afd90..77b20eb 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -107,7 +107,6 @@
 
 int getGpioValue(const std::string& gpioName)
 {
-
     int gpioval = -1;
     gpiod_line* line = gpiod_line_find(gpioName.c_str());
 
@@ -135,7 +134,6 @@
     sdbusplus::xyz::openbmc_project::Logging::server::Entry::Level errLevel,
     std::map<std::string, std::string> additionalData)
 {
-
     try
     {
         // Always add the _PID on for some extra logging debug