diff --git a/manifests/site.pp b/manifests/site.pp
index 95c38167e6..abe116d43b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -543,7 +543,10 @@ node 'etherpad.openstack.org' {
   }
 
   include etherpad_lite
-  include etherpad_lite::nginx
+  class { 'etherpad_lite::nginx':
+    etherpad_crt => hiera('etherpad_crt'),
+    etherpad_key => hiera('etherpad_key')
+  }
   class { 'etherpad_lite::site':
     database_password => hiera('etherpad_db_password'),
   }
diff --git a/modules/etherpad_lite/manifests/nginx.pp b/modules/etherpad_lite/manifests/nginx.pp
index 4b0d5e3ea7..bb7574b481 100644
--- a/modules/etherpad_lite/manifests/nginx.pp
+++ b/modules/etherpad_lite/manifests/nginx.pp
@@ -1,6 +1,8 @@
 class etherpad_lite::nginx (
   $default_server = 'default_server',
-  $server_name    = $fqdn
+  $server_name    = $fqdn,
+  $etherpad_crt,
+  $etherpad_key
 ) {
 
   package { 'nginx':
diff --git a/modules/etherpad_lite/templates/eplite.crt.erb b/modules/etherpad_lite/templates/eplite.crt.erb
index b9ce57ad7d..2b2bdcdbc5 100644
--- a/modules/etherpad_lite/templates/eplite.crt.erb
+++ b/modules/etherpad_lite/templates/eplite.crt.erb
@@ -1 +1 @@
-<%= cert_file %>
+<%= etherpad_crt %>
diff --git a/modules/etherpad_lite/templates/eplite.key.erb b/modules/etherpad_lite/templates/eplite.key.erb
index 2ba76d2919..9f99d02c15 100644
--- a/modules/etherpad_lite/templates/eplite.key.erb
+++ b/modules/etherpad_lite/templates/eplite.key.erb
@@ -1 +1 @@
-<%= key_file %>
+<%= etherpad_key %>