diff --git a/stable/testlink/Chart.yaml b/stable/testlink/Chart.yaml
index af2d30182b..4299bda1a6 100644
--- a/stable/testlink/Chart.yaml
+++ b/stable/testlink/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: testlink
-version: 6.1.1
+version: 6.1.2
 appVersion: 1.9.19
 description: Web-based test management system that facilitates software quality assurance.
 icon: https://bitnami.com/assets/stacks/testlink/img/testlink-stack-220x234.png
diff --git a/stable/testlink/requirements.lock b/stable/testlink/requirements.lock
index 808243a954..bda6eeadaa 100644
--- a/stable/testlink/requirements.lock
+++ b/stable/testlink/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: mariadb
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 6.7.4
+  version: 6.8.2
 digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a
-generated: 2019-08-12T05:21:13.584954298Z
+generated: "2019-08-22T17:45:51.811208+02:00"
diff --git a/stable/testlink/templates/_helpers.tpl b/stable/testlink/templates/_helpers.tpl
index a357460ae2..b390ff4979 100644
--- a/stable/testlink/templates/_helpers.tpl
+++ b/stable/testlink/templates/_helpers.tpl
@@ -130,25 +130,25 @@ but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else
 {{- if .Values.global -}}
     {{- if .Values.global.storageClass -}}
         {{- if (eq "-" .Values.global.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
         {{- else }}
-            {{- printf "%s" .Values.global.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.global.storageClass -}}
         {{- end -}}
     {{- else -}}
         {{- if .Values.persistence.testlink.storageClass -}}
               {{- if (eq "-" .Values.persistence.testlink.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
               {{- else }}
-                  {{- printf "%s" .Values.persistence.testlink.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.testlink.storageClass -}}
               {{- end -}}
         {{- end -}}
     {{- end -}}
 {{- else -}}
     {{- if .Values.persistence.testlink.storageClass -}}
         {{- if (eq "-" .Values.persistence.testlink.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
         {{- else }}
-            {{- printf "%s" .Values.persistence.testlink.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.testlink.storageClass -}}
         {{- end -}}
     {{- end -}}
 {{- end -}}
diff --git a/stable/testlink/templates/testlink-pvc.yaml b/stable/testlink/templates/testlink-pvc.yaml
index dc707568c9..ac0fc064cb 100644
--- a/stable/testlink/templates/testlink-pvc.yaml
+++ b/stable/testlink/templates/testlink-pvc.yaml
@@ -14,5 +14,5 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.testlink.size | quote }}
-  storageClassName: {{ include "testlink.storageClass" . }}
+  {{ include "testlink.storageClass" . }}
 {{- end -}}
diff --git a/stable/testlink/values.yaml b/stable/testlink/values.yaml
index a9ffc16cb8..addea23a2b 100644
--- a/stable/testlink/values.yaml
+++ b/stable/testlink/values.yaml
@@ -14,7 +14,7 @@
 image:
   registry: docker.io
   repository: bitnami/testlink
-  tag: 1.9.19-debian-9-r172
+  tag: 1.9.19-debian-9-r181
   ## 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
@@ -253,7 +253,7 @@ metrics:
   image:
     registry: docker.io
     repository: bitnami/apache-exporter
-    tag: 0.7.0-debian-9-r21
+    tag: 0.7.0-debian-9-r32
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.