diff --git a/bitnami/wordpress-nginx/5/debian-9/Dockerfile b/bitnami/wordpress-nginx/5/debian-9/Dockerfile
index 9c37ae81ae65..d1da0e4283ec 100644
--- a/bitnami/wordpress-nginx/5/debian-9/Dockerfile
+++ b/bitnami/wordpress-nginx/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
@@ -17,7 +17,7 @@ RUN ln -sf /dev/stderr /opt/bitnami/nginx/logs/error.log
 COPY rootfs /
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="wordpress-nginx" \
-    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-nginx/README.md b/bitnami/wordpress-nginx/README.md
index 2f1178fcf455..1d7dc2b84f51 100644
--- a/bitnami/wordpress-nginx/README.md
+++ b/bitnami/wordpress-nginx/README.md
@@ -45,9 +45,9 @@ $ kubectl apply -f test.yaml
 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-r9` (5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress-nginx/blob/5.1.1-rhel-7-r9/5/rhel-7/Dockerfile)
+* [`5-rhel-7`, `5.1.1-rhel-7-r8` (5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress-nginx/blob/5.1.1-rhel-7-r8/5/rhel-7/Dockerfile)
 * [`5-ol-7`, `5.1.1-ol-7-r8` (5/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress-nginx/blob/5.1.1-ol-7-r8/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-nginx/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-nginx/blob/5.1.1-debian-9-r9/5/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wordpress-nginx GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress-nginx).
 
diff --git a/bitnami/wordpress-nginx/docker-compose.yml b/bitnami/wordpress-nginx/docker-compose.yml
new file mode 100644
index 000000000000..e60ec7983eb9
--- /dev/null
+++ b/bitnami/wordpress-nginx/docker-compose.yml
@@ -0,0 +1,31 @@
+version: '2'
+services:
+  mariadb:
+    image: 'bitnami/mariadb:latest'
+    volumes:
+      - 'mariadb_data:/bitnami'
+    environment:
+      - MARIADB_USER=bn_wordpress
+      - MARIADB_DATABASE=bitnami_wordpress
+      - ALLOW_EMPTY_PASSWORD=yes
+  wordpress:
+    image: 'bitnami/wordpress-nginx:5'
+    ports:
+      - '80:80'
+      - '443:443'
+    volumes:
+      - 'wordpress_data:/bitnami'
+      - './wordpress-vhosts.conf:/bitnami/nginx/conf/vhosts/wordpress-vhosts.conf'
+    depends_on:
+      - mariadb
+    environment:
+      - MARIADB_HOST=mariadb
+      - MARIADB_PORT_NUMBER=3306
+      - WORDPRESS_DATABASE_USER=bn_wordpress
+      - WORDPRESS_DATABASE_NAME=bitnami_wordpress
+      - ALLOW_EMPTY_PASSWORD=yes
+volumes:
+  mariadb_data:
+    driver: local
+  wordpress_data:
+    driver: local