Actions builder: fix in builder and templates adaptation (WIP)