diff --git a/metadata.json b/metadata.json
index dce64a3..ac572f5 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,118 +1,118 @@
 {
   "name": "theforeman-puppet",
   "version": "15.0.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 < 8.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.18.0 < 8.0.0"
     },
     {
       "name": "puppet/extlib",
       "version_requirement": ">= 3.0.0 < 6.0.0"
     },
     {
       "name": "camptocamp/systemd",
       "version_requirement": ">= 2.9.0 < 4.0.0"
     }
   ],
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 5.5.8 < 7.0.0"
+      "version_requirement": ">= 5.5.8 < 8.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "6",
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "6",
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
         "31"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "9",
         "10"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "16.04",
         "18.04",
         "20.04"
       ]
     },
     {
       "operatingsystem": "FreeBSD",
       "operatingsystemrelease": [
         "11",
         "12"
       ]
     },
     {
       "operatingsystem": "DragonFly",
       "operatingsystemrelease": [
         "4"
       ]
     },
     {
       "operatingsystem": "Archlinux"
     },
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
         "11",
         "12"
       ]
     },
     {
       "operatingsystem": "windows",
       "operatingsystemrelease": [
         "8",
         "2012",
         "2012 R2"
       ]
     }
   ]
 }
diff --git a/spec/acceptance/puppetserver_latest_spec.rb b/spec/acceptance/puppetserver_latest_spec.rb
index 1a62502..e9ab88f 100644
--- a/spec/acceptance/puppetserver_latest_spec.rb
+++ b/spec/acceptance/puppetserver_latest_spec.rb
@@ -1,56 +1,58 @@
 require 'spec_helper_acceptance'
 
 describe 'Scenario: install puppetserver (latest):', unless: unsupported_puppetserver do
   before(:all) 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, 'find /etc/puppetlabs/puppet/ssl/ -type f -delete'
     end
 
     # puppetserver won't start with lower than 2GB memory
     memoryfree_mb = fact('memoryfree_mb').to_i
     raise 'At least 2048MB free memory required' if memoryfree_mb < 256
   end
 
   context 'default options' do
     it_behaves_like 'an idempotent resource' do
       let(:manifest) do
         <<-EOS
         class { 'puppet':
           server => true,
         }
         EOS
       end
     end
   end
 
   describe 'server_max_open_files' do
     it_behaves_like 'an idempotent resource' do
       let(:manifest) do
         <<-MANIFEST
         class { 'puppet':
           server                => true,
           server_max_open_files => 32143,
         }
 
         # Puppet 5 + puppet/systemd 3 workaround
-        if $puppet::server_max_open_files and versioncmp($facts['puppetversion'], '6.1') < 0 {
+        # Also a possible systemd bug on Ubuntu 20.04
+        # https://github.com/theforeman/puppet-puppet/pull/779#issuecomment-886847275
+        if $puppet::server_max_open_files and (versioncmp($facts['puppetversion'], '6.1') < 0 or $facts['os']['name'] == 'Ubuntu' and $facts['os']['release']['major'] == '20.04') {
           exec { 'puppetserver-systemctl-daemon-reload':
             command     => 'systemctl daemon-reload',
             refreshonly => true,
             path        => $facts['path'],
             subscribe   => File['/etc/systemd/system/puppetserver.service.d/limits.conf'],
           }
         }
         MANIFEST
       end
     end
 
     # pgrep -f java.*puppetserver would be better. But i cannot get it to work. Shellwords.escape() seems to break something
     describe command("grep '^Max open files' /proc/`cat /var/run/puppetlabs/puppetserver/puppetserver.pid`/limits"), :sudo => true do
       its(:exit_status) { is_expected.to eq 0 }
       its(:stdout) { is_expected.to match %r{^Max open files\s+32143\s+32143\s+files\s*$} }
     end
   end
 end