diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml
index 516c34fc4..9553f9b7c 100644
--- a/library/common/Chart.yaml
+++ b/library/common/Chart.yaml
@@ -15,7 +15,7 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 18.1.1
+version: 18.1.2
 annotations:
   artifacthub.io/category: "integration-delivery"
   artifacthub.io/license: "BUSL-1.1"
diff --git a/library/common/templates/class/metrics/_podMonitor.tpl b/library/common/templates/class/metrics/_podMonitor.tpl
index 35b2c8ffd..587c8e09b 100644
--- a/library/common/templates/class/metrics/_podMonitor.tpl
+++ b/library/common/templates/class/metrics/_podMonitor.tpl
@@ -15,7 +15,7 @@
     {{- $podmonitorName = printf "%v-%v" $podmonitorName $values.nameOverride -}}
   {{- end }}
 
-  {{- include "tc.v1.common.lib.util.verifycrd" (dict "crd" "podmonitors.monitoring.coreos.com" "missing" "Grafana-Agent-Operator or Prometheus-Operator") }}
+  {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" . "crd" "podmonitors.monitoring.coreos.com" "missing" "Prometheus-Operator") }}
 
 ---
 apiVersion: {{ include "tc.v1.common.capabilities.podmonitor.apiVersion" $ }}
diff --git a/library/common/templates/class/metrics/_prometheusRule.tpl b/library/common/templates/class/metrics/_prometheusRule.tpl
index 96d0c7e61..9127ba08d 100644
--- a/library/common/templates/class/metrics/_prometheusRule.tpl
+++ b/library/common/templates/class/metrics/_prometheusRule.tpl
@@ -15,7 +15,7 @@
     {{- $prometheusruleName = printf "%v-%v" $prometheusruleName $values.nameOverride -}}
   {{- end }}
 
-  {{- include "tc.v1.common.lib.util.verifycrd" (dict "crd" "prometheusrules.monitoring.coreos.com" "missing" "Grafana-Agent-Operator or Prometheus-Operator") }}
+  {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" .  "crd" "prometheusrules.monitoring.coreos.com" "missing" "Prometheus-Operator") }}
 
 ---
 apiVersion: {{ include "tc.v1.common.capabilities.prometheusrule.apiVersion" $ }}
diff --git a/library/common/templates/class/metrics/_serviceMonitor.tpl b/library/common/templates/class/metrics/_serviceMonitor.tpl
index beff69c2e..f01cea670 100644
--- a/library/common/templates/class/metrics/_serviceMonitor.tpl
+++ b/library/common/templates/class/metrics/_serviceMonitor.tpl
@@ -15,7 +15,7 @@
     {{- $servicemonitorName = printf "%v-%v" $servicemonitorName $values.nameOverride -}}
   {{- end }}
 
-  {{- include "tc.v1.common.lib.util.verifycrd" (dict "crd" "servicemonitors.monitoring.coreos.com" "missing" "Grafana-Agent-Operator or Prometheus-Operator") }}
+  {{- include "tc.v1.common.lib.util.verifycrd" (dict "rootCtx" . "crd" "servicemonitors.monitoring.coreos.com" "missing" "Prometheus-Operator") }}
 
 ---
 apiVersion: {{ include "tc.v1.common.capabilities.servicemonitor.apiVersion" $ }}