diff --git a/modules/ocf/manifests/extrapackages.pp b/modules/ocf/manifests/extrapackages.pp
index baa70a2ac..db250c33f 100644
--- a/modules/ocf/manifests/extrapackages.pp
+++ b/modules/ocf/manifests/extrapackages.pp
@@ -194,7 +194,7 @@
     ]:;
   }
 
-  if Integer($::os['distro']['release']['major']) >= 11 {
+  if $::os[release][major] !~ /\d+/ or Integer($::os['distro']['release']['major']) >= 11 {
     package {
       [
         'bat',
diff --git a/modules/ocf/manifests/packages/mysql_server.pp b/modules/ocf/manifests/packages/mysql_server.pp
index 260240e38..6f6481647 100644
--- a/modules/ocf/manifests/packages/mysql_server.pp
+++ b/modules/ocf/manifests/packages/mysql_server.pp
@@ -10,7 +10,7 @@
   }
 
   if $manage_service {
-    if Integer($::os[release][major]) < 11 {
+    if $::os[release][major] =~ /\d+/ and Integer($::os[release][major]) < 11 {
       $servicename = 'mysql'
     } else {
       $servicename = 'mariadb'