diff --git a/hack/lib/generator-help.sh b/hack/lib/generator-help.sh
index 7b96947fa..ca5685b36 100644
--- a/hack/lib/generator-help.sh
+++ b/hack/lib/generator-help.sh
@@ -20,6 +20,6 @@ function find_dirs_containing_comment_tags() {
      | LC_ALL=C sort -u \
      )
 
-   IFS=",";
+   IFS=" ";
    printf '%s' "${array[*]}";
 }
diff --git a/hack/update-generated-conversions.sh b/hack/update-generated-conversions.sh
index 4edd5c967..b83da7769 100755
--- a/hack/update-generated-conversions.sh
+++ b/hack/update-generated-conversions.sh
@@ -6,5 +6,5 @@ go build -o "${OS_OUTPUT_BINPATH}/conversion-gen" "k8s.io/code-generator/cmd/con
 
 ${OS_OUTPUT_BINPATH}/conversion-gen \
 		--go-header-file "hack/boilerplate/boilerplate.go.txt" \
-		--input-dirs "$(find_dirs_containing_comment_tags "+k8s:conversion-gen=")" \
-		--output-file-base zz_generated.conversion
+		--output-file zz_generated.conversion.go \
+		$(find_dirs_containing_comment_tags "+k8s:conversion-gen=")
diff --git a/hack/update-generated-deep-copies.sh b/hack/update-generated-deep-copies.sh
index 3f2f67e26..8bacfe0d6 100755
--- a/hack/update-generated-deep-copies.sh
+++ b/hack/update-generated-deep-copies.sh
@@ -6,6 +6,6 @@ go build -o "${OS_OUTPUT_BINPATH}/deepcopy-gen" "k8s.io/code-generator/cmd/deepc
 
 ${OS_OUTPUT_BINPATH}/deepcopy-gen \
                 --go-header-file "hack/boilerplate/boilerplate.go.txt" \
-                --input-dirs "$(find_dirs_containing_comment_tags "+k8s:deepcopy-gen=")" \
-                --output-file-base zz_generated.deepcopy
+                --output-file zz_generated.deepcopy.go \
+                $(find_dirs_containing_comment_tags "+k8s:deepcopy-gen=")
 
diff --git a/hack/update-generated-defaulters.sh b/hack/update-generated-defaulters.sh
index 52e0f42f2..ee3d7cf8e 100755
--- a/hack/update-generated-defaulters.sh
+++ b/hack/update-generated-defaulters.sh
@@ -6,6 +6,6 @@ go build -o "${OS_OUTPUT_BINPATH}/defaulter-gen" "k8s.io/code-generator/cmd/defa
 
 ${OS_OUTPUT_BINPATH}/defaulter-gen \
                 --go-header-file "hack/boilerplate/boilerplate.go.txt" \
-                --input-dirs "$(find_dirs_containing_comment_tags "+k8s:defaulter-gen=")" \
-		--extra-peer-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1" \
-                --output-file-base zz_generated.defaults
+                --extra-peer-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1" \
+                --output-file zz_generated.defaults.go \
+                $(find_dirs_containing_comment_tags "+k8s:defaulter-gen=")