Resolve order only over packages we actually build
Correct tags to include distro name