diff --git a/Taskfile.yml b/Taskfile.yml
index 8c40e80..10d999a 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -28,7 +28,8 @@ vars:
   STREAMER_TAG: "{{.OPERATOR_TAG}}"
   STREAMER_SRC: "docker.io/apache/openserverless-streamer:{{.STREAMER_TAG}}"
 
-  ADMIN_API_TAG: "{{.OPERATOR_TAG}}"
+  ADMIN_API_TAG:
+    sh: git -C admin-api rev-parse --short HEAD
   ADMIN_API_SRC: "docker.io/apache/openserverless-admin-api:{{.ADMIN_API_TAG}}"
 
   RUNTIMES_TAG: "{{.OPERATOR_TAG}}"
@@ -109,7 +110,7 @@ tasks:
       dir: admin-api
       cmds:
       - echo Building {{.ADMIN_API_SRC}}
-      - git tag -d $(git tag) && git tag {{.STREAMER_TAG}}
+      - git tag -d $(git tag) && git tag {{.ADMIN_API_TAG}}
       - echo -e "NAMESPACE=apache\nREGISTRY=dockerhub\n" >.env
       - task buildx
       - task: image-save
diff --git a/admin-api b/admin-api
index 1553fe4..3a1b1be 160000
--- a/admin-api
+++ b/admin-api
@@ -1 +1 @@
-Subproject commit 1553fe44dee1a105b98c09507139aa3db0062b7e
+Subproject commit 3a1b1be91f4617c353e445f1d393e461cebea7a7
diff --git a/cli b/cli
index e429d0b..39d3e3d 160000
--- a/cli
+++ b/cli
@@ -1 +1 @@
-Subproject commit e429d0b74fdcab9a584a6c51cda86d99b04effbe
+Subproject commit 39d3e3de963a81b5f72f58bdbc1519503f8e0175
diff --git a/olaris b/olaris
index 31b343b..dd2427d 160000
--- a/olaris
+++ b/olaris
@@ -1 +1 @@
-Subproject commit 31b343b60674c5570f1a07e069bd6531a24e7f22
+Subproject commit dd2427d092bf6e8410c1a606a90a2f6b7d53b0b5
diff --git a/testing b/testing
index bd633c2..192a6b3 160000
--- a/testing
+++ b/testing
@@ -1 +1 @@
-Subproject commit bd633c2136afc4f1b1c3d8ee00ccc9babc42dda2
+Subproject commit 192a6b3a0a4798595d4cdb5e3fcc1b671b60c96d