diff --git a/lerna.json b/lerna.json
index cd325fee..1d7ce7a0 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,13 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useWorkspaces": true,
-  "version": "1.0.0",
-  "npmClient": "yarn"
-}
\ No newline at end of file
+  "command": {
+    "bootstrap": {
+      "npmClientArgs": [
+        "--no-package-lock"
+      ]
+    }
+  },
+  "npmClient": "pnpm",
+  "version": "1.0.0"
+}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
new file mode 100644
index 00000000..c1368ed9
--- /dev/null
+++ b/pnpm-workspace.yaml
@@ -0,0 +1,5 @@
+packages:
+  # all packages in subdirs of packages/ and components/
+  - 'packages/**'
+  # exclude packages that are inside test directories
+  - '!**/test/**'