diff --git a/stable/spartakus/README.md b/stable/spartakus/README.md
index b5934408ed..7f13788703 100644
--- a/stable/spartakus/README.md
+++ b/stable/spartakus/README.md
@@ -44,11 +44,11 @@ The following tables lists the configurable parameters of the Spartakus chart an
 
 | Parameter                            | Description                              | Default                                                    |
 | -------------------------------      | -------------------------------          | ---------------------------------------------------------- |
-| `image`                              | Spartakus image                          | `gcr.io/google_containers/spartakus-amd64:{VERSION}`                              |
+| `image`                              | Container image                          | `gcr.io/google_containers/spartakus-amd64:{VERSION}`                              |
 | `imagePullPolicy`                    | Image pull policy                        | `Always` if `image` tag is `latest`, else `IfNotPresent`   |
-| `resources.requests.cpu`            | CPU resource request    | `1m`                                                      |
+| `resources.requests.cpu`            | CPU resource request    | `2m`                                                      |
 | `resources.requests.memory` | Memory resource request   | `8Mi`                                                  |
-| `uuid` | Unique cluster ID   | Dynamically-generated using `uuidv4` template function                                                  |
+| `uuid` | Unique cluster ID   | Dynamically generated using `uuidv4` template function                                                  |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 
diff --git a/stable/spartakus/templates/deployment.yaml b/stable/spartakus/templates/deployment.yaml
index 603ac66510..d382990512 100644
--- a/stable/spartakus/templates/deployment.yaml
+++ b/stable/spartakus/templates/deployment.yaml
@@ -16,7 +16,7 @@ spec:
         release: "{{ .Release.Name }}"
     spec:
       containers:
-        - name: {{ template "fullname" . }}
+        - name: {{ template "name" . }}
           image: "{{ .Values.image }}"
           imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
           args:
diff --git a/stable/spartakus/values.yaml b/stable/spartakus/values.yaml
index 3273a339ff..beb2213830 100644
--- a/stable/spartakus/values.yaml
+++ b/stable/spartakus/values.yaml
@@ -1,13 +1,15 @@
+## Container image
+##
 image: gcr.io/google_containers/spartakus-amd64:v1.0.0
 
-## Specify a imagePullPolicy
-## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
-## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+## imagePullPolicy
+## Default: 'Always' if image tag is 'latest', else 'IfNotPresent'
+## Ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
 ##
 # imagePullPolicy:
 
-## Configure resource requests and limits
-## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+## Resource requests and limits
+## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
 ##
 resources:
   # limits: