diff --git a/bitnami/kafka/Chart.yaml b/bitnami/kafka/Chart.yaml
index c08e304d51..d07aa38fce 100644
--- a/bitnami/kafka/Chart.yaml
+++ b/bitnami/kafka/Chart.yaml
@@ -29,4 +29,4 @@ name: kafka
 sources:
   - https://github.com/bitnami/bitnami-docker-kafka
   - https://kafka.apache.org/
-version: 12.2.3
+version: 12.2.4
diff --git a/bitnami/kafka/templates/extra-list.yaml b/bitnami/kafka/templates/extra-list.yaml
index 184da188e3..9ac65f9e16 100644
--- a/bitnami/kafka/templates/extra-list.yaml
+++ b/bitnami/kafka/templates/extra-list.yaml
@@ -1,5 +1,4 @@
-{{- if .Values.extraDeploy }}
-apiVersion: v1
-kind: List
-items: {{- include "common.tplvalues.render" (dict "value" .Values.extraDeploy "context" $) | nindent 2 }}
+{{- range .Values.extraDeploy }}
+---
+{{ include "common.tplvalues.render" (dict "value" . "context" $) }}
 {{- end }}
diff --git a/bitnami/kube-prometheus/Chart.yaml b/bitnami/kube-prometheus/Chart.yaml
index 6f17edd06d..8bb57e273d 100644
--- a/bitnami/kube-prometheus/Chart.yaml
+++ b/bitnami/kube-prometheus/Chart.yaml
@@ -34,4 +34,4 @@ sources:
   - https://github.com/bitnami/bitnami-docker-prometheus
   - https://github.com/bitnami/bitnami-docker-alertmanager
   - https://github.com/prometheus-operator/kube-prometheus
-version: 3.1.1
+version: 3.1.2
diff --git a/bitnami/kube-prometheus/templates/prometheus/additionalPrometheusRules.yaml b/bitnami/kube-prometheus/templates/prometheus/additionalPrometheusRules.yaml
index 9f92847ac4..06ef91300c 100644
--- a/bitnami/kube-prometheus/templates/prometheus/additionalPrometheusRules.yaml
+++ b/bitnami/kube-prometheus/templates/prometheus/additionalPrometheusRules.yaml
@@ -1,16 +1,13 @@
 {{- if and .Values.prometheus.enabled .Values.prometheus.additionalPrometheusRules}}
-apiVersion: v1
-kind: List
-items:
-{{- range .Values.prometheus.additionalPrometheusRules }}
-  - apiVersion: monitoring.coreos.com/v1
-    kind: PrometheusRule
-    metadata:
-      name: {{ template "kube-prometheus.name" $ }}-{{ .name }}
-      namespace: {{ $.Release.Namespace }}
-      labels: {{ include "kube-prometheus.prometheus.labels" $ | nindent 8 }}
-    spec:
-      groups:
-{{ toYaml .groups| indent 8 }}
-{{- end }}
+  {{- range .Values.prometheus.additionalPrometheusRules }}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ template "kube-prometheus.name" $ }}-{{ .name }}
+  namespace: {{ $.Release.Namespace }}
+  labels: {{ include "kube-prometheus.prometheus.labels" $ | nindent 4 }}
+spec:
+  groups: {{- toYaml .groups | nindent 4 }}
+  {{- end }}
 {{- end }}
diff --git a/bitnami/kubernetes-event-exporter/Chart.yaml b/bitnami/kubernetes-event-exporter/Chart.yaml
index c56bed94b9..4bccc955a8 100644
--- a/bitnami/kubernetes-event-exporter/Chart.yaml
+++ b/bitnami/kubernetes-event-exporter/Chart.yaml
@@ -24,4 +24,4 @@ name: kubernetes-event-exporter
 sources:
   - https://github.com/bitnami/bitnami-docker-kubernetes-event-exporter
   - https://github.com/opsgenie/kubernetes-event-exporter
-version: 1.0.2
+version: 1.0.3
diff --git a/bitnami/kubernetes-event-exporter/templates/extra-list.yaml b/bitnami/kubernetes-event-exporter/templates/extra-list.yaml
index 184da188e3..9ac65f9e16 100644
--- a/bitnami/kubernetes-event-exporter/templates/extra-list.yaml
+++ b/bitnami/kubernetes-event-exporter/templates/extra-list.yaml
@@ -1,5 +1,4 @@
-{{- if .Values.extraDeploy }}
-apiVersion: v1
-kind: List
-items: {{- include "common.tplvalues.render" (dict "value" .Values.extraDeploy "context" $) | nindent 2 }}
+{{- range .Values.extraDeploy }}
+---
+{{ include "common.tplvalues.render" (dict "value" . "context" $) }}
 {{- end }}