Change base image and add gc++