diff --git a/manifests/candlepin.pp b/manifests/candlepin.pp
index 64b4f8a..475ff48 100644
--- a/manifests/candlepin.pp
+++ b/manifests/candlepin.pp
@@ -52,10 +52,8 @@
     oauth_secret                 => $katello::params::candlepin_oauth_secret,
     ca_key                       => $certs::candlepin::ca_key,
     ca_cert                      => $certs::candlepin::ca_cert,
-    keystore_file                => $certs::candlepin::keystore,
-    keystore_password            => $certs::candlepin::keystore_password,
-    truststore_file              => $certs::candlepin::truststore,
-    truststore_password          => $certs::candlepin::truststore_password,
+    certificate_file             => $certs::candlepin::tomcat_cert,
+    certificate_key_file         => $certs::candlepin::tomcat_key,
     java_home                    => '/usr/lib/jvm/jre-25',
     java_package                 => 'java-25-openjdk',
     enable_basic_auth            => false,
diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
index da533b8..975c30e 100644
--- a/spec/setup_acceptance_node.pp
+++ b/spec/setup_acceptance_node.pp
@@ -5,7 +5,7 @@
   repo_version => 'nightly',
 }
 class { 'candlepin::repo':
-  version => 'nightly',
+  version => '4.8',
 }
 
 group { 'foreman':