diff --git a/codegen/update.sh b/codegen/update.sh
index f8ddd643..033fdd0a 100755
--- a/codegen/update.sh
+++ b/codegen/update.sh
@@ -11,26 +11,11 @@ export GOTOOLCHAIN=go1.23.3 # Should match the go version in go.mod
 CODEGEN_VERSION=v0.30.1 # Should match the k8s.io/apimachinery version in go.mod
 BOILERPLATE_FILE="${ROOT_DIR}/codegen/boilerplate.go.txt"
 
-function generate_helpers() {
-  local dirs=("$@")
-  for dir in "${dirs[@]}"; do
-    echo "Generating code for ${dir}/..."
+echo "Generating helper code..."
 
-    go run "k8s.io/code-generator/cmd/deepcopy-gen@${CODEGEN_VERSION}" \
-      --output-file zz_generated.deepcopy.go \
-      --go-header-file "${BOILERPLATE_FILE}" \
-      "$dir"
-
-    go run "k8s.io/code-generator/cmd/register-gen@${CODEGEN_VERSION}" \
-      --output-file zz_generated.register.go \
-      --go-header-file "${BOILERPLATE_FILE}" \
-      k8s.io/apimachinery/pkg/runtime \
-      "$dir"
-
-  done
-}
-
-generate_helpers \
+go run "k8s.io/code-generator/cmd/deepcopy-gen@${CODEGEN_VERSION}" \
+  --output-file zz_generated.deepcopy.go \
+  --go-header-file "${BOILERPLATE_FILE}" \
   ./api/config/v1alpha1 \
   ./api/controllers/v1alpha1 \
   ./api/core/v1alpha \
@@ -40,27 +25,17 @@ generate_helpers \
   ./pkg/gateway/gatewayapi \
   ./pkg/gateway/ir
 
-echo "Generating OpenAPI schema..."
-
-# Sadly no published tags.
-go run "k8s.io/kube-openapi/cmd/openapi-gen@master" \
+go run "k8s.io/code-generator/cmd/register-gen@${CODEGEN_VERSION}" \
+  --output-file zz_generated.register.go \
   --go-header-file "${BOILERPLATE_FILE}" \
-  --output-dir "api/generated" \
-  --output-pkg "generated" \
-  --output-file zz_generated.openapi.go \
-  --report-filename /dev/null \
-  k8s.io/api/core/v1 \
-  k8s.io/apimachinery/pkg/api/resource \
-  k8s.io/apimachinery/pkg/apis/meta/v1 \
-  k8s.io/apimachinery/pkg/runtime \
-  k8s.io/apimachinery/pkg/util/intstr \
-  k8s.io/apimachinery/pkg/version \
-  sigs.k8s.io/gateway-api/apis/v1 \
+  ./api/config/v1alpha1 \
   ./api/controllers/v1alpha1 \
   ./api/core/v1alpha \
   ./api/extensions/v1alpha1 \
   ./api/gateway/v1 \
-  ./api/policy/v1alpha1
+  ./api/policy/v1alpha1 \
+  ./pkg/gateway/gatewayapi \
+  ./pkg/gateway/ir
 
 echo "Generating client code..."
 
@@ -68,13 +43,13 @@ go run "k8s.io/code-generator/cmd/client-gen@${CODEGEN_VERSION}" \
   --go-header-file "${BOILERPLATE_FILE}" \
   --output-dir "client/" \
   --output-pkg "github.com/apoxy-dev/apoxy-cli/client" \
-  --input-base "github.com/apoxy-dev/apoxy-cli/api" \
+  --input-base "github.com/apoxy-dev/apoxy-cli" \
   --clientset-name "versioned" \
-  --input "controllers/v1alpha1" \
-  --input "core/v1alpha" \
-  --input "extensions/v1alpha1" \
-  --input "gateway/v1" \
-  --input "policy/v1alpha1"
+  --input "./api/controllers/v1alpha1" \
+  --input "./api/core/v1alpha" \
+  --input "./api/extensions/v1alpha1" \
+  --input "./api/gateway/v1" \
+  --input "./api/policy/v1alpha1"
 
 echo "Generating listers and informers..."
 
@@ -100,3 +75,25 @@ go run "k8s.io/code-generator/cmd/informer-gen@${CODEGEN_VERSION}" \
   ./api/extensions/v1alpha1 \
   ./api/gateway/v1 \
   ./api/policy/v1alpha1
+
+echo "Generating OpenAPI schema..."
+
+# Sadly no published tags.
+go run "k8s.io/kube-openapi/cmd/openapi-gen@master" \
+  --go-header-file "${BOILERPLATE_FILE}" \
+  --output-dir "api/generated" \
+  --output-pkg "generated" \
+  --output-file zz_generated.openapi.go \
+  --report-filename /dev/null \
+  k8s.io/api/core/v1 \
+  k8s.io/apimachinery/pkg/api/resource \
+  k8s.io/apimachinery/pkg/apis/meta/v1 \
+  k8s.io/apimachinery/pkg/runtime \
+  k8s.io/apimachinery/pkg/util/intstr \
+  k8s.io/apimachinery/pkg/version \
+  sigs.k8s.io/gateway-api/apis/v1 \
+  ./api/controllers/v1alpha1 \
+  ./api/core/v1alpha \
+  ./api/extensions/v1alpha1 \
+  ./api/gateway/v1 \
+  ./api/policy/v1alpha1
\ No newline at end of file