adapt upstream, use public repo, unify container versions