diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
index 82d6063..937562f 100644
--- a/build/docker-bake.hcl
+++ b/build/docker-bake.hcl
@@ -87,6 +87,21 @@ target "_common" {
 # DEPENDENCY TARGETS
 # ──────────────────────────────────────────────
 
+target "third-party" {
+  inherits   = ["_common"]
+  context    = ".."
+  dockerfile = "./core/.docker/third-party.bake.Dockerfile"
+  target     = "third-party-builder"
+  tags       = ["${REGISTRY}/third-party:${TAG}"]
+  secret = [
+    "id=nextcloud_user,env=NEXTCLOUD_USER",
+    "id=nextcloud_pass,env=NEXTCLOUD_PASS",
+  ]
+  cache-from = ["type=local,src=/tmp/${REGISTRY}/third-party"]
+  cache-to   = ["type=local,dest=/tmp/${REGISTRY}/third-party,mode=max"]
+}
+
+
 target "core-base" {
   inherits   = ["_common"]
   context    = ".."
@@ -152,7 +167,12 @@ target "desktop-builder" {
     desktop-js    = "target:desktop-js"
     sdkjs-desktop = "target:sdkjs-desktop"
     web-apps      = "target:web-apps"
+    third-party   = "target:third-party"
   }
+  secret = [
+    "id=nextcloud_user,env=NEXTCLOUD_USER",
+    "id=nextcloud_pass,env=NEXTCLOUD_PASS",
+  ]
   cache-from = ["type=local,src=/tmp/${REGISTRY}/desktop-builder"]
   cache-to   = ["type=local,dest=/tmp/${REGISTRY}/desktop-builder,mode=max"]
 }
diff --git a/core b/core
index ab71097..a2240cc 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit ab710975ac3e5b7f5ea4eea53207ec58e5c869ed
+Subproject commit a2240cc821e56f72217259c409d9c02688659e75
diff --git a/desktop-apps b/desktop-apps
index 83f4d92..ed9433d 160000
--- a/desktop-apps
+++ b/desktop-apps
@@ -1 +1 @@
-Subproject commit 83f4d92487bf2111a3df459f5ca856730070fc3e
+Subproject commit ed9433de2572bcd2cd577a9ae70673ae89e151ea
diff --git a/desktop-sdk b/desktop-sdk
index 55917e4..73985d4 160000
--- a/desktop-sdk
+++ b/desktop-sdk
@@ -1 +1 @@
-Subproject commit 55917e46b08173df5271ea0bb83369e58ffca049
+Subproject commit 73985d40570e8726a397defb1da46d147037dceb