diff --git a/.github/workflows/build-publish-image.yml b/.github/workflows/ci.yml
similarity index 80%
rename from .github/workflows/build-publish-image.yml
rename to .github/workflows/ci.yml
index 8f7bef2..829ddfd 100644
--- a/.github/workflows/build-publish-image.yml
+++ b/.github/workflows/ci.yml
@@ -1,12 +1,27 @@
-name: 'Build and publish docker image'
+name: 'CI'
 
 on:
   push:
     branches: [main]
 
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up NodeJs
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16
+      - name: Install dependencies
+        run: npm ci
+      - name: Linter
+        run: npm run lint
+      - name: Typecheck
+        run: npm run typecheck
   docker:
     runs-on: ubuntu-latest
+    needs: lint
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index b5c65d7..4a48fc3 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -1,8 +1,6 @@
 name: Validation
 
 on:
-  push:
-    branches: [main]
   pull_request:
     branches: [main]