diff --git a/apps/api/project.json b/apps/api/project.json
index 4ffbf5f7..ebf6a6cd 100644
--- a/apps/api/project.json
+++ b/apps/api/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/api/src",
   "projectType": "application",
-  "tags": ["server"],
+  "tags": ["scope:server"],
   "targets": {
     "build": {
       "executor": "@nx/esbuild:esbuild",
diff --git a/apps/cron-tasks/project.json b/apps/cron-tasks/project.json
index 5412eaad..c48f803a 100644
--- a/apps/cron-tasks/project.json
+++ b/apps/cron-tasks/project.json
@@ -55,5 +55,5 @@
       }
     }
   },
-  "tags": []
+  "tags": ["scope:server"]
 }
diff --git a/apps/docs/project.json b/apps/docs/project.json
index c07fd569..42dbb8dd 100644
--- a/apps/docs/project.json
+++ b/apps/docs/project.json
@@ -18,5 +18,5 @@
       }
     }
   },
-  "tags": []
+  "tags": ["scope:browser"]
 }
diff --git a/apps/jetstream-web-extension/project.json b/apps/jetstream-web-extension/project.json
index 0f5582b6..dff0b705 100644
--- a/apps/jetstream-web-extension/project.json
+++ b/apps/jetstream-web-extension/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/jetstream-web-extension/src",
   "projectType": "application",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "build": {
       "executor": "@nx/webpack:webpack",
diff --git a/apps/jetstream-worker/project.json b/apps/jetstream-worker/project.json
index 3cc1c9d7..421b61a2 100644
--- a/apps/jetstream-worker/project.json
+++ b/apps/jetstream-worker/project.json
@@ -50,5 +50,5 @@
       }
     }
   },
-  "tags": []
+  "tags": ["scope:server"]
 }
diff --git a/apps/jetstream/project.json b/apps/jetstream/project.json
index 63256223..ae8b11ad 100644
--- a/apps/jetstream/project.json
+++ b/apps/jetstream/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/jetstream/src",
   "projectType": "application",
-  "tags": [],
+  "tags": ["scope:browser"],
   "generators": {},
   "targets": {
     "build": {
diff --git a/apps/landing/project.json b/apps/landing/project.json
index 91dc0a36..e84a5a33 100644
--- a/apps/landing/project.json
+++ b/apps/landing/project.json
@@ -12,5 +12,5 @@
       }
     }
   },
-  "tags": []
+  "tags": ["scope:browser"]
 }
diff --git a/libs/email/project.json b/libs/email/project.json
index 99f1c613..97b5d2fc 100644
--- a/libs/email/project.json
+++ b/libs/email/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/email/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:server"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/anon-apex/project.json b/libs/features/anon-apex/project.json
index a9503615..451ff282 100644
--- a/libs/features/anon-apex/project.json
+++ b/libs/features/anon-apex/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/anon-apex/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/automation-control/project.json b/libs/features/automation-control/project.json
index d2618a8b..e49c8b3b 100644
--- a/libs/features/automation-control/project.json
+++ b/libs/features/automation-control/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/automation-control/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/create-object-and-fields/project.json b/libs/features/create-object-and-fields/project.json
index 27485e34..dba21e34 100644
--- a/libs/features/create-object-and-fields/project.json
+++ b/libs/features/create-object-and-fields/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/create-object-and-fields/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/debug-log-viewer/project.json b/libs/features/debug-log-viewer/project.json
index 42f6674f..bc706c59 100644
--- a/libs/features/debug-log-viewer/project.json
+++ b/libs/features/debug-log-viewer/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/debug-log-viewer/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/deploy/project.json b/libs/features/deploy/project.json
index 6f0183c7..314c346f 100644
--- a/libs/features/deploy/project.json
+++ b/libs/features/deploy/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/deploy/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/formula-evaluator/project.json b/libs/features/formula-evaluator/project.json
index 9ea32203..572c2fff 100644
--- a/libs/features/formula-evaluator/project.json
+++ b/libs/features/formula-evaluator/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/formula-evaluator/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/load-records-multi-object/project.json b/libs/features/load-records-multi-object/project.json
index 554b204d..cd6aa272 100644
--- a/libs/features/load-records-multi-object/project.json
+++ b/libs/features/load-records-multi-object/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/load-records-multi-object/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/load-records/project.json b/libs/features/load-records/project.json
index f94f7461..ab3a9bae 100644
--- a/libs/features/load-records/project.json
+++ b/libs/features/load-records/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/load-records/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/manage-permissions/project.json b/libs/features/manage-permissions/project.json
index da1decf1..ee3434a1 100644
--- a/libs/features/manage-permissions/project.json
+++ b/libs/features/manage-permissions/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/manage-permissions/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/organizations/project.json b/libs/features/organizations/project.json
index 148ef24c..26fad434 100644
--- a/libs/features/organizations/project.json
+++ b/libs/features/organizations/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/organizations/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/platform-event-monitor/project.json b/libs/features/platform-event-monitor/project.json
index 970490b2..feebbf79 100644
--- a/libs/features/platform-event-monitor/project.json
+++ b/libs/features/platform-event-monitor/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/platform-event-monitor/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/query/project.json b/libs/features/query/project.json
index d0219b99..15cb4fce 100644
--- a/libs/features/query/project.json
+++ b/libs/features/query/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/query/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/salesforce-api/project.json b/libs/features/salesforce-api/project.json
index 55afc346..5acc65f8 100644
--- a/libs/features/salesforce-api/project.json
+++ b/libs/features/salesforce-api/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/salesforce-api/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/sobject-export/project.json b/libs/features/sobject-export/project.json
index d2be432f..537ccef8 100644
--- a/libs/features/sobject-export/project.json
+++ b/libs/features/sobject-export/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/sobject-export/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/features/update-records/project.json b/libs/features/update-records/project.json
index 4ee58698..f9fe2255 100644
--- a/libs/features/update-records/project.json
+++ b/libs/features/update-records/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/features/update-records/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/salesforce-api/project.json b/libs/salesforce-api/project.json
index d73ba53e..ce0599d8 100644
--- a/libs/salesforce-api/project.json
+++ b/libs/salesforce-api/project.json
@@ -28,5 +28,5 @@
       }
     }
   },
-  "tags": []
+  "tags": ["scope:shared"]
 }
diff --git a/libs/shared/ui-core-shared/project.json b/libs/shared/ui-core-shared/project.json
index 9d98396b..aad5c51b 100644
--- a/libs/shared/ui-core-shared/project.json
+++ b/libs/shared/ui-core-shared/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/shared/ui-core-shared/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/shared/ui-core/project.json b/libs/shared/ui-core/project.json
index b9807845..01777700 100644
--- a/libs/shared/ui-core/project.json
+++ b/libs/shared/ui-core/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/shared/ui-core/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",
diff --git a/libs/shared/ui-utils/project.json b/libs/shared/ui-utils/project.json
index 416324ac..66a733c1 100644
--- a/libs/shared/ui-utils/project.json
+++ b/libs/shared/ui-utils/project.json
@@ -16,5 +16,5 @@
       "outputs": ["{workspaceRoot}/coverage/libs/shared/ui-utils"]
     }
   },
-  "tags": ["scope:shared", "scope:allow-worker-import"]
+  "tags": ["scope:shared", "scope:browser", "scope:allow-worker-import"]
 }
diff --git a/libs/web-extension-utils/project.json b/libs/web-extension-utils/project.json
index 49f486ac..92c69989 100644
--- a/libs/web-extension-utils/project.json
+++ b/libs/web-extension-utils/project.json
@@ -3,7 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/web-extension-utils/src",
   "projectType": "library",
-  "tags": [],
+  "tags": ["scope:browser"],
   "targets": {
     "test": {
       "executor": "@nx/jest:jest",