diff --git a/manifests/params.pp b/manifests/params.pp
index 1663a30..eac6e88 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,70 +1,70 @@
 #
 class unattended_upgrades::params {
   if $facts['os']['family'] != 'Debian' {
     fail('This module only works on Debian or derivatives like Ubuntu')
   }
 
   $default_auto                 = { 'fix_interrupted_dpkg' => true, 'remove' => true, 'reboot' => false, 'clean' => 0, 'reboot_time' => 'now', }
   $default_mail                 = { 'only_on_error'        => true, }
   $default_backup               = { 'archive_interval'     => 0, 'level'     => 3, }
   $default_age                  = { 'min'                  => 2, 'max'       => 0, }
   $default_upgradeable_packages = { 'download_only'        => 0, 'debdelta'  => 1, }
   # those are DEPRECATED and will be removed in a future releaseq
   $default_options              = {
     'force_confdef'        => false,
     'force_confold'        => false,
     'force_confnew'        => false,
     'force_confmiss'       => false,
   }
 
   case fact('lsbdistid') {
     'debian', 'raspbian': {
       case fact('lsbdistcodename') {
-        'buster': {
+        'bullseye': {
           $legacy_origin      = false
           $origins            = [
             'origin=Debian,codename=${distro_codename},label=Debian', #lint:ignore:single_quote_string_with_variables
-            'origin=Debian,codename=${distro_codename},label=Debian-Security', #lint:ignore:single_quote_string_with_variables
+            'origin=Debian,codename=${distro_codename}-security,label=Debian-Security', #lint:ignore:single_quote_string_with_variables
           ]
         }
         default: {
           $legacy_origin      = false
           $origins            = [
             'origin=Debian,codename=${distro_codename},label=Debian-Security', #lint:ignore:single_quote_string_with_variables
           ]
         }
       }
     }
     'ubuntu', 'neon': {
       # Ubuntu: https://ubuntu.com/about/release-cycle and https://wiki.ubuntu.com/Releases
       $legacy_origin      = true
       $origins            = [
         '${distro_id}:${distro_codename}', #lint:ignore:single_quote_string_with_variables
         '${distro_id}:${distro_codename}-security', #lint:ignore:single_quote_string_with_variables
         '${distro_id}ESMApps:${distro_codename}-apps-security', #lint:ignore:single_quote_string_with_variables
         '${distro_id}ESM:${distro_codename}-infra-security', #lint:ignore:single_quote_string_with_variables
       ]
     }
     'LinuxMint': {
       case fact('lsbmajdistrelease') {
         # Linux Mint 18* is based on Ubuntu 16.04
         '18': {
           $legacy_origin      = true
           $origins            = [
             'Ubuntu:xenial-security',
           ]
         }
         default: {
           $legacy_origin      = true
           $origins            = [
             '${distro_id}:${distro_codename}-security', #lint:ignore:single_quote_string_with_variables
           ]
         }
       }
     }
     default: {
       $legacy_origin = undef
       $origins       = undef
     }
   }
 }
diff --git a/metadata.json b/metadata.json
index 9a26573..c2267cc 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,50 +1,51 @@
 {
   "name": "puppet-unattended_upgrades",
   "version": "5.1.1-rc0",
   "author": "Vox Pupuli",
   "summary": "Provides an interface for managing Apt unattended_upgrades with Puppet",
   "license": "Apache-2.0",
   "source": "https://github.com/voxpupuli/puppet-unattended_upgrades.git",
   "project_page": "https://github.com/voxpupuli/puppet-unattended_upgrades",
   "issues_url": "https://github.com/voxpupuli/puppet-unattended_upgrades/issues",
   "tags": [
     "unattended-upgrades",
     "unattended_upgrades",
     "apt",
     "patching",
     "security",
     "debian"
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "10"
+        "10",
+        "11"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "18.04",
         "19.10",
         "20.04"
       ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
       "version_requirement": ">= 6.1.0 < 8.0.0"
     }
   ],
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.13.1 < 9.0.0"
     },
     {
       "name": "puppetlabs/apt",
       "version_requirement": ">= 2.2.0 < 9.0.0"
     }
   ]
 }
diff --git a/spec/classes/os_spec.rb b/spec/classes/os_spec.rb
index b748be9..24d9f50 100644
--- a/spec/classes/os_spec.rb
+++ b/spec/classes/os_spec.rb
@@ -1,81 +1,81 @@
 require 'spec_helper'
 
 describe 'unattended_upgrades' do
   on_supported_os.each do |os, os_facts|
     context "on #{os}" do
       let(:facts) { os_facts }
       let(:file_unattended) { '/etc/apt/apt.conf.d/50unattended-upgrades' }
 
       it { is_expected.to compile.with_all_deps }
 
       it do
         is_expected.to create_file('/etc/apt/apt.conf.d/10periodic').
           with_owner('root').
           with_group('root').
           with_content(%r{APT::Periodic::Enable "1";}).
           with_content(%r{APT::Periodic::BackupArchiveInterval "0";}).
           with_content(%r{APT::Periodic::BackupLevel "3";}).
           with_content(%r{APT::Periodic::MaxAge "0";}).
           with_content(%r{APT::Periodic::MinAge "2";}).
           with_content(%r{APT::Periodic::MaxSize "0";}).
           with_content(%r{APT::Periodic::Update-Package-Lists "1";}).
           with_content(%r{APT::Periodic::Download-Upgradeable-Packages "0";}).
           with_content(%r{APT::Periodic::Download-Upgradeable-Packages-Debdelta "1";}).
           with_content(%r{APT::Periodic::Unattended-Upgrade "1";}).
           with_content(%r{APT::Periodic::AutocleanInterval "0";}).
           with_content(%r{APT::Periodic::Verbose "0";})
       end
 
       it { is_expected.to contain_apt__conf('auto-upgrades').with_ensure('absent') }
 
       it do
         is_expected.to create_file('/etc/apt/apt.conf.d/10options').
           with_owner('root').
           with_group('root').
           with_content(%r{^Dpkg::Options\s\{}).
           without_content(%r{^\s+\"--force-confdef\";}).
           without_content(%r{^\s+\"--force-confold\";}).
           without_content(%r{\"--force-confnew\";}).
           without_content(%r{\"--force-confmiss\";})
       end
 
       it { is_expected.to create_file(file_unattended).with_owner('root').with_group('root') }
 
       # rubocop:disable Style/RegexpLiteral
       case os_facts[:operatingsystem]
       when 'Debian'
         case os_facts[:lsbdistcodename]
-        when 'jessie', 'stretch'
+        when 'stretch', 'buster'
           it do
             is_expected.to create_file(file_unattended).with_content(
               /Unattended-Upgrade::Origins-Pattern\ {\n
               \t"origin=Debian,codename=\${distro_codename},label=Debian-Security";\n
               };/x
             )
           end
-        when 'buster'
+        when 'bullseye'
           it do
             is_expected.to create_file(file_unattended).with_content(
               /Unattended-Upgrade::Origins-Pattern\ {\n
               \t"origin=Debian,codename=\${distro_codename},label=Debian";\n
-              \t"origin=Debian,codename=\${distro_codename},label=Debian-Security";\n
+              \t"origin=Debian,codename=\${distro_codename}-security,label=Debian-Security";\n
               };/x
             )
           end
         end
       when 'Ubuntu'
         it do
           is_expected.to create_file(file_unattended).with_content(
             /Unattended-Upgrade::Allowed-Origins\ {\n
             \t"\${distro_id}\:\${distro_codename}";\n
             \t"\${distro_id}\:\${distro_codename}-security";\n
             \t"\${distro_id}ESMApps\:\${distro_codename}-apps-security";\n
             \t"\${distro_id}ESM\:\${distro_codename}-infra-security";\n
             };/x
           )
         end
       end
       # rubocop:enable Style/RegexpLiteral
     end
   end
 end