Fix #1
Fix environment variable name
Extend and enhance build step