[#74385698] Correct submission templates