diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4dc63606..dc120cf3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -18,7 +18,22 @@ on:
   workflow_dispatch:
 
 jobs:
+  Lint:
+    name: lint
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: "1.21"
+          cache: false
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.54
+
   Tests:
+    needs: [Lint]
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -38,18 +53,10 @@ jobs:
         run: |
           go mod download
 
-      - name: Get dependencies
-        run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.36.0
-
       - name: Verify Code Generation
         run: |
           make verify-generate
 
-      - name: Lint
-        run: |
-          make lint
-
       - name: Build
         run: |
           make build