diff --git a/.github/workflows/client_javascript.yml b/.github/workflows/client_javascript.yml
index 3b42934894..809862d9d0 100644
--- a/.github/workflows/client_javascript.yml
+++ b/.github/workflows/client_javascript.yml
@@ -1,14 +1,9 @@
 name: client_javascript
 
-on:
-  workflow_run:
-    workflows: ['specs']
-    types:
-      - completed
+on: [push]
 
 jobs:
   build:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -41,10 +36,3 @@ jobs:
 
       - name: Lint
         run: yarn lint
-
-  build-failure:
-    if: ${{ github.event.workflow_run.conclusion == 'failure' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Error on `specs` workflow
-        run: exit 1
diff --git a/package.json b/package.json
index f9cd4e7508..03a28e8ca6 100644
--- a/package.json
+++ b/package.json
@@ -17,16 +17,15 @@
     "client:build-js:recommend": "yarn workspace @algolia/recommend build",
     "client:build-js": "yarn client:build-js:search && yarn client:build-js:recommend",
     "client:build": "yarn client:build-js",
-    "lint:fix": "yarn lint --fix",
-    "lint": "eslint --ext .ts .",
+    "lint:client:fix": "yarn prettier --write ${CLIENT} && eslint --ext=ts ${CLIENT} --fix",
+    "lint": "eslint --ext=ts .",
     "format:specs": "yarn prettier --write specs",
-    "generate:js:recommend": "yarn openapi-generator-cli generate --generator-key javascript-recommend && CLIENT=recommend yarn utils:import-js && yarn prettier --write clients/algoliasearch-client-javascript/recommend/",
-    "generate:js:search": "yarn openapi-generator-cli generate --generator-key javascript-client-search && CLIENT=client-search yarn utils:import-js && yarn prettier --write clients/algoliasearch-client-javascript/client-search/",
+    "generate:js:recommend": "yarn openapi-generator-cli generate --generator-key javascript-recommend && CLIENT=recommend yarn utils:import-js && CLIENT=clients/algoliasearch-client-javascript/recommend/ yarn lint:client:fix",
+    "generate:js:search": "yarn openapi-generator-cli generate --generator-key javascript-client-search && CLIENT=client-search yarn utils:import-js && CLIENT=clients/algoliasearch-client-javascript/client-search/ yarn lint:client:fix",
     "generate:js": "yarn generate:js:search && yarn generate:js:recommend",
     "generate:recommend": "yarn generate:js:recommend",
     "generate:search": "yarn generate:js:search",
-    "generate": "yarn generate:js && yarn post:generate",
-    "post:generate": "yarn format:specs && yarn lint:fix",
+    "generate": "yarn generate:js && yarn format:specs",
     "playground:js:search": "yarn workspace javascript-playground start:search",
     "playground:js:recommend": "yarn workspace javascript-playground start:recommend",
     "utils:import-js": "mkdir -p -- clients/algoliasearch-client-javascript/${CLIENT}/utils && cp -R clients/algoliasearch-client-javascript/utils/ clients/algoliasearch-client-javascript/${CLIENT}/utils",