diff --git a/.gitmodules b/.gitmodules
index 4dcf3d77e0..97aef8fa1c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "trezor-crypto"]
 	path = trezor-crypto
-	url = https://github.com/romanz/trezor-crypto.git
+	url = https://github.com/trezor/trezor-crypto.git
 [submodule "trezor-common"]
 	path = trezor-common
-	url = https://github.com/romanz/trezor-common.git
+	url = https://github.com/trezor/trezor-common.git
 [submodule "trezor-qrenc"]
 	path = trezor-qrenc
 	url = https://github.com/trezor/trezor-qrenc.git
diff --git a/trezor-common b/trezor-common
index 12288143f5..d334bbf740 160000
--- a/trezor-common
+++ b/trezor-common
@@ -1 +1 @@
-Subproject commit 12288143f563cc51e4ae1d990de08db3add87380
+Subproject commit d334bbf740fee0cef02010945c1e904bb5f1aae9
diff --git a/trezor-crypto b/trezor-crypto
index 7c58fc11a4..71c24673ce 160000
--- a/trezor-crypto
+++ b/trezor-crypto
@@ -1 +1 @@
-Subproject commit 7c58fc11a46361476e3a7862816adb0671de6a74
+Subproject commit 71c24673ced80c83dc90539364fa1dbeeb12ee6d