[WIP] Updated installers

As followup of #329, here a fragmented PR of the changes. Will rebase after review.