diff --git a/charts/retool/Chart.yaml b/charts/retool/Chart.yaml
index abe6b28..2fd761a 100644
--- a/charts/retool/Chart.yaml
+++ b/charts/retool/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: retool
 description: A Helm chart for Kubernetes
 type: application
-version: 6.9.0
+version: 6.9.1
 maintainers:
   - name: Retool Engineering
     email: engineering+helm@retool.com
diff --git a/charts/retool/charts/retool-temporal-services-helm/templates/server-configmap.yaml b/charts/retool/charts/retool-temporal-services-helm/templates/server-configmap.yaml
index 514841a..1f12b91 100644
--- a/charts/retool/charts/retool-temporal-services-helm/templates/server-configmap.yaml
+++ b/charts/retool/charts/retool-temporal-services-helm/templates/server-configmap.yaml
@@ -11,6 +11,9 @@ metadata:
     app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/version: {{ $.Chart.AppVersion | replace "+" "_" }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
+  {{- range $key, $value := $.Values.server.labels }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
 data:
   config_template.yaml: |-
     log:
@@ -103,7 +106,7 @@ data:
 
       pprof:
         port: 7936
-        
+
       metrics:
         tags:
           type: {{ $service }}
diff --git a/charts/retool/charts/retool-temporal-services-helm/templates/server-dynamicconfigmap.yaml b/charts/retool/charts/retool-temporal-services-helm/templates/server-dynamicconfigmap.yaml
index 95ba8f9..95471b0 100644
--- a/charts/retool/charts/retool-temporal-services-helm/templates/server-dynamicconfigmap.yaml
+++ b/charts/retool/charts/retool-temporal-services-helm/templates/server-dynamicconfigmap.yaml
@@ -10,6 +10,9 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | replace "+" "_" }}
     app.kubernetes.io/part-of: {{ .Chart.Name }}
+  {{- range $key, $value := $.Values.server.labels }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
 data:
   dynamic_config.yaml: |-
   {{- if $.Values.server.dynamicConfig }}
diff --git a/charts/retool/charts/retool-temporal-services-helm/templates/server-service.yaml b/charts/retool/charts/retool-temporal-services-helm/templates/server-service.yaml
index 7013abb..8ff02c2 100644
--- a/charts/retool/charts/retool-temporal-services-helm/templates/server-service.yaml
+++ b/charts/retool/charts/retool-temporal-services-helm/templates/server-service.yaml
@@ -11,6 +11,9 @@ metadata:
     app.kubernetes.io/version: {{ .Chart.AppVersion | replace "+" "_" }}
     app.kubernetes.io/component: frontend
     app.kubernetes.io/part-of: {{ .Chart.Name }}
+  {{- range $key, $value := $.Values.server.labels }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
   {{- if .Values.server.frontend.service.annotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.server.frontend.service.annotations "context" $) | nindent 4 }}
   {{- end }}
@@ -60,6 +63,9 @@ metadata:
     prometheus.io/scrape: 'true'
     prometheus.io/scheme: http
     prometheus.io/port: "9090"
+  {{- range $key, $value := $.Values.server.labels }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
 
   annotations:
     # Use this annotation in addition to the actual field below because the
diff --git a/charts/retool/charts/retool-temporal-services-helm/templates/serviceaccount.yaml b/charts/retool/charts/retool-temporal-services-helm/templates/serviceaccount.yaml
index f44e51d..4be7c07 100644
--- a/charts/retool/charts/retool-temporal-services-helm/templates/serviceaccount.yaml
+++ b/charts/retool/charts/retool-temporal-services-helm/templates/serviceaccount.yaml
@@ -10,6 +10,9 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | replace "+" "_" }}
     app.kubernetes.io/part-of: {{ .Chart.Name }}
+  {{- range $key, $value := .Values.serviceAccount.labels }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
   annotations:
     helm.sh/hook: pre-install
     helm.sh/hook-weight: "-10"
diff --git a/charts/retool/charts/retool-temporal-services-helm/templates/web-configmap.yaml b/charts/retool/charts/retool-temporal-services-helm/templates/web-configmap.yaml
index b5f0509..770acda 100644
--- a/charts/retool/charts/retool-temporal-services-helm/templates/web-configmap.yaml
+++ b/charts/retool/charts/retool-temporal-services-helm/templates/web-configmap.yaml
@@ -11,6 +11,9 @@ metadata:
     app.kubernetes.io/version: {{ .Chart.AppVersion | replace "+" "_" }}
     app.kubernetes.io/component: web
     app.kubernetes.io/part-of: {{ .Chart.Name }}
+  {{- range $key, $value := $.Values.server.labels }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
 data:
   config.yml: |
     {{- toYaml .Values.web.config | nindent 4  }}
diff --git a/charts/retool/charts/retool-temporal-services-helm/values.yaml b/charts/retool/charts/retool-temporal-services-helm/values.yaml
index f87f387..b9c1c74 100644
--- a/charts/retool/charts/retool-temporal-services-helm/values.yaml
+++ b/charts/retool/charts/retool-temporal-services-helm/values.yaml
@@ -67,6 +67,7 @@ server:
       timerType: histogram
   podAnnotations: {}
   podLabels: {}
+  labels: {}
   resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
diff --git a/charts/retool/templates/serviceaccount.yaml b/charts/retool/templates/serviceaccount.yaml
index 90ec6ca..a6564cd 100644
--- a/charts/retool/templates/serviceaccount.yaml
+++ b/charts/retool/templates/serviceaccount.yaml
@@ -5,6 +5,9 @@ automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
 metadata:
   name: {{ include "retool.serviceAccountName" . }}
   labels: {{- include "retool.labels" . | nindent 4 }}
+  {{- range $key, $value := .Values.serviceAccount.labels }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
 {{- if .Values.serviceAccount.annotations }}
   annotations:
 {{ toYaml .Values.serviceAccount.annotations | indent 4 }}
diff --git a/charts/retool/values.yaml b/charts/retool/values.yaml
index 91284ce..b860a47 100644
--- a/charts/retool/values.yaml
+++ b/charts/retool/values.yaml
@@ -233,6 +233,7 @@ serviceAccount:
   # If set and create is false, the service account must be existing
   name:
   annotations: {}
+  labels: {}
   automountToken: false
 
 livenessProbe:
diff --git a/values.yaml b/values.yaml
index 91284ce..b860a47 100644
--- a/values.yaml
+++ b/values.yaml
@@ -233,6 +233,7 @@ serviceAccount:
   # If set and create is false, the service account must be existing
   name:
   annotations: {}
+  labels: {}
   automountToken: false
 
 livenessProbe: