diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 9cd28966cdfa79b8da676d3a3ca525dc6eb11100..98b504f190c98e532ccc03ba8630da4eda6a36d9 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
           "subdir": "Documentation/etcd-mixin"
         }
       },
-      "version": "53f15caf73b9285d6043009fa64c925d5a8f573c",
+      "version": "b9d00aae7cc6940143fbe35afa26af920b6ae7f2",
       "sum": "Ko3qhNfC2vN/houLh6C0Ryacjv70gl0DVPGU/PQ4OD0="
     },
     {
@@ -72,8 +72,8 @@
           "subdir": ""
         }
       },
-      "version": "003c3e8db3aee2699b9e31fe8fd0cb906354a48f",
-      "sum": "rMy/F8MHwyKuyud73q9vY8PrX6BEODTU9ela03iv9UY="
+      "version": "151d18f121b3dc67b875a95ebe1920eef917be18",
+      "sum": "CTngOAgi3+vHNPZ9b2K1BnjvYys775tbhW7M0y0BaEQ="
     },
     {
       "name": "node-mixin",
@@ -83,7 +83,7 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "9bb37873a8757508853b14e6048a9c3418f3d667",
+      "version": "eac3e30f7f7f564c2bd110c7bb97390711e45e32",
       "sum": "7vEamDTP9AApeiF4Zu9ZyXzDIs3rYHzwf9k7g8X+wsg="
     },
     {
@@ -94,7 +94,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "ddd49b743c1c03527064d38f4830258b4a6ccb27",
+      "version": "8c2bc2f57a4e01121dbe0377fbaa7805311afc8e",
       "sum": "u1YS9CVuBTcw2vks0PZbLb1gtlI/7bVGDVBZsjWFLTw="
     },
     {
@@ -116,7 +116,7 @@
           "subdir": "lib/promgrafonnet"
         }
       },
-      "version": "003c3e8db3aee2699b9e31fe8fd0cb906354a48f",
+      "version": "151d18f121b3dc67b875a95ebe1920eef917be18",
       "sum": "VhgBM39yv0f4bKv8VfGg4FXkg573evGDRalip9ypKbc="
     },
     {
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index a6aee8bb13c4ef077f408f55ec3d8d0acc33499d..e5365dfeed964f63a3399a6b0ae1a73f3c96e1ce 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -750,7 +750,7 @@ items:
                           "steppedLine": false,
                           "targets": [
                               {
-                                  "expr": "sum(rate(etcd_helper_cache_hit_total{job=\"apiserver\",instance=~\"$instance\", cluster=\"$cluster\"}[5m])) by (intance)",
+                                  "expr": "sum(rate(etcd_helper_cache_hit_total{job=\"apiserver\",instance=~\"$instance\", cluster=\"$cluster\"}[5m])) by (instance)",
                                   "format": "time_series",
                                   "intervalFactor": 2,
                                   "legendFormat": "{{instance}} hit",
diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index 29cbdf3c297eafd3e65e5d0ec1022917dbbdfeb3..885ca1f1b79be0ab0f0657f17bf854b6a23d04b2 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -1011,7 +1011,7 @@ spec:
           in less than 7.0 days.
         runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeclientcertificateexpiration
       expr: |
-        apiserver_client_certificate_expiration_seconds_count{job="apiserver"} > 0 and histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 604800
+        apiserver_client_certificate_expiration_seconds_count{job="apiserver"} > 0 and on(job) histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 604800
       labels:
         severity: warning
     - alert: KubeClientCertificateExpiration
@@ -1020,7 +1020,7 @@ spec:
           in less than 24.0 hours.
         runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeclientcertificateexpiration
       expr: |
-        apiserver_client_certificate_expiration_seconds_count{job="apiserver"} > 0 and histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 86400
+        apiserver_client_certificate_expiration_seconds_count{job="apiserver"} > 0 and on(job) histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 86400
       labels:
         severity: critical
     - alert: KubeAPIDown