diff --git a/incubator/mongodb-replicaset/templates/mongodb-petset.yaml b/incubator/mongodb-replicaset/templates/mongodb-petset.yaml
index 7f00ae66b7..679b501b61 100644
--- a/incubator/mongodb-replicaset/templates/mongodb-petset.yaml
+++ b/incubator/mongodb-replicaset/templates/mongodb-petset.yaml
@@ -67,7 +67,7 @@ spec:
         clusterrole: {{.Values.ClusterRole | quote }}
         replicaset: {{.Values.ReplicaSet | quote }}
         chart: "{{.Chart.Name}}-{{.Chart.Version}}"
-        component: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 24 }}"
+        component: "{{.Release.Name}}-{{.Values.Component}}"
       annotations:
         "helm.sh/created": {{.Release.Time.Seconds | quote }}
         pod.alpha.kubernetes.io/init-containers: '[
@@ -162,7 +162,7 @@ spec:
   - metadata:
       name: datadir
       annotations:
-        volume.beta.kubernetes.io/storage-class: {{.Values.StorageClass}}
+        volume.alpha.kubernetes.io/storage-class: {{.Values.StorageClass}}
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources: