diff --git a/.gitmodules b/.gitmodules
index fd55e4a7de..0d11ec1090 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -33,13 +33,13 @@
 	url = https://github.com/LoopKit/LogglyService.git
 [submodule "OmniBLE"]
 	path = OmniBLE
-	url = https://github.com/LoopKit/OmniBLE.git
+	url = https://github.com/jakalm/OmniBLE.git
 [submodule "NightscoutRemoteCGM"]
 	path = NightscoutRemoteCGM
 	url = https://github.com/LoopKit/NightscoutRemoteCGM.git
 [submodule "LoopSupport"]
 	path = LoopSupport
-	url = https://github.com/LoopKit/LoopSupport
+	url = https://github.com/jakalm/LoopSupport.git
 [submodule "G7SensorKit"]
 	path = G7SensorKit
 	url = https://github.com/LoopKit/G7SensorKit.git
diff --git a/Loop b/Loop
index ade3af6b31..b23d24cf4e 160000
--- a/Loop
+++ b/Loop
@@ -1 +1 @@
-Subproject commit ade3af6b311ac69f5504e955e5bd6caad9704992
+Subproject commit b23d24cf4ecb1dd2fb18f52582e3e2fe7d437ccd
diff --git a/LoopKit b/LoopKit
index c27d87ef0f..076fbf0cbf 160000
--- a/LoopKit
+++ b/LoopKit
@@ -1 +1 @@
-Subproject commit c27d87ef0fbc9e3baca45a29416dba1429d0bd54
+Subproject commit 076fbf0cbf524d0a59d4a947ab7166dee4a9bb66
diff --git a/LoopSupport b/LoopSupport
index 4728c67836..c0e7fe2c99 160000
--- a/LoopSupport
+++ b/LoopSupport
@@ -1 +1 @@
-Subproject commit 4728c67836e6a60118fcf6cc262010e9b3d14e68
+Subproject commit c0e7fe2c99aea7b4cadcaf538b334a635ed9e452
diff --git a/OmniBLE b/OmniBLE
index 85fc3c6d48..d511d877d9 160000
--- a/OmniBLE
+++ b/OmniBLE
@@ -1 +1 @@
-Subproject commit 85fc3c6d4805d580acdf6592b220717b6e842558
+Subproject commit d511d877d9a28417092dae2edc30bc51320a6484