diff --git a/.gitignore b/.gitignore
index 44df37441ec..e6df1a587d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,13 @@ public/build-meta.json
 
 # Generated CSS file from Tailwind
 src/style/index.css
+
+# Yarn
+.pnp.*
+.yarn/*
+.yarn/
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/.prettierignore b/.prettierignore
index 09fa56eaa99..923af917dab 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -4,4 +4,4 @@ lib
 build
 *.css
 *.gen.tsx
-*.bs.js
\ No newline at end of file
+*.bs.js
diff --git a/.yarnrc.yml b/.yarnrc.yml
new file mode 100644
index 00000000000..0e00bfe7cae
--- /dev/null
+++ b/.yarnrc.yml
@@ -0,0 +1,7 @@
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
+    spec: "https://mskelton.dev/yarn-outdated/v2"
+
+yarnPath: .yarn/releases/yarn-3.2.1.cjs
diff --git a/package.json b/package.json
index 6ccab375f50..4e98575b272 100644
--- a/package.json
+++ b/package.json
@@ -251,15 +251,12 @@
     ]
   },
   "lint-staged": {
-    "**/*": [
-      "prettier --write --ignore-unknown",
-      "eslint --fix",
-      "git add"
-    ]
+    "**/*": []
   },
   "eslintConfig": {
     "extends": [
       "react-app"
     ]
-  }
+  },
+  "packageManager": "yarn@3.2.1"
 }