diff --git a/.yarn/cache/@esbuild-darwin-arm64-npm-0.17.19-64d69299ed-10.zip b/.yarn/cache/@esbuild-darwin-arm64-npm-0.17.19-64d69299ed-10.zip
new file mode 100644
index 0000000000..a8f1e57ef1
Binary files /dev/null and b/.yarn/cache/@esbuild-darwin-arm64-npm-0.17.19-64d69299ed-10.zip differ
diff --git a/.yarn/cache/@esbuild-darwin-arm64-npm-0.21.5-62349c1520-10.zip b/.yarn/cache/@esbuild-darwin-arm64-npm-0.21.5-62349c1520-10.zip
new file mode 100644
index 0000000000..cf67cd850e
Binary files /dev/null and b/.yarn/cache/@esbuild-darwin-arm64-npm-0.21.5-62349c1520-10.zip differ
diff --git a/.yarn/cache/@esbuild-darwin-arm64-npm-0.23.1-1d26281f3d-10.zip b/.yarn/cache/@esbuild-darwin-arm64-npm-0.23.1-1d26281f3d-10.zip
new file mode 100644
index 0000000000..3b3418b7ef
Binary files /dev/null and b/.yarn/cache/@esbuild-darwin-arm64-npm-0.23.1-1d26281f3d-10.zip differ
diff --git a/.yarn/cache/@esbuild-darwin-arm64-npm-0.24.2-ab76e2ae8a-10.zip b/.yarn/cache/@esbuild-darwin-arm64-npm-0.24.2-ab76e2ae8a-10.zip
new file mode 100644
index 0000000000..24bdf96249
Binary files /dev/null and b/.yarn/cache/@esbuild-darwin-arm64-npm-0.24.2-ab76e2ae8a-10.zip differ
diff --git a/.yarn/cache/@esbuild-linux-x64-npm-0.17.19-08a7136aa6-10.zip b/.yarn/cache/@esbuild-linux-x64-npm-0.17.19-08a7136aa6-10.zip
deleted file mode 100644
index ee6c567a81..0000000000
Binary files a/.yarn/cache/@esbuild-linux-x64-npm-0.17.19-08a7136aa6-10.zip and /dev/null differ
diff --git a/.yarn/cache/@esbuild-linux-x64-npm-0.21.5-88079726c4-10.zip b/.yarn/cache/@esbuild-linux-x64-npm-0.21.5-88079726c4-10.zip
deleted file mode 100644
index 2a3a835a4e..0000000000
Binary files a/.yarn/cache/@esbuild-linux-x64-npm-0.21.5-88079726c4-10.zip and /dev/null differ
diff --git a/.yarn/cache/@esbuild-linux-x64-npm-0.23.1-e5d2d8764d-10.zip b/.yarn/cache/@esbuild-linux-x64-npm-0.23.1-e5d2d8764d-10.zip
deleted file mode 100644
index 01cb658ce5..0000000000
Binary files a/.yarn/cache/@esbuild-linux-x64-npm-0.23.1-e5d2d8764d-10.zip and /dev/null differ
diff --git a/.yarn/cache/@esbuild-linux-x64-npm-0.24.2-eb2f35022c-10.zip b/.yarn/cache/@esbuild-linux-x64-npm-0.24.2-eb2f35022c-10.zip
deleted file mode 100644
index bb525560c0..0000000000
Binary files a/.yarn/cache/@esbuild-linux-x64-npm-0.24.2-eb2f35022c-10.zip and /dev/null differ
diff --git a/.yarn/cache/@napi-rs-canvas-darwin-arm64-npm-0.1.77-182b76cfd1-10.zip b/.yarn/cache/@napi-rs-canvas-darwin-arm64-npm-0.1.77-182b76cfd1-10.zip
new file mode 100644
index 0000000000..c9f63bf0da
Binary files /dev/null and b/.yarn/cache/@napi-rs-canvas-darwin-arm64-npm-0.1.77-182b76cfd1-10.zip differ
diff --git a/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.24.0-9d2c88b8fe-10.zip b/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.24.0-9d2c88b8fe-10.zip
new file mode 100644
index 0000000000..fe76b474bb
Binary files /dev/null and b/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.24.0-9d2c88b8fe-10.zip differ
diff --git a/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.34.5-d425174563-10.zip b/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.34.5-d425174563-10.zip
new file mode 100644
index 0000000000..42d4d9122d
Binary files /dev/null and b/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.34.5-d425174563-10.zip differ
diff --git a/.yarn/cache/@rollup-rollup-linux-x64-gnu-npm-4.24.0-a67121f2c9-10.zip b/.yarn/cache/@rollup-rollup-linux-x64-gnu-npm-4.24.0-a67121f2c9-10.zip
deleted file mode 100644
index d5637cf624..0000000000
Binary files a/.yarn/cache/@rollup-rollup-linux-x64-gnu-npm-4.24.0-a67121f2c9-10.zip and /dev/null differ
diff --git a/.yarn/cache/@rollup-rollup-linux-x64-gnu-npm-4.34.5-98224166dc-10.zip b/.yarn/cache/@rollup-rollup-linux-x64-gnu-npm-4.34.5-98224166dc-10.zip
deleted file mode 100644
index fe472ea39c..0000000000
Binary files a/.yarn/cache/@rollup-rollup-linux-x64-gnu-npm-4.34.5-98224166dc-10.zip and /dev/null differ
diff --git a/.yarn/cache/@sentry-cli-darwin-npm-2.37.0-109f3042d1-10.zip b/.yarn/cache/@sentry-cli-darwin-npm-2.37.0-109f3042d1-10.zip
new file mode 100644
index 0000000000..bd1d8be88e
Binary files /dev/null and b/.yarn/cache/@sentry-cli-darwin-npm-2.37.0-109f3042d1-10.zip differ
diff --git a/.yarn/cache/@sentry-cli-linux-x64-npm-2.37.0-1ccd9d140f-10.zip b/.yarn/cache/@sentry-cli-linux-x64-npm-2.37.0-1ccd9d140f-10.zip
deleted file mode 100644
index e3284bf649..0000000000
Binary files a/.yarn/cache/@sentry-cli-linux-x64-npm-2.37.0-1ccd9d140f-10.zip and /dev/null differ
diff --git a/.yarn/cache/@napi-rs-canvas-linux-x64-gnu-npm-0.1.77-b142d0bf80-10.zip b/.yarn/cache/@swc-core-darwin-arm64-npm-1.7.36-9c1682cc14-10.zip
similarity index 58%
rename from .yarn/cache/@napi-rs-canvas-linux-x64-gnu-npm-0.1.77-b142d0bf80-10.zip
rename to .yarn/cache/@swc-core-darwin-arm64-npm-1.7.36-9c1682cc14-10.zip
index ea1366b381..72a44483a9 100644
Binary files a/.yarn/cache/@napi-rs-canvas-linux-x64-gnu-npm-0.1.77-b142d0bf80-10.zip and b/.yarn/cache/@swc-core-darwin-arm64-npm-1.7.36-9c1682cc14-10.zip differ
diff --git a/.yarn/cache/@swc-core-linux-x64-gnu-npm-1.7.36-24fed95b50-10.zip b/.yarn/cache/@swc-core-linux-x64-gnu-npm-1.7.36-24fed95b50-10.zip
deleted file mode 100644
index 205f65f84a..0000000000
Binary files a/.yarn/cache/@swc-core-linux-x64-gnu-npm-1.7.36-24fed95b50-10.zip and /dev/null differ
diff --git a/.yarn/cache/fsevents-patch-19706e7e35-10.zip b/.yarn/cache/fsevents-patch-19706e7e35-10.zip
new file mode 100644
index 0000000000..aff1ab12ce
Binary files /dev/null and b/.yarn/cache/fsevents-patch-19706e7e35-10.zip differ
diff --git a/.yarn/cache/fsevents-patch-6b67494872-10.zip b/.yarn/cache/fsevents-patch-6b67494872-10.zip
new file mode 100644
index 0000000000..9887ada72d
Binary files /dev/null and b/.yarn/cache/fsevents-patch-6b67494872-10.zip differ
diff --git a/packages/marketplace-management/src/utils/use-org-id.tsx b/packages/marketplace-management/src/utils/use-org-id.tsx
index f10fc615ac..d57ddd8ccc 100644
--- a/packages/marketplace-management/src/utils/use-org-id.tsx
+++ b/packages/marketplace-management/src/utils/use-org-id.tsx
@@ -100,8 +100,9 @@ export const useOrgId = (): UseOrgIdState => {
           orgClientId,
         }
       })
-
-      connectClearSession()
+      // TODO: needs testing - previously we needed a fresh access token each time but seems to be fine now
+      // Can be removed assuming no issues found 28/20/25
+      // connectClearSession()
     } else {
       setOrgIdState(defaultState)
     }