Correct repositories to work within gridline

Change-Id: I6d8e1c617dc2c36394d496aedf362e3dcd5d8c5b