diff --git a/charts/netbox/Chart.yaml b/charts/netbox/Chart.yaml
index 859a6a6..a6811a1 100644
--- a/charts/netbox/Chart.yaml
+++ b/charts/netbox/Chart.yaml
@@ -2,11 +2,7 @@ apiVersion: v2
 name: netbox
 description: |
   An IP address management (IPAM) and data center infrastructure management (DCIM) tool.
-
-  Important; With chart version 4.0.0 there are major upgrades to the packaged Redis and Postgres,
-  as well as a major version bump of Netbox that introduces housekeeping. Take care when upgrading.
 appVersion: v3.6.7
-
 type: application
 version: 5.5.5
 maintainers:
diff --git a/charts/penpot/templates/_helpers.tpl b/charts/penpot/templates/_helpers.tpl
index 97aeedf..7ae3683 100644
--- a/charts/penpot/templates/_helpers.tpl
+++ b/charts/penpot/templates/_helpers.tpl
@@ -42,16 +42,4 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-
-{{/*
-Create the name of the service account to use.
-*/}}
-{{- define "penpot.serviceAccountName" -}}
-{{- if .Values.serviceAccount.enabled -}}
-    {{ default (include "penpot.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/penpot/templates/serviceaccount.yaml b/charts/penpot/templates/serviceaccount.yaml
index f8a960e..1e2e57f 100644
--- a/charts/penpot/templates/serviceaccount.yaml
+++ b/charts/penpot/templates/serviceaccount.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "penpot.serviceAccountName" . }}
+  name: penpot-sa
   namespace: {{ .Release.Namespace }}