Use env variables instead of System Properties

Avoid exposing secret data in logs etc.

Issue: #52