diff --git a/.circleci/config.yml b/.circleci/config.yml
index 374313392f..dd2ae531bc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -112,7 +112,7 @@ jobs:
 
   build-geth:
     docker:
-      - image: cimg/go:1.20
+      - image: cimg/go:1.21
     resource_class: xlarge
     steps:
       - checkout
@@ -121,7 +121,7 @@ jobs:
   unit-test:
     resource_class: xlarge
     docker:
-      - image: cimg/go:1.20
+      - image: cimg/go:1.21
     steps:
       - checkout
       - run:
@@ -129,14 +129,14 @@ jobs:
   lint-geth:
     resource_class: medium
     docker:
-      - image: cimg/go:1.20
+      - image: cimg/go:1.21
     steps:
       - checkout
       - run:
           command: go run build/ci.go lint
   check-releases:
     docker:
-      - image: cimg/go:1.20
+      - image: cimg/go:1.21
     steps:
       - checkout
       - run:
diff --git a/Dockerfile.alltools b/Dockerfile.alltools
index 70ccc39825..c317da25fa 100644
--- a/Dockerfile.alltools
+++ b/Dockerfile.alltools
@@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""
 
 # Build Geth in a stock Go builder container
-FROM golang:1.20-alpine as builder
+FROM golang:1.21-alpine as builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git