diff --git a/charts/mattermost-team-edition/Chart.yaml b/charts/mattermost-team-edition/Chart.yaml
index 26eb4ee3..cef69135 100644
--- a/charts/mattermost-team-edition/Chart.yaml
+++ b/charts/mattermost-team-edition/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 description: Mattermost Team Edition server.
 type: application
 name: mattermost-team-edition
-version: 6.6.37
+version: 6.6.38
 appVersion: 9.0.0
 keywords:
   - mattermost
diff --git a/charts/mattermost-team-edition/templates/tests/mattermost-test.yaml b/charts/mattermost-team-edition/templates/tests/mattermost-test.yaml
index aa3c231c..bb8b85dd 100644
--- a/charts/mattermost-team-edition/templates/tests/mattermost-test.yaml
+++ b/charts/mattermost-team-edition/templates/tests/mattermost-test.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include  "mattermost-team-edition.fullname" . }}-test-{{ randAlphaNum 5 | lower }}"
+  name: "{{ include  "mattermost-team-edition.fullname" . }}-test"
   labels:
     app.kubernetes.io/name: {{ include "mattermost-team-edition.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -9,6 +9,9 @@ metadata:
     helm.sh/chart: {{ include "mattermost-team-edition.chart" . }}
   annotations:
     "helm.sh/hook": test-success
+    {{- with .Values.testJob.annotations }}
+    {{- . | toYaml | nindent 4 }}
+    {{- end }}
 spec:
   containers:
   - name: {{ .Release.Name }}-test
diff --git a/charts/mattermost-team-edition/values.yaml b/charts/mattermost-team-edition/values.yaml
index eaa61122..39ee9ea1 100644
--- a/charts/mattermost-team-edition/values.yaml
+++ b/charts/mattermost-team-edition/values.yaml
@@ -247,3 +247,8 @@ readinessProbe:
   failureThreshold: 3
   timeoutSeconds: 5
   periodSeconds: 10
+
+## Additional annotations for test job
+
+testJob:
+  annotations: {}