diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c5d615b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.docker-cache/
+build_output.log
diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
index 462b10a..1f1c0db 100644
--- a/build/docker-bake.hcl
+++ b/build/docker-bake.hcl
@@ -97,8 +97,8 @@ target "core-base" {
   dockerfile = "./core/.docker/core.bake.Dockerfile"
   target     = "core-base"
   tags       = ["${REGISTRY}/core-base:${TAG}"]
-  cache-from = ["type=local,src=/tmp/${REGISTRY}/core-base"]
-  cache-to   = ["type=local,dest=/tmp/${REGISTRY}/core-base,mode=max"]
+  cache-from = ["type=local,src=./.docker-cache/${REGISTRY}/core-base"]
+  cache-to   = ["type=local,dest=./.docker-cache/${REGISTRY}/core-base,mode=max"]
 }
 
 target "core-wasm" {
@@ -106,8 +106,8 @@ target "core-wasm" {
   context    = ".."
   dockerfile = "./core/.docker/core-wasm.bake.Dockerfile"
   tags       = ["${REGISTRY}/core-wasm:${TAG}"]
-  cache-from = ["type=local,src=/tmp/${REGISTRY}/core-wasm"]
-  cache-to   = ["type=local,dest=/tmp/${REGISTRY}/core-wasm,mode=max"]
+  cache-from = ["type=local,src=./.docker-cache/${REGISTRY}/core-wasm"]
+  cache-to   = ["type=local,dest=./.docker-cache/${REGISTRY}/core-wasm,mode=max"]
 }
 
 target "desktop-js" {
@@ -115,8 +115,8 @@ target "desktop-js" {
   context    = ".."
   dockerfile = "./desktop-apps/.docker/desktop-js.bake.Dockerfile"
   tags       = ["${REGISTRY}/desktop-js:${TAG}"]
-  cache-from = ["type=local,src=/tmp/${REGISTRY}/desktop-js"]
-  cache-to   = ["type=local,dest=/tmp/${REGISTRY}/desktop-js,mode=max"]
+  cache-from = ["type=local,src=./.docker-cache/${REGISTRY}/desktop-js"]
+  cache-to   = ["type=local,dest=./.docker-cache/${REGISTRY}/desktop-js,mode=max"]
 }
 
 target "sdkjs-desktop" {
@@ -125,8 +125,8 @@ target "sdkjs-desktop" {
   dockerfile = "./sdkjs/.docker/sdkjs.bake.Dockerfile"
   tags       = ["${REGISTRY}/sdkjs-desktop:${TAG}"]
   target     = "sdkjs-desktop"
-  cache-from = ["type=local,src=/tmp/${REGISTRY}/sdkjs-desktop"]
-  cache-to   = ["type=local,dest=/tmp/${REGISTRY}/sdkjs-desktop,mode=max"]
+  cache-from = ["type=local,src=./.docker-cache/${REGISTRY}/sdkjs-desktop"]
+  cache-to   = ["type=local,dest=./.docker-cache/${REGISTRY}/sdkjs-desktop,mode=max"]
   contexts = {
     core-wasm    = "target:core-wasm"
   }
@@ -137,8 +137,8 @@ target "web-apps" {
   context    = ".."
   dockerfile = "./web-apps/.docker/web-apps.bake.Dockerfile"
   tags       = ["${REGISTRY}/web-apps:${TAG}"]
-  cache-from = ["type=local,src=/tmp/${REGISTRY}/web-apps"]
-  cache-to   = ["type=local,dest=/tmp/${REGISTRY}/web-apps,mode=max"]
+  cache-from = ["type=local,src=./.docker-cache/${REGISTRY}/web-apps"]
+  cache-to   = ["type=local,dest=./.docker-cache/${REGISTRY}/web-apps,mode=max"]
 }
 
 # ──────────────────────────────────────────────
diff --git a/build/linux/docker-bake.hcl b/build/linux/docker-bake.hcl
index d123017..772e611 100644
--- a/build/linux/docker-bake.hcl
+++ b/build/linux/docker-bake.hcl
@@ -88,20 +88,6 @@ target "_common" {
 # DEPENDENCY TARGETS
 # ──────────────────────────────────────────────
 
-target "third-party" {
-  inherits   = ["_common"]
-  context    = "../.."
-  dockerfile = "./core/.docker/third-party.bake.Dockerfile"
-  target     = "third-party-builder"
-  secret = [
-    "id=nextcloud_user,env=NEXTCLOUD_USER",
-    "id=nextcloud_pass,env=NEXTCLOUD_PASS",
-  ]
-  tags       = ["${REGISTRY}/third-party:${TAG}"]
-  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"]
@@ -126,7 +112,6 @@ target "desktop-linux" {
   contexts = {
     desktop-common  = "docker-image://${REGISTRY}/desktop-common:${GIT_COMMIT}"
     core-base       = "target:core-base"
-    third-party     = "target:third-party"
   }
   secret = [
     "id=nextcloud_user,env=NEXTCLOUD_USER",
diff --git a/core b/core
index ec2bd75..1f9d4b6 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit ec2bd75f7e4d91856afcbd9996cafaff42ad7ea3
+Subproject commit 1f9d4b6ad9a266e24b4f10d32d892243cfa31d80
diff --git a/desktop-apps b/desktop-apps
index de61732..1db5f6f 160000
--- a/desktop-apps
+++ b/desktop-apps
@@ -1 +1 @@
-Subproject commit de61732967e7a639b913146054a2a14df8467b93
+Subproject commit 1db5f6f8336cd736991b0012042e5cee11dda70f
diff --git a/desktop-sdk b/desktop-sdk
index 00827af..6f39508 160000
--- a/desktop-sdk
+++ b/desktop-sdk
@@ -1 +1 @@
-Subproject commit 00827afd78f555d4d8f2d5181aba319f8cd684f5
+Subproject commit 6f39508e986207cdb9911f00f234f7feb4555544