diff --git a/.gitmodules b/.gitmodules
index e93d16e..8525be2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,32 +1,32 @@
 [submodule "site"]
-	path = site
-	url = https://github.com/apache/openserverless-site
-	branch = main
+        path = site
+        url = https://github.com/apache/openserverless-site
+        branch = main
 [submodule "cli"]
-	path = cli
-	url = https://github.com/apache/openserverless-cli
-	branch = main
+        path = cli
+        url = https://github.com/apache/openserverless-cli
+        branch = main
 [submodule "operator"]
-	path = olaris-op
-	url = https://github.com/apache/openserverless-operator
-	branch = main
+        path = operator
+        url = https://github.com/mobs75/openserverless-operator
+        branch = feature/add-spark-operator
 [submodule "testing"]
-	path = testing
-	url = https://github.com/apache/openserverless-testing
-	branch = main
+        path = testing
+        url = https://github.com/apache/openserverless-testing
+        branch = main
 [submodule "task"]
-	path = olaris
-	url = https://github.com/apache/openserverless-task
-	branch = main
+        path = olaris
+        url = https://github.com/apache/openserverless-task
+        branch = main
 [submodule "runtimes"]
-	path = runtimes
-	url = https://github.com/apache/openserverless-runtimes
-	branch = main
+        path = runtimes
+        url = https://github.com/apache/openserverless-runtimes
+        branch = main
 [submodule "vscode"]
-	path = vscode
-	url = https://github.com/apache/openserverless-vscode-extension
+        path = vscode
+        url = https://github.com/apache/openserverless-vscode-extension
         branch = main
 [submodule "openserverless-devcontainer"]
-	path = devcontainer
-	url = https://github.com/apache/openserverless-devcontainer
+        path = devcontainer
+        url = https://github.com/apache/openserverless-devcontainer
         branch = main
diff --git a/olaris b/olaris
index 6467dcb..5bda86f 160000
--- a/olaris
+++ b/olaris
@@ -1 +1 @@
-Subproject commit 6467dcbbcb67293e0a4a30f9a1046e63516a92dc
+Subproject commit 5bda86fc1ad3fc25b07f4d0d426218c088d9a624
diff --git a/olaris-op b/olaris-op
deleted file mode 160000
index c562668..0000000
--- a/olaris-op
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c562668a35c8f383c8ec6d0065da29baa39f0bcd
diff --git a/operator b/operator
new file mode 160000
index 0000000..a2f3dae
--- /dev/null
+++ b/operator
@@ -0,0 +1 @@
+Subproject commit a2f3dae8fb65a35ed821fa058b21e20c1996cfa7
diff --git a/testing b/testing
index 7cb7f6d..12270fb 160000
--- a/testing
+++ b/testing
@@ -1 +1 @@
-Subproject commit 7cb7f6d64e54949cbb7cd634997b75d244454d4d
+Subproject commit 12270fb52713dae6bd575d0f20f582008af1ce24