diff --git a/.gitmodules b/.gitmodules
index 2de5f5b1f..8839a0087 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -27,7 +27,7 @@
 	url = https://github.com/desktop-app/codegen.git
 [submodule "Telegram/lib_ui"]
 	path = Telegram/lib_ui
-	url = https://github.com/desktop-app/lib_ui.git
+	url = https://github.com/kotatogram/lib_ui.git
 [submodule "Telegram/lib_lottie"]
 	path = Telegram/lib_lottie
 	url = https://github.com/desktop-app/lib_lottie.git
@@ -42,7 +42,7 @@
 	url = https://github.com/desktop-app/lib_storage.git
 [submodule "cmake"]
 	path = cmake
-	url = https://github.com/desktop-app/cmake_helpers.git
+	url = https://github.com/kotatogram/cmake_helpers.git
 [submodule "Telegram/ThirdParty/expected"]
 	path = Telegram/ThirdParty/expected
 	url = https://github.com/TartanLlama/expected
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 8a5604880..ed6e89268 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 8a560488011f833b7ba534999f878d20d5152e6c
+Subproject commit ed6e892684e90251f8f106b1b26a44f6043266af
diff --git a/cmake b/cmake
index 0811c5f44..652b9258f 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 0811c5f4469e4da50e9ca0034913569e05913cc5
+Subproject commit 652b9258fa87041b2bf0cee6a3d8995da6e2be76