refactoring;
support for trusted docker build;