improved support for custom image

Signed-off-by: Gerald <gera2ld@163.com>