Rework gerrit node

Change-Id: Ibf454151e98008b23ca2fba11ee7da2938e553c5
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>