diff --git a/stable/chartmuseum/Chart.yaml b/stable/chartmuseum/Chart.yaml
index 80fd7d742d..a7b95196bc 100644
--- a/stable/chartmuseum/Chart.yaml
+++ b/stable/chartmuseum/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Helm Chart Repository with support for Amazon S3 and Google Cloud Storage
 name: chartmuseum
-version: 1.4.0
+version: 1.5.0
 appVersion: 0.7.0
 home: https://github.com/chartmuseum/chartmuseum
 icon: https://raw.githubusercontent.com/chartmuseum/chartmuseum/master/logo.png
diff --git a/stable/chartmuseum/README.md b/stable/chartmuseum/README.md
index f5e5d91962..a1b48669fa 100644
--- a/stable/chartmuseum/README.md
+++ b/stable/chartmuseum/README.md
@@ -62,6 +62,9 @@ their default values. See values.yaml for all available options.
 | `resources.limits.memory`              | Container maximum memory                    | `128Mi`                                             |
 | `resources.requests.cpu`               | Container requested CPU                     | `80m`                                               |
 | `resources.requests.memory`            | Container requested memory                  | `64Mi`                                              |
+| `serviceAccount.create`                | If true, create the service account         | `false`                                             |
+| `serviceAccount.name`                  | Name of the serviceAccount to create or use | `{{ chartmuseum.fullname }}`                        |
+| `securityContext`                      | Map of securityContext for the pod          | `{}`                                                |
 | `nodeSelector`                         | Map of node labels for pod assignment       | `{}`                                                |
 | `tolerations`                          | List of node taints to tolerate             | `[]`                                                |
 | `affinity`                             | Map of node/pod affinities                  | `{}`                                                |
diff --git a/stable/chartmuseum/templates/_helpers.tpl b/stable/chartmuseum/templates/_helpers.tpl
index f03294f0b3..bd998c8bbd 100644
--- a/stable/chartmuseum/templates/_helpers.tpl
+++ b/stable/chartmuseum/templates/_helpers.tpl
@@ -81,4 +81,4 @@ chartmuseum-0.4.5
 */ -}}
 {{- define "chartmuseum.chartref" -}}
 {{- replace "+" "_" .Chart.Version | printf "%s-%s" .Chart.Name -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/stable/chartmuseum/templates/deployment.yaml b/stable/chartmuseum/templates/deployment.yaml
index a4d0ff809b..0750b00433 100644
--- a/stable/chartmuseum/templates/deployment.yaml
+++ b/stable/chartmuseum/templates/deployment.yaml
@@ -89,7 +89,15 @@ spec:
       tolerations:
 {{ toYaml . | indent 8 }}
     {{- end }}
-
+    {{- if .Values.serviceAccount.create }}
+      serviceAccountName: {{ include "chartmuseum.fullname" . }}
+    {{- else if .Values.serviceAccount.name }}
+      serviceAccountName: {{ .Values.serviceAccount.name }}
+    {{- end }}
+    {{- with .Values.securityContext }}
+      securityContext:
+{{ toYaml . | indent 8 }}
+    {{- end }}
       volumes:
       - name: storage-volume
       {{- if .Values.persistence.enabled }}
diff --git a/stable/chartmuseum/templates/serviceaccount.yaml b/stable/chartmuseum/templates/serviceaccount.yaml
new file mode 100644
index 0000000000..a4c4f443ae
--- /dev/null
+++ b/stable/chartmuseum/templates/serviceaccount.yaml
@@ -0,0 +1,9 @@
+{{- if .Values.serviceAccount.create -}}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "chartmuseum.fullname" . }}
+  labels:
+{{ include "chartmuseum.labels.standard" . | indent 4 }}
+{{- end -}}
diff --git a/stable/chartmuseum/values.yaml b/stable/chartmuseum/values.yaml
index af55ed4926..f67092c5e2 100644
--- a/stable/chartmuseum/values.yaml
+++ b/stable/chartmuseum/values.yaml
@@ -124,6 +124,11 @@ probes:
     successThreshold: 1
     failureThreshold: 3
 
+serviceAccount:
+  create: false
+  # name:
+
+securityContext: {}
 
 nodeSelector: {}