diff --git a/.gitmodules b/.gitmodules
index 12b7cb918f2a..b3605a0ea1c3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "lib/chibios"]
 	path = lib/chibios
-	url = https://github.com/ChibiOS/ChibiOS.git
+	url = https://github.com/qmk/ChibiOS
 [submodule "lib/chibios-contrib"]
 	path = lib/chibios-contrib
-	url = https://github.com/ChibiOS/ChibiOS-Contrib.git
+	url = https://github.com/qmk/ChibiOS-Contrib
 [submodule "lib/ugfx"]
 	path = lib/ugfx
-	url = https://bitbucket.org/Tectu/ugfx
+	url = https://github.com/qmk/uGFX
 [submodule "lib/googletest"]
 	path = lib/googletest
 	url = https://github.com/google/googletest
diff --git a/lib/chibios b/lib/chibios
index a7df9a891067..8fce03b3a75c 160000
--- a/lib/chibios
+++ b/lib/chibios
@@ -1 +1 @@
-Subproject commit a7df9a891067621e8e1a5c2a2c0ceada82403afe
+Subproject commit 8fce03b3a75c743e5d5c40b9d59c1637c59d22a7
diff --git a/lib/ugfx b/lib/ugfx
index 13e084ae6231..3e97b74e03c9 160000
--- a/lib/ugfx
+++ b/lib/ugfx
@@ -1 +1 @@
-Subproject commit 13e084ae6231857cd0d472c529f34be07d93c08b
+Subproject commit 3e97b74e03c93631cdd3ddb2ce43b963fdce19b2