diff --git a/cmd/argocd-server/commands/argocd_server.go b/cmd/argocd-server/commands/argocd_server.go
index d1e9cf05f98d5..e94601303a071 100644
--- a/cmd/argocd-server/commands/argocd_server.go
+++ b/cmd/argocd-server/commands/argocd_server.go
@@ -155,6 +155,7 @@ func NewCommand() *cobra.Command {
 			controllerClient, err := client.New(config, client.Options{Scheme: scheme})
 			errors.CheckError(err)
 			controllerClient = client.NewDryRunClient(controllerClient)
+			controllerClient = client.NewNamespacedClient(controllerClient, namespace)
 
 			// Load CA information to use for validating connections to the
 			// repository server, if strict TLS validation was requested.
diff --git a/manifests/cluster-rbac/server/argocd-server-clusterrole.yaml b/manifests/cluster-rbac/server/argocd-server-clusterrole.yaml
index 3ee074622c15c..b33820950fcb6 100644
--- a/manifests/cluster-rbac/server/argocd-server-clusterrole.yaml
+++ b/manifests/cluster-rbac/server/argocd-server-clusterrole.yaml
@@ -15,7 +15,6 @@ rules:
   - delete  # supports deletion a live object in UI
   - get     # supports viewing live object manifest in UI
   - patch   # supports `argocd app patch`
-  - list    # supports `argocd appset generate` with cluster generator
 - apiGroups:
   - ""
   resources:
diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
index 25f104e92c197..5eeb2a693d31d 100644
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -22476,7 +22476,6 @@ rules:
   - delete
   - get
   - patch
-  - list
 - apiGroups:
   - ""
   resources:
diff --git a/manifests/install.yaml b/manifests/install.yaml
index 6231763121080..fd05adcdffd9b 100644
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -22443,7 +22443,6 @@ rules:
   - delete
   - get
   - patch
-  - list
 - apiGroups:
   - ""
   resources: