diff --git a/lib/knife-solo/bootstraps/linux.rb b/lib/knife-solo/bootstraps/linux.rb
index 1728b596..3637e8d1 100644
--- a/lib/knife-solo/bootstraps/linux.rb
+++ b/lib/knife-solo/bootstraps/linux.rb
@@ -66,27 +66,15 @@ def distro
         {:type => (x86? ? "debianoid_omnibus" : "debianoid_gem")}
       when %r{Linaro}
         {:type => "debianoid_gem"}
-      when %r{CentOS.*? 5}
-        {:type => "yum_omnibus"}
-      when %r{CentOS.*? 6}
+      when %r{CentOS}
         {:type => "yum_omnibus"}
       when %r{Amazon Linux}
         {:type => "yum_omnibus"}
-      when %r{Red Hat Enterprise.*? 5}
-        {:type => "yum_omnibus"}
-      when %r{Red Hat Enterprise.*? 6}
-        {:type => "yum_omnibus"}
-      when %r{Fedora release.*? 15}
-        {:type => "yum_omnibus"}
-      when %r{Fedora release.*? 16}
-        {:type => "yum_omnibus"}
-      when %r{Fedora release.*? 17}
-        {:type => "yum_omnibus"}
-      when %r{Fedora release.*? 18}
+      when %r{Red Hat Enterprise}
         {:type => "yum_omnibus"}
-      when %r{Scientific Linux.*? 5}
+      when %r{Fedora release}
         {:type => "yum_omnibus"}
-      when %r{Scientific Linux.*? 6}
+      when %r{Scientific Linux}
         {:type => "yum_omnibus"}
       when %r{SUSE Linux Enterprise Server 1[12]}
         {:type => "omnibus"}