diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eb0370e1..dc0a4677 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,27 +6,36 @@ on:
   pull_request:
 jobs:
   test:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [1.20.x]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
+        go-version: [ 1.20.x, 1.21.x, tip ]
     steps:
-      - name: install Go
+      - name: Set up Go stable
+        if: matrix.go-version != 'tip'
         uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
+      - name: Set up Go tip
+        if: matrix.go-version == 'tip'
+        run: |
+          curl -sL https://storage.googleapis.com/go-build-snap/go/linux-amd64/$(git ls-remote https://github.com/golang/go.git HEAD | awk '{print $1;}').tar.gz -o gotip.tar.gz
+          ls -lah gotip.tar.gz
+          mkdir -p ~/sdk/gotip
+          tar -C ~/sdk/gotip -xzf gotip.tar.gz
+          ~/sdk/gotip/bin/go version
+          echo "PATH=$HOME/go/bin:$HOME/sdk/gotip/bin/:$PATH" >> $GITHUB_ENV
       - name: install cairo
         run: sudo apt-get install libcairo2-dev -y
-      - name: setup linter
-        run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/local/bin v1.52.2
       - name: checkout code
         uses: actions/checkout@v3
       - name: test
         run: make test
       - name: golangci-lint
+        if: matrix.go-version == '1.21.x'
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52.2
+          version: v1.54.2
       - name: integration test
+        if: matrix.go-version == '1.21.x'
         run: tests/system_test.sh
diff --git a/docker/carbonapi/Dockerfile b/docker/carbonapi/Dockerfile
index 943f673b..f7236d6d 100644
--- a/docker/carbonapi/Dockerfile
+++ b/docker/carbonapi/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20
+FROM golang:1.21
 
 RUN apt-get update
 RUN apt-get install -y libcairo2-dev
diff --git a/docker/go-carbon/Dockerfile b/docker/go-carbon/Dockerfile
index afcd1042..a5a69224 100644
--- a/docker/go-carbon/Dockerfile
+++ b/docker/go-carbon/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20
+FROM golang:1.21
 
 RUN mkdir -p /data/graphite/whisper/
 COPY ./docker/go-carbon/*.conf /etc/