diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
index 456143e..1fa2ab1 100644
--- a/.github/workflows/node.yml
+++ b/.github/workflows/node.yml
@@ -33,7 +33,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-
       - run: npm ci
-      - run: npm run format
+      - run: npm run format --if-present
+      - run: npm run lint --if-present -- --fix
       - name: Commit changes if any
         run: |
           git config user.name "GitHub Actions"
@@ -65,6 +66,7 @@ jobs:
             ${{ runner.os }}-node-
       - run: npm ci
       - run: npm run type-check --if-present
+      - run: npm run format --if-present
       - run: npm run lint --if-present
       # TODO: Generate and publish a HTML artifact
       - run: npm start