Feature/improve nginx

Improve the NGINX recipe and template