diff --git a/assets/cert-manager/dashboards/cert-manager.json b/assets/cert-manager/dashboards/cert-manager.json
index 99fa19f..560bd7b 100644
--- a/assets/cert-manager/dashboards/cert-manager.json
+++ b/assets/cert-manager/dashboards/cert-manager.json
@@ -20,7 +20,7 @@
    "links": [ ],
    "panels": [
       {
-         "datasource": "prometheus",
+         "datasource": "$datasource",
          "description": "The number of certificates in the ready state.",
          "fieldConfig": {
             "defaults": {
@@ -753,7 +753,7 @@
          "bars": false,
          "dashLength": 10,
          "dashes": false,
-         "datasource": "prometheus",
+         "datasource": "$datasource",
          "description": "Percent of the time that the CPU is being throttled. Higher is badderer. ",
          "fieldConfig": {
             "defaults": {
@@ -862,7 +862,7 @@
          "bars": false,
          "dashLength": 10,
          "dashes": false,
-         "datasource": "prometheus",
+         "datasource": "$datasource",
          "description": "Memory utilisation and limits.",
          "fieldConfig": {
             "defaults": {
@@ -996,7 +996,7 @@
          "bars": false,
          "dashLength": 10,
          "dashes": false,
-         "datasource": "prometheus",
+         "datasource": "$datasource",
          "description": "Network ingress/egress.",
          "fieldConfig": {
             "defaults": {
diff --git a/assets/sealed-secrets/alerts.yaml b/assets/sealed-secrets/alerts.yaml
index d4f5d40..4a01080 100644
--- a/assets/sealed-secrets/alerts.yaml
+++ b/assets/sealed-secrets/alerts.yaml
@@ -1,12 +1,13 @@
 groups:
 - name: sealed-secrets
   rules:
-  - alert: SealedSecretsUnsealErrorRateHigh
+  - alert: SealedSecretsUnsealErrorHigh
     annotations:
-      description: High rate of errors unsealing Sealed Secrets
+      description: High number of errors during unsealing Sealed Secrets in {{ $labels.namespace
+        }} namespace.
       runbook_url: https://github.com/bitnami-labs/sealed-secrets
-      summary: Sealed Secrets Unseal Error Rate High
+      summary: Sealed Secrets Unseal Error High
     expr: |
-      sum(rate(sealed_secrets_controller_unseal_errors_total{}[5m])) > 0
+      sum by (reason, namespace) (rate(sealed_secrets_controller_unseal_errors_total{}[5m])) > 0
     labels:
       severity: warning
diff --git a/site/content/sealed-secrets/_index.md b/site/content/sealed-secrets/_index.md
index 19c0fd5..5da2419 100644
--- a/site/content/sealed-secrets/_index.md
+++ b/site/content/sealed-secrets/_index.md
@@ -18,16 +18,17 @@ Complete list of pregenerated alerts is available [here](https://github.com/moni
 
 ### sealed-secrets
 
-##### SealedSecretsUnsealErrorRateHigh
+##### SealedSecretsUnsealErrorHigh
 
 {{< code lang="yaml" >}}
-alert: SealedSecretsUnsealErrorRateHigh
+alert: SealedSecretsUnsealErrorHigh
 annotations:
-  description: High rate of errors unsealing Sealed Secrets
+  description: High number of errors during unsealing Sealed Secrets in {{ $labels.namespace
+    }} namespace.
   runbook_url: https://github.com/bitnami-labs/sealed-secrets
-  summary: Sealed Secrets Unseal Error Rate High
+  summary: Sealed Secrets Unseal Error High
 expr: |
-  sum(rate(sealed_secrets_controller_unseal_errors_total{}[5m])) > 0
+  sum by (reason, namespace) (rate(sealed_secrets_controller_unseal_errors_total{}[5m])) > 0
 labels:
   severity: warning
 {{< /code >}}