diff --git a/charts/fullstack-deployment/templates/_helpers.tpl b/charts/fullstack-deployment/templates/_helpers.tpl
index 6b039d8f0..f142bcc2a 100644
--- a/charts/fullstack-deployment/templates/_helpers.tpl
+++ b/charts/fullstack-deployment/templates/_helpers.tpl
@@ -1,11 +1,13 @@
 {{- define "fullstack.testLabels" -}}
-{{- if .Values.deployment.testMetadata.enabled }}
-fullstack.hedera.com/testSuiteName: {{ .Values.deployment.testMetadata.testSuiteName }}
-fullstack.hedera.com/testName: {{ .Values.deployment.testMetadata.testName }}
-fullstack.hedera.com/testRunUID: {{ .Values.deployment.testMetadata.testRunUID }}
-fullstack.hedera.com/testCreationTimestamp: {{ .Values.deployment.testMetadata.testCreationTimestamp }}
-fullstack.hedera.com/testExpirationTimestamp: {{ .Values.deployment.testMetadata.testExpirationTimestamp }}
-fullstack.hedera.com/testRequester: {{ .Values.deployment.testMetadata.testRequester }}
+{{- if .Values.deployment.testMetadata.enabled -}}
+{{- with .Values.deployment.testMetadata -}}
+fullstack.hedera.com/testSuiteName: "{{ .testSuiteName }}"
+fullstack.hedera.com/testName: "{{ .testName }}"
+fullstack.hedera.com/testRunUID: "{{ .testRunUID }}"
+fullstack.hedera.com/testCreationTimestamp: "{{ .testCreationTimestamp }}"
+fullstack.hedera.com/testExpirationTimestamp: "{{ .testExpirationTimestamp }}"
+fullstack.hedera.com/testRequester: "{{ .testRequester }}"
+{{- end }}
 {{- end }}
 {{- end }}