Update all configs to current upstream state.
Add more resources (unable to pass tests now)...