refactoring some Dockerfiles...