refactor new docker funcs