diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 75f7202ae..54777a2ac 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
   "image": "mcr.microsoft.com/vscode/devcontainers/base:ubuntu",
   "features": {
     "ghcr.io/devcontainers/features/go:1": {
-      "version": "1.22"
+      "version": "1.26"
     },
     "ghcr.io/devcontainers/features/docker-in-docker:2": {}
   },
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index c3fca3169..cbbfe78d6 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5  # v6.2.0
         with:
-          go-version: '1.22'
+          go-version: '1.26'
       - name: Run tests
         run: |
           make e2e
@@ -39,7 +39,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5  # v6.2.0
         with:
-          go-version: '1.22'
+          go-version: '1.26'
       - name: Run tests
         run: |
           make e2e
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 81c2d9575..0a768004d 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -12,7 +12,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5  # v6.2.0
         with:
-          go-version: '1.22'
+          go-version: '1.26'
       - name: Run tests
         run: |
           make build
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 928ee7e88..31f7d3aa6 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -18,7 +18,7 @@ jobs:
       - run: git fetch --force --tags
       - uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5  # v6.2.0
         with:
-          go-version: '1.22'
+          go-version: '1.26'
       - name: Set GORELEASER_PREVIOUS_TAG in actual release
         if: ${{ !contains(github.ref, '-nightly') }}
         # find previous tag by filtering out nightly tags and choosing the
diff --git a/Makefile b/Makefile
index 67e6c1279..6cb852913 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ HELM_TGZ ?= $(LOCALBIN)/helm.tar.gz
 HELM ?= $(LOCALBIN)/helm
 
 ## Tool Versions
-CONTROLLER_TOOLS_VERSION ?= v0.15.0
+CONTROLLER_TOOLS_VERSION ?= v0.20.0
 
 .PHONY: fmt
 fmt: ## Run go fmt against code.
diff --git a/pkg/controllers/resources/idpbuilder.cnoe.io_custompackages.yaml b/pkg/controllers/resources/idpbuilder.cnoe.io_custompackages.yaml
index a81df9ad8..805eb2c9f 100644
--- a/pkg/controllers/resources/idpbuilder.cnoe.io_custompackages.yaml
+++ b/pkg/controllers/resources/idpbuilder.cnoe.io_custompackages.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: custompackages.idpbuilder.cnoe.io
 spec:
   group: idpbuilder.cnoe.io
diff --git a/pkg/controllers/resources/idpbuilder.cnoe.io_gitrepositories.yaml b/pkg/controllers/resources/idpbuilder.cnoe.io_gitrepositories.yaml
index e305cdcf3..ed17fbf42 100644
--- a/pkg/controllers/resources/idpbuilder.cnoe.io_gitrepositories.yaml
+++ b/pkg/controllers/resources/idpbuilder.cnoe.io_gitrepositories.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: gitrepositories.idpbuilder.cnoe.io
 spec:
   group: idpbuilder.cnoe.io
diff --git a/pkg/controllers/resources/idpbuilder.cnoe.io_localbuilds.yaml b/pkg/controllers/resources/idpbuilder.cnoe.io_localbuilds.yaml
index d1959ab7c..e9bfcc9af 100644
--- a/pkg/controllers/resources/idpbuilder.cnoe.io_localbuilds.yaml
+++ b/pkg/controllers/resources/idpbuilder.cnoe.io_localbuilds.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: localbuilds.idpbuilder.cnoe.io
 spec:
   group: idpbuilder.cnoe.io