Changed to base-service image structure