Issues/401/build app improvement