Fix issue with service images