diff --git a/.gitmodules b/.gitmodules
index 4bb1d2151f..fe32821490 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,18 +1,9 @@
-[submodule "vendor/trezor-crypto"]
-	path = core/vendor/trezor-crypto
-	url = https://github.com/trezor/trezor-crypto.git
 [submodule "vendor/micropython"]
 	path = core/vendor/micropython
 	url = https://github.com/trezor/micropython.git
-[submodule "vendor/trezor-common"]
-	path = core/vendor/trezor-common
-	url = https://github.com/trezor/trezor-common.git
 [submodule "vendor/nanopb"]
 	path = core/vendor/nanopb
 	url = https://github.com/nanopb/nanopb.git
-[submodule "vendor/trezor-storage"]
-	path = core/vendor/trezor-storage
-	url = https://github.com/trezor/trezor-storage.git
 [submodule "vendor/QR-Code-generator"]
 	path = core/vendor/QR-Code-generator
 	url = https://github.com/nayuki/QR-Code-generator.git
@@ -26,25 +17,13 @@
 [submodule "crypto/tests/wycheproof"]
 	path = crypto/tests/wycheproof
 	url = https://github.com/google/wycheproof
-[submodule "legacy/trezor-crypto"]
-	path = legacy/vendor/trezor-crypto
-	url = https://github.com/trezor/trezor-crypto.git
-[submodule "legacy/trezor-common"]
-	path = legacy/vendor/trezor-common
-	url = https://github.com/trezor/trezor-common.git
 [submodule "legacy/libopencm3"]
 	path = legacy/vendor/libopencm3
 	url = https://github.com/libopencm3/libopencm3.git
 [submodule "legacy/vendor/nanopb"]
 	path = legacy/vendor/nanopb
 	url = https://github.com/nanopb/nanopb.git
-[submodule "legacy/vendor/trezor-storage"]
-	path = legacy/vendor/trezor-storage
-	url = https://github.com/trezor/trezor-storage.git
 [submodule "legacy/vendor/QR-Code-generator"]
 	path = legacy/vendor/QR-Code-generator
 	url = https://github.com/nayuki/QR-Code-generator.git
 	ignore = untracked
-[submodule "python/vendor/trezor-common"]
-	path = python/vendor/trezor-common
-	url = https://github.com/trezor/trezor-common.git
diff --git a/core/vendor/trezor-common b/core/vendor/trezor-common
deleted file mode 160000
index 3aef649850..0000000000
--- a/core/vendor/trezor-common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3aef6498506805dab105cee724a33b5929bf7edd
diff --git a/core/vendor/trezor-common b/core/vendor/trezor-common
new file mode 120000
index 0000000000..dc879abe93
--- /dev/null
+++ b/core/vendor/trezor-common
@@ -0,0 +1 @@
+../../common
\ No newline at end of file
diff --git a/core/vendor/trezor-crypto b/core/vendor/trezor-crypto
deleted file mode 160000
index 4211ce389f..0000000000
--- a/core/vendor/trezor-crypto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4211ce389f6795d844809b0ba66a84082038ca04
diff --git a/core/vendor/trezor-crypto b/core/vendor/trezor-crypto
new file mode 120000
index 0000000000..45eb34f185
--- /dev/null
+++ b/core/vendor/trezor-crypto
@@ -0,0 +1 @@
+../../crypto
\ No newline at end of file
diff --git a/core/vendor/trezor-storage b/core/vendor/trezor-storage
deleted file mode 160000
index 511fc205b2..0000000000
--- a/core/vendor/trezor-storage
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 511fc205b284605651348512c5c5c2c95a642fa1
diff --git a/core/vendor/trezor-storage b/core/vendor/trezor-storage
new file mode 120000
index 0000000000..305c709c6c
--- /dev/null
+++ b/core/vendor/trezor-storage
@@ -0,0 +1 @@
+../../storage
\ No newline at end of file
diff --git a/legacy/vendor/trezor-common b/legacy/vendor/trezor-common
deleted file mode 160000
index 90bd68f55a..0000000000
--- a/legacy/vendor/trezor-common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 90bd68f55adeebacfca05c0f54aa29283aa0d760
diff --git a/legacy/vendor/trezor-common b/legacy/vendor/trezor-common
new file mode 120000
index 0000000000..dc879abe93
--- /dev/null
+++ b/legacy/vendor/trezor-common
@@ -0,0 +1 @@
+../../common
\ No newline at end of file
diff --git a/legacy/vendor/trezor-crypto b/legacy/vendor/trezor-crypto
deleted file mode 160000
index 4211ce389f..0000000000
--- a/legacy/vendor/trezor-crypto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4211ce389f6795d844809b0ba66a84082038ca04
diff --git a/legacy/vendor/trezor-crypto b/legacy/vendor/trezor-crypto
new file mode 120000
index 0000000000..45eb34f185
--- /dev/null
+++ b/legacy/vendor/trezor-crypto
@@ -0,0 +1 @@
+../../crypto
\ No newline at end of file
diff --git a/legacy/vendor/trezor-storage b/legacy/vendor/trezor-storage
deleted file mode 160000
index 511fc205b2..0000000000
--- a/legacy/vendor/trezor-storage
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 511fc205b284605651348512c5c5c2c95a642fa1
diff --git a/legacy/vendor/trezor-storage b/legacy/vendor/trezor-storage
new file mode 120000
index 0000000000..305c709c6c
--- /dev/null
+++ b/legacy/vendor/trezor-storage
@@ -0,0 +1 @@
+../../storage
\ No newline at end of file
diff --git a/python/vendor/trezor-common b/python/vendor/trezor-common
deleted file mode 160000
index 5ccebed9d3..0000000000
--- a/python/vendor/trezor-common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5ccebed9d356c0eeeb12f73389c3d470562c3e79
diff --git a/python/vendor/trezor-common b/python/vendor/trezor-common
new file mode 120000
index 0000000000..dc879abe93
--- /dev/null
+++ b/python/vendor/trezor-common
@@ -0,0 +1 @@
+../../common
\ No newline at end of file