Refactor the forking process and add new images

[ci skip]