Update docker-gen and update template