diff --git a/metadata.json b/metadata.json
index a1ae0c2e..20a08b65 100644
--- a/metadata.json
+++ b/metadata.json
@@ -28,7 +28,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/mysql_spec.rb b/spec/acceptance/mysql_spec.rb
index 8bfb3777..9c18e857 100644
--- a/spec/acceptance/mysql_spec.rb
+++ b/spec/acceptance/mysql_spec.rb
@@ -50,7 +50,7 @@ class { 'java':
       }
 
       exec { 'tmpkey':
-        command => "openssl req -x509 -nodes -days 1 -subj '/C=CA/ST=QC/L=Montreal/O=FOO/CN=${fqdn}' -newkey rsa:1024 -keyout /tmp/key.pem -out /tmp/cert.pem",
+        command => "openssl req -x509 -nodes -days 1 -subj '/C=CA/ST=QC/L=Montreal/O=FOO/CN=${facts['networking']['fqdn']}' -newkey rsa:1024 -keyout /tmp/key.pem -out /tmp/cert.pem",
         path    => [ "/bin/", "/sbin/" , "/usr/bin/", "/usr/sbin/" ],
         creates => '/tmp/cert.pem',
       }
diff --git a/templates/cluster.properties.epp b/templates/cluster.properties.epp
index 38c50cdc..d66586c8 100644
--- a/templates/cluster.properties.epp
+++ b/templates/cluster.properties.epp
@@ -1,5 +1,5 @@
 # This ID must be unique across the cluster
-jira.node.id = <%= $facts['fqdn'] %>
+jira.node.id = <%= $facts['networking']['fqdn'] %>
 # The location of the shared home directory for all JIRA nodes
 jira.shared.home = <%= $jira::shared_homedir %>
 <% if $jira::ehcache_listener_host { -%>