diff --git a/.gitmodules b/.gitmodules
index e228240..cdd2819 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
 [submodule "rootfs-templates"]
 	path = rootfs-templates
-	url = https://github.com/droidian-releng/rootfs-templates
-[submodule "android-recovery-flashing-template"]
-	path = android-recovery-flashing-template
-	url = https://github.com/droidian-releng/android-recovery-flashing-template.git
-[submodule "android-image-flashing-template"]
-	path = android-image-flashing-template
-	url = https://github.com/droidian-releng/android-image-flashing-template.git
+	url = https://github.com/Linux-on-droid/rootfs-templates
diff --git a/android-image-flashing-template b/android-image-flashing-template
deleted file mode 160000
index ec1b935..0000000
--- a/android-image-flashing-template
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ec1b9356fec5a78a52a24eb9ad2e2cf0973e0100
diff --git a/android-recovery-flashing-template b/android-recovery-flashing-template
deleted file mode 160000
index bd6b41f..0000000
--- a/android-recovery-flashing-template
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bd6b41ff80b3826ac221a98c4facc7220d24076e