diff --git a/charmhelpers/contrib/hahelpers/apache.py b/charmhelpers/contrib/hahelpers/apache.py
index 22acb68..a852704 100644
--- a/charmhelpers/contrib/hahelpers/apache.py
+++ b/charmhelpers/contrib/hahelpers/apache.py
@@ -65,7 +65,8 @@ def get_ca_cert():
     if ca_cert is None:
         log("Inspecting identity-service relations for CA SSL certificate.",
             level=INFO)
-        for r_id in relation_ids('identity-service'):
+        for r_id in (relation_ids('identity-service') +
+                     relation_ids('identity-credentials')):
             for unit in relation_list(r_id):
                 if ca_cert is None:
                     ca_cert = relation_get('ca_cert',
diff --git a/hooks/ceilometer_hooks.py b/hooks/ceilometer_hooks.py
index 6e935f1..0479e0c 100755
--- a/hooks/ceilometer_hooks.py
+++ b/hooks/ceilometer_hooks.py
@@ -55,6 +55,9 @@ from charmhelpers.contrib.openstack.utils import (
 from charmhelpers.contrib.openstack.ha.utils import (
     update_dns_ha_resource_params,
 )
+from ceilometer_utils import (
+    ApacheSSLContext,
+)
 from ceilometer_utils import (
     disable_package_apache_site,
     get_packages,
@@ -184,6 +187,8 @@ def configure_https():
     cmp_codename = CompareOpenStackReleases(
         get_os_codename_install_source(config('openstack-origin')))
     if cmp_codename >= 'queens':
+        ssl = ApacheSSLContext()
+        ssl.configure_ca()
         return
     CONFIGS.write_all()
     if 'https' in CONFIGS.complete_contexts():