diff --git a/controllers/defaults/placements.go b/controllers/defaults/placements.go
index 25d45a0e18..f9d8014416 100644
--- a/controllers/defaults/placements.go
+++ b/controllers/defaults/placements.go
@@ -42,18 +42,12 @@ var (
 		},
 
 		"osd": {
-			Tolerations: []corev1.Toleration{
-				getOcsToleration(),
-			},
 			TopologySpreadConstraints: []corev1.TopologySpreadConstraint{
 				getTopologySpreadConstraintsSpec(1, []string{osdLabelSelector}),
 			},
 		},
 
 		"osd-prepare": {
-			Tolerations: []corev1.Toleration{
-				getOcsToleration(),
-			},
 			TopologySpreadConstraints: []corev1.TopologySpreadConstraint{
 				getTopologySpreadConstraintsSpec(1, []string{osdLabelSelector, osdPrepareLabelSelector}),
 			},
diff --git a/controllers/storagecluster/placement.go b/controllers/storagecluster/placement.go
index e251deb716..6091a45aa2 100644
--- a/controllers/storagecluster/placement.go
+++ b/controllers/storagecluster/placement.go
@@ -62,7 +62,10 @@ func getPlacement(sc *ocsv1.StorageCluster, component string) rookCephv1.Placeme
 	// StorageCluster has no label selector, set the default node
 	// affinity.
 	if placement.NodeAffinity == nil && sc.Spec.LabelSelector == nil {
-		placement.NodeAffinity = defaults.DefaultNodeAffinity
+		// Don't add node affinity again for these rook-ceph daemons as it is already added via the "all" key
+		if component != "mgr" && component != "mon" && component != "osd" && component != "osd-prepare" {
+			placement.NodeAffinity = defaults.DefaultNodeAffinity
+		}
 	}
 
 	// If the StorageCluster specifies a label selector, append it to the