init: updates based on mogami init

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Idc1876dcc23e3ea93c1c188d34a11cf899a32120