Move environment variables to main app