diff --git a/class/defaults.yml b/class/defaults.yml
index 49dfe2e..371fcbe 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -17,7 +17,7 @@ parameters:
       cmo_version: ${openshift4_monitoring:manifests_version}
       etcd_version: ${openshift4_monitoring:manifests_version}
       # renovate repo=https://github.com/kubernetes/kube-state-metrics
-      kube_state_metrics_version: v2.13.0
+      kube_state_metrics_version: v2.14.0
     defaultConfig:
       nodeSelector:
         node-role.kubernetes.io/infra: ''
diff --git a/tests/golden/capacity-alerts-with-node-labels/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml b/tests/golden/capacity-alerts-with-node-labels/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
index 40d2cd7..a60aab1 100644
--- a/tests/golden/capacity-alerts-with-node-labels/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
+++ b/tests/golden/capacity-alerts-with-node-labels/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
@@ -638,13 +638,13 @@ spec:
       rules:
         - alert: SYN_KubeContainerWaiting
           annotations:
-            description: pod/{{ $labels.pod }} in namespace {{ $labels.namespace }}
-              on container {{ $labels.container}} has been in waiting state for longer
-              than 1 hour.
+            description: 'pod/{{ $labels.pod }} in namespace {{ $labels.namespace
+              }} on container {{ $labels.container}} has been in waiting state for
+              longer than 1 hour. (reason: "{{ $labels.reason }}").'
             summary: Pod container waiting longer than 1 hour
             syn_component: openshift4-monitoring
           expr: |
-            sum by (namespace, pod, container, cluster) (kube_pod_container_status_waiting_reason{namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"}) > 0
+            kube_pod_container_status_waiting_reason{reason!="CrashLoopBackOff", namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"} > 0
           for: 1h
           labels:
             severity: warning
diff --git a/tests/golden/capacity-alerts/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml b/tests/golden/capacity-alerts/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
index 40d2cd7..a60aab1 100644
--- a/tests/golden/capacity-alerts/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
+++ b/tests/golden/capacity-alerts/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
@@ -638,13 +638,13 @@ spec:
       rules:
         - alert: SYN_KubeContainerWaiting
           annotations:
-            description: pod/{{ $labels.pod }} in namespace {{ $labels.namespace }}
-              on container {{ $labels.container}} has been in waiting state for longer
-              than 1 hour.
+            description: 'pod/{{ $labels.pod }} in namespace {{ $labels.namespace
+              }} on container {{ $labels.container}} has been in waiting state for
+              longer than 1 hour. (reason: "{{ $labels.reason }}").'
             summary: Pod container waiting longer than 1 hour
             syn_component: openshift4-monitoring
           expr: |
-            sum by (namespace, pod, container, cluster) (kube_pod_container_status_waiting_reason{namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"}) > 0
+            kube_pod_container_status_waiting_reason{reason!="CrashLoopBackOff", namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"} > 0
           for: 1h
           labels:
             severity: warning
diff --git a/tests/golden/custom-rules/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml b/tests/golden/custom-rules/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
index c5960e8..8247946 100644
--- a/tests/golden/custom-rules/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
+++ b/tests/golden/custom-rules/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
@@ -647,13 +647,13 @@ spec:
       rules:
         - alert: SYN_KubeContainerWaiting
           annotations:
-            description: pod/{{ $labels.pod }} in namespace {{ $labels.namespace }}
-              on container {{ $labels.container}} has been in waiting state for longer
-              than 1 hour.
+            description: 'pod/{{ $labels.pod }} in namespace {{ $labels.namespace
+              }} on container {{ $labels.container}} has been in waiting state for
+              longer than 1 hour. (reason: "{{ $labels.reason }}").'
             summary: Pod container waiting longer than 1 hour
             syn_component: openshift4-monitoring
           expr: |
-            sum by (namespace, pod, container, cluster) (kube_pod_container_status_waiting_reason{namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",namespace!~"(openshift-adp)",job="kube-state-metrics"}) > 0
+            kube_pod_container_status_waiting_reason{reason!="CrashLoopBackOff", namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",namespace!~"(openshift-adp)",job="kube-state-metrics"} > 0
           for: 1h
           labels:
             severity: warning
diff --git a/tests/golden/ovn-kubernetes/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml b/tests/golden/ovn-kubernetes/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
index 47c414a..68b6352 100644
--- a/tests/golden/ovn-kubernetes/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
+++ b/tests/golden/ovn-kubernetes/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
@@ -789,13 +789,13 @@ spec:
       rules:
         - alert: SYN_KubeContainerWaiting
           annotations:
-            description: pod/{{ $labels.pod }} in namespace {{ $labels.namespace }}
-              on container {{ $labels.container}} has been in waiting state for longer
-              than 1 hour.
+            description: 'pod/{{ $labels.pod }} in namespace {{ $labels.namespace
+              }} on container {{ $labels.container}} has been in waiting state for
+              longer than 1 hour. (reason: "{{ $labels.reason }}").'
             summary: Pod container waiting longer than 1 hour
             syn_component: openshift4-monitoring
           expr: |
-            sum by (namespace, pod, container, cluster) (kube_pod_container_status_waiting_reason{namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"}) > 0
+            kube_pod_container_status_waiting_reason{reason!="CrashLoopBackOff", namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"} > 0
           for: 1h
           labels:
             severity: warning
diff --git a/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml b/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
index 66eb33b..47bac8c 100644
--- a/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
+++ b/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
@@ -619,13 +619,13 @@ spec:
       rules:
         - alert: SYN_KubeContainerWaiting
           annotations:
-            description: pod/{{ $labels.pod }} in namespace {{ $labels.namespace }}
-              on container {{ $labels.container}} has been in waiting state for longer
-              than 1 hour.
+            description: 'pod/{{ $labels.pod }} in namespace {{ $labels.namespace
+              }} on container {{ $labels.container}} has been in waiting state for
+              longer than 1 hour. (reason: "{{ $labels.reason }}").'
             summary: Pod container waiting longer than 1 hour
             syn_component: openshift4-monitoring
           expr: |
-            sum by (namespace, pod, container, cluster) (kube_pod_container_status_waiting_reason{namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"}) > 0
+            kube_pod_container_status_waiting_reason{reason!="CrashLoopBackOff", namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"} > 0
           for: 1h
           labels:
             severity: warning
diff --git a/tests/golden/release-4.15/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml b/tests/golden/release-4.15/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
index 40d2cd7..a60aab1 100644
--- a/tests/golden/release-4.15/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
+++ b/tests/golden/release-4.15/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
@@ -638,13 +638,13 @@ spec:
       rules:
         - alert: SYN_KubeContainerWaiting
           annotations:
-            description: pod/{{ $labels.pod }} in namespace {{ $labels.namespace }}
-              on container {{ $labels.container}} has been in waiting state for longer
-              than 1 hour.
+            description: 'pod/{{ $labels.pod }} in namespace {{ $labels.namespace
+              }} on container {{ $labels.container}} has been in waiting state for
+              longer than 1 hour. (reason: "{{ $labels.reason }}").'
             summary: Pod container waiting longer than 1 hour
             syn_component: openshift4-monitoring
           expr: |
-            sum by (namespace, pod, container, cluster) (kube_pod_container_status_waiting_reason{namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"}) > 0
+            kube_pod_container_status_waiting_reason{reason!="CrashLoopBackOff", namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"} > 0
           for: 1h
           labels:
             severity: warning
diff --git a/tests/golden/remote-write/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml b/tests/golden/remote-write/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
index 40d2cd7..a60aab1 100644
--- a/tests/golden/remote-write/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
+++ b/tests/golden/remote-write/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
@@ -638,13 +638,13 @@ spec:
       rules:
         - alert: SYN_KubeContainerWaiting
           annotations:
-            description: pod/{{ $labels.pod }} in namespace {{ $labels.namespace }}
-              on container {{ $labels.container}} has been in waiting state for longer
-              than 1 hour.
+            description: 'pod/{{ $labels.pod }} in namespace {{ $labels.namespace
+              }} on container {{ $labels.container}} has been in waiting state for
+              longer than 1 hour. (reason: "{{ $labels.reason }}").'
             summary: Pod container waiting longer than 1 hour
             syn_component: openshift4-monitoring
           expr: |
-            sum by (namespace, pod, container, cluster) (kube_pod_container_status_waiting_reason{namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"}) > 0
+            kube_pod_container_status_waiting_reason{reason!="CrashLoopBackOff", namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"} > 0
           for: 1h
           labels:
             severity: warning
diff --git a/tests/golden/team-routing/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml b/tests/golden/team-routing/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
index 965f34b..32cceb0 100644
--- a/tests/golden/team-routing/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
+++ b/tests/golden/team-routing/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
@@ -670,13 +670,13 @@ spec:
       rules:
         - alert: SYN_KubeContainerWaiting
           annotations:
-            description: pod/{{ $labels.pod }} in namespace {{ $labels.namespace }}
-              on container {{ $labels.container}} has been in waiting state for longer
-              than 1 hour.
+            description: 'pod/{{ $labels.pod }} in namespace {{ $labels.namespace
+              }} on container {{ $labels.container}} has been in waiting state for
+              longer than 1 hour. (reason: "{{ $labels.reason }}").'
             summary: Pod container waiting longer than 1 hour
             syn_component: openshift4-monitoring
           expr: |
-            sum by (namespace, pod, container, cluster) (kube_pod_container_status_waiting_reason{namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"}) > 0
+            kube_pod_container_status_waiting_reason{reason!="CrashLoopBackOff", namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"} > 0
           for: 1h
           labels:
             severity: warning
diff --git a/tests/golden/user-workload-monitoring/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml b/tests/golden/user-workload-monitoring/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
index ef14096..5bf9390 100644
--- a/tests/golden/user-workload-monitoring/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
+++ b/tests/golden/user-workload-monitoring/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
@@ -638,13 +638,13 @@ spec:
       rules:
         - alert: SYN_KubeContainerWaiting
           annotations:
-            description: pod/{{ $labels.pod }} in namespace {{ $labels.namespace }}
-              on container {{ $labels.container}} has been in waiting state for longer
-              than 1 hour.
+            description: 'pod/{{ $labels.pod }} in namespace {{ $labels.namespace
+              }} on container {{ $labels.container}} has been in waiting state for
+              longer than 1 hour. (reason: "{{ $labels.reason }}").'
             summary: Pod container waiting longer than 1 hour
             syn_component: openshift4-monitoring
           expr: |
-            sum by (namespace, pod, container, cluster) (kube_pod_container_status_waiting_reason{namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"}) > 0
+            kube_pod_container_status_waiting_reason{reason!="CrashLoopBackOff", namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"} > 0
           for: 1h
           labels:
             severity: warning
diff --git a/tests/golden/vsphere/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml b/tests/golden/vsphere/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
index 61e8d57..6d03678 100644
--- a/tests/golden/vsphere/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
+++ b/tests/golden/vsphere/openshift4-monitoring/openshift4-monitoring/prometheus_rules.yaml
@@ -638,13 +638,13 @@ spec:
       rules:
         - alert: SYN_KubeContainerWaiting
           annotations:
-            description: pod/{{ $labels.pod }} in namespace {{ $labels.namespace }}
-              on container {{ $labels.container}} has been in waiting state for longer
-              than 1 hour.
+            description: 'pod/{{ $labels.pod }} in namespace {{ $labels.namespace
+              }} on container {{ $labels.container}} has been in waiting state for
+              longer than 1 hour. (reason: "{{ $labels.reason }}").'
             summary: Pod container waiting longer than 1 hour
             syn_component: openshift4-monitoring
           expr: |
-            sum by (namespace, pod, container, cluster) (kube_pod_container_status_waiting_reason{namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"}) > 0
+            kube_pod_container_status_waiting_reason{reason!="CrashLoopBackOff", namespace=~"(appuio.*|cilium|default|kube-.*|openshift-.*|syn.*)",job="kube-state-metrics"} > 0
           for: 1h
           labels:
             severity: warning