Further work for downstream dockerfiles