diff --git a/tools/make/common.mk b/tools/make/common.mk
index c2e0d380f2b..aed3368ac38 100644
--- a/tools/make/common.mk
+++ b/tools/make/common.mk
@@ -120,7 +120,7 @@ export USAGE_OPTIONS
 
 .PHONY: generate
 generate: ## Generate go code from templates and tags
-generate: kube-generate docs-api helm-generate go.generate copy-current-release-docs
+generate: kube-generate docs-api helm-generate go.generate copy-current-release-docs kube-generate-examples
 
 ## help: Show this help info.
 .PHONY: help
diff --git a/tools/make/examples.mk b/tools/make/examples.mk
index 447a35638f1..b5274afc732 100644
--- a/tools/make/examples.mk
+++ b/tools/make/examples.mk
@@ -3,10 +3,17 @@ EXAMPLE_IMAGE_PREFIX ?= envoyproxy/gateway-
 EXAMPLE_TAG ?= latest
 
 sync-examples-tools:
+	@$(LOG_TARGET)
 	@cp -r tools/src/controller-gen examples/extension-server/tools/src
 
+kube-generate-examples: sync-examples-tools
+	@$(LOG_TARGET)
+	@pushd $(ROOT_DIR)/examples/extension-server; \
+		make generate; \
+		popd
+
 .PHONY: kube-build-examples-image
-kube-build-examples-image: sync-examples-tools
+kube-build-examples-image:
 	@$(LOG_TARGET)
 	@for app in $(EXAMPLE_APPS); do \
 		pushd $(ROOT_DIR)/examples/$$app; \