fix: properly take env value into account; hash sensitive data (#591)

fix: properly take env value into account; hash sensitive data (#591) #321