Yeah, I meant disabling (removing) the new Dockerfile jobs and restoring changes to the dist-various. Effectively reverting #140772 and #143031 but it will probably have conflicts.
Tracking a beta backport we need to do as discussed in #144659 regarding #144533 so it's not lost in PR comments.
cc @mati865