diff --git a/common/config/devConf.h b/common/config/devConf.h
index 7e09b50f..abb3b3e1 100644
--- a/common/config/devConf.h
+++ b/common/config/devConf.h
@@ -3,6 +3,7 @@
 
 #include <cstdint>
 #include <fsfw_hal/linux/spi/spiDefinitions.h>
+#include <fsfw_hal/linux/uart/UartCookie.h>
 
 /**
  * SPI configuration will be contained here to let the device handlers remain independent
@@ -49,11 +50,11 @@ static constexpr spi::SpiModes RTD_MODE = spi::SpiModes::MODE_3;
 namespace uart {
 
 static constexpr size_t HYPERION_GPS_REPLY_MAX_BUFFER = 1024;
-static constexpr uint32_t SYRLINKS_BAUD = 38400;
-static constexpr uint32_t GNSS_BAUD = 9600;
-static constexpr uint32_t PLOC_MPSOC_BAUD = 115200;
-static constexpr uint32_t PLOC_SUPERVISOR_BAUD = 115200;
-static constexpr uint32_t STAR_TRACKER_BAUD = 921600;
+static constexpr UartBaudRate SYRLINKS_BAUD = UartBaudRate::RATE_38400;
+static constexpr UartBaudRate GNSS_BAUD = UartBaudRate::RATE_9600;
+static constexpr UartBaudRate PLOC_MPSOC_BAUD = UartBaudRate::RATE_115200;
+static constexpr UartBaudRate PLOC_SUPERVISOR_BAUD = UartBaudRate::RATE_115200;
+static constexpr UartBaudRate STAR_TRACKER_BAUD = UartBaudRate::RATE_921600;
 
 }
 
diff --git a/fsfw b/fsfw
index 94ed5822..ce17be63 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 94ed5822971575e9715c39c86ab4466c81718441
+Subproject commit ce17be63f4f3bb8947843e423685c622510ae09f