diff --git a/.circleci/config.yml b/.circleci/config.yml
index 55d436087..f3622dfc4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -168,7 +168,7 @@ jobs:
 
   format-go:
     docker:
-      - image: cimg/go:1.19.7
+      - image: cimg/go:1.21.4
     steps:
       - run:
           name: Install gofumpt
@@ -186,7 +186,7 @@ jobs:
   # Build types and cosmwam package without cgo
   wasmvm_no_cgo:
     docker:
-      - image: cimg/go:1.19.7
+      - image: cimg/go:1.21.4
     steps:
       - checkout
       - run:
@@ -204,12 +204,12 @@ jobs:
 
   tidy-go:
     docker:
-      - image: cimg/go:1.19.7
+      - image: cimg/go:1.21.4
     steps:
       - checkout
       - run:
           name: Check go mod tidy
-          # Use --check or --exit-code when available (Go 1.19?)
+          # Use --check or --exit-code when available (Go 1.22?)
           # https://github.com/golang/go/issues/27005
           command: |
             go mod tidy
@@ -222,7 +222,7 @@ jobs:
 
   format-scripts:
     docker:
-      - image: cimg/go:1.21.3
+      - image: cimg/go:1.21.4
     steps:
       - run:
           name: Install shfmt
@@ -279,7 +279,7 @@ jobs:
   # Test the Go project
   wasmvm_test:
     docker:
-      - image: cimg/go:1.19.7
+      - image: cimg/go:1.21.4
     environment:
       GORACE: "halt_on_error=1"
       BUILD_VERSION: $(echo ${CIRCLE_SHA1} | cut -c 1-10)
diff --git a/Makefile b/Makefile
index 86b47a85c..572fd3787 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ test:
 
 test-safety:
 	# Use package list mode to include all subdirectores. The -count=1 turns off caching.
-	GODEBUG=cgocheck=2 go test -race -v -count=1 ./...
+	GOEXPERIMENT=cgocheck2 go test -race -v -count=1 ./...
 
 # Creates a release build in a containerized build environment of the static library for Alpine Linux (.a)
 release-build-alpine:
diff --git a/go.mod b/go.mod
index c160e7e92..1951d7274 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/CosmWasm/wasmvm
 
-go 1.18
+go 1.21
 
 require (
 	github.com/google/btree v1.0.0