Merge branch 'update/ci-images' into 'master'

Switch to my own images, with dependencies satisfied

See merge request !3