diff --git a/manager/manifests/istio.yaml.j2 b/manager/manifests/istio.yaml.j2
index b782830644..ecccf38695 100644
--- a/manager/manifests/istio.yaml.j2
+++ b/manager/manifests/istio.yaml.j2
@@ -55,18 +55,12 @@ spec:
               app: operator-istio-gateway
               istio: ingressgateway-operator
             ports:
-              - name: status-port  # should be first in the list, see https://github.com/istio/istio/issues/12503
-                port: 15021
-                targetPort: 15021
               - name: http2
                 port: 80
                 targetPort: 80
               - name: https
                 port: 443
                 targetPort: 443
-              - name: tls  # used for SNI
-                port: 15443
-                targetPort: 15443
           resources:
             requests:
               cpu: 100m
@@ -114,18 +108,12 @@ spec:
               app: apis-istio-gateway
               istio: ingressgateway-apis
             ports:
-              - name: status-port  # should be first in the list, see https://github.com/istio/istio/issues/12503
-                port: 15021
-                targetPort: 15021
               - name: http2
                 port: 80
                 targetPort: 80
               - name: https
                 port: 443
                 targetPort: 443
-              - name: tls  # used for SNI
-                port: 15443
-                targetPort: 15443
           resources:
             requests:
               cpu: 400m
diff --git a/pkg/types/clusterconfig/cluster_config.go b/pkg/types/clusterconfig/cluster_config.go
index aa7c80dbd1..2b47c55887 100644
--- a/pkg/types/clusterconfig/cluster_config.go
+++ b/pkg/types/clusterconfig/cluster_config.go
@@ -48,8 +48,16 @@ import (
 const (
 	// MaxNodeGroups represents the max number of node groups in a cluster
 	MaxNodeGroups = 100
+
 	// MaxNodesToAddOnClusterUp represents the max number of nodes to add on cluster up
-	MaxNodesToAddOnClusterUp = 250
+	// Limited to 200 nodes (rounded down from 248 nodes) for two reasons:
+	//
+	// * To prevent overloading the API servers when the nodes are being added.
+	//
+	// * To prevent hitting the 500 targets per LB (when the cross-load balancing is enabled) limit (quota code L-B211E961);
+	//   500 divided by 2 target listeners - 1 operator node - 1 prometheus node => 248
+	MaxNodesToAddOnClusterUp = 200
+
 	// MaxNodesToAddOnClusterConfigure represents the max number of nodes to add on cluster up/configure
 	MaxNodesToAddOnClusterConfigure = 100
 	// ClusterNameTag is the tag used for storing a cluster's name in AWS resources