diff --git a/.gitmodules b/.gitmodules
index a452e17113..92ba2764c9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,11 +12,11 @@
 	branch = gh-pages
 [submodule "packages/external-plugins/oscd-template-generator"]
 	path = packages/external-plugins/oscd-template-generator
-	url = https://github.com/OpenEnergyTools/oscd-template-generator
+	url = https://github.com/openscd/oscd-template-generator
 	branch = deploy
 [submodule "packages/external-plugins/scl-template-update"]
 	path = packages/external-plugins/scl-template-update
-	url = https://github.com/OpenEnergyTools/scl-template-update
+	url = https://github.com/openscd/scl-template-update
 	branch = deploy
 [submodule "packages/external-plugins/oscd-designer"]
 	path = packages/external-plugins/oscd-designer
diff --git a/packages/external-plugins/oscd-template-generator b/packages/external-plugins/oscd-template-generator
index 38907b7a10..80bbc33eec 160000
--- a/packages/external-plugins/oscd-template-generator
+++ b/packages/external-plugins/oscd-template-generator
@@ -1 +1 @@
-Subproject commit 38907b7a10473f84a53989f0e03f3235f9d1b472
+Subproject commit 80bbc33eec90c854cda4f01ee6a60d673acaf0d7
diff --git a/packages/external-plugins/scl-template-update b/packages/external-plugins/scl-template-update
index 8f587d0608..1d3289c387 160000
--- a/packages/external-plugins/scl-template-update
+++ b/packages/external-plugins/scl-template-update
@@ -1 +1 @@
-Subproject commit 8f587d06086d9bd7953dbb118b3f49ff8cb19e98
+Subproject commit 1d3289c387b95b210679b4bbbbaeaeb94a0d447d