diff --git a/.sync.yml b/.sync.yml
index cbc2e57..a3a81ba 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,32 +1,33 @@
 ---
 .travis.yml:
   secure: "lmmQ5+ueE39cDevK+TjJWgD7b9X6FQDoyL/OTRXzOuCu/96yXQrm/KBq4E2IsFTx91XiqOH6ZnKcgiGwaY54E10ddTvlZhEa8orMmwfkrLAbyh7POB1q3AtQze7RPLvOuHZc6XIRBDiiFKMrzvwdP5OgU9iPEFdSRZll64nw240="
   docker_sets:
     - set: ubuntu1604-64m
     - set: ubuntu1804-64m
+    - set: ubuntu2004-64m
     - set: centos6-64m
     - set: centos7-64m
     - set: centos8-64m
     - set: debian9-64m
     - set: debian10-64m
 Gemfile:
   optional:
     ':test':
       - gem: 'redis'
       - gem: 'mock_redis'
 spec/spec_helper.rb:
   unmanaged: true
 spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml:
   delete: true
 spec/acceptance/nodesets/ec2/image_templates.yaml:
   delete: true
 spec/acceptance/nodesets/ec2/rhel-73-x64.yml:
   delete: true
 spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml:
   delete: true
 spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml:
   delete: true
 spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml:
   delete: true
 spec/acceptance/nodesets/archlinux-2-x64.yml:
   delete: true
diff --git a/.travis.yml b/.travis.yml
index c6c93f1..6990f2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,103 +1,107 @@
 ---
 dist: bionic
 language: ruby
 cache: bundler
 before_install:
   - yes | gem update --system
   - bundle --version
 script:
   - 'bundle exec rake $CHECK'
 matrix:
   fast_finish: true
   include:
   - rvm: 2.4.4
     bundler_args: --without system_tests development release
     env: PUPPET_VERSION="~> 5.0" CHECK=test
   - rvm: 2.5.3
     bundler_args: --without system_tests development release
     env: PUPPET_VERSION="~> 6.0" CHECK=test_with_coveralls
   - rvm: 2.5.3
     bundler_args: --without system_tests development release
     env: PUPPET_VERSION="~> 6.0" CHECK=rubocop
   - rvm: 2.4.4
     bundler_args: --without system_tests development release
     env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu2004-64m BEAKER_HYPERVISOR=docker CHECK=beaker
+    services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos6-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos6-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos8-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos8-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian10-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian10-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
 branches:
   only:
   - master
   - /^v\d/
 notifications:
   email: false
   webhooks: https://voxpupu.li/incoming/travis
   irc:
     on_success: always
     on_failure: always
     channels:
       - "chat.freenode.org#voxpupuli-notifications"
 deploy:
   provider: puppetforge
   user: puppet
   password:
     secure: "lmmQ5+ueE39cDevK+TjJWgD7b9X6FQDoyL/OTRXzOuCu/96yXQrm/KBq4E2IsFTx91XiqOH6ZnKcgiGwaY54E10ddTvlZhEa8orMmwfkrLAbyh7POB1q3AtQze7RPLvOuHZc6XIRBDiiFKMrzvwdP5OgU9iPEFdSRZll64nw240="
   on:
     tags: true
     # all_branches is required to use tags
     all_branches: true
     # Only publish the build marked with "DEPLOY_TO_FORGE"
     condition: "$DEPLOY_TO_FORGE = yes"
diff --git a/manifests/params.pp b/manifests/params.pp
index 7c1b514..13e1361 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,203 +1,204 @@
 # @summary This class provides a number of parameters.
 # @api private
 class redis::params inherits redis::globals {
   case $facts['os']['family'] {
     'Debian': {
       $ppa_repo                  = 'ppa:chris-lea/redis-server'
 
       $config_dir                = '/etc/redis'
       $config_dir_mode           = '0755'
       $config_file               = '/etc/redis/redis.conf'
       $config_file_orig          = '/etc/redis/redis.conf.puppet'
       $config_owner              = 'redis'
       $log_dir_mode              = '0755'
       $package_name              = 'redis-server'
       $pid_file                  = '/var/run/redis/redis-server.pid'
       $workdir                   = '/var/lib/redis'
       $daemonize                 = true
       $service_name              = 'redis-server'
 
       $sentinel_config_file      = '/etc/redis/sentinel.conf'
       $sentinel_config_file_orig = '/etc/redis/redis-sentinel.conf.puppet'
       $sentinel_service_name     = 'redis-sentinel'
       $sentinel_daemonize        = true
       $sentinel_init_script      = '/etc/init.d/redis-sentinel'
       $sentinel_package_name     = 'redis-sentinel'
       $sentinel_log_file         = '/var/log/redis/redis-sentinel.log'
       $sentinel_working_dir      = '/var/lib/redis'
 
       case $facts['os']['name'] {
         'Ubuntu': {
           $config_group = 'redis'
           $minimum_version = $facts['os']['release']['major'] ? {
             '16.04' => '3.0.5',
-            default => '4.0.9',
+            '18.04' => '4.0.9',
+            default => '5.0.7',
           }
           $sentinel_pid_file = $facts['os']['release']['major'] ? {
             '16.04' => '/var/run/redis/redis-sentinel.pid',
             default => '/var/run/sentinel/redis-sentinel.pid',
           }
         }
         default: {
           $config_group              = 'root'
           $minimum_version           = '3.2.5'
           if versioncmp($facts['os']['release']['major'], '10') >= 0 {
             $sentinel_pid_file         = '/run/sentinel/redis-sentinel.pid'
           } else {
             $sentinel_pid_file         = '/var/run/redis/redis-sentinel.pid'
           }
         }
       }
 
     }
 
     'RedHat': {
       $ppa_repo             = undef
       $daemonize            = false
       $config_owner         = 'redis'
       $config_group         = 'root'
       $config_dir_mode      = '0755'
       $log_dir_mode         = '0750'
 
       $sentinel_daemonize   = false
       $sentinel_init_script = undef
       $sentinel_working_dir = '/tmp'
 
       $scl = $redis::globals::scl
       if $scl {
         $config_dir                = "/etc/opt/rh/${scl}/redis"
         $config_file               = "/etc/opt/rh/${scl}/redis.conf"
         $config_file_orig          = "/etc/opt/rh/${scl}/redis.conf.puppet"
         $package_name              = "${scl}-redis"
         $pid_file                  = "/var/opt/rh/${scl}/run/redis_6379.pid"
         $service_name              = "${scl}-redis"
         $workdir                   = "/var/opt/rh/${scl}/lib/redis"
 
         $sentinel_config_file      = "${config_dir}/redis-sentinel.conf"
         $sentinel_config_file_orig = "${config_dir}/redis-sentinel.conf.puppet"
         $sentinel_service_name     = "${scl}-redis-sentinel"
         $sentinel_package_name     = $package_name
         $sentinel_pid_file         = "/var/opt/rh/${scl}/run/redis-sentinel.pid"
         $sentinel_log_file         = "/var/opt/rh/${scl}/log/redis/sentinel.log"
 
         $minimum_version = $scl ? {
           'rh-redis32' => '3.2.13',
           default      => '5.0.5',
         }
       } else {
         $config_dir                = '/etc/redis'
         $config_file               = '/etc/redis.conf'
         $config_file_orig          = '/etc/redis.conf.puppet'
         $package_name              = 'redis'
         $pid_file                  = $facts['os']['release']['major'] ? {
           '6'     => '/var/run/redis/redis.pid',
           default => '/var/run/redis_6379.pid',
         }
         $service_name              = 'redis'
         $workdir                   = '/var/lib/redis'
 
         $sentinel_config_file      = '/etc/redis-sentinel.conf'
         $sentinel_config_file_orig = '/etc/redis-sentinel.conf.puppet'
         $sentinel_service_name     = 'redis-sentinel'
         $sentinel_package_name     = 'redis'
         $sentinel_pid_file         = '/var/run/redis/redis-sentinel.pid'
         $sentinel_log_file         = '/var/log/redis/sentinel.log'
 
         # EPEL 6 and newer have 3.2 so we can assume all EL is 3.2+
         $minimum_version           = '3.2.10'
       }
     }
 
     'FreeBSD': {
       $ppa_repo                  = undef
 
       $config_dir                = '/usr/local/etc/redis'
       $config_dir_mode           = '0755'
       $config_file               = '/usr/local/etc/redis.conf'
       $config_file_orig          = '/usr/local/etc/redis.conf.puppet'
       $config_group              = 'wheel'
       $config_owner              = 'redis'
       $log_dir_mode              = '0755'
       $package_name              = 'redis'
       $pid_file                  = '/var/run/redis/redis.pid'
       $daemonize                 = true
       $service_name              = 'redis'
       $workdir                   = '/var/db/redis'
 
       $sentinel_config_file      = '/usr/local/etc/redis-sentinel.conf'
       $sentinel_config_file_orig = '/usr/local/etc/redis-sentinel.conf.puppet'
       $sentinel_service_name     = 'redis-sentinel'
       $sentinel_daemonize        = true
       $sentinel_init_script      = undef
       $sentinel_package_name     = 'redis'
       $sentinel_pid_file         = '/var/run/redis/redis-sentinel.pid'
       $sentinel_log_file         = '/var/log/redis/sentinel.log'
       $sentinel_working_dir      = '/tmp'
 
       # pkg version
       $minimum_version           = '3.2.4'
     }
 
     'Suse': {
       $ppa_repo                  = undef
 
       $config_dir                = '/etc/redis'
       $config_dir_mode           = '0750'
       $config_file               = '/etc/redis/redis-server.conf'
       $config_group              = 'redis'
       $config_owner              = 'redis'
       $log_dir_mode              = '0750'
       $package_name              = 'redis'
       $pid_file                  = '/var/run/redis/redis-server.pid'
       $daemonize                 = true
       $service_name              = 'redis'
       $workdir                   = '/var/lib/redis'
 
       $sentinel_config_file      = '/etc/redis/redis-sentinel.conf'
       $sentinel_config_file_orig = '/etc/redis/redis-sentinel.conf.puppet'
       $sentinel_service_name     = 'redis-sentinel'
       $sentinel_daemonize        = true
       $sentinel_init_script      = undef
       $sentinel_package_name     = 'redis'
       $sentinel_pid_file         = '/var/run/redis/redis-sentinel.pid'
       $sentinel_log_file         = '/var/log/redis/sentinel.log'
       $sentinel_working_dir      = '/tmp'
 
       # suse package version
       $minimum_version           = '3.0.5'
     }
 
     'Archlinux': {
       $ppa_repo                  = undef
 
       $config_dir                = '/etc/redis'
       $config_dir_mode           = '0755'
       $config_file               = '/etc/redis/redis.conf'
       $config_file_orig          = '/etc/redis/redis.conf.puppet'
       $config_group              = 'root'
       $config_owner              = 'root'
       $log_dir_mode              = '0755'
       $package_name              = 'redis'
       $pid_file                  = '/var/run/redis.pid'
       $daemonize                 = true
       $service_name              = 'redis'
       $workdir                   = '/var/lib/redis'
 
       $sentinel_config_file      = '/etc/redis/redis-sentinel.conf'
       $sentinel_config_file_orig = '/etc/redis/redis-sentinel.conf.puppet'
       $sentinel_service_name     = 'redis-sentinel'
       $sentinel_daemonize        = true
       $sentinel_init_script      = undef
       $sentinel_package_name     = 'redis'
       $sentinel_pid_file         = '/var/run/redis/redis-sentinel.pid'
       $sentinel_log_file         = '/var/log/redis/sentinel.log'
       $sentinel_working_dir      = '/tmp'
 
       # pkg version
       $minimum_version           = '3.2.4'
     }
     default: {
       fail "Operating system ${facts['os']['name']} is not supported yet."
     }
   }
 }
diff --git a/metadata.json b/metadata.json
index d7b3715..bb834fc 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,73 +1,74 @@
 {
   "name": "puppet-redis",
   "version": "6.0.1-rc0",
   "author": "Vox Pupuli",
   "summary": "Redis module",
   "license": "Apache-2.0",
   "source": "https://github.com/voxpupuli/puppet-redis.git",
   "project_page": "http://github.com/voxpupuli/puppet-redis",
   "issues_url": "https://github.com/voxpupuli/puppet-redis/issues",
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.25.0 < 7.0.0"
     },
     {
       "name": "herculesteam/augeasproviders_sysctl",
       "version_requirement": ">= 2.1.0 < 3.0.0"
     },
     {
       "name": "herculesteam/augeasproviders_core",
       "version_requirement": ">= 2.1.0 < 3.0.0"
     }
   ],
   "description": "Redis module with cluster support",
   "tags": [
     "cluster",
     "failover",
     "loadbalancing",
     "redis",
     "sentinel"
   ],
   "requirements": [
     {
       "name": "puppet",
       "version_requirement": ">= 5.5.8 < 7.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "9",
         "10"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "16.04",
-        "18.04"
+        "18.04",
+        "20.04"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "6",
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "6",
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "Archlinux"
     }
   ]
 }