diff --git a/stable/drupal/Chart.yaml b/stable/drupal/Chart.yaml
index 784348ab93..2ded4c0f6b 100644
--- a/stable/drupal/Chart.yaml
+++ b/stable/drupal/Chart.yaml
@@ -1,5 +1,5 @@
 name: drupal
-version: 0.3.0
+version: 0.3.1
 description: One of the most versatile open source content management systems.
 keywords:
 - drupal
diff --git a/stable/drupal/charts/mariadb/Chart.yaml b/stable/drupal/charts/mariadb/Chart.yaml
index 2f8e5ad1c5..16e08cd3ab 100644
--- a/stable/drupal/charts/mariadb/Chart.yaml
+++ b/stable/drupal/charts/mariadb/Chart.yaml
@@ -1,5 +1,5 @@
 name: mariadb
-version: 0.3.0
+version: 0.3.1
 description: Chart for MariaDB
 keywords:
 - mariadb
diff --git a/stable/drupal/charts/mariadb/README.md b/stable/drupal/charts/mariadb/README.md
index fd0554c12a..8948515966 100644
--- a/stable/drupal/charts/mariadb/README.md
+++ b/stable/drupal/charts/mariadb/README.md
@@ -52,14 +52,14 @@ The command removes all the Kubernetes components associated with the chart and
 
 The following tables lists the configurable parameters of the MariaDB chart and their default values.
 
-|       Parameter       |           Description            |                         Default                          |
-|-----------------------|----------------------------------|----------------------------------------------------------|
-| `imageTag`            | `bitnami/mariadb` image tag.     | Most recent release                                      |
-| `imagePullPolicy`     | Image pull policy.               | `Always` if `imageTag` is `latest`, else `IfNotPresent`. |
-| `mariadbRootPassword` | Password for the `root` user.    | `nil`                                                    |
-| `mariadbUser`         | Username of new user to create.  | `nil`                                                    |
-| `mariadbPassword`     | Password for the new user.       | `nil`                                                    |
-| `mariadbDatabase`     | Name for new database to create. | `nil`                                                    |
+| Parameter               | Description                        | Default                                                    |
+| ----------------------- | ---------------------------------- | ---------------------------------------------------------- |
+| `image`                 | MariaDB image                      | `bitnami/mariadb:{VERSION}`                                |
+| `imagePullPolicy`       | Image pull policy.                 | `Always` if `imageTag` is `latest`, else `IfNotPresent`.   |
+| `mariadbRootPassword`   | Password for the `root` user.      | `nil`                                                      |
+| `mariadbUser`           | Username of new user to create.    | `nil`                                                      |
+| `mariadbPassword`       | Password for the new user.         | `nil`                                                      |
+| `mariadbDatabase`       | Name for new database to create.   | `nil`                                                      |
 
 The above parameters map to the env variables defined in [bitnami/mariadb](http://github.com/bitnami/bitnami-docker-mariadb). For more information please refer to the [bitnami/mariadb](http://github.com/bitnami/bitnami-docker-mariadb) image documentation.
 
diff --git a/stable/drupal/charts/mariadb/templates/_helpers.tpl b/stable/drupal/charts/mariadb/templates/_helpers.tpl
index dcbb49dcc8..234480de71 100644
--- a/stable/drupal/charts/mariadb/templates/_helpers.tpl
+++ b/stable/drupal/charts/mariadb/templates/_helpers.tpl
@@ -14,18 +14,3 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
 {{- end -}}
-
-{{/*
-Get the imagePullPolicy.
-*/}}
-{{- define "imagePullPolicy" -}}
-  {{- if .Values.imagePullPolicy -}}
-    {{- .Values.imagePullPolicy -}}
-  {{- else -}}
-    {{- if eq .Values.imageTag "latest" -}}
-      {{- "Always" -}}
-    {{- else -}}
-      {{- "IfNotPresent" -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}
diff --git a/stable/drupal/charts/mariadb/templates/deployment.yaml b/stable/drupal/charts/mariadb/templates/deployment.yaml
index 70eba8f955..58153c2b8b 100644
--- a/stable/drupal/charts/mariadb/templates/deployment.yaml
+++ b/stable/drupal/charts/mariadb/templates/deployment.yaml
@@ -18,8 +18,8 @@ spec:
     spec:
       containers:
       - name: {{ template "fullname" . }}
-        image: "bitnami/mariadb:{{ .Values.imageTag }}"
-        imagePullPolicy: {{ template "imagePullPolicy" . }}
+        image: "{{ .Values.image }}"
+        imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
         env:
         - name: MARIADB_ROOT_PASSWORD
           valueFrom:
diff --git a/stable/drupal/charts/mariadb/values.yaml b/stable/drupal/charts/mariadb/values.yaml
index fbdf843e45..ef0d3b4031 100644
--- a/stable/drupal/charts/mariadb/values.yaml
+++ b/stable/drupal/charts/mariadb/values.yaml
@@ -2,7 +2,7 @@
 ## ref: https://hub.docker.com/r/bitnami/mariadb/tags/
 ##
 ## Default: none
-imageTag: 10.1.14-r3
+image: bitnami/mariadb:10.1.17-r1
 
 ## Specify a imagePullPolicy
 ## Default to 'Always' if imageTag is 'latest', else set to 'IfNotPresent'
diff --git a/stable/drupal/values.yaml b/stable/drupal/values.yaml
index e2147f3fc4..4f8480b5b0 100644
--- a/stable/drupal/values.yaml
+++ b/stable/drupal/values.yaml
@@ -1,7 +1,7 @@
 ## Bitnami Drupal image version
 ## ref: https://hub.docker.com/r/bitnami/drupal/tags/
 ##
-image: bitnami/drupal:8.1.9-r0
+image: bitnami/drupal:8.1.9-r1
 
 ## Specify a imagePullPolicy
 ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'