Moved secure env vars under env key