diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index 4770018cf454ab7dfa54f15798fee86884a5cb85..11a2330711399ead5b138cb08e3651056e499021 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -852,7 +852,7 @@ spec:
         severity: warning
     - alert: KubeClientErrors
       annotations:
-        message: Kubernetes API server client '{{ $labels.job_name }}/{{ $labels.instance
+        message: Kubernetes API server client '{{ $labels.job }}/{{ $labels.instance
           }}' is experiencing {{ printf "%0.0f" $value }}% errors.'
         runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeclienterrors
       expr: |
@@ -865,7 +865,7 @@ spec:
         severity: warning
     - alert: KubeClientErrors
       annotations:
-        message: Kubernetes API server client '{{ $labels.job_name }}/{{ $labels.instance
+        message: Kubernetes API server client '{{ $labels.job }}/{{ $labels.instance
           }}' is experiencing {{ printf "%0.0f" $value }} errors / second.
         runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeclienterrors
       expr: |
@@ -975,7 +975,7 @@ spec:
     rules:
     - alert: TargetDown
       annotations:
-        message: '{{ $value }}% of the {{ $labels.job_name }} targets are down.'
+        message: '{{ $value }}% of the {{ $labels.job }} targets are down.'
       expr: 100 * (count(up == 0) BY (job) / count(up) BY (job)) > 10
       for: 10m
       labels:
@@ -1060,7 +1060,7 @@ spec:
         severity: warning
     - alert: PrometheusTSDBReloadsFailing
       annotations:
-        description: '{{$labels.job_name}} at {{$labels.instance}} had {{$value | humanize}}
+        description: '{{$labels.job}} at {{$labels.instance}} had {{$value | humanize}}
           reload failures over the last four hours.'
         summary: Prometheus has issues reloading data blocks from disk
       expr: |
@@ -1070,7 +1070,7 @@ spec:
         severity: warning
     - alert: PrometheusTSDBCompactionsFailing
       annotations:
-        description: '{{$labels.job_name}} at {{$labels.instance}} had {{$value | humanize}}
+        description: '{{$labels.job}} at {{$labels.instance}} had {{$value | humanize}}
           compaction failures over the last four hours.'
         summary: Prometheus has issues compacting sample blocks
       expr: |
@@ -1080,7 +1080,7 @@ spec:
         severity: warning
     - alert: PrometheusTSDBWALCorruptions
       annotations:
-        description: '{{$labels.job_name}} at {{$labels.instance}} has a corrupted write-ahead
+        description: '{{$labels.job}} at {{$labels.instance}} has a corrupted write-ahead
           log (WAL).'
         summary: Prometheus write-ahead log is corrupted
       expr: |