[TRE-454/455/456/457] Adjust mapping rule for cert packages