diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index 5afd30c4..3e1e046b 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -35,7 +35,7 @@ lint:
 
 runtimes:
   enabled:
-    - go@1.22.0
+    - go@1.21.4
     - node@20.10.0
     - python@3.10.8
 
diff --git a/Dockerfile b/Dockerfile
index 86f3166e..0266463d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.22 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.21 AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
diff --git a/go.mod b/go.mod
index 53246a20..1fd832d1 100644
--- a/go.mod
+++ b/go.mod
@@ -1,11 +1,10 @@
 module github.com/aiven/aiven-operator
 
-go 1.22
+go 1.21
 
 require (
 	github.com/aiven/aiven-go-client/v2 v2.12.0
 	github.com/aiven/go-api-schemas v1.59.0
-	github.com/aiven/go-client-codegen v0.0.0-20240209135349-3182cbc52bc8
 	github.com/dave/jennifer v1.7.0
 	github.com/docker/go-units v0.5.0
 	github.com/ghodss/yaml v1.0.0
@@ -28,6 +27,7 @@ require (
 )
 
 require (
+	github.com/aiven/go-client-codegen v0.0.0-20240209135349-3182cbc52bc8 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
diff --git a/go.sum b/go.sum
index ef4e35f0..4e3b88c3 100644
--- a/go.sum
+++ b/go.sum
@@ -365,7 +365,6 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
-golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o=
 golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=