Try a bit harder to join the cluster

[#72786764]