diff --git a/.gitmodules b/.gitmodules
index 48c7035afa44..bfd9522e0aad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,8 @@
 	branch = master
 [submodule "lib/chibios-contrib"]
 	path = lib/chibios-contrib
-	url = https://github.com/qmk/ChibiOS-Contrib
-	branch = master
+	url = https://github.com/SonixQMK/ChibiOS-Contrib
+	branch = sn32_develop
 [submodule "lib/googletest"]
 	path = lib/googletest
 	url = https://github.com/qmk/googletest
diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index bb8356fb5a3a..fa0593bd31ef 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit bb8356fb5a3a9bbc1561826f174a9a631c614546
+Subproject commit fa0593bd31ef908bdfe9efdacbdd12954a2a2263