Build: Be more specific about which images