diff --git a/.clang-format b/.clang-format
index 65fb646f..ff46e883 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,3 +3,9 @@ BasedOnStyle: Chromium
 IndentWidth: 4
 ColumnLimit: 120
 AccessModifierOffset: -2
+SortIncludes: true
+IncludeBlocks: Regroup
+IncludeCategories:
+  # Zephyr headers come last
+  - Regex: '^<zephyr/.*>'
+    Priority: 3
diff --git a/FprimeZephyrReference/ComCcsdsUart/SubtopologyTopologyDefs.hpp b/FprimeZephyrReference/ComCcsdsUart/SubtopologyTopologyDefs.hpp
index d130ae38..daa5e746 100644
--- a/FprimeZephyrReference/ComCcsdsUart/SubtopologyTopologyDefs.hpp
+++ b/FprimeZephyrReference/ComCcsdsUart/SubtopologyTopologyDefs.hpp
@@ -4,6 +4,7 @@
 #include <Fw/Types/MallocAllocator.hpp>
 #include <Svc/BufferManager/BufferManager.hpp>
 #include <Svc/FrameAccumulator/FrameDetector/CcsdsTcFrameDetector.hpp>
+
 #include "ComCcsdsConfig/ComCcsdsSubtopologyConfig.hpp"
 #include "Svc/Subtopologies/ComCcsds/ComCcsdsConfig/FppConstantsAc.hpp"
 
diff --git a/FprimeZephyrReference/Components/Burnwire/Burnwire.hpp b/FprimeZephyrReference/Components/Burnwire/Burnwire.hpp
index 4f41d832..04e482bb 100644
--- a/FprimeZephyrReference/Components/Burnwire/Burnwire.hpp
+++ b/FprimeZephyrReference/Components/Burnwire/Burnwire.hpp
@@ -7,6 +7,7 @@
 #define Components_Burnwire_HPP
 
 #include <atomic>
+
 #include "FprimeZephyrReference/Components/Burnwire/BurnwireComponentAc.hpp"
 
 namespace Components {
diff --git a/FprimeZephyrReference/Components/ComDelay/ComDelay.cpp b/FprimeZephyrReference/Components/ComDelay/ComDelay.cpp
index a94cdef2..55693cc9 100644
--- a/FprimeZephyrReference/Components/ComDelay/ComDelay.cpp
+++ b/FprimeZephyrReference/Components/ComDelay/ComDelay.cpp
@@ -5,6 +5,7 @@
 // ======================================================================
 
 #include "FprimeZephyrReference/Components/ComDelay/ComDelay.hpp"
+
 #include "FprimeZephyrReference/Components/ComDelay/FppConstantsAc.hpp"
 
 namespace Components {
diff --git a/FprimeZephyrReference/Components/ComDelay/ComDelay.hpp b/FprimeZephyrReference/Components/ComDelay/ComDelay.hpp
index 82368b02..0345c966 100644
--- a/FprimeZephyrReference/Components/ComDelay/ComDelay.hpp
+++ b/FprimeZephyrReference/Components/ComDelay/ComDelay.hpp
@@ -8,6 +8,7 @@
 #define Components_ComDelay_HPP
 
 #include <atomic>
+
 #include "FprimeZephyrReference/Components/ComDelay/ComDelayComponentAc.hpp"
 
 namespace Components {
diff --git a/FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.cpp b/FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.cpp
index 46eef487..a11af7ac 100644
--- a/FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.cpp
+++ b/FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.cpp
@@ -4,6 +4,7 @@
 // ======================================================================
 
 #include "FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.hpp"
+
 #include <Fw/Types/Assert.hpp>
 
 namespace Drv {
diff --git a/FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.hpp b/FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.hpp
index a76245c9..6bbf101a 100644
--- a/FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.hpp
+++ b/FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.hpp
@@ -7,7 +7,6 @@
 #define Drv_Ina219Manager_HPP
 
 #include "FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219ManagerComponentAc.hpp"
-
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/kernel.h>
diff --git a/FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManager.hpp b/FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManager.hpp
index f7850cec..7203a0d6 100644
--- a/FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManager.hpp
+++ b/FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManager.hpp
@@ -7,7 +7,6 @@
 #define Components_Lis2mdlManager_HPP
 
 #include "FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManagerComponentAc.hpp"
-
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/kernel.h>
diff --git a/FprimeZephyrReference/Components/Drv/Lsm6dsoManager/Lsm6dsoManager.hpp b/FprimeZephyrReference/Components/Drv/Lsm6dsoManager/Lsm6dsoManager.hpp
index e28bc24f..106445ff 100644
--- a/FprimeZephyrReference/Components/Drv/Lsm6dsoManager/Lsm6dsoManager.hpp
+++ b/FprimeZephyrReference/Components/Drv/Lsm6dsoManager/Lsm6dsoManager.hpp
@@ -7,7 +7,6 @@
 #define Components_Lsm6dsoManager_HPP
 
 #include "FprimeZephyrReference/Components/Drv/Lsm6dsoManager/Lsm6dsoManagerComponentAc.hpp"
-
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/kernel.h>
diff --git a/FprimeZephyrReference/Components/Drv/RtcManager/RtcManager.hpp b/FprimeZephyrReference/Components/Drv/RtcManager/RtcManager.hpp
index 48b3467b..e9701257 100644
--- a/FprimeZephyrReference/Components/Drv/RtcManager/RtcManager.hpp
+++ b/FprimeZephyrReference/Components/Drv/RtcManager/RtcManager.hpp
@@ -6,14 +6,12 @@
 #ifndef Components_RtcManager_HPP
 #define Components_RtcManager_HPP
 
-#include "FprimeZephyrReference/Components/Drv/RtcManager/RtcManagerComponentAc.hpp"
-
+#include <Fw/Logger/Logger.hpp>
 #include <cerrno>
 #include <string>
 #include <vector>
 
-#include <Fw/Logger/Logger.hpp>
-
+#include "FprimeZephyrReference/Components/Drv/RtcManager/RtcManagerComponentAc.hpp"
 #include <zephyr/device.h>
 #include <zephyr/drivers/rtc.h>
 #include <zephyr/drivers/sensor.h>
diff --git a/FprimeZephyrReference/Components/FatalHandler/FatalHandler.cpp b/FprimeZephyrReference/Components/FatalHandler/FatalHandler.cpp
index b57d4d49..ff0ad029 100644
--- a/FprimeZephyrReference/Components/FatalHandler/FatalHandler.cpp
+++ b/FprimeZephyrReference/Components/FatalHandler/FatalHandler.cpp
@@ -10,11 +10,12 @@
 //
 // ======================================================================
 
-#include <zephyr/sys/reboot.h>
 #include <FprimeZephyrReference/Components/FatalHandler/FatalHandler.hpp>
 #include <Fw/FPrimeBasicTypes.hpp>
 #include <Fw/Logger/Logger.hpp>
 
+#include <zephyr/sys/reboot.h>
+
 namespace Components {
 
 // ----------------------------------------------------------------------
diff --git a/FprimeZephyrReference/Components/FsSpace/FsSpace.cpp b/FprimeZephyrReference/Components/FsSpace/FsSpace.cpp
index 4c5e44f2..6c08a567 100644
--- a/FprimeZephyrReference/Components/FsSpace/FsSpace.cpp
+++ b/FprimeZephyrReference/Components/FsSpace/FsSpace.cpp
@@ -5,9 +5,10 @@
 // ======================================================================
 
 #include "FprimeZephyrReference/Components/FsSpace/FsSpace.hpp"
+
+#include "Os/FileSystem.hpp"
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
-#include "Os/FileSystem.hpp"
 
 namespace Components {
 
diff --git a/FprimeZephyrReference/Components/Watchdog/Watchdog.cpp b/FprimeZephyrReference/Components/Watchdog/Watchdog.cpp
index 91c8e102..7d5c226a 100644
--- a/FprimeZephyrReference/Components/Watchdog/Watchdog.cpp
+++ b/FprimeZephyrReference/Components/Watchdog/Watchdog.cpp
@@ -5,6 +5,7 @@
 // ======================================================================
 
 #include "FprimeZephyrReference/Components/Watchdog/Watchdog.hpp"
+
 #include "config/FpConfig.hpp"
 
 namespace Components {
diff --git a/FprimeZephyrReference/Components/Watchdog/Watchdog.hpp b/FprimeZephyrReference/Components/Watchdog/Watchdog.hpp
index 1f96bde6..f8c2613d 100644
--- a/FprimeZephyrReference/Components/Watchdog/Watchdog.hpp
+++ b/FprimeZephyrReference/Components/Watchdog/Watchdog.hpp
@@ -10,6 +10,7 @@
 #include "FprimeZephyrReference/Components/Watchdog/WatchdogComponentAc.hpp"
 // Need to explicitly include because Fw.On is no longer a tlm channel I believe
 #include <atomic>
+
 #include "Fw/Types/OnEnumAc.hpp"
 
 namespace Components {
diff --git a/FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopologyDefs.hpp b/FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopologyDefs.hpp
index fc9fe0ce..63b8ccd6 100644
--- a/FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopologyDefs.hpp
+++ b/FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopologyDefs.hpp
@@ -22,7 +22,6 @@
 
 // Include autocoded FPP constants
 #include "FprimeZephyrReference/ReferenceDeployment/Top/FppConstantsAc.hpp"
-
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/kernel.h>
diff --git a/FprimeZephyrReference/project/config/LoRaCfg.hpp b/FprimeZephyrReference/project/config/LoRaCfg.hpp
index 0de46af3..cd0f17a1 100644
--- a/FprimeZephyrReference/project/config/LoRaCfg.hpp
+++ b/FprimeZephyrReference/project/config/LoRaCfg.hpp
@@ -1,7 +1,8 @@
 #ifndef LORA_CFG_HPP
 #define LORA_CFG_HPP
-#include <zephyr/drivers/lora.h>
 #include <Fw/FPrimeBasicTypes.hpp>
+
+#include <zephyr/drivers/lora.h>
 namespace LoRaConfig {
 const U32 FREQUENCY = 437400000;               //!< LoRa frequency in Hz
 lora_signal_bandwidth BANDWIDTH = BW_125_KHZ;  //!< LoRa bandwidth