GONRG-4309: Cost optimization for service

3 jobs for !236 with GONRG-4309-cost-optimization-for-service in 39 minutes and 59 seconds
latest merge request