DB/EoE: Update some templates