diff --git a/.yarnrc.yml b/.yarnrc.yml
index 799aae8ba..fd671398e 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,25 +1,26 @@
+checksumBehavior: update
+
 nodeLinker: node-modules
 
+packageExtensions:
+  "@types/react-beautiful-dnd@*":
+    peerDependencies:
+      "@types/react": "*"
+  "@types/react-dom@*":
+    peerDependencies:
+      "@types/react": "*"
+  "@types/react-redux@*":
+    peerDependencies:
+      "@types/react": "*"
+  "@types/react-transition-group@*":
+    peerDependencies:
+      "@types/react": "*"
+  react-dev-utils@*:
+    peerDependencies:
+      react-error-overlay: "*"
+
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: "@yarnpkg/plugin-workspace-tools"
 
 yarnPath: .yarn/releases/yarn-3.2.1.cjs
-checksumBehavior: update
-
-packageExtensions:
-  "@types/react-redux@*":
-    peerDependencies:
-      "@types/react": "*"
-  "@types/react-dom@*":
-    peerDependencies:
-      "@types/react": "*"
-  "@types/react-beautiful-dnd@*":
-    peerDependencies:
-      "@types/react": "*"
-  "@types/react-transition-group@*":
-    peerDependencies:
-      "@types/react": "*"
-  "react-dev-utils@*":
-    peerDependencies:
-      "react-error-overlay": "*"
\ No newline at end of file
diff --git a/package.json b/package.json
index bc3eb77a7..866a2c784 100644
--- a/package.json
+++ b/package.json
@@ -15,15 +15,15 @@
     "lint": "lerna run lint --parallel",
     "test": "lerna run test --parallel",
     "clean": "lerna run clean",
-    "build": "lerna run build",
-    "build:icons": "lerna run build --scope=@standardnotes/icons",
-    "build:toast": "lerna run build --scope=@standardnotes/toast",
-    "build:styles": "lerna run build --scope=@standardnotes/styles",
-    "build:web": "lerna run build --scope=@standardnotes/web",
+    "build": "yarn workspaces foreach -pt run build",
+    "build:icons": "yarn workspace @standardnotes/icons build",
+    "build:toast": "yarn workspace @standardnotes/toast build",
+    "build:styles": "yarn workspace @standardnotes/styles build",
+    "build:web": "yarn workspace @standardnotes/web build",
     "build:web:front": "yarn build:icons && yarn build:toast && yarn build:styles && yarn build:web",
-    "build:web:back": "lerna run build --scope=@standardnotes/web-server",
+    "build:web:back": "yarn workspace @standardnotes/web-server build",
     "build:web:all": "yarn build:web:front && yarn build:web:back",
-    "build:components": "lerna run build --scope=@standardnotes/components-meta",
+    "build:components": "yarn workspace @standardnotes/components-meta build",
     "start:server:web": "lerna run start --scope=@standardnotes/web-server",
     "start:server:web:localhost": "lerna run start:no-binding --scope=@standardnotes/web-server",
     "prepare": "husky install",