diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index 5ae77b6294..b7aa6bf080 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 8.5.10
+version: 8.5.11
 appVersion: 11.3.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
diff --git a/charts/grafana/templates/tests/test-configmap.yaml b/charts/grafana/templates/tests/test-configmap.yaml
index 1e81bee90b..5695df3276 100644
--- a/charts/grafana/templates/tests/test-configmap.yaml
+++ b/charts/grafana/templates/tests/test-configmap.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "grafana.fullname" . }}-test
   namespace: {{ include "grafana.namespace" . }}
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": {{ .Values.testFramework.hookType | default "test" }}
     "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
   labels:
     {{- include "grafana.labels" . | nindent 4 }}
diff --git a/charts/grafana/templates/tests/test-podsecuritypolicy.yaml b/charts/grafana/templates/tests/test-podsecuritypolicy.yaml
index c13a3bf668..549400ab05 100644
--- a/charts/grafana/templates/tests/test-podsecuritypolicy.yaml
+++ b/charts/grafana/templates/tests/test-podsecuritypolicy.yaml
@@ -4,7 +4,7 @@ kind: PodSecurityPolicy
 metadata:
   name: {{ include "grafana.fullname" . }}-test
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": {{ .Values.testFramework.hookType | default "test" }}
     "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
   labels:
     {{- include "grafana.labels" . | nindent 4 }}
diff --git a/charts/grafana/templates/tests/test-role.yaml b/charts/grafana/templates/tests/test-role.yaml
index 75dddfdd3d..0f04c56ae9 100644
--- a/charts/grafana/templates/tests/test-role.yaml
+++ b/charts/grafana/templates/tests/test-role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "grafana.fullname" . }}-test
   namespace: {{ include "grafana.namespace" . }}
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": {{ .Values.testFramework.hookType | default "test" }}
     "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
   labels:
     {{- include "grafana.labels" . | nindent 4 }}
diff --git a/charts/grafana/templates/tests/test-rolebinding.yaml b/charts/grafana/templates/tests/test-rolebinding.yaml
index c0d2d39efa..811adb0da1 100644
--- a/charts/grafana/templates/tests/test-rolebinding.yaml
+++ b/charts/grafana/templates/tests/test-rolebinding.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "grafana.fullname" . }}-test
   namespace: {{ include "grafana.namespace" . }}
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": {{ .Values.testFramework.hookType | default "test" }}
     "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
   labels:
     {{- include "grafana.labels" . | nindent 4 }}
diff --git a/charts/grafana/templates/tests/test-serviceaccount.yaml b/charts/grafana/templates/tests/test-serviceaccount.yaml
index 7af8982723..2e5f32244e 100644
--- a/charts/grafana/templates/tests/test-serviceaccount.yaml
+++ b/charts/grafana/templates/tests/test-serviceaccount.yaml
@@ -7,6 +7,6 @@ metadata:
   name: {{ include "grafana.serviceAccountNameTest" . }}
   namespace: {{ include "grafana.namespace" . }}
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": {{ .Values.testFramework.hookType | default "test" }}
     "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
 {{- end }}
diff --git a/charts/grafana/templates/tests/test.yaml b/charts/grafana/templates/tests/test.yaml
index 2484a96da0..3aac160b6d 100644
--- a/charts/grafana/templates/tests/test.yaml
+++ b/charts/grafana/templates/tests/test.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     {{- include "grafana.labels" . | nindent 4 }}
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": {{ .Values.testFramework.hookType | default "test" }}
     "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
   namespace: {{ include "grafana.namespace" . }}
 spec:
diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
index 6beae1bf49..98ebe9ad12 100644
--- a/charts/grafana/values.yaml
+++ b/charts/grafana/values.yaml
@@ -114,6 +114,10 @@ image:
 
 testFramework:
   enabled: true
+  ## The type of Helm hook used to run this test. Defaults to test.
+  ## ref: https://helm.sh/docs/topics/charts_hooks/#the-available-hooks
+  ##
+  # hookType: test
   image:
     # -- The Docker registry
     registry: docker.io