Prepare new forge upload
Adjust erb templates and add test