diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 9ba22fe52..4b87a8f29 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -14,8 +14,8 @@
             "minikube": "none"
         },
         "ghcr.io/devcontainers/features/go:1": {
-            "version": "1.20",
-            "golangciLintVersion": "1.55.2"
+            "version": "1.21",
+            "golangciLintVersion": "1.58.2"
         },
         "ghcr.io/mpriscella/features/kind:1": {
             "version": "latest"
diff --git a/config.base.env b/config.base.env
index 8f1759a29..86a4f0314 100644
--- a/config.base.env
+++ b/config.base.env
@@ -3,7 +3,7 @@ API_VERSION_NEXT="v1alpha3"
 API_VERSION="v1alpha2"
 CLUSTER_DOMAIN="cluster.local"
 GEN_CRD_API="gen-crd-api-reference-docs"
-GO_VERSION="1.20.14"
+GO_VERSION="1.21.12"
 HELM_VERSION="3.12.3"
 IMAGE_PULL_MODE="local"
 KIND_CLUSTER_NAME="jenkins"