diff --git a/charts/dependency-track/Chart.yaml b/charts/dependency-track/Chart.yaml
index 5ee1dd8..ad3cbf5 100644
--- a/charts/dependency-track/Chart.yaml
+++ b/charts/dependency-track/Chart.yaml
@@ -4,7 +4,7 @@ description: |
   Dependency-Track is an intelligent Software Supply Chain Component Analysis platform that allows organizations to identify and reduce risk from the use of third-party and open source components. Dependency-Track takes a unique and highly beneficial approach by leveraging the capabilities of Software Bill-of-Materials (SBOM). This approach provides capabilities that traditional Software Composition Analysis (SCA) solutions cannot achieve.
 name: dependency-track
 home: https://dependencytrack.org/
-version: 1.5.2
+version: 1.5.3
 icon: https://raw.githubusercontent.com/DependencyTrack/branding/master/dt-logo-black-text.svg
 keywords:
  - security
diff --git a/charts/dependency-track/templates/backend/deployment.yaml b/charts/dependency-track/templates/backend/deployment.yaml
index 3f7f01a..0e67354 100644
--- a/charts/dependency-track/templates/backend/deployment.yaml
+++ b/charts/dependency-track/templates/backend/deployment.yaml
@@ -18,7 +18,9 @@ spec:
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets: {{- toYaml . | nindent 6 }}
       {{- end }}
+      {{- if .Values.apiserver.serviceAccount.create}}
       serviceAccountName: {{ include "common.names.fullname" . }}-apiserver
+      {{- end }}
       securityContext: {{- toYaml .Values.apiserver.podSecurityContext | nindent 8 }}
       {{- with .Values.apiserver.initContainers }}
       initContainers: {{- toYaml . | nindent 6 }}
diff --git a/charts/dependency-track/templates/frontend/deployment.yaml b/charts/dependency-track/templates/frontend/deployment.yaml
index 4e9fefb..3c575bd 100644
--- a/charts/dependency-track/templates/frontend/deployment.yaml
+++ b/charts/dependency-track/templates/frontend/deployment.yaml
@@ -14,7 +14,9 @@ spec:
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets: {{- toYaml . | nindent 6 }}
       {{- end }}
+      {{- if .Values.frontend.serviceAccount.create}}
       serviceAccountName: {{ include "common.names.fullname" . }}-frontend
+      {{- end }}
       securityContext: {{- toYaml .Values.frontend.podSecurityContext | nindent 8 }}
       containers:
       - name: {{ .Chart.Name }}-frontend