Helipng the new builders get set up

Change-Id: I7eb8db87c40df1770aaef00f5ff8fdfef94a6abf