diff --git a/.sync.yml b/.sync.yml
index 9e9876b..ca841d2 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,14 +1,15 @@
 ---
 .travis.yml:
   beaker_sets:
     - centos6-64
     - debian9-64
+    - debian10-64
   env:
     global:
       - PARALLEL_TEST_PROCESSORS=8
   beaker_puppet_collections:
     - puppet5
     - puppet6
 Rakefile:
   param_docs_pattern:
     - manifests/init.pp
diff --git a/.travis.yml b/.travis.yml
index 977b907..c04e954 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,60 +1,71 @@
 ---
 # This file is managed centrally by modulesync
 #   https://github.com/theforeman/foreman-installer-modulesync
 env:
   global:
     - PARALLEL_TEST_PROCESSORS=8
 matrix:
   fast_finish: true
   include:
     - rvm: 2.4.1
       env: PUPPET_VERSION=5.0
     - rvm: 2.5.1
       env: PUPPET_VERSION=6.0
     # Acceptance tests
     - rvm: 2.5.1
       env:
         - BEAKER_PUPPET_COLLECTION=puppet5
         - BEAKER_setfile=centos6-64{hostname=centos6-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development
       before_install:
         - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
         - sudo service docker restart
 
     - rvm: 2.5.1
       env:
         - BEAKER_PUPPET_COLLECTION=puppet6
         - BEAKER_setfile=centos6-64{hostname=centos6-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development
       before_install:
         - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
         - sudo service docker restart
 
     - rvm: 2.5.1
       env:
         - BEAKER_PUPPET_COLLECTION=puppet5
         - BEAKER_setfile=debian9-64{hostname=debian9-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development
       before_install:
         - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
         - sudo service docker restart
 
     - rvm: 2.5.1
       env:
         - BEAKER_PUPPET_COLLECTION=puppet6
         - BEAKER_setfile=debian9-64{hostname=debian9-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development
       before_install:
         - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
         - sudo service docker restart
 
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet6
+        - BEAKER_setfile=debian10-64{hostname=debian10-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
 bundler_args: --without system_tests development
 dist: xenial
diff --git a/metadata.json b/metadata.json
index fb707bf..e61aaf3 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,112 +1,113 @@
 {
   "name": "theforeman-puppet",
   "version": "12.1.0",
   "author": "theforeman",
   "summary": "Puppet agent and server configuration",
   "license": "GPL-3.0+",
   "source": "git://github.com/theforeman/puppet-puppet",
   "project_page": "https://github.com/theforeman/puppet-puppet",
   "issues_url": "https://github.com/theforeman/puppet-puppet/issues",
   "description": "Module for installing the Puppet agent and Puppet server",
   "tags": [
     "foreman",
     "puppet",
     "puppetmaster",
     "puppet-server"
   ],
   "dependencies": [
     {
       "name": "puppetlabs/concat",
       "version_requirement": ">= 4.1.0 < 7.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.18.0 < 7.0.0"
     },
     {
       "name": "puppet/extlib",
       "version_requirement": ">= 3.0.0 < 5.0.0"
     }
   ],
   "requirements": [
     {
       "name": "puppet",
       "version_requirement": ">= 5.5.8 < 7.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
         "26"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "9"
+        "9",
+        "10"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "16.04",
         "18.04"
       ]
     },
     {
       "operatingsystem": "FreeBSD",
       "operatingsystemrelease": [
         "11",
         "12"
       ]
     },
     {
       "operatingsystem": "DragonFly",
       "operatingsystemrelease": [
         "4"
       ]
     },
     {
       "operatingsystem": "Archlinux"
     },
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
         "11",
         "12"
       ]
     },
     {
       "operatingsystem": "windows",
       "operatingsystemrelease": [
         "7",
         "8",
         "2008 R2",
         "2012",
         "2012 R2"
       ]
     }
   ]
 }
diff --git a/spec/acceptance/puppetserver_upgrade_5_3_6_to_5_3_7_spec.rb b/spec/acceptance/puppetserver_upgrade_5_3_6_to_5_3_7_spec.rb
index c1f0256..e450a3e 100644
--- a/spec/acceptance/puppetserver_upgrade_5_3_6_to_5_3_7_spec.rb
+++ b/spec/acceptance/puppetserver_upgrade_5_3_6_to_5_3_7_spec.rb
@@ -1,90 +1,90 @@
 require 'spec_helper_acceptance'
 
-describe 'Scenario: 5.3.6 to 5.3.7 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet5' && fact('lsbdistcodename') != 'bionic' do
+describe 'Scenario: 5.3.6 to 5.3.7 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet5' do
   before(:context) do
     if check_for_package(default, 'puppetserver')
       on default, puppet('resource package puppetserver ensure=purged')
       on default, 'rm -rf /etc/sysconfig/puppetserver /etc/puppetlabs/puppetserver'
       on default, 'rm -rf /etc/puppetlabs/puppet/ssl'
     end
 
-    # puppetserver won't start with lower than 2GB memory
+    # puppetserver won't start with low memory
     memoryfree_mb = fact('memoryfree_mb').to_i
-    raise 'At least 2048MB free memory required' if memoryfree_mb < 256
+    raise 'At least 256MB free memory required' if memoryfree_mb < 256
   end
 
   case fact('osfamily')
   when 'Debian'
     from_version = "5.3.6-1#{fact('lsbdistcodename')}"
     to_version = "5.3.7-1#{fact('lsbdistcodename')}"
   else
     from_version = '5.3.6'
     to_version = '5.3.7'
   end
 
   context 'install 5.3.6' do
     let(:pp) do
       <<-EOS
       class { '::puppet':
         server                => true,
         server_foreman        => false,
         server_reports        => 'store',
         server_external_nodes => '',
         server_version        => '#{from_version}',
         # only for install test - don't think to use this in production!
         # https://docs.puppet.com/puppetserver/latest/tuning_guide.html
         server_jvm_max_heap_size => '256m',
         server_jvm_min_heap_size => '256m',
       }
       EOS
     end
 
     it_behaves_like 'a idempotent resource'
 
     describe command('puppetserver --version') do
       its(:stdout) { is_expected.to match("puppetserver version: 5.3.6\n") }
     end
 
     describe service('puppetserver') do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
     describe port('8140') do
       it { is_expected.to be_listening }
     end
   end
 
   context 'upgrade to 5.3.7' do
     let(:pp) do
       <<-EOS
       class { '::puppet':
         server                => true,
         server_foreman        => false,
         server_reports        => 'store',
         server_external_nodes => '',
         server_version        => '#{to_version}',
         # only for install test - don't think to use this in production!
         # https://docs.puppet.com/puppetserver/latest/tuning_guide.html
         server_jvm_max_heap_size => '256m',
         server_jvm_min_heap_size => '256m',
       }
       EOS
     end
 
     it_behaves_like 'a idempotent resource'
 
     describe command('puppetserver --version') do
       its(:stdout) { is_expected.to match("puppetserver version: 5.3.7\n") }
     end
 
     describe service('puppetserver') do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
     describe port('8140') do
       it { is_expected.to be_listening }
     end
   end
 end
diff --git a/spec/acceptance/puppetserver_upgrade_5_3_6_to_5_3_7_spec.rb b/spec/acceptance/puppetserver_upgrade_6_7_0_to_6_7_2_spec.rb
similarity index 81%
copy from spec/acceptance/puppetserver_upgrade_5_3_6_to_5_3_7_spec.rb
copy to spec/acceptance/puppetserver_upgrade_6_7_0_to_6_7_2_spec.rb
index c1f0256..8a046f5 100644
--- a/spec/acceptance/puppetserver_upgrade_5_3_6_to_5_3_7_spec.rb
+++ b/spec/acceptance/puppetserver_upgrade_6_7_0_to_6_7_2_spec.rb
@@ -1,90 +1,90 @@
 require 'spec_helper_acceptance'
 
-describe 'Scenario: 5.3.6 to 5.3.7 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet5' && fact('lsbdistcodename') != 'bionic' do
+describe 'Scenario: 6.7.0 to 6.7.2 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet6' do
   before(:context) do
     if check_for_package(default, 'puppetserver')
       on default, puppet('resource package puppetserver ensure=purged')
       on default, 'rm -rf /etc/sysconfig/puppetserver /etc/puppetlabs/puppetserver'
       on default, 'rm -rf /etc/puppetlabs/puppet/ssl'
     end
 
-    # puppetserver won't start with lower than 2GB memory
+    # puppetserver won't start with low memory
     memoryfree_mb = fact('memoryfree_mb').to_i
-    raise 'At least 2048MB free memory required' if memoryfree_mb < 256
+    raise 'At least 256MB free memory required' if memoryfree_mb < 256
   end
 
   case fact('osfamily')
   when 'Debian'
-    from_version = "5.3.6-1#{fact('lsbdistcodename')}"
-    to_version = "5.3.7-1#{fact('lsbdistcodename')}"
+    from_version = "6.7.0-1#{fact('lsbdistcodename')}"
+    to_version = "6.7.2-1#{fact('lsbdistcodename')}"
   else
-    from_version = '5.3.6'
-    to_version = '5.3.7'
+    from_version = '6.7.0'
+    to_version = '6.7.2'
   end
 
-  context 'install 5.3.6' do
+  context 'install 6.7.0' do
     let(:pp) do
       <<-EOS
       class { '::puppet':
         server                => true,
         server_foreman        => false,
         server_reports        => 'store',
         server_external_nodes => '',
         server_version        => '#{from_version}',
         # only for install test - don't think to use this in production!
         # https://docs.puppet.com/puppetserver/latest/tuning_guide.html
         server_jvm_max_heap_size => '256m',
         server_jvm_min_heap_size => '256m',
       }
       EOS
     end
 
     it_behaves_like 'a idempotent resource'
 
     describe command('puppetserver --version') do
-      its(:stdout) { is_expected.to match("puppetserver version: 5.3.6\n") }
+      its(:stdout) { is_expected.to match("puppetserver version: 6.7.0\n") }
     end
 
     describe service('puppetserver') do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
     describe port('8140') do
       it { is_expected.to be_listening }
     end
   end
 
-  context 'upgrade to 5.3.7' do
+  context 'upgrade to 6.7.2' do
     let(:pp) do
       <<-EOS
       class { '::puppet':
         server                => true,
         server_foreman        => false,
         server_reports        => 'store',
         server_external_nodes => '',
         server_version        => '#{to_version}',
         # only for install test - don't think to use this in production!
         # https://docs.puppet.com/puppetserver/latest/tuning_guide.html
         server_jvm_max_heap_size => '256m',
         server_jvm_min_heap_size => '256m',
       }
       EOS
     end
 
     it_behaves_like 'a idempotent resource'
 
     describe command('puppetserver --version') do
-      its(:stdout) { is_expected.to match("puppetserver version: 5.3.7\n") }
+      its(:stdout) { is_expected.to match("puppetserver version: 6.7.2\n") }
     end
 
     describe service('puppetserver') do
       it { is_expected.to be_enabled }
       it { is_expected.to be_running }
     end
 
     describe port('8140') do
       it { is_expected.to be_listening }
     end
   end
 end