diff --git a/stable/wordpress/Chart.yaml b/stable/wordpress/Chart.yaml
index 9c3f0c1c12..e92d2f017e 100644
--- a/stable/wordpress/Chart.yaml
+++ b/stable/wordpress/Chart.yaml
@@ -1,5 +1,5 @@
 name: wordpress
-version: 0.8.17
+version: 0.8.18
 appVersion: 4.9.4
 description: Web publishing platform for building blogs and websites.
 icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png
diff --git a/stable/wordpress/README.md b/stable/wordpress/README.md
index 169d9a1966..89c7179271 100644
--- a/stable/wordpress/README.md
+++ b/stable/wordpress/README.md
@@ -55,6 +55,7 @@ The following table lists the configurable parameters of the WordPress chart and
 | `wordpressFirstName`                 | First name                                 | `FirstName`                                                |
 | `wordpressLastName`                  | Last name                                  | `LastName`                                                 |
 | `wordpressBlogName`                  | Blog name                                  | `User's Blog!`                                             |
+| `wordpressTablePrefix`               | Table prefix                               | `wp_`                                                      |
 | `allowEmptyPassword`                 | Allow DB blank passwords                   | `yes`                                                      |
 | `smtpHost`                           | SMTP host                                  | `nil`                                                      |
 | `smtpPort`                           | SMTP port                                  | `nil`                                                      |
diff --git a/stable/wordpress/templates/deployment.yaml b/stable/wordpress/templates/deployment.yaml
index 1d43d68884..516a0363e5 100644
--- a/stable/wordpress/templates/deployment.yaml
+++ b/stable/wordpress/templates/deployment.yaml
@@ -17,7 +17,7 @@ spec:
       containers:
       - name: {{ template "fullname" . }}
         image: "{{ .Values.image }}"
-        imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
+        imagePullPolicy: {{ .Values.imagePullPolicy | quote }}
         env:
         - name: ALLOW_EMPTY_PASSWORD
         {{- if .Values.allowEmptyPassword }}
@@ -60,35 +60,37 @@ spec:
               key: db-password
             {{- end }}
         - name: WORDPRESS_USERNAME
-          value: {{ default "" .Values.wordpressUsername | quote }}
+          value: {{ .Values.wordpressUsername | quote }}
         - name: WORDPRESS_PASSWORD
           valueFrom:
             secretKeyRef:
               name: {{ template "fullname" . }}
               key: wordpress-password
         - name: WORDPRESS_EMAIL
-          value: {{ default "" .Values.wordpressEmail | quote }}
+          value: {{ .Values.wordpressEmail | quote }}
         - name: WORDPRESS_FIRST_NAME
-          value: {{ default "" .Values.wordpressFirstName | quote }}
+          value: {{ .Values.wordpressFirstName | quote }}
         - name: WORDPRESS_LAST_NAME
-          value: {{ default "" .Values.wordpressLastName | quote }}
+          value: {{ .Values.wordpressLastName | quote }}
         - name: WORDPRESS_BLOG_NAME
-          value: {{ default "" .Values.wordpressBlogName | quote }}
+          value: {{ .Values.wordpressBlogName | quote }}
+        - name: WORDPRESS_TABLE_PREFIX
+          value: {{ .Values.wordpressTablePrefix | quote }}
         - name: SMTP_HOST
-          value: {{ default "" .Values.smtpHost | quote }}
+          value: {{ .Values.smtpHost | quote }}
         - name: SMTP_PORT
-          value: {{ default "" .Values.smtpPort | quote }}
+          value: {{ .Values.smtpPort | quote }}
         - name: SMTP_USER
-          value: {{ default "" .Values.smtpUser | quote }}
+          value: {{ .Values.smtpUser | quote }}
         - name: SMTP_PASSWORD
           valueFrom:
             secretKeyRef:
               name: {{ template "fullname" . }}
               key: smtp-password
         - name: SMTP_USERNAME
-          value: {{ default "" .Values.smtpUsername | quote }}
+          value: {{ .Values.smtpUsername | quote }}
         - name: SMTP_PROTOCOL
-          value: {{ default "" .Values.smtpProtocol | quote }}
+          value: {{ .Values.smtpProtocol | quote }}
         ports:
         - name: http
           containerPort: 80
diff --git a/stable/wordpress/values.yaml b/stable/wordpress/values.yaml
index b90370b61d..4b00f57fd6 100644
--- a/stable/wordpress/values.yaml
+++ b/stable/wordpress/values.yaml
@@ -39,6 +39,11 @@ wordpressLastName: LastName
 ##
 wordpressBlogName: User's Blog!
 
+## Table prefix
+## ref: https://github.com/bitnami/bitnami-docker-wordpress#environment-variables
+##
+wordpressTablePrefix: wp_
+
 ## Set to `yes` to allow the container to be started with blank passwords
 ## ref: https://github.com/bitnami/bitnami-docker-wordpress#environment-variables
 allowEmptyPassword: yes