diff --git a/stable/spartakus/README.md b/stable/spartakus/README.md
index 3a1c164ebe..4517bd3113 100644
--- a/stable/spartakus/README.md
+++ b/stable/spartakus/README.md
@@ -45,7 +45,7 @@ The following tables lists the configurable parameters of the Spartakus chart an
 | Parameter                            | Description                              | Default                                                    |
 | -------------------------------      | -------------------------------          | ---------------------------------------------------------- |
 | `containerImage`                              | Container image                          | `gcr.io/google_containers/spartakus-amd64:{VERSION}`                              |
-| `containerName`                              | Container name                          | Dynamically generated based on the chart & release names                              |
+| `containerName`                              | Container name                          | `spartakus`                              |
 | `imagePullPolicy`                    | Image pull policy                        | `Always` if `image` tag is `latest`, else `IfNotPresent`   |
 | `resources.requests.cpu`            | CPU resource request    | `2m`                                                      |
 | `resources.requests.memory` | Memory resource request   | `8Mi`                                                  |
diff --git a/stable/spartakus/templates/deployment.yaml b/stable/spartakus/templates/deployment.yaml
index 668da8ec4a..e82d5755c0 100644
--- a/stable/spartakus/templates/deployment.yaml
+++ b/stable/spartakus/templates/deployment.yaml
@@ -16,7 +16,7 @@ spec:
         release: "{{ .Release.Name }}"
     spec:
       containers:
-        - name: {{ if .Values.containerName }}"{{ .Values.containerName }}"{{ else }}{{ template "fullname" . }}{{ end }}
+        - name: {{ default "spartakus" .Values.containerName | quote }}
           image: "{{ .Values.containerImage }}"
           imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
           args:
diff --git a/stable/spartakus/values.yaml b/stable/spartakus/values.yaml
index 6911c44c79..cb73618c5d 100644
--- a/stable/spartakus/values.yaml
+++ b/stable/spartakus/values.yaml
@@ -3,11 +3,11 @@
 containerImage: gcr.io/google_containers/spartakus-amd64:v1.0.0
 
 ## Container name
-## If not provided, Helm will template a name based on the chart & release names
+## Default: 'spartakus'
 ##
-## containerName: spartakus
+## containerName:
 
-## Global imagePullPolicy
+## imagePullPolicy
 ## Default: 'Always' if image tag is 'latest', else 'IfNotPresent'
 ## Ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
 ##