Upgrades pods

/cc @diegoreymendez 

Closes #2393
Closes #2403