diff --git a/incubator/grafana/Chart.yaml b/incubator/grafana/Chart.yaml
index 82d796894b..4b53bb11d8 100755
--- a/incubator/grafana/Chart.yaml
+++ b/incubator/grafana/Chart.yaml
@@ -1,3 +1,3 @@
 description: A Helm chart for Kubernetes
 name: grafana
-version: 0.1.2
+version: 0.1.3
diff --git a/incubator/grafana/templates/pvc.yaml b/incubator/grafana/templates/pvc.yaml
index 0a077f19cf..e9a3417ec5 100644
--- a/incubator/grafana/templates/pvc.yaml
+++ b/incubator/grafana/templates/pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{template "fullname" .}}
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
 spec:
diff --git a/stable/drupal/Chart.yaml b/stable/drupal/Chart.yaml
index 49415fd80c..2cddaf19a2 100644
--- a/stable/drupal/Chart.yaml
+++ b/stable/drupal/Chart.yaml
@@ -1,5 +1,5 @@
 name: drupal
-version: 0.3.8
+version: 0.3.9
 description: One of the most versatile open source content management systems.
 keywords:
 - drupal
diff --git a/stable/drupal/templates/NOTES.txt b/stable/drupal/templates/NOTES.txt
index 70df8f9404..e4e4be76a2 100644
--- a/stable/drupal/templates/NOTES.txt
+++ b/stable/drupal/templates/NOTES.txt
@@ -1,3 +1,4 @@
+
 *******************************************************************
 *** PLEASE BE PATIENT: Drupal may take a few minutes to install ***
 *******************************************************************
@@ -13,7 +14,7 @@
 {{- else if contains "LoadBalancer" .Values.serviceType }}
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc -w {{ template "fullname" . }}'
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
 
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP/
diff --git a/stable/drupal/templates/apache-pvc.yaml b/stable/drupal/templates/apache-pvc.yaml
index c4cbd9e11a..39fd689744 100644
--- a/stable/drupal/templates/apache-pvc.yaml
+++ b/stable/drupal/templates/apache-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-apache
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }}
 spec:
diff --git a/stable/drupal/templates/drupal-pvc.yaml b/stable/drupal/templates/drupal-pvc.yaml
index 8f5d1af634..558facde4a 100644
--- a/stable/drupal/templates/drupal-pvc.yaml
+++ b/stable/drupal/templates/drupal-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-drupal
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.drupal.storageClass | quote }}
 spec:
diff --git a/stable/factorio/templates/NOTES.txt b/stable/factorio/templates/NOTES.txt
index a83174bfb1..e77456222f 100644
--- a/stable/factorio/templates/NOTES.txt
+++ b/stable/factorio/templates/NOTES.txt
@@ -18,7 +18,7 @@ same shell:
    value for factorioServer.serviceType. See the README.md for more info.
 
 You can watch for EXTERNAL-IP to populate by running:
-  kubectl get svc -w {{ template "fullname" . }}
+  kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}
 
 {{- else if contains "ClusterIP" .Values.factorioServer.serviceType }}
   export POD_NAME=$(kubectl get pods \
diff --git a/stable/factorio/templates/mods-pvc.yaml b/stable/factorio/templates/mods-pvc.yaml
index 07629972b4..b83c14e7b0 100644
--- a/stable/factorio/templates/mods-pvc.yaml
+++ b/stable/factorio/templates/mods-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-mods
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
 spec:
diff --git a/stable/factorio/templates/saves-pvc.yaml b/stable/factorio/templates/saves-pvc.yaml
index c715baf331..01a4b2f588 100644
--- a/stable/factorio/templates/saves-pvc.yaml
+++ b/stable/factorio/templates/saves-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-savedgames
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
 spec:
diff --git a/stable/ghost/Chart.yaml b/stable/ghost/Chart.yaml
index 068905ab62..c6aaab2a42 100644
--- a/stable/ghost/Chart.yaml
+++ b/stable/ghost/Chart.yaml
@@ -1,5 +1,5 @@
 name: ghost
-version: 0.4.0
+version: 0.4.1
 description: A simple, powerful publishing platform that allows you to share your stories with the world
 keywords:
 - ghost
diff --git a/stable/ghost/templates/NOTES.txt b/stable/ghost/templates/NOTES.txt
index 90a90b1124..1f4080b313 100644
--- a/stable/ghost/templates/NOTES.txt
+++ b/stable/ghost/templates/NOTES.txt
@@ -16,7 +16,7 @@ host. To configure Ghost with the URL of your service:
   {{- else if contains "LoadBalancer" .Values.serviceType }}
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc -w {{ template "fullname" . }}'
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
 
   export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   {{- end }}
diff --git a/stable/ghost/templates/pvc.yaml b/stable/ghost/templates/pvc.yaml
index 2b71f599e8..250603780f 100644
--- a/stable/ghost/templates/pvc.yaml
+++ b/stable/ghost/templates/pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
 spec:
diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml
index e44362a418..2ffc134626 100755
--- a/stable/jenkins/Chart.yaml
+++ b/stable/jenkins/Chart.yaml
@@ -1,6 +1,6 @@
 name: jenkins
 home: https://jenkins.io/
-version: 0.1.4
+version: 0.1.5
 description: A Jenkins Helm chart for Kubernetes.
 sources:
   - https://github.com/jenkinsci/jenkins
diff --git a/stable/jenkins/templates/NOTES.txt b/stable/jenkins/templates/NOTES.txt
index a37d6d3b26..d857860b42 100644
--- a/stable/jenkins/templates/NOTES.txt
+++ b/stable/jenkins/templates/NOTES.txt
@@ -8,11 +8,11 @@
   echo http://$NODE_IP:$NODE_PORT/login
 
 {{- else if contains "LoadBalancer" .Values.Master.ServiceType }}
-**** NOTE: It may take a few minutes for the LoadBalancer IP to be available.                      ****
-****       You can watch the status of by running 'kubectl get svc -w {{ template "fullname" . }}' ****
+  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+        You can watch the status of by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
   export SERVICE_IP=$(kubectl get svc {{ template "fullname" . }} --namespace {{ .Release.Namespace }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ .Values.Master.ServicePort }}/login
-  
+
 {{- else if contains "ClusterIP"  .Values.Master.ServiceType }}
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "component={{ template "fullname" . }}-master" -o jsonpath="{.items[0].metadata.name}")
   echo http://127.0.0.1:{{ .Values.Master.ServicePort }}
diff --git a/stable/jenkins/templates/home-pvc.yaml b/stable/jenkins/templates/home-pvc.yaml
index aca548155e..12a9fd0fac 100644
--- a/stable/jenkins/templates/home-pvc.yaml
+++ b/stable/jenkins/templates/home-pvc.yaml
@@ -4,6 +4,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.Persistence.StorageClass | quote }}
 spec:
@@ -12,4 +17,4 @@ spec:
   resources:
     requests:
       storage: {{ .Values.Persistence.Size | quote }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/joomla/Chart.yaml b/stable/joomla/Chart.yaml
index 721ef17c62..d6923fc5db 100644
--- a/stable/joomla/Chart.yaml
+++ b/stable/joomla/Chart.yaml
@@ -1,5 +1,5 @@
 name: joomla
-version: 0.4.0
+version: 0.4.1
 description: PHP content management system (CMS) for publishing web content
 keywords:
 - joomla
diff --git a/stable/joomla/templates/NOTES.txt b/stable/joomla/templates/NOTES.txt
index 1ed533aeb6..069fde930b 100644
--- a/stable/joomla/templates/NOTES.txt
+++ b/stable/joomla/templates/NOTES.txt
@@ -9,7 +9,7 @@
 {{- else if contains "LoadBalancer" .Values.serviceType }}
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc -w {{ template "fullname" . }}'
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
 
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP/
diff --git a/stable/joomla/templates/apache-pvc.yaml b/stable/joomla/templates/apache-pvc.yaml
index c4cbd9e11a..39fd689744 100644
--- a/stable/joomla/templates/apache-pvc.yaml
+++ b/stable/joomla/templates/apache-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-apache
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }}
 spec:
diff --git a/stable/joomla/templates/joomla-pvc.yaml b/stable/joomla/templates/joomla-pvc.yaml
index 4cae63aba5..baf18ec540 100644
--- a/stable/joomla/templates/joomla-pvc.yaml
+++ b/stable/joomla/templates/joomla-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-joomla
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.joomla.storageClass | quote }}
 spec:
diff --git a/stable/mariadb/Chart.yaml b/stable/mariadb/Chart.yaml
index 4bf176ddaa..a6fad899d6 100644
--- a/stable/mariadb/Chart.yaml
+++ b/stable/mariadb/Chart.yaml
@@ -1,5 +1,5 @@
 name: mariadb
-version: 0.5.4
+version: 0.5.5
 description: Chart for MariaDB
 keywords:
 - mariadb
diff --git a/stable/mariadb/templates/pvc.yaml b/stable/mariadb/templates/pvc.yaml
index db19bb97d9..ce71ca3ebc 100644
--- a/stable/mariadb/templates/pvc.yaml
+++ b/stable/mariadb/templates/pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
 spec:
diff --git a/stable/mediawiki/Chart.yaml b/stable/mediawiki/Chart.yaml
index d798fdf216..49f871c1ea 100644
--- a/stable/mediawiki/Chart.yaml
+++ b/stable/mediawiki/Chart.yaml
@@ -1,5 +1,5 @@
 name: mediawiki
-version: 0.4.0
+version: 0.4.1
 description: Extremely powerful, scalable software and a feature-rich wiki implementation that uses PHP to process and display data stored in a database.
 keywords:
 - mediawiki
diff --git a/stable/mediawiki/README.md b/stable/mediawiki/README.md
index b7730d6b2d..b596879359 100644
--- a/stable/mediawiki/README.md
+++ b/stable/mediawiki/README.md
@@ -52,7 +52,7 @@ The following tables lists the configurable parameters of the MediaWiki chart an
 | `mediawikiUser`                      | User of the application                  | `user`                                                  |
 | `mediawikiPassword`                  | Application password                     | _random 10 character long alphanumeric string_          |
 | `mediawikiEmail`                     | Admin email                              | `user@example.com`                                      |
-| `mediawikiName`                      | Name for the wiki                        | `Bitnami MediaWiki`                                     |
+| `mediawikiName`                      | Name for the wiki                        | `My Wiki`                                               |
 | `smtpHost`                           | SMTP host                                | `nil`                                                   |
 | `smtpPort`                           | SMTP port                                | `nil`                                                   |
 | `smtpHostID`                         | SMTP host ID                             | `nil`                                                   |
diff --git a/stable/mediawiki/templates/NOTES.txt b/stable/mediawiki/templates/NOTES.txt
index 18698fa68f..8c63ed9ff7 100644
--- a/stable/mediawiki/templates/NOTES.txt
+++ b/stable/mediawiki/templates/NOTES.txt
@@ -10,7 +10,7 @@
 {{- else if contains "LoadBalancer" .Values.serviceType }}
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc -w {{ template "fullname" . }}'
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
 
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP/
diff --git a/stable/mediawiki/templates/apache-pvc.yaml b/stable/mediawiki/templates/apache-pvc.yaml
index c4cbd9e11a..39fd689744 100644
--- a/stable/mediawiki/templates/apache-pvc.yaml
+++ b/stable/mediawiki/templates/apache-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-apache
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }}
 spec:
diff --git a/stable/mediawiki/templates/mediawiki-pvc.yaml b/stable/mediawiki/templates/mediawiki-pvc.yaml
index 2dfc50798b..97b3b759e2 100644
--- a/stable/mediawiki/templates/mediawiki-pvc.yaml
+++ b/stable/mediawiki/templates/mediawiki-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-mediawiki
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.mediawiki.storageClass | quote }}
 spec:
diff --git a/stable/minecraft/templates/NOTES.txt b/stable/minecraft/templates/NOTES.txt
index 103c5d1217..af64a5762c 100644
--- a/stable/minecraft/templates/NOTES.txt
+++ b/stable/minecraft/templates/NOTES.txt
@@ -27,7 +27,7 @@ same shell:
 !! NOTE: It may take a few minutes for the LoadBalancer IP to be available. !!
 
 You can watch for EXTERNAL-IP to populate by running:
-  kubectl get svc -w {{ template "fullname" . }}
+  kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}
 
 {{- else if contains "ClusterIP" .Values.minecraftServer.serviceType }}
   export POD_NAME=$(kubectl get pods \
diff --git a/stable/minecraft/templates/datadir-pvc.yaml b/stable/minecraft/templates/datadir-pvc.yaml
index 3577635afb..f5aa529261 100644
--- a/stable/minecraft/templates/datadir-pvc.yaml
+++ b/stable/minecraft/templates/datadir-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-datadir
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
 spec:
diff --git a/stable/mysql/Chart.yaml b/stable/mysql/Chart.yaml
index 30520c2505..9ca0cd795c 100644
--- a/stable/mysql/Chart.yaml
+++ b/stable/mysql/Chart.yaml
@@ -1,5 +1,5 @@
 name: mysql
-version: 0.2.1
+version: 0.2.2
 description: Chart for MySQL
 keywords:
 - mysql
diff --git a/stable/mysql/templates/pvc.yaml b/stable/mysql/templates/pvc.yaml
index db19bb97d9..ce71ca3ebc 100644
--- a/stable/mysql/templates/pvc.yaml
+++ b/stable/mysql/templates/pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
 spec:
diff --git a/stable/phpbb/Chart.yaml b/stable/phpbb/Chart.yaml
index e9313eafcc..b42ea8ea85 100644
--- a/stable/phpbb/Chart.yaml
+++ b/stable/phpbb/Chart.yaml
@@ -1,5 +1,5 @@
 name: phpbb
-version: 0.4.0
+version: 0.4.1
 description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more.
 keywords:
 - phpbb
diff --git a/stable/phpbb/templates/NOTES.txt b/stable/phpbb/templates/NOTES.txt
index 93a76833fc..b12c03fd9b 100644
--- a/stable/phpbb/templates/NOTES.txt
+++ b/stable/phpbb/templates/NOTES.txt
@@ -10,7 +10,7 @@
 {{- else if contains "LoadBalancer" .Values.serviceType }}
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc -w {{ template "fullname" . }}'
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
 
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP/
diff --git a/stable/phpbb/templates/apache-pvc.yaml b/stable/phpbb/templates/apache-pvc.yaml
index c4cbd9e11a..39fd689744 100644
--- a/stable/phpbb/templates/apache-pvc.yaml
+++ b/stable/phpbb/templates/apache-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-apache
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }}
 spec:
diff --git a/stable/phpbb/templates/phpbb-pvc.yaml b/stable/phpbb/templates/phpbb-pvc.yaml
index ac769bd5e9..701fc39307 100644
--- a/stable/phpbb/templates/phpbb-pvc.yaml
+++ b/stable/phpbb/templates/phpbb-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-phpbb
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.phpbb.storageClass | quote }}
 spec:
diff --git a/stable/postgresql/templates/pvc.yaml b/stable/postgresql/templates/pvc.yaml
index fdf98ed2de..ce71ca3ebc 100644
--- a/stable/postgresql/templates/pvc.yaml
+++ b/stable/postgresql/templates/pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
 spec:
@@ -11,4 +16,4 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.size | quote }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/prometheus/templates/NOTES.txt b/stable/prometheus/templates/NOTES.txt
index e072e67459..6f344101c3 100644
--- a/stable/prometheus/templates/NOTES.txt
+++ b/stable/prometheus/templates/NOTES.txt
@@ -16,7 +16,7 @@ Get the server URL by running these commands in the same shell:
 
 {{- else if contains "LoadBalancer" .Values.server.serviceType }}
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        You can watch the status of by running 'kubectl get svc -w {{ template "server.fullname" . }}'
+        You can watch the status of by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "server.fullname" . }}'
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "server.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.server.httpPort }}
 {{- else if contains "ClusterIP"  .Values.server.serviceType }}
@@ -52,7 +52,7 @@ Get the server URL by running these commands in the same shell:
 
 {{- else if contains "LoadBalancer" .Values.alertmanager.serviceType }}
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        You can watch the status of by running 'kubectl get svc -w {{ template "alertmanager.fullname" . }}'
+        You can watch the status of by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "alertmanager.fullname" . }}'
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "alertmanager.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.alertmanager.httpPort }}
 {{- else if contains "ClusterIP"  .Values.alertmanager.serviceType }}
diff --git a/stable/redis/Chart.yaml b/stable/redis/Chart.yaml
index df2e543c8b..6e3209d610 100644
--- a/stable/redis/Chart.yaml
+++ b/stable/redis/Chart.yaml
@@ -1,5 +1,5 @@
 name: redis
-version: 0.4.1
+version: 0.4.2
 description: Chart for Redis
 keywords:
 - redis
diff --git a/stable/redis/templates/pvc.yaml b/stable/redis/templates/pvc.yaml
index db19bb97d9..ce71ca3ebc 100644
--- a/stable/redis/templates/pvc.yaml
+++ b/stable/redis/templates/pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
 spec:
diff --git a/stable/redmine/templates/NOTES.txt b/stable/redmine/templates/NOTES.txt
index 677efb28c4..1504585a0a 100644
--- a/stable/redmine/templates/NOTES.txt
+++ b/stable/redmine/templates/NOTES.txt
@@ -9,7 +9,7 @@
 {{- else if contains "LoadBalancer" .Values.serviceType }}
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc -w {{ template "fullname" . }}'
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
 
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP/
diff --git a/stable/redmine/templates/pvc.yaml b/stable/redmine/templates/pvc.yaml
index db19bb97d9..ce71ca3ebc 100644
--- a/stable/redmine/templates/pvc.yaml
+++ b/stable/redmine/templates/pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
 spec:
diff --git a/stable/testlink/Chart.yaml b/stable/testlink/Chart.yaml
index acf9a68de5..56dc7f245a 100644
--- a/stable/testlink/Chart.yaml
+++ b/stable/testlink/Chart.yaml
@@ -1,5 +1,5 @@
 name: testlink
-version: 0.4.0
+version: 0.4.1
 description: Web-based test management system that facilitates software quality assurance.
 keywords:
 - testlink
diff --git a/stable/testlink/templates/apache-pvc.yaml b/stable/testlink/templates/apache-pvc.yaml
index c4cbd9e11a..39fd689744 100644
--- a/stable/testlink/templates/apache-pvc.yaml
+++ b/stable/testlink/templates/apache-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-apache
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }}
 spec:
diff --git a/stable/testlink/templates/testlink-pvc.yaml b/stable/testlink/templates/testlink-pvc.yaml
index 5e4b6d7cf6..a71b272d48 100644
--- a/stable/testlink/templates/testlink-pvc.yaml
+++ b/stable/testlink/templates/testlink-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-testlink
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.testlink.storageClass | quote }}
 spec:
diff --git a/stable/uchiwa/templates/NOTES.txt b/stable/uchiwa/templates/NOTES.txt
index e7275cbf91..bad3dd6fce 100644
--- a/stable/uchiwa/templates/NOTES.txt
+++ b/stable/uchiwa/templates/NOTES.txt
@@ -1,12 +1,14 @@
+
 1. Get the Uchiwa URL to visit by running these commands in the same shell:
 {{- if contains "NodePort" .Values.serviceType }}
   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
-
 {{- else if contains "LoadBalancer" .Values.serviceType }}
-**** NOTE: It may take a few minutes for the LoadBalancer IP to be available.                      ****
-****       You can watch the status of by running 'kubectl get svc -w {{ template "fullname" . }}' ****
+
+  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+        You can watch the status of by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
+
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.httpPort }}/login
 {{- else if contains "ClusterIP"  .Values.serviceType }}
diff --git a/stable/wordpress/Chart.yaml b/stable/wordpress/Chart.yaml
index 46d012ecb9..f12061bfc4 100644
--- a/stable/wordpress/Chart.yaml
+++ b/stable/wordpress/Chart.yaml
@@ -1,5 +1,5 @@
 name: wordpress
-version: 0.3.2
+version: 0.3.3
 description: Web publishing platform for building blogs and websites.
 keywords:
 - wordpress
diff --git a/stable/wordpress/templates/NOTES.txt b/stable/wordpress/templates/NOTES.txt
index 6e808a9958..5b1ca00a72 100644
--- a/stable/wordpress/templates/NOTES.txt
+++ b/stable/wordpress/templates/NOTES.txt
@@ -9,7 +9,7 @@
 {{- else if contains "LoadBalancer" .Values.serviceType }}
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc -w {{ template "fullname" . }}'
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
 
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP/admin
diff --git a/stable/wordpress/templates/apache-pvc.yaml b/stable/wordpress/templates/apache-pvc.yaml
index c4cbd9e11a..39fd689744 100644
--- a/stable/wordpress/templates/apache-pvc.yaml
+++ b/stable/wordpress/templates/apache-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-apache
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }}
 spec:
diff --git a/stable/wordpress/templates/wordpress-pvc.yaml b/stable/wordpress/templates/wordpress-pvc.yaml
index 54b8dafa83..29bb586370 100644
--- a/stable/wordpress/templates/wordpress-pvc.yaml
+++ b/stable/wordpress/templates/wordpress-pvc.yaml
@@ -3,6 +3,11 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-wordpress
+  labels:
+    app: {{ template "fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
   annotations:
     volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.wordpress.storageClass | quote }}
 spec: