diff --git a/manifests/machineconfigdaemon/daemonset.yaml b/manifests/machineconfigdaemon/daemonset.yaml
index 36a64e2e73..a4d9b67723 100644
--- a/manifests/machineconfigdaemon/daemonset.yaml
+++ b/manifests/machineconfigdaemon/daemonset.yaml
@@ -63,13 +63,6 @@ spec:
       hostPID: true
       serviceAccountName: machine-config-daemon
       terminationGracePeriodSeconds: 600
-      tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
-        effect: NoSchedule
-      - key: node-role.kubernetes.io/etcd
-        operator: Exists
-        effect: NoSchedule
       nodeSelector:
         kubernetes.io/os: linux
       priorityClassName: "system-node-critical"
@@ -83,3 +76,6 @@ spec:
         - name: cookie-secret
           secret:
             secretName: cookie-secret
+      tolerations:
+      # MCD needs to run everywhere. Tolerate all taints.
+      - operator: Exists
\ No newline at end of file
diff --git a/pkg/operator/assets/bindata.go b/pkg/operator/assets/bindata.go
index 5e82704573..5c5589b672 100644
--- a/pkg/operator/assets/bindata.go
+++ b/pkg/operator/assets/bindata.go
@@ -1288,13 +1288,6 @@ spec:
       hostPID: true
       serviceAccountName: machine-config-daemon
       terminationGracePeriodSeconds: 600
-      tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
-        effect: NoSchedule
-      - key: node-role.kubernetes.io/etcd
-        operator: Exists
-        effect: NoSchedule
       nodeSelector:
         kubernetes.io/os: linux
       priorityClassName: "system-node-critical"
@@ -1308,7 +1301,9 @@ spec:
         - name: cookie-secret
           secret:
             secretName: cookie-secret
-`)
+      tolerations:
+      # MCD needs to run everywhere. Tolerate all taints.
+      - operator: Exists`)
 
 func manifestsMachineconfigdaemonDaemonsetYamlBytes() ([]byte, error) {
 	return _manifestsMachineconfigdaemonDaemonsetYaml, nil