diff --git a/pipelines/dockerfile-builders/pipeline.yml b/pipelines/dockerfile-builders/pipeline.yml
index 3bafcae4d..5dbc90951 100644
--- a/pipelines/dockerfile-builders/pipeline.yml
+++ b/pipelines/dockerfile-builders/pipeline.yml
@@ -41,12 +41,12 @@ meta:
     BUILD_ARG_GO_VERSION: '1.26.4'
     # Choose which version of sigs.k8s.io/controller-tools/cmd/controller-gen to install
     # in the codegen container images.
-    BUILD_ARG_CONTROLLER_GEN_VERSION: 0.20.1
+    BUILD_ARG_CONTROLLER_GEN_VERSION: v0.21.0
     # Choose which version of github.com/elastic/crd-ref-docs to install in the codegen
     # container images. We use a commit sha instead of a release semver because this project
     # does not create releases very often. They seem to only release 1-2 times per year, but
     # commit to main more often.
-    BUILD_ARG_CRD_REF_DOCS_COMMIT_SHA: c85b7b3
+    BUILD_ARG_CRD_REF_DOCS_COMMIT_SHA: fdfed81
 
 resources:
 
@@ -712,7 +712,7 @@ jobs:
         - path: cache
         params:
           CONTEXT: k8s-code-generator-dockerfile/dockerfiles/k8s-code-generator
-          BUILD_ARG_K8S_PKG_VERSION: 0.33.10
+          BUILD_ARG_K8S_PKG_VERSION: 0.33.13
           <<: *codegen-versions
           OUTPUT_OCI: true # needed for building multi-arch images
           IMAGE_PLATFORM: "linux/amd64,linux/arm64" # build a multi-arch images which includes these platforms
@@ -748,7 +748,7 @@ jobs:
         - path: cache
         params:
           CONTEXT: k8s-code-generator-dockerfile/dockerfiles/k8s-code-generator
-          BUILD_ARG_K8S_PKG_VERSION: 0.34.6
+          BUILD_ARG_K8S_PKG_VERSION: 0.34.9
           <<: *codegen-versions
           OUTPUT_OCI: true # needed for building multi-arch images
           IMAGE_PLATFORM: "linux/amd64,linux/arm64" # build a multi-arch images which includes these platforms
@@ -784,7 +784,7 @@ jobs:
         - path: cache
         params:
           CONTEXT: k8s-code-generator-dockerfile/dockerfiles/k8s-code-generator
-          BUILD_ARG_K8S_PKG_VERSION: 0.35.3
+          BUILD_ARG_K8S_PKG_VERSION: 0.35.6
           <<: *codegen-versions
           OUTPUT_OCI: true # needed for building multi-arch images
           IMAGE_PLATFORM: "linux/amd64,linux/arm64" # build a multi-arch images which includes these platforms
@@ -820,7 +820,7 @@ jobs:
         - path: cache
         params:
           CONTEXT: k8s-code-generator-dockerfile/dockerfiles/k8s-code-generator
-          BUILD_ARG_K8S_PKG_VERSION: 0.36.0
+          BUILD_ARG_K8S_PKG_VERSION: 0.36.2
           <<: *codegen-versions
           OUTPUT_OCI: true # needed for building multi-arch images
           IMAGE_PLATFORM: "linux/amd64,linux/arm64" # build a multi-arch images which includes these platforms