diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 9ca59b3..4437b82 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -271,7 +271,7 @@ class puppet::server::common inherits puppet::client {
             }
             "mysql": {
                 require ruby::mysql
-                if $::selinux == "true" and $::operatingsystem == "CentOS" and $::operatingsystemrelease !~ /^[1-5]\..*/ {
+                if $::operatingsystem == "CentOS" and $::operatingsystemrelease !~ /^[1-5]\..*/ {
                     selinux::boolean { "puppetmaster_use_db":
                         value => "on",
                     }
diff --git a/selinux/manifests/init.pp b/selinux/manifests/init.pp
index 81f5bce..6671162 100644
--- a/selinux/manifests/init.pp
+++ b/selinux/manifests/init.pp
@@ -109,9 +109,11 @@ class selinux::tools {
 #
 define selinux::boolean($value) {
 
-    selboolean { $name:
-        value      => $value,
-        persistent => true,
+    if $::selinux == "true" {
+        selboolean { $name:
+            value      => $value,
+            persistent => true,
+        }
     }
 
 }