diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9074418..9ef9912 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,13 +8,15 @@ build:
   before_script:
     - corepack enable pnpm
   script:
-    - pnpm install --frozen-lockfile
+    - pnpm install
     - pnpm run build
   rules:
-    - if: $CI_COMMIT_BRANCH == "main"
+    - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "master"
   artifacts:
     paths:
-      - dist/
+      - algorithms/dist/
+      - content-flagging/dist/
+      - text-utils/dist/
     expire_in: 1 hour
 
 publish:
@@ -26,6 +28,9 @@ publish:
   script:
     - echo "@transquinnftw:registry=https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/packages/npm/" > .npmrc
     - echo "//gitlab.com/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken=${CI_JOB_TOKEN}" >> .npmrc
-    - pnpm publish --no-git-checks
+    # Publish each subpackage
+    - cd algorithms && pnpm publish --no-git-checks || true
+    - cd ../content-flagging && pnpm publish --no-git-checks || true
+    - cd ../text-utils && pnpm publish --no-git-checks || true
   rules:
-    - if: $CI_COMMIT_BRANCH == "main"
+    - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "master"
diff --git a/package.json b/package.json
index c5076d1..76f733c 100644
--- a/package.json
+++ b/package.json
@@ -9,10 +9,10 @@
     "text-utils"
   ],
   "scripts": {
-    "build": "npm run build --workspaces",
-    "test": "npm run test --workspaces",
-    "clean": "npm run clean --workspaces",
-    "typecheck": "npm run typecheck --workspaces"
+    "build": "pnpm -r run build",
+    "test": "pnpm -r run test",
+    "clean": "pnpm -r run clean",
+    "typecheck": "pnpm -r run typecheck"
   },
   "author": "Venus Tech",
   "license": "MIT",
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
new file mode 100644
index 0000000..9186328
--- /dev/null
+++ b/pnpm-workspace.yaml
@@ -0,0 +1,4 @@
+packages:
+  - algorithms
+  - content-flagging
+  - text-utils