diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 32e64257..883da692 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -29,7 +29,7 @@ jobs:
 
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.20"
+        go-version: "1.21"
 
     - run: |
         go mod tidy
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8e9b1c3f..81a07f8b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
 
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.20"
+        go-version: "1.21"
 
     - run: make test-highlevel-nodocker
 
diff --git a/Makefile b/Makefile
index f6eb0afe..c6a994ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-BASE_IMAGE = golang:1.20-alpine3.18
+BASE_IMAGE = golang:1.21-alpine3.18
 LINT_IMAGE = golangci/golangci-lint:v1.53.3
 
 .PHONY: $(shell ls)