Add proper handling to determine Ubuntu/Centos. Hack needs to be
cleaned up