diff --git a/.github/workflows/build-push-frontend.yml b/.github/workflows/build-push-frontend.yml
index 4460d0c..8780cb9 100644
--- a/.github/workflows/build-push-frontend.yml
+++ b/.github/workflows/build-push-frontend.yml
@@ -12,7 +12,23 @@ on:
   workflow_dispatch:
 
 jobs:
+  lint:
+    name: Lint Frontend
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - name: Install dependencies
+        run: npm install
+        working-directory: ./web
+      - name: Lint code
+        run: npm run lint
+        working-directory: ./web
   build-and-push:
+    needs: lint
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -53,4 +69,3 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             VERSION=${{ steps.meta.outputs.version }}
-
diff --git a/.github/workflows/python-lint.yaml b/.github/workflows/python-lint.yaml
index 9572831..7301c16 100644
--- a/.github/workflows/python-lint.yaml
+++ b/.github/workflows/python-lint.yaml
@@ -1,6 +1,8 @@
 name: Ruff
 on:
   push:
+    branches:
+      - master
     paths:
       - 'media_manager/**'
       - 'alembic/**'
diff --git a/.github/workflows/web-lint.yml b/.github/workflows/web-lint.yml
new file mode 100644
index 0000000..0a22d3e
--- /dev/null
+++ b/.github/workflows/web-lint.yml
@@ -0,0 +1,31 @@
+name: Lint Frontend
+
+on:
+  pull_request:
+    paths:
+      - 'web/**'
+      - '.github/workflows/web-lint.yml'
+  push:
+    branches:
+      - master
+    paths:
+      - 'web/**'
+      - '.github/workflows/web-lint.yml'
+
+jobs:
+  lint:
+    name: Lint Frontend
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - name: Install dependencies
+        run: npm install
+        working-directory: ./web
+      - name: Lint code
+        run: npm run lint
+        working-directory: ./web
+