diff --git a/bitnami/wordpress/5/debian-9/Dockerfile b/bitnami/wordpress/5/debian-9/Dockerfile
index 7602a959a004..e204d4dd5ced 100644
--- a/bitnami/wordpress/5/debian-9/Dockerfile
+++ b/bitnami/wordpress/5/debian-9/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/minideb-extras:stretch-r318
+FROM bitnami/minideb-extras:stretch-r319
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 # Install required system packages and dependencies
@@ -18,7 +18,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="443" \
     APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="wordpress" \
-    BITNAMI_IMAGE_VERSION="5.1.1-debian-9-r8" \
+    BITNAMI_IMAGE_VERSION="5.1.1-debian-9-r9" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/wordpress/README.md b/bitnami/wordpress/README.md
index b750127ae872..1ea5d13e91d0 100644
--- a/bitnami/wordpress/README.md
+++ b/bitnami/wordpress/README.md
@@ -38,9 +38,9 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`5-rhel-7`, `5.1.1-rhel-7-r8` (5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.1.1-rhel-7-r8/5/rhel-7/Dockerfile)
+* [`5-rhel-7`, `5.1.1-rhel-7-r9` (5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.1.1-rhel-7-r9/5/rhel-7/Dockerfile)
 * [`5-ol-7`, `5.1.1-ol-7-r9` (5/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.1.1-ol-7-r9/5/ol-7/Dockerfile)
-* [`5-debian-9`, `5.1.1-debian-9-r8`, `5`, `5.1.1`, `5.1.1-r8`, `latest` (5/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.1.1-debian-9-r8/5/debian-9/Dockerfile)
+* [`5-debian-9`, `5.1.1-debian-9-r9`, `5`, `5.1.1`, `5.1.1-r9`, `latest` (5/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/5.1.1-debian-9-r9/5/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wordpress GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress).
 
diff --git a/bitnami/wordpress/docker-compose.yml b/bitnami/wordpress/docker-compose.yml
index fe1e3d535ace..74ce3d72fd8c 100644
--- a/bitnami/wordpress/docker-compose.yml
+++ b/bitnami/wordpress/docker-compose.yml
@@ -3,20 +3,18 @@ services:
   mariadb:
     image: 'bitnami/mariadb:latest'
     volumes:
-      - mariadb_data:/bitnami
+      - 'mariadb_data:/bitnami'
     environment:
       - MARIADB_USER=bn_wordpress
       - MARIADB_DATABASE=bitnami_wordpress
       - ALLOW_EMPTY_PASSWORD=yes
   wordpress:
-    image: 'bitnami/wordpress:latest'
-    labels:
-      kompose.service.type: nodeport
+    image: 'bitnami/wordpress:5'
     ports:
       - '80:80'
       - '443:443'
     volumes:
-      - wordpress_data:/bitnami
+      - 'wordpress_data:/bitnami'
     depends_on:
       - mariadb
     environment: