diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
deleted file mode 100644
index dcad287..0000000
--- a/.github/workflows/golangci-lint.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: golangci-lint
-on:
-  push:
-    branches:
-    - "master"
-    - "release-*"
-    tags:
-    - "v*"
-  pull_request:
-    branches:
-    - "master"
-    - "release-*"
-
-jobs:
-  golangci:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
-        with:
-          go-version-file: go.mod
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          version: v1.64.8
-          args: --timeout=5m
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 04fcc88..200fb7d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
         with:
           go-version-file: ${{ env.GOPATH }}/src/github.com/kubeflow/mpi-operator/go.mod
       - name: fmt check
-        run: make fmt
+        run: make fmt lint
       - name: go mod tidy
         run: make tidy
       - name: Build
diff --git a/Makefile b/Makefile
index ebde8d7..0b51134 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ tidy:
 
 .PHONY: lint
 lint: bin/golangci-lint ## Run golangci-lint linter
-	$(GOLANGCI_LINT) run
+	$(GOLANGCI_LINT) run --timeout=5m
 
 # Generate deploy/v2beta1/mpi-operator.yaml
 manifest: kustomize crd