Merge "Update Aether production deployment configs"