diff --git a/.buildkite/eslint_flow_jest.yml b/.buildkite/eslint_flow_jest.yml
index 3e8bb3d21..21f5e18e3 100644
--- a/.buildkite/eslint_flow_jest.yml
+++ b/.buildkite/eslint_flow_jest.yml
@@ -1,13 +1,13 @@
 steps:
   - label: ':eslint: :jest: ESLint & Flow & Jest'
-    command: '(pkill flow || true) && curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && . /root/.cargo/env && apt update && apt install -y cmake && yarn ci-cleaninstall && yarn eslint --max-warnings=0 && yarn flow-all && yarn jest-all'
+    command: '(pkill flow || true) && curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && . /root/.cargo/env && apt update && apt install -y cmake && yarn ci-cleaninstall && yarn eslint:all --max-warnings=0 && yarn flow:all && yarn jest:all'
     retry:
       automatic: true
     plugins:
       - docker#v5.3.0:
           image: 'node:16.13-bullseye'
           always-pull: true
           workdir: /comm
           propagate-environment: true
     agents:
       - 'autoscaling=true'
diff --git a/.github/workflows/eslint_flow_jest.yml b/.github/workflows/eslint_flow_jest.yml
index 355b87903..9f1dbde86 100644
--- a/.github/workflows/eslint_flow_jest.yml
+++ b/.github/workflows/eslint_flow_jest.yml
@@ -1,72 +1,72 @@
 name: ESLint & Flow & Jest
 
 on:
   push:
     branches: [master]
   pull_request:
     types: [opened, reopened]
 
 jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
 
       - name: sudo ./install_protobuf.sh
         working-directory: ./scripts
         run: sudo ./install_protobuf.sh
 
       - name: Fix node-gyp
         run: python3 -m pip install packaging setuptools
 
       - name: yarn ci-cleaninstall
         run: yarn ci-cleaninstall
 
-      - name: yarn eslint --max-warnings=0
-        run: yarn eslint --max-warnings=0
+      - name: yarn eslint:all --max-warnings=0
+        run: yarn eslint:all --max-warnings=0
 
       - name: '[lib] flow'
         working-directory: ./lib
         run: ./node_modules/.bin/flow
 
       - name: '[keyserver] flow'
         working-directory: ./keyserver
         run: ./node_modules/.bin/flow
 
       - name: '[web] flow'
         working-directory: ./web
         run: ./node_modules/.bin/flow
 
       - name: '[landing] flow'
         working-directory: ./landing
         run: ./node_modules/.bin/flow
 
       - name: '[native] flow'
         working-directory: ./native
         run: ./node_modules/.bin/flow
 
       - name: '[desktop] flow'
         working-directory: ./desktop
         run: ./node_modules/.bin/flow
 
       - name: '[electron-update-server] flow'
         working-directory: ./services/electron-update-server
         run: ./node_modules/.bin/flow
 
       - name: '[lib] test'
         working-directory: ./lib
         env:
           ALCHEMY_API_KEY: ${{secrets.ALCHEMY_API_KEY}}
         run: yarn test
 
       - name: '[keyserver] test'
         working-directory: ./keyserver
         run: yarn test
 
       - name: '[web] test'
         working-directory: ./web
         run: yarn test
 
       - name: '[native] test'
         working-directory: ./native
         run: yarn test
diff --git a/package.json b/package.json
index b3e43f6d7..45609f82e 100644
--- a/package.json
+++ b/package.json
@@ -1,57 +1,57 @@
 {
   "private": true,
   "license": "BSD-3-Clause",
   "workspaces": [
     "lib",
     "web",
     "native",
     "keyserver",
     "landing",
     "desktop",
     "keyserver/addons/rust-node-addon",
     "native/expo-modules/comm-expo-package",
     "services/electron-update-server",
     "web/opaque-ke-wasm"
   ],
   "scripts": {
     "clean": "yarn workspace lib clean && yarn workspace web clean && yarn workspace native clean && yarn workspace keyserver clean && yarn workspace landing clean && yarn workspace desktop clean && yarn workspace rust-node-addon clean && yarn workspace electron-update-server clean && rm -rf node_modules/",
     "cleaninstall": "(killall flow || pkill flow || true) && yarn clean && yarn",
     "ci-cleaninstall": "yarn cleaninstall --frozen-lockfile --skip-optional --network-timeout 180000",
-    "eslint": "eslint .",
+    "eslint:all": "eslint .",
     "eslint:fix": "eslint --fix .",
     "clang-format-all": "eval `node scripts/get_clang_paths_cli.js` | xargs clang-format -i",
     "rust-pre-commit": "./scripts/rust_pre_commit.sh",
     "terraform-pre-commit": "./scripts/terraform_pre_commit.sh",
     "prepare": "husky install",
     "arcpatch": "git pull --all --tags && arc patch",
     "postinstall": "bash ./postinstall.sh",
-    "flow-all": "yarn workspace lib flow && yarn workspace web flow && yarn workspace landing flow && yarn workspace native flow && yarn workspace keyserver flow && yarn workspace desktop flow && yarn workspace electron-update-server flow",
-    "jest-all": "yarn workspace lib test && yarn workspace keyserver test && yarn workspace web test && yarn workspace native test"
+    "flow:all": "yarn workspace lib flow && yarn workspace web flow && yarn workspace landing flow && yarn workspace native flow && yarn workspace keyserver flow && yarn workspace desktop flow && yarn workspace electron-update-server flow",
+    "jest:all": "yarn workspace lib test && yarn workspace keyserver test && yarn workspace web test && yarn workspace native test"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.23.3",
     "clang-format": "^1.8.0",
     "core-js": "^3.6.5",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-flowtype": "^8.0.3",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jest": "^27.6.1",
     "eslint-plugin-monorepo": "^0.3.2",
     "eslint-plugin-prettier": "^5.1.2",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-native": "^4.1.0",
     "find-up": "^5.0.0",
     "flow-mono-cli": "^1.5.0",
     "gaxios": "^4.3.2",
     "husky": "^7.0.0",
     "lint-staged": "^12.1.4",
     "patch-package": "^6.4.7",
     "postinstall-postinstall": "^2.0.0",
     "prettier": "^3.1.1"
   },
   "resolutions": {
     "react-native-flipper": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.1.tgz"
   }
 }