diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5f9dc63..c36eda1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,6 +1,13 @@
 name: CI
 # This workflow is triggered on pushes & pull requests
-on: [pull_request]
+on:
+  push:
+    branches:
+      -  master
+  pull_request: 
+
+permissions:
+  contents: read
 
 jobs:
   test-frontend:
@@ -72,6 +79,19 @@ jobs:
           fail_ci_if_error: true
           verbose: true
 
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
+        with:
+          go-version: 1.25
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v9
+        with:
+          args: --issues-exit-code=0
+
   build:
     name: Build ${{ matrix.cfg.goos }}/${{ matrix.cfg.goarch }}
     runs-on: ${{ matrix.cfg.on }}
diff --git a/.github/workflows/golang-lint.yml b/.github/workflows/golang-lint.yml
deleted file mode 100644
index 0d65036..0000000
--- a/.github/workflows/golang-lint.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: golangci-lint
-on:
-  push:
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  golangci:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
-        with:
-          go-version: 1.25
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v9
-        with:
-          args: --issues-exit-code=0