diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
index 9125f300e..cb1162f32 100644
--- a/.circleci/continue_config.yml
+++ b/.circleci/continue_config.yml
@@ -16,7 +16,7 @@ parameters:
 executors:
   golang-executor:
     docker:
-      - image: gcr.io/gcr-for-testing/golang:1.20.12
+      - image: gcr.io/gcr-for-testing/golang:1.21.6
   machine-executor:
     machine:
       image: ubuntu-2204:current
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f23910225..4ade7d475 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - (Bugfix) Don't abort plan in case of optional action timeout
 - (Documentation) Use relative links for generated docs
 - (Improvement) Change default logging level to info. Add --log.sampling (default true). Adjust log levels.
+- (Maintenance) Bump Go to 1.21.6
 
 ## [1.2.36](https://github.com/arangodb/kube-arangodb/tree/1.2.36) (2024-01-08)
 - (Documentation) Improvements and fixes for rendered documentation (GH pages)
diff --git a/Makefile b/Makefile
index ceb52967b..dcb08cf89 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ endif
 
 TEST_BUILD ?= 0
 GOBUILDARGS ?=
-GOBASEVERSION := 1.20.12
+GOBASEVERSION := 1.21.6
 GOVERSION := $(GOBASEVERSION)-alpine3.17
 DISTRIBUTION := alpine:3.15
 GOBUILDTAGS := $(RELEASE_MODE)