diff --git a/.gitmodules b/.gitmodules
index be4ccba..e93d16e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -27,5 +27,6 @@
 	url = https://github.com/apache/openserverless-vscode-extension
         branch = main
 [submodule "openserverless-devcontainer"]
-	path = openserverless-devcontainer
+	path = devcontainer
 	url = https://github.com/apache/openserverless-devcontainer
+        branch = main
diff --git a/devcontainer b/devcontainer
new file mode 160000
index 0000000..4e69ae5
--- /dev/null
+++ b/devcontainer
@@ -0,0 +1 @@
+Subproject commit 4e69ae59fe6aea64521f2007c523577b3ed6a792
diff --git a/olaris b/olaris
index 6e657d6..6467dcb 160000
--- a/olaris
+++ b/olaris
@@ -1 +1 @@
-Subproject commit 6e657d6a8ccf3eb305c73014c8dfed8b5ed38d8f
+Subproject commit 6467dcbbcb67293e0a4a30f9a1046e63516a92dc
diff --git a/openserverless-devcontainer b/openserverless-devcontainer
deleted file mode 160000
index 9657602..0000000
--- a/openserverless-devcontainer
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 96576024dd98aa09e8d8ef942a73b1dd7d3f9c70
diff --git a/testing b/testing
index 3f7843a..7cb7f6d 160000
--- a/testing
+++ b/testing
@@ -1 +1 @@
-Subproject commit 3f7843a5225e3bf77afc09864284cf65b1ed505e
+Subproject commit 7cb7f6d64e54949cbb7cd634997b75d244454d4d