Swap more repos w/ OctOS repos