Removed hardcoded env references in some templates
Merge pull request #1 from opportunato/master

Removed hardcoded env references in some templates