diff --git a/manifests/setup.pp b/manifests/setup.pp
index 19acfb8db2618bdf6c0977ab4c778437afdf3faf..0cfc79227bca0eb3979f49094b55661fa9822ea2 100644
--- a/manifests/setup.pp
+++ b/manifests/setup.pp
@@ -86,15 +86,15 @@ class irc_bouncer::setup {
     # address of ns-master.lysator.liu.se
     # Since the python can't handle DNS...
     server              => '2001:6b0:17:f0a0::2',
-    key_name            => 'verdigris.lysator.liu.se',
+    key_name            => $facts['fqdn'],
     key_algorithm       => 'HMAC-SHA256',
     key_secret          => 'YHR7/5gOkdPF64GwWRu6Ge8jcjz8siqCWIy/G8FsVzw=',
     propagation_seconds => 10,
     manage_package      => true,
   }
-  -> letsencrypt::certonly { $servername:
+  -> letsencrypt::certonly { $facts['fqdn']:
     ensure  => 'present',
-    domains => [ $servername, ],
+    domains => [ $facts['fqdn'], ],
     plugin  => 'dns-rfc2136'
   }