diff --git a/grafana/Chart.yaml b/grafana/Chart.yaml
index 977b884b6..82468cfe2 100644
--- a/grafana/Chart.yaml
+++ b/grafana/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v9.2.10
 description: OpenStack-Helm Grafana
 name: grafana
-version: 0.1.24
+version: 0.1.25
 home: https://grafana.com/
 sources:
   - https://github.com/grafana/grafana
diff --git a/grafana/templates/deployment.yaml b/grafana/templates/deployment.yaml
index 427c5df05..2bb980d43 100644
--- a/grafana/templates/deployment.yaml
+++ b/grafana/templates/deployment.yaml
@@ -51,7 +51,7 @@ spec:
         {{ .Values.labels.grafana.node_selector_key }}: {{ .Values.labels.grafana.node_selector_value | quote }}
       initContainers:
 {{ tuple $envAll "grafana" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container"  | indent 8 }}
-{{- if .Values.conf.grafana.image_rendering_sidecar.enabled }}
+{{- if and .Values.conf.grafana.image_rendering_sidecar.enabled .Values.conf.grafana.image_rendering_sidecar.k8s_sidecar_feature_enabled }}
         - name: grafana-image-renderer
 {{ tuple $envAll "grafana_image_renderer" | include "helm-toolkit.snippets.image" | indent 10 }}
           restartPolicy: Always
@@ -64,6 +64,17 @@ spec:
             periodSeconds: 10
 {{- end }}
       containers:
+{{- if and .Values.conf.grafana.image_rendering_sidecar.enabled (not .Values.conf.grafana.image_rendering_sidecar.k8s_sidecar_feature_enabled) }}
+        - name: grafana-image-renderer
+{{ tuple $envAll "grafana_image_renderer" | include "helm-toolkit.snippets.image" | indent 10 }}
+          ports:
+            - containerPort: {{ tuple "grafana" "image_rendering" "grafana" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          readinessProbe:
+            tcpSocket:
+              port: {{ tuple "grafana" "image_rendering" "grafana" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+            initialDelaySeconds: 15
+            periodSeconds: 10
+{{- end }}
         - name: grafana
 {{ tuple $envAll "grafana" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.grafana | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
diff --git a/grafana/values.yaml b/grafana/values.yaml
index 165590831..54b89a6e3 100644
--- a/grafana/values.yaml
+++ b/grafana/values.yaml
@@ -507,6 +507,8 @@ conf:
       enabled: true
     image_rendering_sidecar:
       enabled: false
+      # https://kubernetes.io/docs/concepts/workloads/pods/sidecar-containers/
+      k8s_sidecar_feature_enabled: true
     analytics:
       reporting_enabled: false
       check_for_updates: false
diff --git a/releasenotes/notes/grafana.yaml b/releasenotes/notes/grafana.yaml
index 5e3eb92f9..e5b8f565e 100644
--- a/releasenotes/notes/grafana.yaml
+++ b/releasenotes/notes/grafana.yaml
@@ -25,4 +25,5 @@ grafana:
   - 0.1.22 Make selenium v4 syntax optional
   - 0.1.23 Modified selenium test for compatibility
   - 0.1.24 Add image rendering sidecar
+  - 0.1.25 Add value for rendering sidecar feature
 ...