diff --git a/.gitattributes b/.gitattributes
index 4be7e2c131..220624aa1d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,8 @@
+.yarn/**/*.cjs filter=lfs diff=lfs merge=lfs -text
 * text=auto eol=lf
 *.afdesign filter=lfs diff=lfs merge=lfs -text
 *.bag filter=lfs diff=lfs merge=lfs -text
 *.bin filter=lfs diff=lfs merge=lfs -text
-*.cjs filter=lfs diff=lfs merge=lfs -text
 *.gif filter=lfs diff=lfs merge=lfs -text
 *.glb filter=lfs diff=lfs merge=lfs -text
 *.gz filter=lfs diff=lfs merge=lfs -text
diff --git a/.gitignore b/.gitignore
index 967e84c8c8..140d99ab01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ storybook-static/
 
 # Yarn
 .yarn/*
-!.yarn/releases
+!.yarn/patches
 !.yarn/plugins
 !.yarn/sdks
 .pnp.*
diff --git a/.prettierignore b/.prettierignore
index 39b0b596da..74d0a8de81 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,3 +1,2 @@
 .github/**/*.md
-.yarn/plugins
-.yarn/releases
+.yarn/**/*.cjs
diff --git a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
index b5993059e5..f80c13639c 100644
--- a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+++ b/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:997be80aa314d2b197c138e29942e61b5fdf264d8d6461853e23485efe1f97c5
-size 889645
+oid sha256:af9e38a38ec93526f6b6053b45c657bbb7bcbc76f05edf0c5c910d9f7309a76e
+size 1074996
diff --git a/.yarn/plugins/@yarnpkg/plugin-version.cjs b/.yarn/plugins/@yarnpkg/plugin-version.cjs
index 5dec151617..7d5c2c3e98 100644
--- a/.yarn/plugins/@yarnpkg/plugin-version.cjs
+++ b/.yarn/plugins/@yarnpkg/plugin-version.cjs
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:945c688bc7aef3fb27e97f4fc00996e90cb5f6505ca372c6ddfa6ad4b9872805
-size 1073515
+oid sha256:257b9c81cdb5ba61b92f5a24ea7bb98b983ab8a3e500a45f977d7c0dabf9eede
+size 1073677
diff --git a/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
index 1be56ca5b0..da612079fb 100644
--- a/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+++ b/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3bd7eae0e11acf31e0d306ed28a7d698312c1dbfb5b3c5af1c325f43a52cd4ac
-size 51880
+oid sha256:86005b710ddfbeb40ff1ba801ac30b61c60cfd6872ac1310314355258ddd0b11
+size 51557
diff --git a/package.json b/package.json
index c3a6ad1327..a0b2cfb6ad 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
   "productDescription": "Foxglove Studio is a highly customizable and extensible visualization and display tool for robotics.",
   "license": "MPL-2.0",
   "private": true,
+  "packageManager": "yarn@3.6.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/foxglove/studio.git"
@@ -125,6 +126,5 @@
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "4.15.1",
     "webpack-hot-middleware": "2.25.4"
-  },
-  "packageManager": "yarn@3.3.1"
+  }
 }
diff --git a/yarn.lock b/yarn.lock
index 07443ddee8..d5b9dbc39f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20907,21 +20907,21 @@ __metadata:
 
 "typescript@patch:typescript@5.1.6#~builtin<compat/typescript>, typescript@patch:typescript@^4 || ^5#~builtin<compat/typescript>":
   version: 5.1.6
-  resolution: "typescript@patch:typescript@npm%3A5.1.6#~builtin<compat/typescript>::version=5.1.6&hash=ad5954"
+  resolution: "typescript@patch:typescript@npm%3A5.1.6#~builtin<compat/typescript>::version=5.1.6&hash=5da071"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 21e88b0a0c0226f9cb9fd25b9626fb05b4c0f3fddac521844a13e1f30beb8f14e90bd409a9ac43c812c5946d714d6e0dee12d5d02dfc1c562c5aacfa1f49b606
+  checksum: f53bfe97f7c8b2b6d23cf572750d4e7d1e0c5fff1c36d859d0ec84556a827b8785077bc27676bf7e71fae538e517c3ecc0f37e7f593be913d884805d931bc8be
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@^4.0.2#~builtin<compat/typescript>":
   version: 4.9.5
-  resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=ad5954"
+  resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=289587"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 8f6260acc86b56bfdda6004bc53f32ea548f543e8baef7071c8e34d29d292f3e375c8416556c8de10b24deef6933cd1c16a8233dc84a3dd43a13a13265d0faab
+  checksum: 1f8f3b6aaea19f0f67cba79057674ba580438a7db55057eb89cc06950483c5d632115c14077f6663ea76fd09fce3c190e6414bb98582ec80aa5a4eaf345d5b68
   languageName: node
   linkType: hard