diff --git a/.gitmodules b/.gitmodules
index 70ce6f3af..9fa367103 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "supervisor/openembedded-core"]
-	path = supervisor/openembedded-core
+[submodule "supervisor-base/openembedded-core"]
+	path = supervisor-base/openembedded-core
 	url = git://git.openembedded.org/openembedded-core
-[submodule "supervisor/bitbake"]
-	path = supervisor/bitbake
+[submodule "supervisor-base/bitbake"]
+	path = supervisor-base/bitbake
 	url = git://git.openembedded.org/bitbake
diff --git a/supervisor/bitbake b/supervisor/bitbake
deleted file mode 160000
index acd2fd74e..000000000
--- a/supervisor/bitbake
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit acd2fd74ed467dc85ec75d5d0815f43e493f29bf
diff --git a/supervisor/openembedded-core b/supervisor/openembedded-core
deleted file mode 160000
index 477805b91..000000000
--- a/supervisor/openembedded-core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 477805b913a6c4b4b630e42f08cd9e59f1e4e254