Build: Switch to env instead of embedded keys