Fix registry push tags

Fixes #3139.
Also ACTUALLY fixes #2698 (unlike my previous PR, #2917)