Update prod config

Change-Id: I7a90c2f65b3f50fa977b1faa6f6e8ac0276aa896
Clean up the config a bit

Change-Id: I0db72546cc28750b15b32b73b7ea70f46523ab12