Move variables to env key