Changed build from spec to yaml
And buildfixes after rebranding