Upgrade service (20/24)

Upgrade service