Template creation for M5.x deliverables