DockerPaas prep refactoring