diff --git a/bitnami/drupal/8/ol-7/Dockerfile b/bitnami/drupal/8/ol-7/Dockerfile
index 88234a3512bf..73cf36b6f0d5 100644
--- a/bitnami/drupal/8/ol-7/Dockerfile
+++ b/bitnami/drupal/8/ol-7/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/oraclelinux-extras:7-r53
+FROM bitnami/oraclelinux-extras:7-r56
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 # Install required system packages and dependencies
@@ -6,7 +6,7 @@ RUN install_packages bzip2-libs cyrus-sasl-lib expat freetds freetype glibc gmp
 RUN bitnami-pkg unpack apache-2.4.34-1 --checksum d06af72741b365147c39bb30ca9e1df1501d97c3c6a44b200e64c3c4eb7878f6
 RUN bitnami-pkg unpack php-7.1.20-1 --checksum 453099c5c33e2d3f011ab61b7dc27e68e77063a80e6ce166a2ef26f73434ef62
 RUN bitnami-pkg unpack mysql-client-10.1.34-0 --checksum 012f1f222898565b55f7d4522514c7c130d2bfe4c988754eed658ef6dafa980c
-RUN bitnami-pkg install libphp-7.1.20-0 --checksum e6de4d5e2fc165cfa2c71c70826ca71bf60ed2816c2d1708fe0a4bd974d9e9cf
+RUN bitnami-pkg install libphp-7.1.20-1 --checksum 70d768e0a0435fd175c1b3116432d5b3d2ff6a14bd078f5216dc756ec629e69f
 RUN bitnami-pkg unpack drupal-8.5.5-1 --checksum f25aa919bcfcfe0db6358d17a9f3a0a763e314256037cf643c4040c4ef17a1b0
 
 COPY rootfs /
@@ -14,7 +14,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="443" \
     APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="8.5.5-ol-7-r20" \
+    BITNAMI_IMAGE_VERSION="8.5.5-ol-7-r21" \
     DRUPAL_DATABASE_NAME="bitnami_drupal" \
     DRUPAL_DATABASE_PASSWORD="" \
     DRUPAL_DATABASE_USER="bn_drupal" \
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index 9df8bb9007eb..3bf64e93ebc8 100644
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -30,7 +30,7 @@ $ docker-compose up -d
 
 * [`8-rhel-7`, `8.5.5-rhel-7-r2` (8/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.5-rhel-7-r2/8/rhel-7/Dockerfile)
 * [`8-php5-rhel-7`, `8.5.5-php5-rhel-7-r2` (8-php5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.5-php5-rhel-7-r2/8-php5/rhel-7/Dockerfile)
-* [`8-ol-7`, `8.5.5-ol-7-r20` (8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.5-ol-7-r20/8/ol-7/Dockerfile)
+* [`8-ol-7`, `8.5.5-ol-7-r21` (8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.5-ol-7-r21/8/ol-7/Dockerfile)
 * [`8-debian-9`, `8.5.5-debian-9-r17`, `8`, `8.5.5`, `8.5.5-r17`, `latest` (8/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.5-debian-9-r17/8/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).
diff --git a/bitnami/drupal/circle.yml b/bitnami/drupal/circle.yml
index 7d9d34272dbe..4d72020c6ff4 100644
--- a/bitnami/drupal/circle.yml
+++ b/bitnami/drupal/circle.yml
@@ -34,35 +34,17 @@ jobs:
           command: |
             docker version
             docker info
-      - restore_cache:
-          keys:
-            - cache-{{ .Branch }}
-          paths:
-            - /cache/layers.tar
-      - run:
-          name: Build docker image
-          command: |
-            curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-image-test.sh | bash -
-      - save_cache:
-          key: cache-{{ .Branch }}-{{ epoch }}
-          paths:
-            - /cache/layers.tar
       - deploy:
           name: Publish docker image
           command: |
             if [ -n "${CIRCLE_TAG}" ]; then
               curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-release-image.sh | bash -
-            elif [ "${CIRCLE_BRANCH}" == "master" ]; then
-              curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-development-image.sh | bash -
             fi
-
 workflows:
   version: 2
   build-and-deploy:
     jobs:
       - build:
           filters:
-            branches:
-              only: /.*/
             tags:
               only: /^.*(?<!-rhel-7)-r[0-9]+$/