diff --git a/firmware/ChibiOS b/firmware/ChibiOS
index 4012d627c9..85cf4582a9 160000
--- a/firmware/ChibiOS
+++ b/firmware/ChibiOS
@@ -1 +1 @@
-Subproject commit 4012d627c92b0e60bdbfdfca4af823852c341e18
+Subproject commit 85cf4582a9f6a57cc49759c606af5fda2f52d106
diff --git a/firmware/ChibiOS-Contrib b/firmware/ChibiOS-Contrib
index 9abc320aa5..8f7c2d187b 160000
--- a/firmware/ChibiOS-Contrib
+++ b/firmware/ChibiOS-Contrib
@@ -1 +1 @@
-Subproject commit 9abc320aa536698bfe04a158a282ea3cf7daea90
+Subproject commit 8f7c2d187bbb02915f44b926c7aa02185402aef7