Upgrade service (22/24)

Upgrade service