diff --git a/bitnami/drupal-nginx/8/ol-7/Dockerfile b/bitnami/drupal-nginx/8/ol-7/Dockerfile
deleted file mode 100644
index 6bdbd6bac32d..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM oraclelinux:7-slim
-LABEL maintainer "Bitnami <containers@bitnami.com>"
-
-ENV PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/php/sbin:/opt/bitnami/nginx/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/drupal/vendor/bin:/opt/bitnami/nami/bin:$PATH"
-
-COPY prebuildfs /
-# Install required system packages and dependencies
-RUN install_packages GeoIP audit-libs bzip2-libs ca-certificates curl cyrus-sasl-lib freetds-libs freetype glibc gmp gnutls gzip hostname keyutils-libs krb5-libs libaio-devel libcap-ng libcom_err libcurl libffi libgcc libgcrypt libgpg-error libicu libidn libjpeg-turbo libmemcached libpng libselinux libssh2 libstdc++ libtasn1 libtidy libxml2 libxslt ncurses-libs nettle nspr nss nss-softokn-freebl nss-util openldap openssl-libs p11-kit pam pcre postgresql-libs procps-ng readline sudo tar which xz-libs zlib
-RUN /build/bitnami-user.sh && \
-    /build/install-nami.sh
-RUN bitnami-pkg unpack php-7.3.15-0 --checksum 3a5c92718570bc7dbc0ebbbbd15301317f9e9e447bb7f3f058480e078a614927
-RUN bitnami-pkg unpack nginx-1.16.1-4 --checksum 492b05515c2f72241dc9efa7d92d18ce58e54ea437d643b40ba5b2aaf5077142
-RUN bitnami-pkg unpack mysql-client-10.3.22-1 --checksum a619b82859b607462a5a82900fea0c19665857ff26c2f4506752a82368b66f72
-RUN bitnami-pkg unpack drupal-8.8.2-4 --checksum c6f20d90870341aebac20dea7e16ba8fa02af7baa6a0a009ef78b29a04116973
-RUN yum upgrade -y && \
-    rm -r /var/cache/yum
-RUN /build/install-gosu.sh
-RUN ln -sf /dev/stdout /opt/bitnami/nginx/logs/access.log
-RUN ln -sf /dev/stderr /opt/bitnami/nginx/logs/error.log
-RUN /build/install-tini.sh
-
-COPY rootfs /
-ENV ALLOW_EMPTY_PASSWORD="no" \
-    BITNAMI_APP_NAME="drupal-nginx" \
-    BITNAMI_IMAGE_VERSION="8.8.2-ol-7-r22" \
-    DRUPAL_DATABASE_NAME="bitnami_drupal" \
-    DRUPAL_DATABASE_PASSWORD="" \
-    DRUPAL_DATABASE_USER="bn_drupal" \
-    DRUPAL_EMAIL="user@example.com" \
-    DRUPAL_HTTPS_PORT="443" \
-    DRUPAL_HTTP_PORT="80" \
-    DRUPAL_PASSWORD="bitnami" \
-    DRUPAL_PROFILE="standard" \
-    DRUPAL_USERNAME="user" \
-    MARIADB_HOST="mariadb" \
-    MARIADB_PORT_NUMBER="3306" \
-    MARIADB_ROOT_PASSWORD="" \
-    MARIADB_ROOT_USER="root" \
-    MYSQL_CLIENT_CREATE_DATABASE_NAME="" \
-    MYSQL_CLIENT_CREATE_DATABASE_PASSWORD="" \
-    MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES="ALL" \
-    MYSQL_CLIENT_CREATE_DATABASE_USER="" \
-    NGINX_ENABLE_CUSTOM_PORTS="no" \
-    NGINX_HTTPS_PORT_NUMBER="" \
-    NGINX_HTTP_PORT_NUMBER=""
-
-EXPOSE 80 443
-
-ENTRYPOINT [ "/app-entrypoint.sh" ]
-CMD [ "/run.sh" ]
diff --git a/bitnami/drupal-nginx/8/ol-7/docker-compose.yml b/bitnami/drupal-nginx/8/ol-7/docker-compose.yml
deleted file mode 100644
index d47185d13577..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/docker-compose.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-version: '2'
-
-services:
-  mariadb:
-    image: 'bitnami/mariadb:10.3-ol-7'
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-      - MARIADB_USER=bn_drupal
-      - MARIADB_DATABASE=bitnami_drupal
-    volumes:
-      - 'mariadb_data:/bitnami'
-  drupal:
-    image: 'bitnami/drupal-nginx:8-ol-7'
-    environment:
-      - MARIADB_HOST=mariadb
-      - MARIADB_PORT_NUMBER=3306
-      - DRUPAL_DATABASE_USER=bn_drupal
-      - DRUPAL_DATABASE_NAME=bitnami_drupal
-      - ALLOW_EMPTY_PASSWORD=yes
-    ports:
-      - '80:80'
-      - '443:443'
-    volumes:
-      - 'drupal_data:/bitnami/drupal'
-      - './drupal-server-block.conf:/opt/bitnami/nginx/conf/server_blocks/drupal-server-block.conf'
-    depends_on:
-      - mariadb
-volumes:
-  mariadb_data:
-    driver: local
-  drupal_data:
-    driver: local
diff --git a/bitnami/drupal-nginx/8/ol-7/drupal-server-block.conf b/bitnami/drupal-nginx/8/ol-7/drupal-server-block.conf
deleted file mode 100644
index adc936016c1d..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/drupal-server-block.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-server {
-  listen 0.0.0.0:80;
-  server_name myapp.example.com;
-
-  root /opt/bitnami/drupal;
-
-  location = /favicon.ico {
-    log_not_found off;
-    access_log off;
-  }
-
-  location = /robots.txt {
-    allow all;
-    log_not_found off;
-    access_log off;
-  }
-
-  location ~ ^/sites/.*/private/ {
-    return 403;
-  }
-
-  # Block access to scripts in site files directory
-  location ~ ^/sites/[^/]+/files/.*\.php$ {
-    deny all;
-  }
-
-  # Allow "Well-Known URIs" as per RFC 5785
-  location ~* ^/.well-known/ {
-    allow all;
-  }
-
-  # Block access to "hidden" files and directories whose names begin with a
-  # period. This includes directories used by version control systems such
-  # as Subversion or Git to store control files.
-  location ~ (^|/)\. {
-    return 403;
-  }
-
-  location / {
-    try_files $uri /index.php?$query_string;
-  }
-
-  location @rewrite {
-    rewrite ^/(.*)$ /index.php?q=$1;
-  }
-
-  # Don't allow direct access to PHP files in the vendor directory.
-  location ~ /vendor/.*\.php$ {
-    deny all;
-    return 404;
-  }
-
-  # The laxer rule will continue to work if Drupal uses this new URL
-  # pattern with front controllers other than update.php in a future
-  # release.
-  location ~ \.php(/|$) {
-    fastcgi_split_path_info ^(.+?\.php)(|/.*)$;
-    include fastcgi_params;
-    # Block httpoxy attacks. See https://httpoxy.org/.
-    fastcgi_param HTTP_PROXY "";
-    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-    fastcgi_param PATH_INFO $fastcgi_path_info;
-    fastcgi_param QUERY_STRING $query_string;
-    fastcgi_intercept_errors on;
-    # PHP 7 socket location.
-    fastcgi_pass localhost:9000;
-  }
-
-  # Fighting with Styles? This little gem is amazing.
-  location ~ ^/sites/.*/files/styles/ {
-    try_files $uri @rewrite;
-  }
-
-  # Handle private files through Drupal. Private file's path can come
-  # with a language prefix.
-  location ~ ^(/[a-z\-]+)?/system/files/ {
-    try_files $uri /index.php?$query_string;
-  }
-
-  location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
-    try_files $uri @rewrite;
-    expires max;
-    log_not_found off;
-  }
-}
diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/bitnami-user.sh b/bitnami/drupal-nginx/8/ol-7/prebuildfs/bitnami-user.sh
deleted file mode 100755
index ab84296bcdfa..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/prebuildfs/bitnami-user.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-useradd -ms /bin/bash bitnami
-mkdir -p /opt/bitnami && chown bitnami:bitnami /opt/bitnami
-sed -i -e 's/\s*Defaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers
-echo 'bitnami ALL=NOPASSWD: ALL' >> /etc/sudoers
diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/bitnami-user.sh b/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/bitnami-user.sh
deleted file mode 100755
index ab84296bcdfa..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/bitnami-user.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-useradd -ms /bin/bash bitnami
-mkdir -p /opt/bitnami && chown bitnami:bitnami /opt/bitnami
-sed -i -e 's/\s*Defaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers
-echo 'bitnami ALL=NOPASSWD: ALL' >> /etc/sudoers
diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-gosu.sh b/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-gosu.sh
deleted file mode 100755
index 1756700daa89..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-gosu.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-VERSION="1.11"
-SHA256="0b843df6d86e270c5b0f5cbd3c326a04e18f4b7f9b8457fa497b0454c4b138d7"
-
-curl --silent -L "https://github.com/tianon/gosu/releases/download/${VERSION}/gosu-amd64" > "/usr/local/bin/gosu"
-echo "$SHA256" "/usr/local/bin/gosu" | sha256sum --check
-chmod u+x "/usr/local/bin/gosu"
-mkdir -p "/opt/bitnami/licenses"
-curl --silent -L "https://raw.githubusercontent.com/tianon/gosu/master/LICENSE" > "/opt/bitnami/licenses/gosu-${VERSION}.txt"
diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-nami.sh b/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-nami.sh
deleted file mode 100755
index d8a59c381f6d..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-nami.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-curl --silent -L https://nami-prod.s3.amazonaws.com/tools/nami/releases/nami-1.0.0-1-linux-x64.tar.gz > /tmp/nami-linux-x64.tar.gz
-echo "80488279b056d5e9c183fe34097c5f496715ab16a602afcc9f78d59f15139a16 /tmp/nami-linux-x64.tar.gz" | sha256sum --check
-mkdir -p /opt/bitnami/nami /opt/bitnami/licenses
-tar xzf /tmp/nami-linux-x64.tar.gz --strip 1 -C /opt/bitnami/nami && rm /tmp/nami-linux-x64.tar.gz
-curl --silent -L https://raw.githubusercontent.com/bitnami/nami/master/COPYING > /opt/bitnami/licenses/nami-1.0.0-1.txt
diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-tini.sh b/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-tini.sh
deleted file mode 100755
index 8376a36aee5f..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-tini.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-GPG_KEY="595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7"
-GPG_KEY_FINGERPRINT="6380 DC42 8747 F6C3 93FE  ACA5 9A84 159D 7001 A4E5"
-SERVERS=("ha.pool.sks-keyservers.net" "hkp://p80.pool.sks-keyservers.net:80" "keyserver.ubuntu.com" "hkp://keyserver.ubuntu.com:80" "pgp.mit.edu")
-VERSION="0.13.2"
-
-for server in "${SERVERS[@]}"; do
-    gpg --keyserver "$server" --recv-keys "$GPG_KEY" && break || :
-done
-gpg --fingerprint "$GPG_KEY" | grep -q "$GPG_KEY_FINGERPRINT"
-curl --silent -L "https://github.com/krallin/tini/releases/download/v${VERSION}/tini.asc" > "/tmp/tini.asc"
-curl --silent -L "https://github.com/krallin/tini/releases/download/v${VERSION}/tini" > "/usr/local/bin/tini"
-gpg --verify "/tmp/tini.asc" "/usr/local/bin/tini"
-chmod +x "/usr/local/bin/tini"
-mkdir -p "/opt/bitnami/licenses"
-curl --silent -L "https://raw.githubusercontent.com/krallin/tini/master/LICENSE" > "/opt/bitnami/licenses/tini-${VERSION}.txt"
diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/install-nami.sh b/bitnami/drupal-nginx/8/ol-7/prebuildfs/install-nami.sh
deleted file mode 100755
index d8a59c381f6d..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/prebuildfs/install-nami.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-curl --silent -L https://nami-prod.s3.amazonaws.com/tools/nami/releases/nami-1.0.0-1-linux-x64.tar.gz > /tmp/nami-linux-x64.tar.gz
-echo "80488279b056d5e9c183fe34097c5f496715ab16a602afcc9f78d59f15139a16 /tmp/nami-linux-x64.tar.gz" | sha256sum --check
-mkdir -p /opt/bitnami/nami /opt/bitnami/licenses
-tar xzf /tmp/nami-linux-x64.tar.gz --strip 1 -C /opt/bitnami/nami && rm /tmp/nami-linux-x64.tar.gz
-curl --silent -L https://raw.githubusercontent.com/bitnami/nami/master/COPYING > /opt/bitnami/licenses/nami-1.0.0-1.txt
diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/opt/bitnami/base/functions b/bitnami/drupal-nginx/8/ol-7/prebuildfs/opt/bitnami/base/functions
deleted file mode 100644
index 6e9168c5577b..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/prebuildfs/opt/bitnami/base/functions
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-
-[[ ${BASH_DEBUG:-false} = true ]] && set -x
-
-# Constants
-MODULE="$(basename "$0")"
-BITNAMI_PREFIX=/opt/bitnami
-
-# Color Palette
-RESET='\033[0m'
-BOLD='\033[1m'
-
-## Foreground
-BLACK='\033[38;5;0m'
-RED='\033[38;5;1m'
-GREEN='\033[38;5;2m'
-YELLOW='\033[38;5;3m'
-BLUE='\033[38;5;4m'
-MAGENTA='\033[38;5;5m'
-CYAN='\033[38;5;6m'
-WHITE='\033[38;5;7m'
-
-## Background
-ON_BLACK='\033[48;5;0m'
-ON_RED='\033[48;5;1m'
-ON_GREEN='\033[48;5;2m'
-ON_YELLOW='\033[48;5;3m'
-ON_BLUE='\033[48;5;4m'
-ON_MAGENTA='\033[48;5;5m'
-ON_CYAN='\033[48;5;6m'
-ON_WHITE='\033[48;5;7m'
-
-# Functions
-
-########################
-# Print to STDERR
-# Arguments:
-#   Message to print
-# Returns:
-#   None
-#########################
-stderr_print() {
-    printf "%b\\n" "${*}" >&2
-}
-
-########################
-# Log message
-# Arguments:
-#   Message to log
-# Returns:
-#   None
-#########################
-log() {
-    stderr_print "${NAMI_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")}${RESET}${*}"
-}
-########################
-# Log an 'info' message
-# Arguments:
-#   Message to log
-# Returns:
-#   None
-#########################
-info() {
-    log "${GREEN}INFO ${RESET} ==> ${*}"
-}
-########################
-# Log message
-# Arguments:
-#   Message to log
-# Returns:
-#   None
-#########################
-warn() {
-    log "${YELLOW}WARN ${RESET} ==> ${*}"
-}
-########################
-# Log an 'error' message
-# Arguments:
-#   Message to log
-# Returns:
-#   None
-#########################
-error() {
-    log "${RED}ERROR${RESET} ==> ${*}"
-}
-########################
-# Print the welcome page
-# Globals:
-#   DISABLE_WELCOME_MESSAGE
-#   BITNAMI_APP_NAME
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-print_welcome_page() {
-    if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then
-        if [[ -n "$BITNAMI_APP_NAME" ]]; then
-            print_image_welcome_page
-        fi
-    fi
-}
-########################
-# Print the welcome page for a Bitnami Docker image
-# Globals:
-#   BITNAMI_APP_NAME
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-print_image_welcome_page() {
-    local github_url="https://github.com/bitnami/bitnami-docker-${BITNAMI_APP_NAME}"
-
-    log ""
-    log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}"
-    log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}"
-    log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}"
-    log "Send us your feedback at ${BOLD}containers@bitnami.com${RESET}"
-    log ""
-}
diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/opt/bitnami/base/helpers b/bitnami/drupal-nginx/8/ol-7/prebuildfs/opt/bitnami/base/helpers
deleted file mode 100644
index da35a1975ec6..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/prebuildfs/opt/bitnami/base/helpers
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /opt/bitnami/base/functions
-
-########################
-# Helper function to initialize a single nami module
-# Arguments:
-#   Module to initialize
-# Returns:
-#   None
-# Description:
-#   Initialize an unpacked nami module with the `nami initialize` command.
-#   Command arguments can be specified as function argumnts after the module name.
-#   `--log-level trace` flag is added to the command if `NAMI_DEBUG` env variable exists.
-#   The log level can be overriden using the `NAMI_LOG_LEVEL` env variable.
-#########################
-nami_initialize_one() {
-    local module="${1:?module not specified}"
-    if nami inspect $module | grep -q '"lifecycle": "unpacked"'; then
-        local inputs=
-        if [[ -f "/${module}-inputs.json" ]]; then
-            inputs="--inputs-file=/${module}-inputs.json"
-        fi
-        nami ${NAMI_DEBUG:+--log-level ${NAMI_LOG_LEVEL:-trace}} initialize $module $inputs "${@:2}"
-    fi
-}
-
-########################
-# Helper function to initialize one or more nami modules
-# Arguments:
-#   Module to initialize
-# Returns:
-#   None
-#########################
-nami_initialize() {
-    local module="${1:?module not specified}"
-    for module in "${@}"; do
-        nami_initialize_one $module
-    done
-}
diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/usr/local/bin/bitnami-pkg b/bitnami/drupal-nginx/8/ol-7/prebuildfs/usr/local/bin/bitnami-pkg
deleted file mode 100755
index 78951f91f647..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/prebuildfs/usr/local/bin/bitnami-pkg
+++ /dev/null
@@ -1,211 +0,0 @@
-#!/bin/bash -e
-. /opt/bitnami/base/functions
-
-print_usage() {
-  log "Usage: bitnami-pkg <COMMAND> <PACKAGE>-<VERSION> [OPTIONS] -- [ARGS]"
-  log ""
-  log "Download and install Bitnami packages"
-  log ""
-  log "Commands:"
-  log "  install                    Download and install a package."
-  log "  unpack                     Download and unpack a package."
-  log ""
-  log "Options:"
-  log "  -b, --bucket               Package release bucket (default: stacksmith)."
-  log "  -c, --checksum             SHA256 verification checksum."
-  log "  -h, --help                 Show this help message and exit."
-  log ""
-  log "If the package is already available in the /tmp/bitnami/pkg/cache/"
-  log "directory, the download will be skipped. If there is a corresponding"
-  log "file of the same name post-fixed with .sha256 in the directory,"
-  log "that sha will be used instead of the --checksum option."
-  log ""
-  log "Examples:"
-  log "  - Unpack package"
-  log "    \$ bitnami-pkg unpack nginx-1.9.10-0"
-  log ""
-  log "  - Verify and Install package"
-  log "    \$ bitnami-pkg install nginx-1.9.10-0 --checksum 15565d06b18c2e3710fc08e579ddb3d0e39aa663264a0f7404f0743cb4cdb58d"
-  log ""
-  log "  - Install package with arguments"
-  log "    \$ bitnami-pkg install mariadb-10.1.11-0 -- --password bitnami"
-  log ""
-  log "  - Install package from testing"
-  log "    \$ bitnami-pkg install mariadb-10.1.11-0 --bucket testing"
-  log ""
-}
-
-identify_distro() {
-  distro="${IMAGE_OS:-unknown}"
-  if [ "${distro}" == "unknown" -a -f /etc/os-release ]; then
-    distro="$(grep "^ID=" /etc/os-release | cut -d'=' -f2 | cut -d'"' -f2)-$(grep "^VERSION_ID=" /etc/os-release | cut -d'=' -f2 | cut -d'"' -f2 | cut -d'.' -f1)"
-  fi
-  echo "$distro"
-}
-
-identify_arch() {
-  local arch=$(uname -m)
-
-  case "${arch}" in
-  ppc64le)
-    ;; # no-op
-  x86_64)
-    case $(identify_distro) in
-    debian-*)
-      arch=amd64
-      ;;
-    ol-*)
-      arch=x86_64
-      ;;
-    centos-*)
-      arch=x86_64
-      ;;
-    rhel-*)
-      arch=x86_64
-      ;;
-    photon-*)
-      arch=x86_64
-      ;;
-    esac
-    ;;
-  *)
-    arch="unknown"
-    ;;
-  esac
-  echo $arch
-}
-
-# break up command line for easy parsing and check legal options
-ARGS=$(getopt -o b:c:h -l "bucket:,checksum:,help" -n "bitnami-pkg" -- "$@")
-if [ $? -ne 0 ];
-then
-  exit 1
-fi
-
-eval set -- "$ARGS";
-while true; do
-  case "$1" in
-    -b|--bucket)
-      shift
-      if [ -n "$1" ]; then
-        RELEASE_BUCKET=$1
-        shift
-      fi
-      ;;
-    -c|--checksum)
-      shift
-      if [ -n "$1" ]; then
-        PACKAGE_SHA256=$1
-        shift
-      fi
-      ;;
-    -h|--help)
-      print_usage
-      exit 0
-      ;;
-    --)
-      shift
-      break
-      ;;
-  esac
-done
-
-# weed out unrecognized commands
-case "$1" in
-  install|unpack) ;;
-  *)
-    error "Unrecognized command: $1"
-    print_usage
-    exit 1
-    ;;
-esac
-
-# install/unpack command need to be supplied a package name
-if [ $# -lt 2 ]; then
-  print_usage
-  exit 1
-fi
-
-INSTALL_ROOT=/tmp/bitnami/pkg/install
-CACHE_ROOT=/tmp/bitnami/pkg/cache
-
-PACKAGE="$2-linux-$(identify_arch)-$(identify_distro)"
-PACKAGE_ARGS=${@:3}
-PACKAGE_NAME=$(echo $PACKAGE | sed 's/-[0-9].*//')
-RELEASE_BUCKET=${RELEASE_BUCKET:-stacksmith}
-
-mkdir -p $INSTALL_ROOT
-cd $INSTALL_ROOT
-
-info "Downloading $PACKAGE package"
-if [ -f $CACHE_ROOT/$PACKAGE.tar.gz ]; then
-  info "$CACHE_ROOT/$PACKAGE.tar.gz already exists, skipping download."
-  cp $CACHE_ROOT/$PACKAGE.tar.gz .
-  if [ -f $CACHE_ROOT/$PACKAGE.tar.gz.sha256 ]; then
-    info "Using the local sha256 from $CACHE_ROOT/$PACKAGE.tar.gz.sha256"
-    PACKAGE_SHA256=$(cat $CACHE_ROOT/$PACKAGE.tar.gz.sha256)
-  fi
-else
-  # display cURL progress bar when a tty is attached
-  if tty -s; then
-    CURL_ARGS="-#"
-  else
-    CURL_ARGS="-sS"
-  fi
-  if ! curl $CURL_ARGS -LOf "https://downloads.bitnami.com/files/$RELEASE_BUCKET/$PACKAGE.tar.gz"; then
-    warn "Package name '$PACKAGE' does not exist, will try '${PACKAGE%-$(identify_distro)}'..."
-    if curl $CURL_ARGS -LOf "https://downloads.bitnami.com/files/$RELEASE_BUCKET/${PACKAGE%-$(identify_distro)}.tar.gz"; then
-      PACKAGE="${PACKAGE%-$(identify_distro)}"
-    else
-      error "Could not find the requested package..."
-      exit 1
-    fi
-  fi
-fi
-
-if ! tar tzf $PACKAGE.tar.gz >/dev/null 2>&1; then
-  error "Invalid or corrupt '$PACKAGE' package."
-  exit 1
-fi
-
-if [ "$PACKAGE_SHA256" ]; then
-  info "Verifying package integrity"
-  echo "$PACKAGE_SHA256  $PACKAGE.tar.gz" | sha256sum -c -
-fi
-
-# If the tarball has too many files, it can trigger a bug
-# in overlayfs when using tar. Install bsdtar in the container image
-# to workaround it. As the overhead is too big (~40 MB), it is not added by
-# default. Source: https://github.com/coreos/bugs/issues/1095
-if which bsdtar > /dev/null; then
-  bsdtar -xf $PACKAGE.tar.gz
-else
-  tar xzf $PACKAGE.tar.gz
-fi
-
-case "$1" in
-  install) info "Installing $PACKAGE" ;;
-  unpack) info "Unpacking $PACKAGE" ;;
-esac
-nami $1 $PACKAGE $PACKAGE_ARGS
-
-rm -rf $INSTALL_ROOT
-
-if [ "$BITNAMI_PKG_EXTRA_DIRS" ]; then
-  info "Creating extra directories"
-  for i in  ${BITNAMI_PKG_EXTRA_DIRS}; do
-    mkdir -p $i
-  done
-fi
-
-if [ "$BITNAMI_PKG_CHMOD" ]; then
-  DIRS="/.nami /bitnami $BITNAMI_PKG_EXTRA_DIRS"
-  if ! [[ $PACKAGE_NAME =~ .*-client ]]; then
-    mkdir -p /bitnami/$PACKAGE_NAME
-  fi
-  # We need to be in $HOME in order to nami inspect works
-  cd $HOME
-  DIRS+=" $(nami inspect $PACKAGE_NAME | grep -e '"installdir"' | cut -f4 -d\")"
-  info "Fixing permissions: chmod $BITNAMI_PKG_CHMOD $DIRS"
-  chmod $BITNAMI_PKG_CHMOD $DIRS
-fi
diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/drupal-nginx/8/ol-7/prebuildfs/usr/local/bin/install_packages
deleted file mode 100755
index 370f3516f403..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/prebuildfs/usr/local/bin/install_packages
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-set -eu
-
-if [[ -n "oracle-epel-release-el7" ]]; then
-    if ! yum list installed oracle-epel-release-el7 >/dev/null 2>&1; then
-        yum -y install oracle-epel-release-el7 >/dev/null 2>&1
-        CODE=$?
-        if (( $CODE != 0 )); then
-          echo "EPEL repository installation failed"
-          exit $CODE
-        fi
-    fi
-fi
-
-max=2
-for ((n = 1 ; n <= max ; n+=1 )); do
-    set +e
-    yum --enablerepo base,updates,ol7_developer_EPEL,ol7_optional_latest install -y "$@"
-    CODE=$?
-    set -e
-    if (( $CODE == 0 )); then
-        break
-    fi
-    if (( $n == $max )); then
-        exit $CODE
-    fi
-    echo "yum failed, retrying"
-done
-rm -r /var/cache/yum
diff --git a/bitnami/drupal-nginx/8/ol-7/rootfs/app-entrypoint.sh b/bitnami/drupal-nginx/8/ol-7/rootfs/app-entrypoint.sh
deleted file mode 100755
index aaafd5581b53..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/rootfs/app-entrypoint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash -e
-
-. /opt/bitnami/base/functions
-. /opt/bitnami/base/helpers
-
-print_welcome_page
-
-if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then
-    . /drupal-init.sh
-    nami_initialize php nginx mysql-client drupal
-    info "Starting drupal... "
-    . /post-init.sh
-fi
-
-exec tini -- "$@"
diff --git a/bitnami/drupal-nginx/8/ol-7/rootfs/drupal-init.sh b/bitnami/drupal-nginx/8/ol-7/rootfs/drupal-init.sh
deleted file mode 100644
index 1787f67cc5b2..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/rootfs/drupal-init.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-##
-## @brief     Helper function to show an error when a password is empty and exit
-## param $1   Input name
-##
-empty_password_error() {
-  error "The $1 environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development."
-  exit 1
-}
-
-##
-## @brief     Helper function to show a warning when the ALLOW_EMPTY_PASSWORD flag is enabled
-##
-empty_password_enabled_warn() {
-  warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment."
-}
-
-# Validate passwords
-if [[ "$ALLOW_EMPTY_PASSWORD" =~ ^(yes|Yes|YES)$ ]]; then
-  empty_password_enabled_warn
-else
-  # Database creation by MySQL client
-  if [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_USER" && -z "$MYSQL_CLIENT_CREATE_DATABASE_PASSWORD" ]]; then
-    empty_password_error MYSQL_CLIENT_CREATE_DATABASE_PASSWORD
-  fi
-  # Drupal database
-  if [[ -z "$DRUPAL_DATABASE_PASSWORD" ]]; then
-    empty_password_error DRUPAL_DATABASE_PASSWORD
-  fi
-fi
diff --git a/bitnami/drupal-nginx/8/ol-7/rootfs/drupal-inputs.json b/bitnami/drupal-nginx/8/ol-7/rootfs/drupal-inputs.json
deleted file mode 100644
index dbe201bf02fd..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/rootfs/drupal-inputs.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "databaseName": "{{$global.env.DRUPAL_DATABASE_NAME}}",
-  "databasePassword": "{{$global.env.DRUPAL_DATABASE_PASSWORD}}",
-  "databaseServerHost": "{{$global.env.MARIADB_HOST}}",
-  "databaseServerPort": "{{$global.env.MARIADB_PORT_NUMBER}}",
-  "databaseUser": "{{$global.env.DRUPAL_DATABASE_USER}}",
-  "email": "{{$global.env.DRUPAL_EMAIL}}",
-  "httpPort": "{{$global.env.DRUPAL_HTTP_PORT}}",
-  "httpsPort": "{{$global.env.DRUPAL_HTTPS_PORT}}",
-  "installationProfile": "{{$global.env.DRUPAL_PROFILE}}",
-  "password": "{{$global.env.DRUPAL_PASSWORD}}",
-  "username": "{{$global.env.DRUPAL_USERNAME}}"
-}
\ No newline at end of file
diff --git a/bitnami/drupal-nginx/8/ol-7/rootfs/init.sh b/bitnami/drupal-nginx/8/ol-7/rootfs/init.sh
deleted file mode 100644
index f85df5dce4b2..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/rootfs/init.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-##
-## @brief     Helper function to show an error when a password is empty and exit
-## param $1   Input name
-##
-empty_password_error() {
-    error "The $1 environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development."
-    exit 1
-}
-
-##
-## @brief     Helper function to show a warning when the ALLOW_EMPTY_PASSWORD flag is enabled
-##
-empty_password_enabled_warn() {
-    warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment."
-}
-
-# Validate passwords
-if [[ "$ALLOW_EMPTY_PASSWORD" =~ ^(yes|Yes|YES)$ ]]; then
-    empty_password_enabled_warn
-else
-    # Database creation by MySQL client
-    if [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_USER" && -z "$MYSQL_CLIENT_CREATE_DATABASE_PASSWORD" ]]; then
-        empty_password_error MYSQL_CLIENT_CREATE_DATABASE_PASSWORD
-    fi
-    # Drupal database
-    if [[ -z "$DRUPAL_DATABASE_PASSWORD" ]]; then
-        empty_password_error DRUPAL_DATABASE_PASSWORD
-    fi
-fi
-
-# Check whether custom NGINX ports must be configured
-if [[ -n "${NGINX_HTTP_PORT_NUMBER:-}" || -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]]; then
-    export NGINX_ENABLE_CUSTOM_PORTS="yes"
-fi
diff --git a/bitnami/drupal-nginx/8/ol-7/rootfs/mysql-client-inputs.json b/bitnami/drupal-nginx/8/ol-7/rootfs/mysql-client-inputs.json
deleted file mode 100644
index 6a20ec0837a0..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/rootfs/mysql-client-inputs.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "allowEmptyPassword": "{{$global.env.ALLOW_EMPTY_PASSWORD}}",
-  "createDatabaseName": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_NAME}}",
-  "createDatabasePassword": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PASSWORD}}",
-  "createDatabasePrivileges": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES}}",
-  "createDatabaseUser": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_USER}}",
-  "host": "{{$global.env.MARIADB_HOST}}",
-  "port": "{{$global.env.MARIADB_PORT_NUMBER}}",
-  "rootPassword": "{{$global.env.MARIADB_ROOT_PASSWORD}}",
-  "rootUser": "{{$global.env.MARIADB_ROOT_USER}}"
-}
\ No newline at end of file
diff --git a/bitnami/drupal-nginx/8/ol-7/rootfs/nginx-inputs.json b/bitnami/drupal-nginx/8/ol-7/rootfs/nginx-inputs.json
deleted file mode 100644
index 40475df8964c..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/rootfs/nginx-inputs.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "enableCustomPorts": "{{$global.env.NGINX_ENABLE_CUSTOM_PORTS}}",
-  "httpPort": "{{$global.env.NGINX_HTTP_PORT_NUMBER}}",
-  "httpsPort": "{{$global.env.NGINX_HTTPS_PORT_NUMBER}}"
-}
\ No newline at end of file
diff --git a/bitnami/drupal-nginx/8/ol-7/rootfs/post-init.sh b/bitnami/drupal-nginx/8/ol-7/rootfs/post-init.sh
deleted file mode 100644
index 9d6727ce6c74..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/rootfs/post-init.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. /opt/bitnami/base/functions
-
-if [[ -d /docker-entrypoint-init.d ]] && [[ ! -f "/bitnami/$BITNAMI_APP_NAME/.user_scripts_initialized" ]]; then
-    for f in /docker-entrypoint-init.d/*; do
-        failure=0
-        case "$f" in
-            *.sh)
-                if [[ -x "$f" ]]; then
-                    info "Executing $f"; "$f" || failure=$?
-                else
-                    info "Sourcing $f"; . "$f"
-                fi
-                ;;
-
-            *.php)
-                info "Executing $f with PHP interpreter"
-                php "$f" || failure=$?
-                ;;
-
-            *.sql|*.sql.gz)
-                info "Executing $f"
-                mysql_cmd=( mysql -h "$MARIADB_HOST" -P "$MARIADB_PORT_NUMBER" -u "$MARIADB_ROOT_USER" )
-                if [[ "${ALLOW_EMPTY_PASSWORD:-no}" != "yes" ]]; then
-                    mysql_cmd+=( -p"$MARIADB_ROOT_PASSWORD" )
-                fi
-                if [[ "$f" == *".sql" ]]; then
-                    "${mysql_cmd[@]}" < "$f" || failure=$?
-                elif [[ "$f" == *".sql.gz" ]]; then
-                    gunzip -c "$f" | "${mysql_cmd[@]}" || failure=$?
-                fi
-                ;;
-
-            *)
-                info "Ignoring $f"
-                ;;
-        esac
-        if [[ "$failure" -ne 0 ]]; then
-            error "Failed to execute $f"
-            exit "$failure"
-        fi
-    done
-    info "Custom scripts were executed"
-    touch "/bitnami/$BITNAMI_APP_NAME/.user_scripts_initialized"
-fi
diff --git a/bitnami/drupal-nginx/8/ol-7/rootfs/run.sh b/bitnami/drupal-nginx/8/ol-7/rootfs/run.sh
deleted file mode 100755
index 9a8eacd96e9b..000000000000
--- a/bitnami/drupal-nginx/8/ol-7/rootfs/run.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-. /opt/bitnami/base/functions
-. /opt/bitnami/base/helpers
-
-_forwardTerm () {
-    echo "Caught signal SIGTERM, passing it to child processes..."
-    pgrep -P $$ | xargs kill -15 2>/dev/null
-    wait
-    exit $?
-}
-
-trap _forwardTerm TERM
-
-info "Starting PHP-FPM..."
-su daemon -s /bin/bash -c "/opt/bitnami/php/sbin/php-fpm -F --pid /opt/bitnami/php/tmp/php-fpm.pid --fpm-config /opt/bitnami/php/etc/php-fpm.conf --prefix /opt/bitnami/php -c /opt/bitnami/php/etc/php.ini" &
-
-info "Starting NGINX..."
-exec nginx -c /opt/bitnami/nginx/conf/nginx.conf -g "daemon off;"