diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
deleted file mode 100644
index 89cde05..0000000
--- a/.github/workflows/build-and-test.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: build-and-test
-
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - v*
-  pull_request: {}
-
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go-version:
-          - 1.21.x
-    steps:
-      - name: Setup Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ matrix.go-version }}
-
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Build
-        run: make build
-
-      - name: Lint
-        uses: golangci/golangci-lint-action@v2
-
-      - name: Test
-        run: make test
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..a00c7fd
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,46 @@
+---
+name: build-and-test
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - v*
+  pull_request: {}
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.21"
+          cache: false
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: "v1.54"
+
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.21"
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build
+        run: make build
+
+      - name: Test
+        run: make test