diff --git a/manifests/params.pp b/manifests/params.pp
index 5d5247a..35ef37f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,582 +1,583 @@
 # @summary
 #   Params class.
 #
 # @api private
 #
 class mysql::params {
   $manage_config_file     = true
   $config_file_mode       = '0644'
   $purge_conf_dir         = false
   $restart                = false
   $root_password          = 'UNSET'
   $install_secret_file    = '/.mysql_secret'
   $server_package_ensure  = 'present'
   $server_package_manage  = true
   $server_service_manage  = true
   $server_service_enabled = true
   $client_package_ensure  = 'present'
   $client_package_manage  = true
   $create_root_user       = true
   $create_root_my_cnf     = true
   $create_root_login_file = false
   $login_file             = undef
   $exec_path              = ''
   # mysql::bindings
   $bindings_enable             = false
   $java_package_ensure         = 'present'
   $java_package_provider       = undef
   $perl_package_ensure         = 'present'
   $perl_package_provider       = undef
   $php_package_ensure          = 'present'
   $php_package_provider        = undef
   $python_package_ensure       = 'present'
   $python_package_provider     = undef
   $ruby_package_ensure         = 'present'
   $ruby_package_provider       = undef
   $client_dev_package_ensure   = 'present'
   $client_dev_package_provider = undef
   $daemon_dev_package_ensure   = 'present'
   $daemon_dev_package_provider = undef
   $xtrabackup_package_name_default = 'percona-xtrabackup'
 
   case $::osfamily {
     'RedHat': {
       case $::operatingsystem {
         'Fedora': {
           if versioncmp($::operatingsystemrelease, '19') >= 0 or $::operatingsystemrelease == 'Rawhide' {
             $provider = 'mariadb'
           } else {
             $provider = 'mysql'
           }
           $python_package_name = 'MySQL-python'
         }
         'Amazon': {
           if versioncmp($::operatingsystemrelease, '2') >= 0 {
             $provider = 'mariadb'
           } else {
             $provider = 'mysql'
           }
         }
         /^(RedHat|CentOS|Scientific|OracleLinux)$/: {
           if versioncmp($::operatingsystemmajrelease, '7') >= 0 {
             $provider = 'mariadb'
             if versioncmp($::operatingsystemmajrelease, '8') >= 0 {
               $xtrabackup_package_name_override = 'percona-xtrabackup-24'
             }
           } else {
             $provider = 'mysql'
             $xtrabackup_package_name_override = 'percona-xtrabackup-20'
           }
           if versioncmp($::operatingsystemmajrelease, '8') >= 0 {
             $java_package_name   = 'mariadb-java-client'
             $python_package_name = 'python3-PyMySQL'
           } else {
             $java_package_name   = 'mysql-connector-java'
             $python_package_name = 'MySQL-python'
           }
         }
         default: {
           $provider = 'mysql'
         }
       }
 
       if $provider == 'mariadb' {
         $client_package_name     = 'mariadb'
         $server_package_name     = 'mariadb-server'
         $server_service_name     = 'mariadb'
         $log_error               = '/var/log/mariadb/mariadb.log'
         $config_file             = '/etc/my.cnf.d/server.cnf'
         # mariadb package by default has !includedir set in my.cnf to /etc/my.cnf.d
         $includedir              = undef
         $pidfile                 = '/var/run/mariadb/mariadb.pid'
         $daemon_dev_package_name = 'mariadb-devel'
       } else {
         $client_package_name     = 'mysql'
         $server_package_name     = 'mysql-server'
         $server_service_name     = 'mysqld'
         $log_error               = '/var/log/mysqld.log'
         $config_file             = '/etc/my.cnf'
         $includedir              = '/etc/my.cnf.d'
         $pidfile                 = '/var/run/mysqld/mysqld.pid'
         $daemon_dev_package_name = 'mysql-devel'
       }
 
       $basedir                 = '/usr'
       $datadir                 = '/var/lib/mysql'
       $root_group              = 'root'
       $mysql_group             = 'mysql'
       $mycnf_owner             = undef
       $mycnf_group             = undef
       $socket                  = '/var/lib/mysql/mysql.sock'
       $ssl_ca                  = '/etc/mysql/cacert.pem'
       $ssl_cert                = '/etc/mysql/server-cert.pem'
       $ssl_key                 = '/etc/mysql/server-key.pem'
       $tmpdir                  = '/tmp'
       $managed_dirs            = undef
       # mysql::bindings
       $perl_package_name       = 'perl-DBD-MySQL'
       $php_package_name        = 'php-mysql'
       $ruby_package_name       = 'ruby-mysql'
       $client_dev_package_name = undef
     }
 
     'Suse': {
       case $::operatingsystem {
         'OpenSuSE': {
           if versioncmp( $::operatingsystemmajrelease, '12' ) >= 0 {
             $client_package_name = 'mariadb-client'
             $server_package_name = 'mariadb'
             # First service start fails if this is set. Runs fine without
             # it being set, in any case. Leaving it as-is for the mysql.
             $basedir             = undef
           } else {
             $client_package_name = 'mysql-community-server-client'
             $server_package_name = 'mysql-community-server'
             $basedir             = '/usr'
           }
         }
         'SLES','SLED': {
           if versioncmp($::operatingsystemrelease, '12') >= 0 {
             $client_package_name = 'mariadb-client'
             $server_package_name = 'mariadb'
             $basedir             = undef
           } else {
             $client_package_name = 'mysql-client'
             $server_package_name = 'mysql'
             $basedir             = '/usr'
           }
         }
         default: {
           fail("Unsupported platform: puppetlabs-${module_name} currently doesn\'t support ${::operatingsystem}.")
         }
       }
       $config_file         = '/etc/my.cnf'
       $includedir          = '/etc/my.cnf.d'
       $datadir             = '/var/lib/mysql'
       $log_error           = $::operatingsystem ? {
         /OpenSuSE/         => '/var/log/mysql/mysqld.log',
         /(SLES|SLED)/      => '/var/log/mysqld.log',
       }
       $pidfile             = $::operatingsystem ? {
         /OpenSuSE/         => '/var/run/mysql/mysqld.pid',
         /(SLES|SLED)/      => '/var/lib/mysql/mysqld.pid',
       }
       $root_group          = 'root'
       $mysql_group         = 'mysql'
       $mycnf_owner         = undef
       $mycnf_group         = undef
       $server_service_name = 'mysql'
       $xtrabackup_package_name_override = 'xtrabackup'
 
       if $::operatingsystem =~ /(SLES|SLED)/ {
         if versioncmp( $::operatingsystemmajrelease, '12' ) >= 0 {
           $socket = '/run/mysql/mysql.sock'
         } else {
           $socket = '/var/lib/mysql/mysql.sock'
         }
       } else {
         $socket = '/var/run/mysql/mysql.sock'
       }
 
       $ssl_ca              = '/etc/mysql/cacert.pem'
       $ssl_cert            = '/etc/mysql/server-cert.pem'
       $ssl_key             = '/etc/mysql/server-key.pem'
       $tmpdir              = '/tmp'
       $managed_dirs        = undef
       # mysql::bindings
       $java_package_name   = 'mysql-connector-java'
       $perl_package_name   = 'perl-DBD-mysql'
       $php_package_name    = 'apache2-mod_php53'
       $python_package_name = 'python-mysql'
       $ruby_package_name   = $::operatingsystem ? {
         /OpenSuSE/         => 'rubygem-mysql',
         /(SLES|SLED)/      => 'ruby-mysql',
       }
       $client_dev_package_name = 'libmysqlclient-devel'
       $daemon_dev_package_name = 'mysql-devel'
     }
 
     'Debian': {
       if $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0 {
         $provider = 'mariadb'
       } else {
         $provider = 'mysql'
       }
       if $provider == 'mariadb' {
         $client_package_name     = 'mariadb-client'
         $server_package_name     = 'mariadb-server'
         $server_service_name     = 'mariadb'
         $client_dev_package_name = 'libmariadbclient-dev'
         $daemon_dev_package_name = 'libmariadbd-dev'
       } else {
         $client_package_name     = 'mysql-client'
         $server_package_name     = 'mysql-server'
         $server_service_name     = 'mysql'
         $client_dev_package_name = 'libmysqlclient-dev'
         $daemon_dev_package_name = 'libmysqld-dev'
       }
 
       $basedir                 = '/usr'
       $config_file             = '/etc/mysql/my.cnf'
       $includedir              = '/etc/mysql/conf.d'
       $datadir                 = '/var/lib/mysql'
       $log_error               = '/var/log/mysql/error.log'
       $pidfile                 = '/var/run/mysqld/mysqld.pid'
       $root_group              = 'root'
       $mysql_group             = 'adm'
       $mycnf_owner             = undef
       $mycnf_group             = undef
       $socket                  = '/var/run/mysqld/mysqld.sock'
       $ssl_ca                  = '/etc/mysql/cacert.pem'
       $ssl_cert                = '/etc/mysql/server-cert.pem'
       $ssl_key                 = '/etc/mysql/server-key.pem'
       $tmpdir                  = '/tmp'
       $managed_dirs            = ['tmpdir','basedir','datadir','innodb_data_home_dir','innodb_log_group_home_dir','innodb_undo_directory','innodb_tmpdir']
 
       # mysql::bindings
       if ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '10') >= 0) or
       ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '20.04') >= 0) {
         $java_package_name   = 'libmariadb-java'
       } else {
         $java_package_name   = 'libmysql-java'
       }
       $perl_package_name   = 'libdbd-mysql-perl'
       if  ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') >= 0) or
       ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '9') >= 0) {
         $php_package_name = 'php-mysql'
       } else {
         $php_package_name = 'php5-mysql'
       }
       if  ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') < 0) or
+      ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '20.04') >= 0) or
       ($::operatingsystem == 'Debian') {
         $xtrabackup_package_name_override = 'percona-xtrabackup-24'
       }
       if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '20.04') >= 0) {
         $python_package_name = 'python3-mysqldb'
       } else {
         $python_package_name = 'python-mysqldb'
       }
 
       $ruby_package_name   =  $facts['operatingsystemmajrelease']  ? {
         '8'     => 'ruby-mysql', # jessie
         '9'     => 'ruby-mysql2', # stretch
         '10'    => 'ruby-mysql2', # buster
         '14.04' => 'ruby-mysql', # trusty
         '16.04' => 'ruby-mysql', # xenial
         '18.04' => 'ruby-mysql2', # bionic
         '20.04' => 'ruby-mysql2', # focal
         default => 'libmysql-ruby',
       }
     }
 
     'Archlinux': {
       $daemon_dev_package_name = undef
       $client_dev_package_name = undef
       $includedir              = undef
       $client_package_name     = 'mariadb-clients'
       $server_package_name     = 'mariadb'
       $basedir                 = '/usr'
       $config_file             = '/etc/mysql/my.cnf'
       $datadir                 = '/var/lib/mysql'
       $log_error               = '/var/log/mysqld.log'
       $pidfile                 = '/var/run/mysqld/mysqld.pid'
       $root_group              = 'root'
       $mysql_group             = 'mysql'
       $mycnf_owner             = undef
       $mycnf_group             = undef
       $server_service_name     = 'mysqld'
       $socket                  = '/var/lib/mysql/mysql.sock'
       $ssl_ca                  = '/etc/mysql/cacert.pem'
       $ssl_cert                = '/etc/mysql/server-cert.pem'
       $ssl_key                 = '/etc/mysql/server-key.pem'
       $tmpdir                  = '/tmp'
       $managed_dirs            = undef
       # mysql::bindings
       $java_package_name       = 'mysql-connector-java'
       $perl_package_name       = 'perl-dbd-mysql'
       $php_package_name        = undef
       $python_package_name     = 'mysql-python'
       $ruby_package_name       = 'mysql-ruby'
     }
 
     'Gentoo': {
       $client_package_name = 'virtual/mysql'
       $includedir          = undef
       $server_package_name = 'virtual/mysql'
       $basedir             = '/usr'
       $config_file         = '/etc/mysql/my.cnf'
       $datadir             = '/var/lib/mysql'
       $log_error           = '/var/log/mysql/mysqld.err'
       $pidfile             = '/run/mysqld/mysqld.pid'
       $root_group          = 'root'
       $mysql_group         = 'mysql'
       $mycnf_owner         = undef
       $mycnf_group         = undef
       $server_service_name = 'mysql'
       $socket              = '/run/mysqld/mysqld.sock'
       $ssl_ca              = '/etc/mysql/cacert.pem'
       $ssl_cert            = '/etc/mysql/server-cert.pem'
       $ssl_key             = '/etc/mysql/server-key.pem'
       $tmpdir              = '/tmp'
       $managed_dirs        = undef
       # mysql::bindings
       $java_package_name   = 'dev-java/jdbc-mysql'
       $perl_package_name   = 'dev-perl/DBD-mysql'
       $php_package_name    = undef
       $python_package_name = 'dev-python/mysql-python'
       $ruby_package_name   = 'dev-ruby/mysql-ruby'
     }
 
     'FreeBSD': {
       $client_package_name = 'databases/mysql57-client'
       $server_package_name = 'databases/mysql57-server'
       $basedir             = '/usr/local'
       $config_file         = '/usr/local/etc/my.cnf'
       $includedir          = '/usr/local/etc/my.cnf.d'
       $datadir             = '/var/db/mysql'
       $log_error           = '/var/log/mysqld.log'
       $pidfile             = '/var/run/mysql.pid'
       $root_group          = 'wheel'
       $mysql_group         = 'mysql'
       $mycnf_owner         = undef
       $mycnf_group         = undef
       $server_service_name = 'mysql-server'
       $socket              = '/var/db/mysql/mysql.sock'
       $ssl_ca              = undef
       $ssl_cert            = undef
       $ssl_key             = undef
       $tmpdir              = '/tmp'
       $managed_dirs        = undef
       # mysql::bindings
       $java_package_name   = 'databases/mysql-connector-java'
       $perl_package_name   = 'p5-DBD-mysql'
       $php_package_name    = 'php5-mysql'
       $python_package_name = 'databases/py-MySQLdb'
       $ruby_package_name   = 'databases/ruby-mysql'
       # The libraries installed by these packages are included in client and server packages, no installation required.
       $client_dev_package_name     = undef
       $daemon_dev_package_name     = undef
     }
 
     'OpenBSD': {
       $client_package_name = 'mariadb-client'
       $server_package_name = 'mariadb-server'
       $basedir             = '/usr/local'
       $config_file         = '/etc/my.cnf'
       $includedir          = undef
       $datadir             = '/var/mysql'
       $log_error           = "/var/mysql/${::hostname}.err"
       $pidfile             = '/var/mysql/mysql.pid'
       $root_group          = 'wheel'
       $mysql_group         = '_mysql'
       $mycnf_owner         = undef
       $mycnf_group         = undef
       $server_service_name = 'mysqld'
       $socket              = '/var/run/mysql/mysql.sock'
       $ssl_ca              = undef
       $ssl_cert            = undef
       $ssl_key             = undef
       $tmpdir              = '/tmp'
       $managed_dirs        = undef
       # mysql::bindings
       $java_package_name   = undef
       $perl_package_name   = 'p5-DBD-mysql'
       $php_package_name    = 'php-mysql'
       $python_package_name = 'py-mysql'
       $ruby_package_name   = 'ruby-mysql'
       # The libraries installed by these packages are included in client and server packages, no installation required.
       $client_dev_package_name     = undef
       $daemon_dev_package_name     = undef
     }
 
     'Solaris': {
       $client_package_name = 'database/mysql-55/client'
       $server_package_name = 'database/mysql-55'
       $basedir             = undef
       $config_file         = '/etc/mysql/5.5/my.cnf'
       $datadir             = '/var/mysql/5.5/data'
       $log_error           = "/var/mysql/5.5/data/${::hostname}.err"
       $pidfile             = "/var/mysql/5.5/data/${::hostname}.pid"
       $root_group          = 'bin'
       $server_service_name = 'application/database/mysql:version_55'
       $socket              = '/tmp/mysql.sock'
       $ssl_ca              = undef
       $ssl_cert            = undef
       $ssl_key             = undef
       $tmpdir              = '/tmp'
       $managed_dirs        = undef
       # mysql::bindings
       $java_package_name   = undef
       $perl_package_name   = undef
       $php_package_name    = 'web/php-53/extension/php-mysql'
       $python_package_name = 'library/python/python-mysql'
       $ruby_package_name   = undef
       # The libraries installed by these packages are included in client and server packages, no installation required.
       $client_dev_package_name     = undef
       $daemon_dev_package_name     = undef
     }
 
     default: {
       case $::operatingsystem {
         'Alpine': {
           $client_package_name = 'mariadb-client'
           $server_package_name = 'mariadb'
           $basedir             = '/usr'
           $config_file         = '/etc/mysql/my.cnf'
           $datadir             = '/var/lib/mysql'
           $log_error           = '/var/log/mysqld.log'
           $pidfile             = '/run/mysqld/mysqld.pid'
           $root_group          = 'root'
           $mysql_group         = 'mysql'
           $mycnf_owner         = undef
           $mycnf_group         = undef
           $server_service_name = 'mariadb'
           $socket              = '/run/mysqld/mysqld.sock'
           $ssl_ca              = '/etc/mysql/cacert.pem'
           $ssl_cert            = '/etc/mysql/server-cert.pem'
           $ssl_key             = '/etc/mysql/server-key.pem'
           $tmpdir              = '/tmp'
           $managed_dirs        = undef
           $java_package_name   = undef
           $perl_package_name   = 'perl-dbd-mysql'
           $php_package_name    = 'php7-mysqlnd'
           $python_package_name = 'py-mysqldb'
           $ruby_package_name   = undef
           $client_dev_package_name     = undef
           $daemon_dev_package_name     = undef
         }
         'Amazon': {
           $client_package_name = 'mysql'
           $server_package_name = 'mysql-server'
           $basedir             = '/usr'
           $config_file         = '/etc/my.cnf'
           $includedir          = '/etc/my.cnf.d'
           $datadir             = '/var/lib/mysql'
           $log_error           = '/var/log/mysqld.log'
           $pidfile             = '/var/run/mysqld/mysqld.pid'
           $root_group          = 'root'
           $mysql_group         = 'mysql'
           $mycnf_owner         = undef
           $mycnf_group         = undef
           $server_service_name = 'mysqld'
           $socket              = '/var/lib/mysql/mysql.sock'
           $ssl_ca              = '/etc/mysql/cacert.pem'
           $ssl_cert            = '/etc/mysql/server-cert.pem'
           $ssl_key             = '/etc/mysql/server-key.pem'
           $tmpdir              = '/tmp'
           $managed_dirs        = undef
           # mysql::bindings
           $java_package_name   = 'mysql-connector-java'
           $perl_package_name   = 'perl-DBD-MySQL'
           $php_package_name    = 'php-mysql'
           $python_package_name = 'MySQL-python'
           $ruby_package_name   = 'ruby-mysql'
           # The libraries installed by these packages are included in client and server packages, no installation required.
           $client_dev_package_name     = undef
           $daemon_dev_package_name     = undef
         }
 
         default: {
           fail("Unsupported platform: puppetlabs-${module_name} currently doesn\'t support ${::osfamily} or ${::operatingsystem}.")
         }
       }
     }
   }
 
   case $::operatingsystem {
     'Ubuntu': {
       # lint:ignore:only_variable_string
       if versioncmp("${::operatingsystemmajrelease}", '14.10') > 0 {
         # lint:endignore
         $server_service_provider = 'systemd'
       } else {
         $server_service_provider = 'upstart'
       }
     }
     'Alpine': {
       $server_service_provider = 'rc-service'
     }
     'FreeBSD': {
       $server_service_provider = 'freebsd'
     }
     default: {
       $server_service_provider = undef
     }
   }
 
   $default_options = {
     'client'          => {
       'port'          => '3306',
       'socket'        => $mysql::params::socket,
     },
     'mysqld_safe'        => {
       'nice'             => '0',
       'log-error'        => $mysql::params::log_error,
       'socket'           => $mysql::params::socket,
     },
     'mysqld-5.0'       => {
       'myisam-recover' => 'BACKUP',
     },
     'mysqld-5.1'       => {
       'myisam-recover' => 'BACKUP',
     },
     'mysqld-5.5'       => {
       'myisam-recover' => 'BACKUP',
       'query_cache_limit'     => '1M',
       'query_cache_size'      => '16M',
     },
     'mysqld-5.6'              => {
       'myisam-recover-options' => 'BACKUP',
       'query_cache_limit'     => '1M',
       'query_cache_size'      => '16M',
     },
     'mysqld-5.7'              => {
       'myisam-recover-options' => 'BACKUP',
       'query_cache_limit'     => '1M',
       'query_cache_size'      => '16M',
     },
     'mysqld'                  => {
       'basedir'               => $mysql::params::basedir,
       'bind-address'          => '127.0.0.1',
       'datadir'               => $mysql::params::datadir,
       'expire_logs_days'      => '10',
       'key_buffer_size'       => '16M',
       'log-error'             => $mysql::params::log_error,
       'max_allowed_packet'    => '16M',
       'max_binlog_size'       => '100M',
       'max_connections'       => '151',
       'pid-file'              => $mysql::params::pidfile,
       'port'                  => '3306',
       'skip-external-locking' => true,
       'socket'                => $mysql::params::socket,
       'ssl'                   => false,
       'ssl-ca'                => $mysql::params::ssl_ca,
       'ssl-cert'              => $mysql::params::ssl_cert,
       'ssl-key'               => $mysql::params::ssl_key,
       'ssl-disable'           => false,
       'thread_cache_size'     => '8',
       'thread_stack'          => '256K',
       'tmpdir'                => $mysql::params::tmpdir,
       'user'                  => 'mysql',
     },
     'mysqldump'             => {
       'max_allowed_packet'  => '16M',
       'quick'               => true,
       'quote-names'         => true,
     },
     'isamchk'      => {
       'key_buffer_size' => '16M',
     },
   }
 
   if defined('$xtrabackup_package_name_override') {
     $xtrabackup_package_name = pick($xtrabackup_package_name_override, $xtrabackup_package_name_default)
   } else {
     $xtrabackup_package_name = $xtrabackup_package_name_default
   }
 
   ## Additional graceful failures
   if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '4' and $::operatingsystem != 'Amazon' {
     fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 5.0 and beyond.")
   }
 }
diff --git a/spec/classes/mysql_backup_xtrabackup_spec.rb b/spec/classes/mysql_backup_xtrabackup_spec.rb
index 6caf49a..15ebab8 100644
--- a/spec/classes/mysql_backup_xtrabackup_spec.rb
+++ b/spec/classes/mysql_backup_xtrabackup_spec.rb
@@ -1,234 +1,238 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
 
 describe 'mysql::backup::xtrabackup' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:pre_condition) do
         <<-EOF
           class { 'mysql::server': }
         EOF
       end
       let(:facts) do
         facts.merge(root_home: '/root')
       end
 
       let(:default_params) do
         { 'backupdir' => '/tmp' }
       end
 
       context 'with defaults' do
         let(:params) do
           default_params
         end
 
         it 'contains the wrapper script' do
           is_expected.to contain_file('xtrabackup.sh').with_content(
             %r{(\n*^xtrabackup\s+.*\$@)},
           )
         end
 
         package = if facts[:osfamily] == 'RedHat'
                     if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '8') >= 0
                       'percona-xtrabackup-24'
                     elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '7') >= 0
                       'percona-xtrabackup'
                     else
                       'percona-xtrabackup-20'
                     end
                   elsif facts[:operatingsystem] == 'Debian'
                     'percona-xtrabackup-24'
                   elsif facts[:operatingsystem] == 'Ubuntu'
-                    if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '16') >= 0
+                    if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '20') >= 0
+                      'percona-xtrabackup-24'
+                    elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '16') >= 0
                       'percona-xtrabackup'
                     else
                       'percona-xtrabackup-24'
                     end
                   elsif facts[:osfamily] == 'Suse'
                     'xtrabackup'
                   else
                     'percona-xtrabackup'
                   end
 
         it 'contains the weekly cronjob' do
           is_expected.to contain_cron('xtrabackup-weekly')
             .with(
               ensure: 'present',
               command: '/usr/local/sbin/xtrabackup.sh --target-dir=/tmp/$(date +\%F)_full --backup',
               user: 'root',
               hour: '23',
               minute: '5',
               weekday: '0',
             )
             .that_requires("Package[#{package}]")
         end
 
         it 'contains the daily cronjob for weekdays 1-6' do
           dateformat = case facts[:osfamily]
                        when 'FreeBSD', 'OpenBSD'
                          '$(date -v-sun +\%F)_full'
                        else
                          '$(date -d "last sunday" +\%F)_full'
                        end
           is_expected.to contain_cron('xtrabackup-daily')
             .with(
               ensure: 'present',
               command: "/usr/local/sbin/xtrabackup.sh --incremental-basedir=/tmp/#{dateformat} --target-dir=/tmp/$(date +\\\%F_\\\%H-\\\%M-\\\%S) --backup",
               user: 'root',
               hour: '23',
               minute: '5',
               weekday: '1-6',
             )
             .that_requires("Package[#{package}]")
         end
       end
 
       context 'with backupuser and backuppassword' do
         let(:params) do
           { backupuser: 'backupuser',
             backuppassword: 'backuppassword' }.merge(default_params)
         end
 
         it 'contains the defined mysql user' do
           is_expected.to contain_mysql_user('backupuser@localhost')
             .with(
               ensure: 'present',
               password_hash: '*4110E08DF51E70A4BA1D4E33A84205E38CF3FE58',
             )
             .that_requires('Class[mysql::server::root_password]')
 
           is_expected.to contain_mysql_grant('backupuser@localhost/*.*')
             .with(
               ensure: 'present',
               user: 'backupuser@localhost',
               table: '*.*',
               privileges: ['RELOAD', 'PROCESS', 'LOCK TABLES', 'REPLICATION CLIENT'],
             )
             .that_requires('Mysql_user[backupuser@localhost]')
         end
       end
 
       context 'with additional cron args' do
         let(:params) do
           { additional_cron_args: '--backup --skip-ssl' }.merge(default_params)
         end
 
         package = if facts[:osfamily] == 'RedHat'
                     if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '8') >= 0
                       'percona-xtrabackup-24'
                     elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '7') >= 0
                       'percona-xtrabackup'
                     else
                       'percona-xtrabackup-20'
                     end
                   elsif facts[:operatingsystem] == 'Debian'
                     'percona-xtrabackup-24'
                   elsif facts[:operatingsystem] == 'Ubuntu'
-                    if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '16') >= 0
+                    if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '20') >= 0
+                      'percona-xtrabackup-24'
+                    elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '16') >= 0
                       'percona-xtrabackup'
                     else
                       'percona-xtrabackup-24'
                     end
                   elsif facts[:osfamily] == 'Suse'
                     'xtrabackup'
                   else
                     'percona-xtrabackup'
                   end
 
         dateformat = case facts[:osfamily]
                      when 'FreeBSD', 'OpenBSD'
                        '$(date -v-sun +\%F)_full'
                      else
                        '$(date -d "last sunday" +\%F)_full'
                      end
 
         it 'contains the weekly cronjob' do
           is_expected.to contain_cron('xtrabackup-weekly')
             .with(
               ensure: 'present',
               command: '/usr/local/sbin/xtrabackup.sh --target-dir=/tmp/$(date +\%F)_full --backup --skip-ssl',
               user: 'root',
               hour: '23',
               minute: '5',
               weekday: '0',
             )
             .that_requires("Package[#{package}]")
         end
 
         it 'contains the daily cronjob for weekdays 1-6' do
           is_expected.to contain_cron('xtrabackup-daily')
             .with(
               ensure: 'present',
               command: "/usr/local/sbin/xtrabackup.sh --incremental-basedir=/tmp/#{dateformat} --target-dir=/tmp/$(date +\\\%F_\\\%H-\\\%M-\\\%S) --backup --skip-ssl",
               user: 'root',
               hour: '23',
               minute: '5',
               weekday: '1-6',
             )
             .that_requires("Package[#{package}]")
         end
       end
 
       context 'with deactivated incremental backups' do
         let(:params) do
           { incremental_backups: false }.merge(default_params)
         end
 
         it 'not contains the weekly cronjob' do
           is_expected.not_to contain_cron('xtrabackup-weekly')
         end
 
         it 'contains the daily cronjob with all weekdays' do
           is_expected.to contain_cron('xtrabackup-daily').with(
             ensure: 'present',
             command: '/usr/local/sbin/xtrabackup.sh --target-dir=/tmp/$(date +\%F_\%H-\%M-\%S) --backup',
             user: 'root',
             hour: '23',
             minute: '5',
             weekday: '*',
           )
         end
       end
 
       context 'with prescript defined' do
         let(:params) do
           { prescript: ['rsync -a /tmp backup01.local-lan:',
                         'rsync -a /tmp backup02.local-lan:'] }.merge(default_params)
         end
 
         it 'contains the prescript' do
           is_expected.to contain_file('xtrabackup.sh').with_content(
             %r{.*rsync -a \/tmp backup01.local-lan:\n\nrsync -a \/tmp backup02.local-lan:.*},
           )
         end
       end
 
       context 'with postscript defined' do
         let(:params) do
           { postscript: ['rsync -a /tmp backup01.local-lan:',
                          'rsync -a /tmp backup02.local-lan:'] }.merge(default_params)
         end
 
         it 'contains the prostscript' do
           is_expected.to contain_file('xtrabackup.sh').with_content(
             %r{.*rsync -a \/tmp backup01.local-lan:\n\nrsync -a \/tmp backup02.local-lan:.*},
           )
         end
       end
 
       context 'with mariabackup' do
         let(:params) do
           { backupmethod: 'mariabackup' }.merge(default_params)
         end
 
         it 'contain the mariabackup executor' do
           is_expected.to contain_file('xtrabackup.sh').with_content(
             %r{(\n*^mariabackup\s+.*\$@)},
           )
         end
       end
     end
   end
   # rubocop:enable RSpec/NestedGroups
 end