gitlab-ci: Update for building new containers