diff --git a/bitnami/wildfly/11/Dockerfile b/bitnami/wildfly/11/Dockerfile
index 4f186bae4154..c0b1aa5a34b5 100644
--- a/bitnami/wildfly/11/Dockerfile
+++ b/bitnami/wildfly/11/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/minideb-extras:jessie-r39
+FROM bitnami/minideb-extras:jessie-r40
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 # Install required system packages and dependencies
@@ -8,7 +8,7 @@ RUN ln -sf /opt/bitnami/wildfly/data /app
 
 COPY rootfs /
 ENV BITNAMI_APP_NAME="wildfly" \
-    BITNAMI_IMAGE_VERSION="11.0.0-r20" \
+    BITNAMI_IMAGE_VERSION="11.0.0-r21" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/wildfly/bin:$PATH" \
     WILDFLY_JAVA_HOME="" \
     WILDFLY_JAVA_OPTS="" \
diff --git a/bitnami/wildfly/README.md b/bitnami/wildfly/README.md
index 070be3a3283c..336d11db18e9 100644
--- a/bitnami/wildfly/README.md
+++ b/bitnami/wildfly/README.md
@@ -27,8 +27,8 @@ $ docker-compose up -d
 
 # Supported tags and respective `Dockerfile` links
 
- - [`12`, `12.0.0-r14` (12/Dockerfile)](https://github.com/bitnami/bitnami-docker-wildfly/blob/12.0.0-r14/12/Dockerfile)
- - [`11`, `11.0.0-r20`, `latest` (11/Dockerfile)](https://github.com/bitnami/bitnami-docker-wildfly/blob/11.0.0-r20/11/Dockerfile)
+ - [`12`, `12.0.0-r13` (12/Dockerfile)](https://github.com/bitnami/bitnami-docker-wildfly/blob/12.0.0-r13/12/Dockerfile)
+ - [`11`, `11.0.0-r21`, `latest` (11/Dockerfile)](https://github.com/bitnami/bitnami-docker-wildfly/blob/11.0.0-r21/11/Dockerfile)
  - [`10`, `10.1.0-r25` (10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wildfly/blob/10.1.0-r25/10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/php-fpm GitHub repo](https://github.com/bitnami/bitnami-docker-wildfly).