Merge "Correct image path resolving for cert service"