diff --git a/files/znc.conf b/files/znc.conf
index 3ea43b76c05470a9f4da98ea13e71f68240b10da..5b9ff9c51030d8d5ba14eed7c39dcae8fc100599 100644
--- a/files/znc.conf
+++ b/files/znc.conf
@@ -2,9 +2,9 @@ Version = 1.7.5
 
 ConfigWriteDelay = 0
 ProtectWebSessions = true
-SSLCertFile = /var/lib/znc/znc.pem
-SSLDHParamFile = /var/lib/znc/znc.pem
-SSLKeyFile = /var/lib/znc/znc.pem
+SSLCertFile = /var/lib/znc/fullchain.pem
+SSLDHParamFile = /var/lib/znc/fullchain.pem
+SSLKeyFile = /var/lib/znc/privkey.pem
 
 <Listener irclistener-ssl>
 	Port = 6697
diff --git a/manifests/setup.pp b/manifests/setup.pp
index 17715e06cfcdcb9d05195f02e6e4924d27150837..b2becce5f5b1047674505f6ba3514ce42548deb3 100644
--- a/manifests/setup.pp
+++ b/manifests/setup.pp
@@ -76,12 +76,12 @@ class irc_bouncer::setup {
     args => ['saslauthd'],
   }
 
-  exec { 'znc make pem':
-    command => 'znc --datadir=/var/lib/znc --makepem',
-    path    => '/usr/bin:/bin',
-    user    => 'znc',
-    onlyif  => 'test ! -f /var/lib/znc/znc.pem',
-  }
+  # exec { 'znc make pem':
+  #   command => 'znc --datadir=/var/lib/znc --makepem',
+  #   path    => '/usr/bin:/bin',
+  #   user    => 'znc',
+  #   onlyif  => 'test ! -f /var/lib/znc/znc.pem',
+  # }
 
   file { '/var/lib/znc/moddata/cyrusauth/.registry':
     ensure  => file,