Better build workflow