diff --git a/manifests/params.pp b/manifests/params.pp
index 126f2efdb..b7a11a31c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -171,9 +171,10 @@
     }
 
     'Debian': {
-      if $::operatingsystem == 'Debian' {
+      if $facts['os']['name'] == 'Debian' or
+      ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '20.04') >= 0) {
         $provider = 'mariadb'
-      } else { # Ubuntu
+      } else {
         $provider = 'mysql'
       }
       if $provider == 'mariadb' {
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
index efb01f3b3..0b8bb947c 100644
--- a/manifests/server/config.pp
+++ b/manifests/server/config.pp
@@ -34,7 +34,7 @@
   }
 
   #Debian: Creating world readable directories before installing.
-  case $::operatingsystem {
+  case $facts['os']['family'] {
     'Debian': {
       if $managed_dirs {
         $managed_dirs.each | $entry | {
diff --git a/spec/acceptance/00_mysql_server_spec.rb b/spec/acceptance/00_mysql_server_spec.rb
index 28fba6b8c..c9aa691ef 100644
--- a/spec/acceptance/00_mysql_server_spec.rb
+++ b/spec/acceptance/00_mysql_server_spec.rb
@@ -38,8 +38,7 @@ class { 'mysql::server':
           },
           databases => {
             'somedb' => {
-              ensure  => 'present',
-              charset => #{fetch_charset},
+              ensure => 'present',
             },
           }
         }
diff --git a/spec/acceptance/01_mysql_db_spec.rb b/spec/acceptance/01_mysql_db_spec.rb
index 04586fe2a..15930a62f 100644
--- a/spec/acceptance/01_mysql_db_spec.rb
+++ b/spec/acceptance/01_mysql_db_spec.rb
@@ -14,7 +14,6 @@ class { 'mysql::server':
         mysql::db { 'spec1':
           user            => 'root1',
           password        => 'password',
-          charset         => #{fetch_charset},
         }
       MANIFEST
     end
@@ -43,7 +42,6 @@ class { 'mysql::server': override_options => { 'root_password' => 'password' } }
           user     => 'root1',
           password => 'password',
           sql      => '/tmp/spec.sql',
-          charset  => #{fetch_charset},
         }
       MANIFEST
     end
@@ -68,7 +66,6 @@ class { 'mysql::server': override_options => { 'root_password' => 'password' } }
           user     => 'root1',
           password => 'password',
           dbname   => 'realdb',
-          charset  => #{fetch_charset},
         }
       MANIFEST
     end
diff --git a/spec/acceptance/04_mysql_backup_spec.rb b/spec/acceptance/04_mysql_backup_spec.rb
index fce9c2438..0e174cb95 100644
--- a/spec/acceptance/04_mysql_backup_spec.rb
+++ b/spec/acceptance/04_mysql_backup_spec.rb
@@ -12,7 +12,6 @@ class { 'mysql::server': root_password => 'password' }
         ]:
           user     => 'backup',
           password => 'secret',
-          charset  => #{fetch_charset},
         }
 
         class { 'mysql::server::backup':
@@ -73,7 +72,6 @@ class { 'mysql::server': root_password => 'password' }
           ]:
             user     => 'backup',
             password => 'secret',
-            charset  => #{fetch_charset},
           }
 
           class { 'mysql::server::backup':
@@ -138,7 +136,6 @@ class { 'mysql::server': root_password => 'password' }
           ]:
             user     => 'backup',
             password => 'secret',
-            charset  => #{fetch_charset},
           }
           case $facts['os']['family'] {
             /Debian/: {
@@ -259,7 +256,6 @@ class { 'mysql::server': root_password => 'password' }
           ]:
             user     => 'backup',
             password => 'secret',
-            charset  => #{fetch_charset},
           }
           case $facts['os']['family'] {
             /Debian/: {
diff --git a/spec/acceptance/types/mysql_database_spec.rb b/spec/acceptance/types/mysql_database_spec.rb
index 247eb57df..ac980fc3c 100644
--- a/spec/acceptance/types/mysql_database_spec.rb
+++ b/spec/acceptance/types/mysql_database_spec.rb
@@ -15,8 +15,7 @@ class { 'mysql::server': }
   describe 'creating database' do
     pp = <<-MANIFEST
         mysql_database { 'spec_db':
-          ensure  => present,
-          charset => #{fetch_charset},
+          ensure => present,
         }
     MANIFEST
     it 'works without errors' do
@@ -38,7 +37,7 @@ class { 'mysql::server': }
           collate => 'latin1_swedish_ci',
         }
         mysql_database { 'spec_utf8':
-          charset => #{fetch_charset},
+          charset => 'utf8',
           collate => 'utf8_general_ci',
         }
     MANIFEST
diff --git a/spec/acceptance/types/mysql_grant_spec.rb b/spec/acceptance/types/mysql_grant_spec.rb
index 3f362d416..4608670a3 100644
--- a/spec/acceptance/types/mysql_grant_spec.rb
+++ b/spec/acceptance/types/mysql_grant_spec.rb
@@ -273,8 +273,7 @@ class { 'mysql::server':
         $dbSubnet = '10.10.10.%'
 
         mysql_database { 'foo':
-          ensure  => present,
-          charset => '#{fetch_charset}',
+          ensure => present,
         }
 
         exec { 'mysql-create-table':
@@ -686,7 +685,6 @@ class { 'mysql::server': override_options => { 'root_password' => 'password' } }
           user     => 'root1',
           password => 'password',
           sql      => '/tmp/grant_spec_table.sql',
-          charset  => #{fetch_charset},
         }
     MANIFEST
     it 'creates table' do
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 97381b13b..189350be4 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -32,14 +32,6 @@ def export_locales
   LitmusHelper.instance.run_shell('. ~/.bashrc')
 end
 
-def fetch_charset
-  @charset ||= if os[:family] == 'ubuntu' && os[:release] =~ %r{^20\.04}
-                 'utf8mb3'
-               else
-                 'utf8'
-               end
-end
-
 RSpec.configure do |c|
   c.before :suite do
     if os[:family] == 'debian' || os[:family] == 'ubuntu'