Make gitian builds work

Fixes to make gitian builds work. Only minor changes such as correct naming and image adjustments.