diff --git a/backend/package.json b/backend/package.json
index 9e16c279a..0855bf4eb 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -4,7 +4,7 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC",
   "private": true,
-  "packageManager": "yarn@4.2.2",
+  "packageManager": "yarn@4.3.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"
diff --git a/common/package.json b/common/package.json
index b5b3f1d5a..93a456d1d 100644
--- a/common/package.json
+++ b/common/package.json
@@ -5,7 +5,7 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC",
   "private": true,
-  "packageManager": "yarn@4.2.2",
+  "packageManager": "yarn@4.3.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"
@@ -15,7 +15,7 @@
     "sax": "^1.4.1"
   },
   "devDependencies": {
-    "shadow-cljs": "2.28.8",
+    "shadow-cljs": "2.28.11",
     "source-map-support": "^0.5.21",
     "ws": "^8.17.0"
   },
diff --git a/common/yarn.lock b/common/yarn.lock
index a76624336..94f9b89aa 100644
--- a/common/yarn.lock
+++ b/common/yarn.lock
@@ -354,7 +354,7 @@ __metadata:
   dependencies:
     luxon: "npm:^3.4.4"
     sax: "npm:^1.4.1"
-    shadow-cljs: "npm:2.28.8"
+    shadow-cljs: "npm:2.28.11"
     source-map-support: "npm:^0.5.21"
     ws: "npm:^8.17.0"
   languageName: unknown
@@ -1476,9 +1476,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shadow-cljs@npm:2.28.8":
-  version: 2.28.8
-  resolution: "shadow-cljs@npm:2.28.8"
+"shadow-cljs@npm:2.28.11":
+  version: 2.28.11
+  resolution: "shadow-cljs@npm:2.28.11"
   dependencies:
     node-libs-browser: "npm:^2.2.1"
     readline-sync: "npm:^1.4.7"
@@ -1488,7 +1488,7 @@ __metadata:
     ws: "npm:^7.4.6"
   bin:
     shadow-cljs: cli/runner.js
-  checksum: 10c0/061b5b3518ff21063474ad42ea3c4c1be21153e78b82fd488d1142de46e9f6e5c12c11475a7a44a1243c9740df724611763cbc48a6fa55ba80de7e885b824853
+  checksum: 10c0/c5c77d524ee8f44e4ae2ddc196af170d02405cc8731ea71f852c7b220fc1ba8aaf5cf33753fd8a7566c8749bb75d360f903dfb0d131bcdc6c2c33f44404bd6a3
   languageName: node
   linkType: hard
 
diff --git a/exporter/deps.edn b/exporter/deps.edn
index f84d879dc..0bcd1ec3b 100644
--- a/exporter/deps.edn
+++ b/exporter/deps.edn
@@ -14,7 +14,7 @@
 
   :dev
   {:extra-deps
-   {thheller/shadow-cljs {:mvn/version "2.28.8"}}}
+   {thheller/shadow-cljs {:mvn/version "2.28.11"}}}
 
   :shadow-cljs
   {:main-opts ["-m" "shadow.cljs.devtools.cli"]}
diff --git a/exporter/package.json b/exporter/package.json
index 0b7b67d6d..49da8e876 100644
--- a/exporter/package.json
+++ b/exporter/package.json
@@ -4,7 +4,7 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC",
   "private": true,
-  "packageManager": "yarn@4.2.2",
+  "packageManager": "yarn@4.3.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"
@@ -22,7 +22,7 @@
     "xregexp": "^5.1.1"
   },
   "devDependencies": {
-    "shadow-cljs": "2.28.8",
+    "shadow-cljs": "2.28.11",
     "source-map-support": "^0.5.21"
   },
   "scripts": {
diff --git a/exporter/yarn.lock b/exporter/yarn.lock
index d32ec1b65..cd19abac0 100644
--- a/exporter/yarn.lock
+++ b/exporter/yarn.lock
@@ -788,7 +788,7 @@ __metadata:
     luxon: "npm:^3.4.4"
     playwright: "npm:^1.44.1"
     raw-body: "npm:^2.5.2"
-    shadow-cljs: "npm:2.28.8"
+    shadow-cljs: "npm:2.28.11"
     source-map-support: "npm:^0.5.21"
     xml-js: "npm:^1.6.11"
     xregexp: "npm:^5.1.1"
@@ -1919,9 +1919,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shadow-cljs@npm:2.28.8":
-  version: 2.28.8
-  resolution: "shadow-cljs@npm:2.28.8"
+"shadow-cljs@npm:2.28.11":
+  version: 2.28.11
+  resolution: "shadow-cljs@npm:2.28.11"
   dependencies:
     node-libs-browser: "npm:^2.2.1"
     readline-sync: "npm:^1.4.7"
@@ -1931,7 +1931,7 @@ __metadata:
     ws: "npm:^7.4.6"
   bin:
     shadow-cljs: cli/runner.js
-  checksum: 10c0/061b5b3518ff21063474ad42ea3c4c1be21153e78b82fd488d1142de46e9f6e5c12c11475a7a44a1243c9740df724611763cbc48a6fa55ba80de7e885b824853
+  checksum: 10c0/c5c77d524ee8f44e4ae2ddc196af170d02405cc8731ea71f852c7b220fc1ba8aaf5cf33753fd8a7566c8749bb75d360f903dfb0d131bcdc6c2c33f44404bd6a3
   languageName: node
   linkType: hard
 
diff --git a/frontend/deps.edn b/frontend/deps.edn
index 841aad939..938c794a9 100644
--- a/frontend/deps.edn
+++ b/frontend/deps.edn
@@ -11,11 +11,12 @@
   funcool/potok2
   {:git/tag "v2.1"
    :git/sha "84c97b9"
-   :git/url "https://github.com/funcool/potok.git"}
+   :git/url "https://github.com/funcool/potok.git"
+   :exclusions [funcool/beicon2]}
 
   funcool/beicon2
-  {:git/tag "v2.0"
-   :git/sha "e7135e0"
+  {:git/tag "v2.1"
+   :git/sha "7d648e1"
    :git/url "https://github.com/funcool/beicon.git"}
 
   funcool/rumext
@@ -41,7 +42,7 @@
   :dev
   {:extra-paths ["dev"]
    :extra-deps
-   {thheller/shadow-cljs {:mvn/version "2.28.8"}
+   {thheller/shadow-cljs {:mvn/version "2.28.11"}
     org.clojure/tools.namespace {:mvn/version "RELEASE"}
     cider/cider-nrepl {:mvn/version "0.48.0"}}}
 
@@ -49,4 +50,3 @@
   {:main-opts ["-m" "shadow.cljs.devtools.cli"]}
 
   }}
-
diff --git a/frontend/package.json b/frontend/package.json
index 0ac3ff3ba..9a527d9c0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -4,7 +4,7 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC",
   "private": true,
-  "packageManager": "yarn@4.2.2",
+  "packageManager": "yarn@4.3.1",
   "browserslist": [
     "defaults"
   ],
@@ -37,7 +37,7 @@
     "e2e:test": "playwright test --project default",
     "storybook:compile": "yarn run compile && clojure -M:dev:shadow-cljs compile storybook",
     "storybook:server": "yarn run storybook dev -p 6006 --no-open",
-    "storybook:watch": "yarn run storybook:compile && concurrently \"clojure -M:dev:shadow-cljs watch storybook\" \"yarn run storybook:server\" \"yarn run watch\"",
+    "storybook:watch": "concurrently \"clojure -M:dev:shadow-cljs watch storybook\" \"yarn run storybook:server\" \"yarn run watch\"",
     "storybook:build": "yarn run storybook:compile && storybook build"
   },
   "devDependencies": {
@@ -80,7 +80,7 @@
     "rimraf": "^5.0.7",
     "sass": "^1.77.4",
     "sass-embedded": "^1.77.2",
-    "shadow-cljs": "2.28.8",
+    "shadow-cljs": "2.28.11",
     "storybook": "^8.2.2",
     "svg-sprite": "^2.0.4",
     "typescript": "^5.4.5",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 94375d2bc..2bf90d9c7 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -6663,7 +6663,7 @@ __metadata:
     sass: "npm:^1.77.4"
     sass-embedded: "npm:^1.77.2"
     sax: "npm:^1.4.1"
-    shadow-cljs: "npm:2.28.8"
+    shadow-cljs: "npm:2.28.11"
     source-map-support: "npm:^0.5.21"
     storybook: "npm:^8.2.2"
     svg-sprite: "npm:^2.0.4"
@@ -11744,9 +11744,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shadow-cljs@npm:2.28.8":
-  version: 2.28.8
-  resolution: "shadow-cljs@npm:2.28.8"
+"shadow-cljs@npm:2.28.11":
+  version: 2.28.11
+  resolution: "shadow-cljs@npm:2.28.11"
   dependencies:
     node-libs-browser: "npm:^2.2.1"
     readline-sync: "npm:^1.4.7"
@@ -11756,7 +11756,7 @@ __metadata:
     ws: "npm:^7.4.6"
   bin:
     shadow-cljs: cli/runner.js
-  checksum: 10c0/061b5b3518ff21063474ad42ea3c4c1be21153e78b82fd488d1142de46e9f6e5c12c11475a7a44a1243c9740df724611763cbc48a6fa55ba80de7e885b824853
+  checksum: 10c0/c5c77d524ee8f44e4ae2ddc196af170d02405cc8731ea71f852c7b220fc1ba8aaf5cf33753fd8a7566c8749bb75d360f903dfb0d131bcdc6c2c33f44404bd6a3
   languageName: node
   linkType: hard