DATAREDIS-336: Fine tune build process and formatting