diff --git a/.circleci/config.yml b/.circleci/config.yml
index 98ff4c8000..57cd845d65 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -65,7 +65,7 @@ commands:
 jobs:
   test:
     docker:
-      - image: cimg/go:1.21
+      - image: cimg/go:1.22
       - image: redis:7.2.4
     steps:
       - checkout
@@ -92,7 +92,7 @@ jobs:
 
   build_binaries:
     docker:
-      - image: cimg/go:1.21
+      - image: cimg/go:1.22
     steps:
       - checkout
       - go-build:
@@ -183,7 +183,7 @@ jobs:
 
   build_docker:
     docker:
-      - image: cimg/go:1.21
+      - image: cimg/go:1.22
     steps:
       - setup_googleko
       - checkout
@@ -194,7 +194,7 @@ jobs:
 
   publish_docker_to_ecr:
     docker:
-      - image: cimg/go:1.21
+      - image: cimg/go:1.22
     steps:
       - setup_googleko
       - checkout
@@ -217,7 +217,7 @@ jobs:
 
   publish_docker_to_dockerhub:
     docker:
-      - image: cimg/go:1.21
+      - image: cimg/go:1.22
     steps:
       - setup_googleko
       - checkout
diff --git a/.tool-versions b/.tool-versions
index 9264d46300..48e0dab0ad 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-golang 1.21.8
+golang 1.22