diff --git a/.gitmodules b/.gitmodules
index 36c9ea1..be4ccba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,7 +7,7 @@
 	url = https://github.com/apache/openserverless-cli
 	branch = main
 [submodule "operator"]
-	path = operator
+	path = olaris-op
 	url = https://github.com/apache/openserverless-operator
 	branch = main
 [submodule "testing"]
@@ -22,15 +22,10 @@
 	path = runtimes
 	url = https://github.com/apache/openserverless-runtimes
 	branch = main
-[submodule "devel/olaris"]
-	path = devel/olaris
-	url = https://github.com/apache/openserverless-task
-	branch = devel
-[submodule "devel/olaris-operator"]
-	path = devel/olaris-operator
-	url = https://github.com/apache/openserverless-operator
-	branch = devel
 [submodule "vscode"]
 	path = vscode
 	url = https://github.com/apache/openserverless-vscode-extension
         branch = main
+[submodule "openserverless-devcontainer"]
+	path = openserverless-devcontainer
+	url = https://github.com/apache/openserverless-devcontainer
diff --git a/devel/olaris b/devel/olaris
deleted file mode 160000
index 6388332..0000000
--- a/devel/olaris
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6388332ea80713df0aa8d9f10e82598735840d80
diff --git a/devel/olaris-operator b/devel/olaris-operator
deleted file mode 160000
index ec4d1da..0000000
--- a/devel/olaris-operator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ec4d1dafe236a3840b1d4fdf83a07ab6a4800586
diff --git a/olaris b/olaris
index b88d282..6e657d6 160000
--- a/olaris
+++ b/olaris
@@ -1 +1 @@
-Subproject commit b88d282038a8e569f5e01e122e903d6239a900f2
+Subproject commit 6e657d6a8ccf3eb305c73014c8dfed8b5ed38d8f
diff --git a/olaris-op b/olaris-op
new file mode 160000
index 0000000..c562668
--- /dev/null
+++ b/olaris-op
@@ -0,0 +1 @@
+Subproject commit c562668a35c8f383c8ec6d0065da29baa39f0bcd
diff --git a/openserverless-devcontainer b/openserverless-devcontainer
new file mode 160000
index 0000000..9657602
--- /dev/null
+++ b/openserverless-devcontainer
@@ -0,0 +1 @@
+Subproject commit 96576024dd98aa09e8d8ef942a73b1dd7d3f9c70
diff --git a/operator b/operator
deleted file mode 160000
index 7b36270..0000000
--- a/operator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7b36270cde7bf3660e0b941465200479bac4f710