Move env vars to the right place