moving these under ubuntu target, so we can have other targets (ie coreos, etc)