diff --git a/modules/enableit/common/manifests/monitor/exporter/blackbox.pp b/modules/enableit/common/manifests/monitor/exporter/blackbox.pp
index 90b51ab9..83b7d009 100644
--- a/modules/enableit/common/manifests/monitor/exporter/blackbox.pp
+++ b/modules/enableit/common/manifests/monitor/exporter/blackbox.pp
@@ -59,6 +59,9 @@
         'http'    => {
           'fail_if_not_ssl'       => true,
           'preferred_ip_protocol' => 'ip4',
+          'tls_config'            => {
+            'insecure_skip_verify' => true,
+          },
         },
       },
     }
diff --git a/modules/enableit/common/manifests/monitor/prometheus/server.pp b/modules/enableit/common/manifests/monitor/prometheus/server.pp
index 4512c06b..fe5bba35 100644
--- a/modules/enableit/common/manifests/monitor/prometheus/server.pp
+++ b/modules/enableit/common/manifests/monitor/prometheus/server.pp
@@ -109,7 +109,7 @@
         },
         {
           source_labels => ['certname'],
-          regex         => $trusted['certname'],
+          regex         => regsubst($trusted['certname'], '^[^.]+\.(.*)', '.*\.\1'),
           action        => 'keep',
         },
       ],