diff --git a/.sync.yml b/.sync.yml
index 68cf412b4..4b82960dd 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -2,7 +2,7 @@
 .travis.yml:
   beaker_sets:
     - centos7-64
-    - debian9-64
+    - debian10-64
   env:
     global:
       - PARALLEL_TEST_PROCESSORS=8
diff --git a/.travis.yml b/.travis.yml
index 777f20aef..19d41f9cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ matrix:
     - rvm: 2.5.1
       env:
         - BEAKER_PUPPET_COLLECTION=puppet5
-        - BEAKER_setfile=debian9-64{hostname=debian9-64.example.com}
+        - BEAKER_setfile=debian10-64{hostname=debian10-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development
@@ -48,7 +48,7 @@ matrix:
     - rvm: 2.5.1
       env:
         - BEAKER_PUPPET_COLLECTION=puppet6
-        - BEAKER_setfile=debian9-64{hostname=debian9-64.example.com}
+        - BEAKER_setfile=debian10-64{hostname=debian10-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development
diff --git a/metadata.json b/metadata.json
index 7c195330a..c14f003e6 100644
--- a/metadata.json
+++ b/metadata.json
@@ -65,13 +65,12 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "9"
+        "10"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "16.04",
         "18.04"
       ]
     }
diff --git a/spec/classes/foreman_cli_discovery_spec.rb b/spec/classes/foreman_cli_discovery_spec.rb
index 57ea667d1..1bcfd02ce 100644
--- a/spec/classes/foreman_cli_discovery_spec.rb
+++ b/spec/classes/foreman_cli_discovery_spec.rb
@@ -8,8 +8,8 @@
     it { should contain_package('tfm-rubygem-hammer_cli_foreman_discovery') }
   end
 
-  context 'on debian-9-x86_64' do
-    let(:facts) { on_supported_os['debian-9-x86_64'] }
+  context 'on debian-10-x86_64' do
+    let(:facts) { on_supported_os['debian-10-x86_64'] }
     it { should contain_package('ruby-hammer-cli-foreman-discovery') }
   end
 end
diff --git a/spec/classes/foreman_cli_virt_who_configure_spec.rb b/spec/classes/foreman_cli_virt_who_configure_spec.rb
index cc9fd4daa..9407b8c9b 100644
--- a/spec/classes/foreman_cli_virt_who_configure_spec.rb
+++ b/spec/classes/foreman_cli_virt_who_configure_spec.rb
@@ -8,8 +8,8 @@
     it { should contain_package('tfm-rubygem-hammer_cli_foreman_virt_who_configure') }
   end
 
-  context 'on debian-9-x86_64' do
-    let(:facts) { on_supported_os['debian-9-x86_64'] }
+  context 'on debian-10-x86_64' do
+    let(:facts) { on_supported_os['debian-10-x86_64'] }
     it { should contain_package('ruby-hammer-cli-foreman-virt-who-configure') }
   end
 end
diff --git a/spec/defines/foreman_repos_apt_spec.rb b/spec/defines/foreman_repos_apt_spec.rb
index a6e07f2eb..b9df7b9de 100644
--- a/spec/defines/foreman_repos_apt_spec.rb
+++ b/spec/defines/foreman_repos_apt_spec.rb
@@ -4,7 +4,7 @@
   let(:title) { 'foreman' }
 
   let :facts do
-    on_supported_os['debian-9-x86_64']
+    on_supported_os['debian-10-x86_64']
   end
 
   let(:apt_key) do
@@ -26,7 +26,7 @@
         .with_repos('1.18')
 
       should contain_file('/etc/apt/sources.list.d/foreman.list')
-        .with_content(%r{deb https://deb\.theforeman\.org/ stretch 1\.18})
+        .with_content(%r{deb https://deb\.theforeman\.org/ buster 1\.18})
 
       should contain_apt__source('foreman-plugins')
         .with_location('https://deb.theforeman.org/')
@@ -48,7 +48,7 @@
         .with_repos('nightly')
 
       should contain_file('/etc/apt/sources.list.d/foreman.list')
-        .with_content(%r{deb https://deb\.theforeman\.org/ stretch nightly})
+        .with_content(%r{deb https://deb\.theforeman\.org/ buster nightly})
 
       should contain_apt__source('foreman-plugins')
         .with_location('https://deb.theforeman.org/')