diff --git a/metadata.json b/metadata.json
index fbe3b8d..2c3d02b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -31,7 +31,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ],
   "operatingsystem_support": [
diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb
index 7e73423..a403fa1 100644
--- a/spec/acceptance/basic_spec.rb
+++ b/spec/acceptance/basic_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'Simple installation' do
   interface = 'eth0'
-  config_file = fact('osfamily') == 'Archlinux' ? '/etc/dhcpd.conf' : '/etc/dhcp/dhcpd.conf'
+  config_file = fact('os.family') == 'Archlinux' ? '/etc/dhcpd.conf' : '/etc/dhcp/dhcpd.conf'
 
   it_behaves_like 'an idempotent resource' do
     let(:manifest) do
@@ -18,7 +18,7 @@ class { 'dhcp':
         mask    => $interface['netmask'],
       }
 
-      dhcp::host { $facts['fqdn']:
+      dhcp::host { $facts['networking']['fqdn']:
         ip  => $interface['ip'],
         mac => $interface['mac'],
       }
diff --git a/spec/acceptance/nameservers_spec.rb b/spec/acceptance/nameservers_spec.rb
index 444b840..cebea92 100644
--- a/spec/acceptance/nameservers_spec.rb
+++ b/spec/acceptance/nameservers_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'with empty nameservers list' do
   interface = 'eth0'
-  config_file = fact('osfamily') == 'Archlinux' ? '/etc/dhcpd.conf' : '/etc/dhcp/dhcpd.conf'
+  config_file = fact('os.family') == 'Archlinux' ? '/etc/dhcpd.conf' : '/etc/dhcp/dhcpd.conf'
 
   it_behaves_like 'an idempotent resource' do
     let(:manifest) do