diff --git a/manifests/apache.pp b/manifests/apache.pp
index 2bfab0e..57c3ccd 100644
--- a/manifests/apache.pp
+++ b/manifests/apache.pp
@@ -5,7 +5,7 @@
     ssl           => true,
     ssl_cert      => $certs::apache::apache_cert,
     ssl_key       => $certs::apache::apache_key,
-    ssl_ca        => $certs::apache::ca_cert,
+    ssl_ca        => $certs::apache::apache_client_ca_cert,
     ssl_chain     => $certs::apache::apache_ca_cert,
     proxy_backend => "http://localhost:${katello_devel::rails_port}/",
     proxy_assets  => true,
diff --git a/manifests/init.pp b/manifests/init.pp
index 88ab2d0..94ccfd5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -130,7 +130,7 @@
   include certs
 
   $candlepin_url = $katello::params::candlepin_url
-  $candlepin_ca_cert = $certs::ca_cert
+  $candlepin_ca_cert = $certs::katello_default_ca_cert
 
   $ssl_ca_file = "${foreman_cert_dir}/proxy_ca.pem"
   $ssl_certificate = "${foreman_cert_dir}/client_cert.pem"
diff --git a/metadata.json b/metadata.json
index 2e40ab4..744f416 100644
--- a/metadata.json
+++ b/metadata.json
@@ -51,7 +51,6 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "8",
         "9"
       ]
     },
@@ -64,7 +63,6 @@
     {
       "operatingsystem": "AlmaLinux",
       "operatingsystemrelease": [
-        "8",
         "9"
       ]
     }
diff --git a/spec/classes/katello_devel_spec.rb b/spec/classes/katello_devel_spec.rb
index 28c5d91..5db6455 100644
--- a/spec/classes/katello_devel_spec.rb
+++ b/spec/classes/katello_devel_spec.rb
@@ -32,7 +32,7 @@
           'BIND=0.0.0.0',
           'PORT=3000',
           "RAILS_STARTUP='puma -w 2 -p $PORT --preload'",
-          "WEBPACK_OPTS='--https --key /etc/pki/katello/private/katello-apache.key --cert /etc/pki/katello/certs/katello-apache.crt --cacert /etc/pki/katello/certs/katello-default-ca.crt --host 0.0.0.0 --public #{facts[:fqdn]}'",
+          "WEBPACK_OPTS='--https --key /etc/pki/katello/private/katello-apache.key --cert /etc/pki/katello/certs/katello-apache.crt --cacert /etc/pki/katello/certs/katello-default-ca.crt --host 0.0.0.0 --public #{facts[:networking]['fqdn']}'",
           "REDUX_LOGGER=false",
         ]) }
 
diff --git a/templates/env.erb b/templates/env.erb
index fb58d5b..60f2d6a 100644
--- a/templates/env.erb
+++ b/templates/env.erb
@@ -1,5 +1,5 @@
 BIND=0.0.0.0
 PORT=<%= scope['katello_devel::rails_port'] %>
 RAILS_STARTUP='<%= scope['katello_devel::rails_command'] %>'
-WEBPACK_OPTS='--https --key <%= scope['certs::apache::apache_key'] %> --cert <%= scope['certs::apache::apache_cert'] %> --cacert <%= scope['certs::apache::ca_cert'] %> --host 0.0.0.0 --public <%= scope['certs::apache::hostname'] %>'
+WEBPACK_OPTS='--https --key <%= scope['certs::apache::apache_key'] %> --cert <%= scope['certs::apache::apache_cert'] %> --cacert <%= scope['certs::apache::apache_client_ca_cert'] %> --host 0.0.0.0 --public <%= scope['certs::apache::hostname'] %>'
 REDUX_LOGGER=false