Adjusted go env variable setup