Change order of scripts and use echo + apt-key instead of apt-add-repository