diff --git a/Makefile b/Makefile
index 00e7af86bc26..79bab6aa36b1 100644
--- a/Makefile
+++ b/Makefile
@@ -236,7 +236,7 @@ scan-%:
 # generation
 
 .PHONY: codegen
-codegen: types swagger docs
+codegen: types swagger docs manifests
 
 .PHONY: types
 types: pkg/apis/workflow/v1alpha1/generated.proto pkg/apis/workflow/v1alpha1/openapi_generated.go pkg/apis/workflow/v1alpha1/zz_generated.deepcopy.go
@@ -355,24 +355,30 @@ dist/kustomize:
 	cd dist && ./install_kustomize.sh 3.8.8
 	dist/kustomize version
 
-manifests: dist/manifests/install.yaml \
+manifests: \
+	manifests/install.yaml \
+	manifests/namespace-install.yaml \
+	manifests/quick-start-minimal.yaml \
+	manifests/quick-start-mysql.yaml \
+	manifests/quick-start-postgres.yaml \
+	dist/manifests/install.yaml \
 	dist/manifests/namespace-install.yaml \
 	dist/manifests/quick-start-minimal.yaml \
 	dist/manifests/quick-start-mysql.yaml \
 	dist/manifests/quick-start-postgres.yaml
 
-manifests/install.yaml: /dev/null
+manifests/install.yaml: dist/kustomize /dev/null
 	dist/kustomize build --load_restrictor=none manifests/cluster-install | ./hack/auto-gen-msg.sh > manifests/install.yaml
-manifests/namespace-install.yaml: /dev/null
+manifests/namespace-install.yaml: dist/kustomize /dev/null
 	dist/kustomize build --load_restrictor=none manifests/namespace-install | ./hack/auto-gen-msg.sh > manifests/namespace-install.yaml
-manifests/quick-start-minimal.yaml: /dev/null
+manifests/quick-start-minimal.yaml: dist/kustomize /dev/null
 	dist/kustomize build --load_restrictor=none manifests/quick-start/minimal | ./hack/auto-gen-msg.sh > manifests/quick-start-minimal.yaml
-manifests/quick-start-mysql.yaml: /dev/null
+manifests/quick-start-mysql.yaml: dist/kustomize /dev/null
 	dist/kustomize build --load_restrictor=none manifests/quick-start/mysql | ./hack/auto-gen-msg.sh > manifests/quick-start-mysql.yaml
-manifests/quick-start-postgres.yaml: /dev/null
+manifests/quick-start-postgres.yaml: dist/kustomize /dev/null
 	dist/kustomize build --load_restrictor=none manifests/quick-start/postgres | ./hack/auto-gen-msg.sh > manifests/quick-start-postgres.yaml
 
-dist/manifests/%: manifests/$*
+dist/manifests/%: manifests/%
 	@mkdir -p dist/manifests
 	sed 's/:latest/:$(VERSION)/' manifests/$* > $@
 
diff --git a/manifests/cluster-install/argo-server-rbac/argo-server-clusterolebinding.yaml b/manifests/cluster-install/argo-server-rbac/argo-server-clusterolebinding.yaml
index 70a2960b8f0f..6d7ac27ff5e0 100644
--- a/manifests/cluster-install/argo-server-rbac/argo-server-clusterolebinding.yaml
+++ b/manifests/cluster-install/argo-server-rbac/argo-server-clusterolebinding.yaml
@@ -9,4 +9,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: argo-server
-    namespace: default
+    namespace: argo
diff --git a/manifests/cluster-install/kustomization.yaml b/manifests/cluster-install/kustomization.yaml
index 94e2c768ea8a..a1698bd2ac72 100644
--- a/manifests/cluster-install/kustomization.yaml
+++ b/manifests/cluster-install/kustomization.yaml
@@ -1,6 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: argo
 
 resources:
 - ../base
diff --git a/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrolebinding.yaml b/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrolebinding.yaml
index cce4ae7bc35e..b4e54ea67c90 100644
--- a/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrolebinding.yaml
+++ b/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrolebinding.yaml
@@ -9,4 +9,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: argo
-  namespace: default
+  namespace: argo
diff --git a/manifests/quick-start-minimal.yaml b/manifests/quick-start-minimal.yaml
index 62db102ec09d..8aa6b288a09b 100644
--- a/manifests/quick-start-minimal.yaml
+++ b/manifests/quick-start-minimal.yaml
@@ -667,6 +667,7 @@ data:
     enabled: true
     path: /metrics
     port: 9090
+  namespaceParallelism: "10"
 kind: ConfigMap
 metadata:
   name: workflow-controller-configmap
diff --git a/manifests/quick-start-mysql.yaml b/manifests/quick-start-mysql.yaml
index 71c84d408115..1ae29ae1779b 100644
--- a/manifests/quick-start-mysql.yaml
+++ b/manifests/quick-start-mysql.yaml
@@ -667,6 +667,7 @@ data:
     enabled: true
     path: /metrics
     port: 9090
+  namespaceParallelism: "10"
   persistence: |
     connectionPool:
       maxIdleConns: 100
diff --git a/manifests/quick-start-postgres.yaml b/manifests/quick-start-postgres.yaml
index ea79776b78da..fef3260fae16 100644
--- a/manifests/quick-start-postgres.yaml
+++ b/manifests/quick-start-postgres.yaml
@@ -667,6 +667,7 @@ data:
     enabled: true
     path: /metrics
     port: 9090
+  namespaceParallelism: "10"
   persistence: |
     connectionPool:
       maxIdleConns: 100