diff --git a/.gitmodules b/.gitmodules
index 0e870021f0c..eab2ee2bbac 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,7 @@
 [submodule "lib/chibios"]
 	path = lib/chibios
 	url = https://github.com/qmk/ChibiOS
+  branch = handwire
 [submodule "lib/chibios-contrib"]
 	path = lib/chibios-contrib
 	url = https://github.com/qmk/ChibiOS-Contrib
diff --git a/lib/chibios b/lib/chibios
index 8fce03b3a75..f9643c88ad5 160000
--- a/lib/chibios
+++ b/lib/chibios
@@ -1 +1 @@
-Subproject commit 8fce03b3a75c743e5d5c40b9d59c1637c59d22a7
+Subproject commit f9643c88ad5cd0704d57bed83fe64f45b3e6be4e
diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index e1311c4db6c..ede48346eee 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit e1311c4db6cd366cf760673f769e925741ac0ad3
+Subproject commit ede48346eee4b8d6847c19bc01420bee76a5e486