This should have been backported in https://github.com/openshift/machine-config-operator/pull/1787 already (respective BZ is https://bugzilla.redhat.com/show_bug.cgi?id=1844384). Can we close this as a duplicate?