diff --git a/bitnami/kibana/templates/deployment.yaml b/bitnami/kibana/templates/deployment.yaml
index c2fd91b30..ea859df27 100644
--- a/bitnami/kibana/templates/deployment.yaml
+++ b/bitnami/kibana/templates/deployment.yaml
@@ -175,14 +175,14 @@ spec:
       {{- end }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
-      {{- tpl (toYaml .Values.nodeSelector) $ | nindent 6 }}
+      {{- tpl (toYaml .Values.nodeSelector) $ | nindent 8 }}
       {{- end }}
       {{- if .Values.affinity }}
       affinity:
-      {{- tpl (toYaml .Values.affinity) $ | nindent 6 }}
+      {{- tpl (toYaml .Values.affinity) $ | nindent 8 }}
       {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
-      {{- tpl (toYaml .Values.tolerations) $ | nindent 6 }}
+      {{- tpl (toYaml .Values.tolerations) $ | nindent 8 }}
       {{- end }}
 {{- end }}
diff --git a/bitnami/kibana/values-production.yaml b/bitnami/kibana/values-production.yaml
index 59d5ec56a..76dce6174 100644
--- a/bitnami/kibana/values-production.yaml
+++ b/bitnami/kibana/values-production.yaml
@@ -14,7 +14,7 @@ global: {}
 image:
   registry: docker.io
   repository: bitnami/kibana
-  tag: 7.7.0-debian-10-r9
+  tag: 7.7.0-debian-10-r12
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
diff --git a/bitnami/kibana/values.yaml b/bitnami/kibana/values.yaml
index 246f90c10..457941c70 100644
--- a/bitnami/kibana/values.yaml
+++ b/bitnami/kibana/values.yaml
@@ -14,7 +14,7 @@ global: {}
 image:
   registry: docker.io
   repository: bitnami/kibana
-  tag: 7.7.0-debian-10-r9
+  tag: 7.7.0-debian-10-r12
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images