I would suggest a rewrite or cleanup of Dockerfiles in order to reduce the number of layers in these images.