diff --git a/package.json b/package.json
index 825fd7941..b65ec349e 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
     "scripts": {
         "build": "yarn build:libraries && yarn build:subgraph && yarn build:website && yarn build:docs",
         "build:libraries": "yarn workspaces foreach -Apt --no-private run build",
-        "build:subgraph": "yarn workspace semaphore-subgraph build:sepolia",
+        "clean:subgraph": "rimraf apps/subgraph/node_modules",
+        "build:subgraph": "yarn clean:subgraph && yarn workspace semaphore-subgraph build:sepolia",
         "build:website": "yarn workspace semaphore-website build",
         "build:docs": "yarn workspace semaphore-docs build",
         "compile:contracts": "yarn workspace semaphore-contracts compile",
@@ -45,11 +46,16 @@
         "proof-of-membership",
         "monorepo"
     ],
-    "workspaces": [
-        "apps/*",
-        "packages/*",
-        "packages/contracts/contracts"
-    ],
+    "workspaces": {
+        "packages": [
+            "packages/*",
+            "apps/*",
+            "packages/contracts/contracts"
+        ],
+        "nohoist": [
+            "**/semaphore-subgraph/**"
+        ]
+    },
     "packageManager": "yarn@4.1.0",
     "devDependencies": {
         "@commitlint/cli": "^18.6.1",