diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 0b2c7b5..a47ec12 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 download
diff --git a/Makefile b/Makefile
index c1acb3c..c5ad60b 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)
diff --git a/go.mod b/go.mod
index 8864ba8..75fc6f9 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/bluenviron/mavp2p
 
-go 1.20
+go 1.21
 
 require (
 	github.com/alecthomas/kong v0.8.1
diff --git a/manualtests/mavp2p/Dockerfile b/manualtests/mavp2p/Dockerfile
index 3f6177e..ea4b5c6 100644
--- a/manualtests/mavp2p/Dockerfile
+++ b/manualtests/mavp2p/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20
+FROM golang:1.21
 
 WORKDIR /src