merge use-dockerfiles-repo (tested it on k4 and it works), closes #11