diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6cf5971a..45954f6d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -25,10 +25,12 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
       - name: Install npm modules
         run: npm ci
+      - name: Lint
+        run: npm lint
       - name: Test
         run: npm test
-      - name: Grunt
-        run: grunt
+      - name: Build
+        run: npm start
       - name: Upload artifact
         uses: actions/upload-artifact@v1
         with:
@@ -41,7 +43,7 @@ jobs:
           mkdir keys
           echo "$VIRUS_TOTAL" > keys/virus-total.json
       - name: Check on VirusTotal
-        run: grunt virustotal
+        run: npm start virustotal
         if: ${{ github.repository == 'keeweb/keeweb' }}
 
   linux:
@@ -129,8 +131,6 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
       - name: Install npm modules
         run: npm ci
-      - name: Install grunt
-        run: sudo npm i -g grunt-cli
       - name: Write secrets
         env:
           CODESIGN: ${{ secrets.CODESIGN }}
@@ -147,8 +147,8 @@ jobs:
         with:
           p12-file-base64: ${{ secrets.APPLE_CERTIFICATE }}
           p12-password: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-      - name: Grunt
-        run: grunt --max-old-space-size=4096 desktop-darwin ${{ github.repository != 'keeweb/keeweb' && '--skip-sign' || '' }}
+      - name: Build
+        run: npm start -- --max-old-space-size=4096 desktop-darwin ${{ github.repository != 'keeweb/keeweb' && '--skip-sign' || '' }}
       - name: Upload x64 dmg artifact
         uses: actions/upload-artifact@v1
         with:
@@ -188,8 +188,6 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
       - name: Install npm modules
         run: npm ci
-      - name: Install grunt
-        run: npm i -g grunt-cli
       - name: Write secrets
         env:
           CODESIGN: ${{ secrets.CODESIGN }}
@@ -203,8 +201,8 @@ jobs:
           echo $Env:MS_CODESIGN_PRIVATE_KEY_CLIENT > keys/code-signing/private-key-client.pem
           echo $Env:MS_CODESIGN_PUBLIC_KEY_CLIENT > keys/code-signing/public-key-client.pem
           echo $Env:MS_CODESIGN_PUBLIC_KEY_SERVER > keys/code-signing/public-key-server.pem
-      - name: Grunt
-        run: grunt desktop-win32 ${{ github.repository != 'keeweb/keeweb' && '--skip-sign' || '' }}
+      - name: Build
+        run: npm start -- desktop-win32 ${{ github.repository != 'keeweb/keeweb' && '--skip-sign' || '' }}
       - name: Upload ia32 exe artifact
         uses: actions/upload-artifact@v1
         with:
@@ -353,9 +351,9 @@ jobs:
           mkdir keys
           echo "$PRIVATE_KEY" > keys/private-key.pem
           echo "$KEEWEB_SIGN" > keys/keeweb-sign.json
-      - name: Grunt
+      - name: Build
         working-directory: keeweb
-        run: grunt finish-release
+        run: npm start finish-release
       - name: Copy signatures to assets
         run: cp keeweb/dist/desktop/Verify.sign.sha256 assets
       - name: Copy checksums to assets
diff --git a/grunt.tasks.js b/grunt.tasks.js
index 6d9cfcb9..37f96542 100644
--- a/grunt.tasks.js
+++ b/grunt.tasks.js
@@ -3,7 +3,6 @@ module.exports = function (grunt) {
 
     grunt.registerTask('build-web-app', [
         'clean',
-        'eslint',
         'webpack:app',
         'inline',
         'htmlmin',