diff --git a/manifests/init.pp b/manifests/init.pp
index b51b697..d6caabb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,7 +3,7 @@
 # Manages puppet agent
 #
 class puppet (
-  String                                  $certname = $::fqdn,
+  String                                  $certname = $facts['networking']['fqdn'],
   Variant[Enum['true', 'false'], Boolean] $run_every_thirty = true, #lint:ignore:quoted_booleans
   Variant[Enum['true', 'false'], Boolean] $run_in_noop = true, #lint:ignore:quoted_booleans
   String                                  $cron_command = '/opt/puppetlabs/bin/puppet agent --onetime --no-daemonize --no-usecacheonfailure --detailed-exitcodes --no-splay',
diff --git a/metadata.json b/metadata.json
index d6134dd..921855c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -11,7 +11,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.7.0 < 7.0.0"
+      "version_requirement": ">= 4.7.0 < 9.0.0"
     }
   ],
   "operatingsystem_support": [