diff --git a/bitnami/apache/2.4/ol-7/Dockerfile b/bitnami/apache/2.4/ol-7/Dockerfile
deleted file mode 100644
index de55deed0ba1..000000000000
--- a/bitnami/apache/2.4/ol-7/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM oraclelinux:7-slim
-LABEL maintainer "Bitnami <containers@bitnami.com>"
-
-ENV HOME="/" \
-    OS_ARCH="x86_64" \
-    OS_FLAVOUR="ol-7" \
-    OS_NAME="linux"
-
-COPY prebuildfs /
-# Install required system packages and dependencies
-RUN install_packages ca-certificates curl cyrus-sasl-lib expat glibc gzip hostname keyutils-libs krb5-libs libaio-devel libcom_err libnghttp2 libselinux nspr nss nss-softokn-freebl nss-util openldap openssl-libs pcre procps-ng sudo tar unzip which zlib
-RUN . ./libcomponent.sh && component_unpack "apache" "2.4.41-4" --checksum f776f87e3c54a2ff1e13ed75de39356df465b53ac3264a94c3d6ad9252f5b682
-RUN yum upgrade -y && \
-    rm -r /var/cache/yum
-RUN /build/install-gosu.sh
-RUN curl --silent -L https://github.com/bitnami/render-template/releases/download/v1.0/render-template.zip > /tmp/render-template.zip && echo "60334a29f9692659f9d3a5d9659f2a97de1f5e7a0fc2e84c1868fdba7f160a9d /tmp/render-template.zip" | sha256sum --check && unzip -q -d /usr/local/bin -o /tmp/render-template.zip render-template && mkdir -p /opt/bitnami/licenses && curl --silent -L https://raw.githubusercontent.com/bitnami/render-template/master/COPYING > /opt/bitnami/licenses/render-template-1.0.txt
-
-COPY rootfs /
-RUN /postunpack.sh
-ENV APACHE_HTTPS_PORT_NUMBER="" \
-    APACHE_HTTP_PORT_NUMBER="" \
-    APACHE_SET_HTTPS_PORT="no" \
-    APACHE_SET_HTTP_PORT="no" \
-    BITNAMI_APP_NAME="apache" \
-    BITNAMI_IMAGE_VERSION="2.4.41-ol-7-r201" \
-    PATH="/opt/bitnami/apache/bin:$PATH"
-
-EXPOSE 8080 8443
-
-WORKDIR /app
-USER 1001
-ENTRYPOINT [ "/entrypoint.sh" ]
-CMD [ "/run.sh" ]
diff --git a/bitnami/apache/2.4/ol-7/docker-compose.yml b/bitnami/apache/2.4/ol-7/docker-compose.yml
deleted file mode 100644
index ddaffba780df..000000000000
--- a/bitnami/apache/2.4/ol-7/docker-compose.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: '2'
-services:
-  apache:
-    image: bitnami/apache:2.4-ol-7
-    ports:
-      - 80:8080
-      - 443:8443
diff --git a/bitnami/apache/2.4/ol-7/prebuildfs/build/install-gosu.sh b/bitnami/apache/2.4/ol-7/prebuildfs/build/install-gosu.sh
deleted file mode 100755
index 1756700daa89..000000000000
--- a/bitnami/apache/2.4/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/apache/2.4/ol-7/prebuildfs/libbitnami.sh b/bitnami/apache/2.4/ol-7/prebuildfs/libbitnami.sh
deleted file mode 100644
index 529c3fd4a3e2..000000000000
--- a/bitnami/apache/2.4/ol-7/prebuildfs/libbitnami.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-#
-# Bitnami custom library
-
-# Load Generic Libraries
-. /liblog.sh
-
-# Constants
-BOLD='\033[1m'
-
-# Functions
-
-########################
-# 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/apache/2.4/ol-7/prebuildfs/libcomponent.sh b/bitnami/apache/2.4/ol-7/prebuildfs/libcomponent.sh
deleted file mode 100644
index 025288664f69..000000000000
--- a/bitnami/apache/2.4/ol-7/prebuildfs/libcomponent.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-#
-# Library for managing Bitnami components
-
-# Constants
-CACHE_ROOT="/tmp/bitnami/pkg/cache"
-DOWNLOAD_URL="https://downloads.bitnami.com/files/stacksmith"
-
-# Functions
-
-########################
-# Download and unpack a Bitnami package
-# Globals:
-#   OS_NAME
-#   OS_ARCH
-#   OS_FLAVOUR
-# Arguments:
-#   $1 - component's name
-#   $2 - component's version
-# Returns:
-#   None
-#########################
-component_unpack() {
-    local name="${1:?name is required}"
-    local version="${2:?version is required}"
-    local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}"
-    local package_sha256=""
-
-    # Validate arguments
-    shift 2
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            -c|--checksum)
-                shift
-                package_sha256="${1:?missing package checksum}"
-                ;;
-            *)
-                echo "Invalid command line flag $1" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    echo "Downloading $base_name package"
-    if [ -f "${CACHE_ROOT}/${base_name}.tar.gz" ]; then
-        echo "${CACHE_ROOT}/${base_name}.tar.gz already exists, skipping download."
-        cp "${CACHE_ROOT}/${base_name}.tar.gz" .
-        rm "${CACHE_ROOT}/${base_name}.tar.gz"
-        if [ -f "${CACHE_ROOT}/${base_name}.tar.gz.sha256" ]; then
-            echo "Using the local sha256 from ${CACHE_ROOT}/${base_name}.tar.gz.sha256"
-            package_sha256="$(< "${CACHE_ROOT}/${base_name}.tar.gz.sha256")"
-            rm "${CACHE_ROOT}/${base_name}.tar.gz.sha256"
-        fi
-    else
-	curl --remote-name --silent "${DOWNLOAD_URL}/${base_name}.tar.gz"
-    fi
-    if [ -n "$package_sha256" ]; then
-        echo "Verifying package integrity"
-        echo "$package_sha256  ${base_name}.tar.gz" | sha256sum --check -
-    fi
-    tar --directory /opt/bitnami --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 "${base_name}/files/"
-    rm "${base_name}.tar.gz"
-}
diff --git a/bitnami/apache/2.4/ol-7/prebuildfs/libfile.sh b/bitnami/apache/2.4/ol-7/prebuildfs/libfile.sh
deleted file mode 100644
index 337e2e779701..000000000000
--- a/bitnami/apache/2.4/ol-7/prebuildfs/libfile.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-#
-# Library for managing files
-
-# Functions
-
-########################
-# Replace a regex in a file
-# Arguments:
-#   $1 - filename
-#   $2 - match regex
-#   $3 - substitute regex
-#   $4 - use POSIX regex. Default: true
-# Returns:
-#   None
-#########################
-replace_in_file() {
-    local filename="${1:?filename is required}"
-    local match_regex="${2:?match regex is required}"
-    local substitute_regex="${3:?substitute regex is required}"
-    local posix_regex=${4:-true}
-
-    local result
-
-    # We should avoid using 'sed in-place' substitutions
-    # 1) They are not compatible with files mounted from ConfigMap(s)
-    # 2) We found incompatibility issues with Debian10 and "in-place" substitutions
-    if [[ $posix_regex = true ]]; then
-        result="$(sed -E "s@$match_regex@$substitute_regex@g" "$filename")"
-    else
-        result="$(sed "s@$match_regex@$substitute_regex@g" "$filename")"
-    fi
-    echo "$result" > "$filename"
-}
-
-########################
-# Remove a line in a file based on a regex
-# Arguments:
-#   $1 - filename
-#   $2 - match regex
-#   $3 - use POSIX regex. Default: true
-# Returns:
-#   None
-#########################
-remove_in_file() {
-    local filename="${1:?filename is required}"
-    local match_regex="${2:?match regex is required}"
-    local posix_regex=${3:-true}
-    local result
-
-    # We should avoid using 'sed in-place' substitutions
-    # 1) They are not compatible with files mounted from ConfigMap(s)
-    # 2) We found incompatibility issues with Debian10 and "in-place" substitutions
-    if [[ $posix_regex = true ]]; then
-        result="$(sed -E "/$match_regex/d" "$filename")"
-    else
-        result="$(sed "/$match_regex/d" "$filename")"
-    fi
-    echo "$result" > "$filename"
-}
diff --git a/bitnami/apache/2.4/ol-7/prebuildfs/libfs.sh b/bitnami/apache/2.4/ol-7/prebuildfs/libfs.sh
deleted file mode 100644
index 10a24735c096..000000000000
--- a/bitnami/apache/2.4/ol-7/prebuildfs/libfs.sh
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/bin/bash
-#
-# Library for file system actions
-
-# Load Generic Libraries
-. /liblog.sh
-
-# Functions
-
-########################
-# Ensure a file/directory is owned (user and group) but the given user
-# Arguments:
-#   $1 - filepath
-#   $2 - owner
-# Returns:
-#   None
-#########################
-owned_by() {
-    local path="${1:?path is missing}"
-    local owner="${2:?owner is missing}"
-
-    chown "$owner":"$owner" "$path"
-}
-
-########################
-# Ensure a directory exists and, optionally, is owned by the given user
-# Arguments:
-#   $1 - directory
-#   $2 - owner
-# Returns:
-#   None
-#########################
-ensure_dir_exists() {
-    local dir="${1:?directory is missing}"
-    local owner="${2:-}"
-
-    mkdir -p "${dir}"
-    if [[ -n $owner ]]; then
-        owned_by "$dir" "$owner"
-    fi
-}
-
-########################
-# Checks whether a directory is empty or not
-# Arguments:
-#   $1 - directory
-# Returns:
-#   Boolean
-#########################
-is_dir_empty() {
-    local dir="${1:?missing directory}"
-
-    if [[ ! -e "$dir" ]] || [[ -z "$(ls -A "$dir")" ]]; then
-        true
-    else
-        false
-    fi
-}
-
-########################
-# Configure permisions and ownership recursively
-# Globals:
-#   None
-# Arguments:
-#   $1 - paths (as a string).
-# Flags:
-#   -f|--file-mode - mode for directories.
-#   -d|--dir-mode - mode for files.
-#   -u|--user - user
-#   -g|--group - group
-# Returns:
-#   None
-#########################
-configure_permissions_ownership() {
-    local -r paths="${1:?paths is missing}"
-    local dir_mode=""
-    local file_mode=""
-    local user=""
-    local group=""
-
-    # Validate arguments
-    shift 1
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            -f|--file-mode)
-                shift
-                file_mode="${1:?missing mode for files}"
-                ;;
-            -d|--dir-mode)
-                shift
-                dir_mode="${1:?missing mode for directories}"
-                ;;
-            -u|--user)
-                shift
-                user="${1:?missing user}"
-                ;;
-            -g|--group)
-                shift
-                group="${1:?missing group}"
-                ;;
-            *)
-                echo "Invalid command line flag $1" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    read -r -a filepaths <<< "$paths"
-    for p in "${filepaths[@]}"; do
-        if [[ -e "$p" ]]; then
-            if [[ -n $dir_mode ]]; then
-                find -L "$p" -type d -exec chmod "$dir_mode" {} \;
-            fi
-            if [[ -n $file_mode ]]; then
-                find -L "$p" -type f -exec chmod "$file_mode" {} \;
-            fi
-            if [[ -n $user ]] && [[ -n $group ]]; then
-                chown -LR "$user":"$group" "$p"
-            elif [[ -n $user ]] && [[ -z $group ]]; then
-                chown -LR "$user" "$p"
-            elif [[ -z $user ]] && [[ -n $group ]]; then
-                chgrp -LR "$group" "$p"
-            fi
-        else
-            stderr_print "$p does not exist"
-        fi
-    done
-}
diff --git a/bitnami/apache/2.4/ol-7/prebuildfs/liblog.sh b/bitnami/apache/2.4/ol-7/prebuildfs/liblog.sh
deleted file mode 100644
index 04118273394a..000000000000
--- a/bitnami/apache/2.4/ol-7/prebuildfs/liblog.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-#
-# Library for logging functions
-
-# Constants
-RESET='\033[0m'
-RED='\033[38;5;1m'
-GREEN='\033[38;5;2m'
-YELLOW='\033[38;5;3m'
-MAGENTA='\033[38;5;5m'
-CYAN='\033[38;5;6m'
-
-# 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 "${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} ==> ${*}"
-}
-########################
-# Log a 'debug' message
-# Globals:
-#   BITNAMI_DEBUG
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-debug() {
-    # 'is_boolean_yes' is defined in libvalidations.sh, but depends on this file so we cannot source it
-    local -r bool="${BITNAMI_DEBUG:-false}"
-    # comparison is performed without regard to the case of alphabetic characters
-    shopt -s nocasematch
-    if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then
-        log "${MAGENTA}DEBUG${RESET} ==> ${*}"
-    fi
-}
diff --git a/bitnami/apache/2.4/ol-7/prebuildfs/libnet.sh b/bitnami/apache/2.4/ol-7/prebuildfs/libnet.sh
deleted file mode 100644
index f884b7661fd7..000000000000
--- a/bitnami/apache/2.4/ol-7/prebuildfs/libnet.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-#
-# Library for network functions
-
-# Functions
-
-########################
-# Resolve dns
-# Arguments:
-#   $1 - Hostname to resolve
-# Returns:
-#   IP
-#########################
-dns_lookup() {
-    local host="${1:?host is missing}"
-    getent ahosts "$host" | awk '/STREAM/ {print $1 }'
-}
-
-########################
-# Get machine's IP
-# Arguments:
-#   None
-# Returns:
-#   Machine IP
-#########################
-get_machine_ip() {
-    dns_lookup "$(hostname)"
-}
-
-########################
-# Check if the provided argument is a resolved hostname
-# Arguments:
-#   $1 - Value to check
-# Returns:
-#   Boolean
-#########################
-is_hostname_resolved() {
-    local -r host="${1:?missing value}"
-    if [[ -n "$(dns_lookup "$host")" ]]; then
-        true
-    else
-        false
-    fi
-}
diff --git a/bitnami/apache/2.4/ol-7/prebuildfs/libos.sh b/bitnami/apache/2.4/ol-7/prebuildfs/libos.sh
deleted file mode 100644
index 1a5ba3bb2a64..000000000000
--- a/bitnami/apache/2.4/ol-7/prebuildfs/libos.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash
-#
-# Library for operating system actions
-
-# Functions
-
-########################
-# Check if an user exists in the system
-# Arguments:
-#   $1 - user
-# Returns:
-#   Boolean
-#########################
-user_exists() {
-    local user="${1:?user is missing}"
-    id "$user" >/dev/null 2>&1
-}
-
-########################
-# Check if a group exists in the system
-# Arguments:
-#   $1 - group
-# Returns:
-#   Boolean
-#########################
-group_exists() {
-    local group="${1:?group is missing}"
-    getent group "$group" >/dev/null 2>&1
-}
-
-########################
-# Create a group in the system if it does not exist already
-# Arguments:
-#   $1 - group
-# Returns:
-#   None
-#########################
-ensure_group_exists() {
-    local group="${1:?group is missing}"
-
-    if ! group_exists "$group"; then
-        groupadd "$group" >/dev/null 2>&1
-    fi
-}
-
-########################
-# Create an user in the system if it does not exist already
-# Arguments:
-#   $1 - user
-#   $2 - group
-# Returns:
-#   None
-#########################
-ensure_user_exists() {
-    local user="${1:?user is missing}"
-    local group="${2:-}"
-
-    if ! user_exists "$user"; then
-	useradd "$user" >/dev/null 2>&1
-        if [[ -n "$group" ]]; then
-            ensure_group_exists "$group"
-            usermod -a -G "$group" "$user" >/dev/null 2>&1
-        fi
-    fi
-}
-
-########################
-# Check if the script is currently running as root
-# Arguments:
-#   $1 - user
-#   $2 - group
-# Returns:
-#   Boolean
-#########################
-am_i_root() {
-    if [[ "$(id -u)" = "0" ]]; then
-        true
-    else
-	false
-    fi
-}
-
-########################
-# Get total memory available
-# Arguments:
-#   None
-# Returns:
-#   Memory in bytes
-#########################
-get_total_memory() {
-    echo $(($(grep MemTotal /proc/meminfo | awk '{print $2}') / 1024))
-}
-
-#########################
-# Redirects output to /dev/null if debug mode is disabled
-# Globals:
-#   BITNAMI_DEBUG
-# Arguments:
-#   $@ - Command to execute
-# Returns:
-#   None
-#########################
-debug_execute() {
-    if ${BITNAMI_DEBUG:-false}; then
-        "$@"
-    else
-        "$@" >/dev/null 2>&1
-    fi
-}
-
-########################
-# Retries a command a given number of times
-# Arguments:
-#   $1 - cmd (as a string)
-#   $2 - max retries. Default: 12
-#   $3 - sleep between retries (in seconds). Default: 5
-# Returns:
-#   Boolean
-#########################
-retry_while() {
-    local -r cmd="${1:?cmd is missing}"
-    local -r retries="${2:-12}"
-    local -r sleep_time="${3:-5}"
-    local return_value=1
-
-    read -r -a command <<< "$cmd"
-    for ((i = 1 ; i <= retries ; i+=1 )); do
-        "${command[@]}" && return_value=0 && break
-        sleep "$sleep_time"
-    done
-    return $return_value
-}
diff --git a/bitnami/apache/2.4/ol-7/prebuildfs/libservice.sh b/bitnami/apache/2.4/ol-7/prebuildfs/libservice.sh
deleted file mode 100644
index 0a83cd3d927f..000000000000
--- a/bitnami/apache/2.4/ol-7/prebuildfs/libservice.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-#
-# Library for managing services
-
-# Functions
-
-########################
-# Read the provided pid file and returns a PID
-# Arguments:
-#   $1 - Pid file
-# Returns:
-#   PID
-#########################
-get_pid_from_file() {
-    local pid_file="${1:?pid file is missing}"
-
-    if [[ -f "$pid_file" ]]; then
-        if [[ -n "$(< "$pid_file")" ]] && [[ "$(< "$pid_file")" -gt 0 ]]; then
-            echo "$(< "$pid_file")"
-	fi
-    fi
-}
-
-########################
-# Check if a provided PID corresponds to a running service
-# Arguments:
-#   $1 - PID
-# Returns:
-#   Boolean
-#########################
-is_service_running() {
-    local pid="${1:?pid is missing}"
-
-    kill -0 "$pid" 2>/dev/null
-}
-
-########################
-# Stop a service by sending a termination signal to its pid
-# Arguments:
-#   $1 - Pid file
-# Returns:
-#   None
-#########################
-stop_service_using_pid() {
-    local pid_file="${1:?pid file is missing}"
-    local pid
-
-    pid="$(get_pid_from_file "$pid_file")"
-    [[ -z "$pid" ]] || ! is_service_running "$pid" && return
-
-    kill "$pid"
-    local counter=10
-    while [[ "$counter" -ne 0 ]] && is_service_running "$pid"; do
-        sleep 1
-        counter=$((counter - 1))
-    done
-}
diff --git a/bitnami/apache/2.4/ol-7/prebuildfs/libvalidations.sh b/bitnami/apache/2.4/ol-7/prebuildfs/libvalidations.sh
deleted file mode 100644
index ef9aaf0cf31f..000000000000
--- a/bitnami/apache/2.4/ol-7/prebuildfs/libvalidations.sh
+++ /dev/null
@@ -1,246 +0,0 @@
-#!/bin/bash
-#
-# Validation functions library
-
-# Load Generic Libraries
-. /liblog.sh
-
-# Functions
-
-########################
-# Check if the provided argument is an integer
-# Arguments:
-#   $1 - Value to check
-# Returns:
-#   Boolean
-#########################
-is_int() {
-    local -r int="${1:?missing value}"
-    if [[ "$int" =~ ^-?[0-9]+ ]]; then
-        true
-    else
-        false
-    fi
-}
-
-########################
-# Check if the provided argument is a positive integer
-# Arguments:
-#   $1 - Value to check
-# Returns:
-#   Boolean
-#########################
-is_positive_int() {
-    local -r int="${1:?missing value}"
-    if is_int "$int" && (( "${int}" >= 0 )); then
-        true
-    else
-        false
-    fi
-}
-
-########################
-# Check if the provided argument is a boolean or is the string 'yes/true'
-# Arguments:
-#   $1 - Value to check
-# Returns:
-#   Boolean
-#########################
-is_boolean_yes() {
-    local -r bool="${1:-}"
-    # comparison is performed without regard to the case of alphabetic characters
-    shopt -s nocasematch
-    if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then
-        true
-    else
-        false
-    fi
-}
-
-########################
-# Check if the provided argument is a boolean yes/no value
-# Arguments:
-#   $1 - Value to check
-# Returns:
-#   Boolean
-#########################
-is_yes_no_value() {
-    local -r bool="${1:-}"
-    if [[ "$bool" =~ ^(yes|no)$ ]]; then
-        true
-    else
-        false
-    fi
-}
-
-########################
-# Check if the provided argument is a boolean true/false value
-# Arguments:
-#   $1 - Value to check
-# Returns:
-#   Boolean
-#########################
-is_true_false_value() {
-    local -r bool="${1:-}"
-    if [[ "$bool" =~ ^(true|false)$ ]]; then
-        true
-    else
-        false
-    fi
-}
-
-########################
-# Check if the provided argument is an empty string or not defined
-# Arguments:
-#   $1 - Value to check
-# Returns:
-#   Boolean
-#########################
-is_empty_value() {
-    local -r val="${1:-}"
-    if [[ -z "$val" ]]; then
-        true
-    else
-        false
-    fi
-}
-
-########################
-# Validate if the provided argument is a valid port
-# Arguments:
-#   $1 - Port to validate
-# Returns:
-#   Boolean and error message
-#########################
-validate_port() {
-    local value
-    local unprivileged=0
-
-    # Parse flags
-    while [[ "$#" -gt 0 ]]; do
-        case "$1" in
-            -unprivileged)
-                unprivileged=1
-                ;;
-            --)
-                shift
-                break
-                ;;
-            -*)
-                stderr_print "unrecognized flag $1"
-                return 1
-                ;;
-            *)
-                break
-                ;;
-        esac
-        shift
-    done
-
-    if [[ "$#" -gt 1 ]]; then
-        echo "too many arguments provided"
-        return 2
-    elif [[ "$#" -eq 0 ]]; then
-        stderr_print "missing port argument"
-        return 1
-    else
-        value=$1
-    fi
-
-    if [[ -z "$value" ]]; then
-        echo "the value is empty"
-        return 1
-    else
-        if ! is_int "$value"; then
-            echo "value is not an integer"
-            return 2
-        elif [[ "$value" -lt 0 ]]; then
-            echo "negative value provided"
-            return 2
-        elif [[ "$value" -gt 65535 ]]; then
-            echo "requested port is greater than 65535"
-            return 2
-        elif [[ "$unprivileged" = 1 && "$value" -lt 1024 ]]; then
-            echo "privileged port requested"
-            return 3
-        fi
-    fi
-}
-
-########################
-# Validate if the provided argument is a valid IPv4 address
-# Arguments:
-#   $1 - IP to validate
-# Returns:
-#   Boolean
-#########################
-validate_ipv4() {
-    local ip="${1:?ip is missing}"
-    local stat=1
-
-    if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-	read -r -a ip_array <<< "$(tr '.' ' ' <<< "$ip")"
-        [[ ${ip_array[0]} -le 255 && ${ip_array[1]} -le 255 \
-            && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]]
-        stat=$?
-    fi
-    return $stat
-}
-
-########################
-# Validate a string format
-# Arguments:
-#   $1 - String to validate
-# Returns:
-#   Boolean
-#########################
-validate_string() {
-    local string
-    local min_length=-1
-    local max_length=-1
-
-    # Parse flags
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            -min-length)
-                shift
-                min_length=${1:-}
-                ;;
-            -max-length)
-                shift
-                max_length=${1:-}
-                ;;
-            --)
-                shift
-                break
-                ;;
-            -*)
-                stderr_print "unrecognized flag $1"
-                return 1
-                ;;
-            *)
-                break
-                ;;
-        esac
-        shift
-    done
-
-    if [ "$#" -gt 1 ]; then
-        stderr_print "too many arguments provided"
-        return 2
-    elif [ "$#" -eq 0 ]; then
-        stderr_print "missing string"
-        return 1
-    else
-        string=$1
-    fi
-
-    if [[ "$min_length" -ge 0 ]] && [[ "${#string}" -lt "$min_length" ]]; then
-        echo "string length is less than $min_length"
-        return 1
-    fi
-    if [[ "$max_length" -ge 0 ]] && [[ "${#string}" -gt "$max_length" ]]; then
-        echo "string length is great than $max_length"
-        return 1
-    fi
-}
diff --git a/bitnami/apache/2.4/ol-7/prebuildfs/libversion.sh b/bitnami/apache/2.4/ol-7/prebuildfs/libversion.sh
deleted file mode 100644
index b16090cfe1f4..000000000000
--- a/bitnami/apache/2.4/ol-7/prebuildfs/libversion.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-#
-# Library for managing versions strings
-
-# Load Generic Libraries
-. ./liblog.sh
-
-# Functions
-########################
-# Gets semantic version 
-# Arguments:
-#   $1 - version: string to extract major.minor.patch
-#   $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch
-# Returns:
-#   array with the major, minor and release
-#########################
-get_sematic_version () {
-    local version="${1:?version is required}"
-    local section="${2:?section is required}"
-    local -a version_sections
-
-    #Regex to parse versions: x.y.z
-    local -r regex='([0-9]+)(\.([0-9]+)(\.([0-9]+))?)?'
-
-    if [[ "$version" =~ $regex ]]; then
-        local i=1
-        local j=1
-        local n=${#BASH_REMATCH[*]}
-
-        while [[ $i -lt $n ]]; do
-            if [[ -n "${BASH_REMATCH[$i]}" ]] && [[ "${BASH_REMATCH[$i]:0:1}" != '.' ]];  then
-                version_sections[$j]=${BASH_REMATCH[$i]}
-                ((j++))
-            fi
-            ((i++))
-        done
-
-        local number_regex='^[0-9]+$'
-        if [[ "$section" =~ $number_regex ]] && (( $section > 0 )) && (( $section <= 3 )); then
-             echo "${version_sections[$section]}"
-             return
-        else
-            stderr_print "Section allowed values are: 1, 2, and 3"
-            return 1
-        fi
-    fi
-}
diff --git a/bitnami/apache/2.4/ol-7/prebuildfs/opt/bitnami/.exists b/bitnami/apache/2.4/ol-7/prebuildfs/opt/bitnami/.exists
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/bitnami/apache/2.4/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/apache/2.4/ol-7/prebuildfs/usr/local/bin/install_packages
deleted file mode 100755
index 370f3516f403..000000000000
--- a/bitnami/apache/2.4/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/apache/2.4/ol-7/rootfs/entrypoint.sh b/bitnami/apache/2.4/ol-7/rootfs/entrypoint.sh
deleted file mode 100755
index 4df5e01a5c54..000000000000
--- a/bitnami/apache/2.4/ol-7/rootfs/entrypoint.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# shellcheck disable=SC1091
-
-set -o errexit
-set -o nounset
-set -o pipefail
-#set -o xtrace
-
-# Load libraries
-. /libapache.sh
-. /libbitnami.sh
-. /liblog.sh
-
-# Load Apache environment
-eval "$(apache_env)"
-
-print_welcome_page
-
-if [[ "$*" == *"/run.sh"* ]]; then
-    info "** Starting Apache setup **"
-    /setup.sh
-    info "** Apache setup finished! **"
-fi
-
-echo ""
-exec "$@"
diff --git a/bitnami/apache/2.4/ol-7/rootfs/libapache.sh b/bitnami/apache/2.4/ol-7/rootfs/libapache.sh
deleted file mode 100644
index 1ffd4fd7ce6f..000000000000
--- a/bitnami/apache/2.4/ol-7/rootfs/libapache.sh
+++ /dev/null
@@ -1,262 +0,0 @@
-#!/bin/bash
-#
-# Bitnami Apache library
-
-# shellcheck disable=SC1090
-# shellcheck disable=SC1091
-
-# Load Generic Libraries
-. /libfs.sh
-. /liblog.sh
-. /libos.sh
-. /libvalidations.sh
-
-########################
-# Load global variables used on Apache configuration.
-# Globals:
-#   APACHE_*
-# Arguments:
-#   None
-# Returns:
-#   Series of exports to be used as 'eval' arguments
-#########################
-apache_env() {
-    cat <<"EOF"
-# Bitnami debug
-export MODULE=apache
-export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
-
-# Paths
-export APACHE_BASE_DIR="/opt/bitnami/apache"
-export APACHE_BIN_DIR="${APACHE_BASE_DIR}/bin"
-export APACHE_CONF_DIR="${APACHE_BASE_DIR}/conf"
-export APACHE_HTDOCS_DIR="${APACHE_BASE_DIR}/htdocs"
-export APACHE_LOG_DIR="${APACHE_BASE_DIR}/logs"
-export APACHE_TMP_DIR="${APACHE_BASE_DIR}/tmp"
-export APACHE_VHOSTS_DIR="${APACHE_CONF_DIR}/vhosts"
-export APACHE_HTACCESS_DIR="${APACHE_VHOSTS_DIR}/htaccess"
-export APACHE_CONF_FILE="${APACHE_CONF_DIR}/httpd.conf"
-export APACHE_PID_FILE="${APACHE_TMP_DIR}/httpd.pid"
-
-# Users
-export APACHE_DAEMON_USER="daemon"
-export APACHE_DAEMON_GROUP="daemon"
-
-# Configuration
-export APACHE_HTTP_PORT_NUMBER="${APACHE_HTTP_PORT_NUMBER:-}"
-export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-}"
-EOF
-}
-
-########################
-# Validate settings in APACHE_* env vars
-# Globals:
-#   APACHE_*
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-apache_validate() {
-    debug "Validating settings in APACHE_* environment variables..."
-    local error_code=0
-
-    # Auxiliary functions
-    print_validation_error() {
-        error "$1"
-        error_code=1
-    }
-
-    check_allowed_port() {
-        local port_var="${1:?missing port variable}"
-        local validate_port_args=()
-        ! am_i_root && validate_port_args+=("-unprivileged")
-        if ! err=$(validate_port "${validate_port_args[@]}" "${!port_var}"); then
-            print_validation_error "An invalid port was specified in the environment variable ${port_var}: ${err}."
-        fi
-    }
-
-    [[ -w "$APACHE_CONF_FILE" ]] || warn "The Apache configuration file '${APACHE_CONF_FILE}' is not writable. Configurations based on environment variables will not be applied."
-
-    if [[ -n "$APACHE_HTTP_PORT_NUMBER" ]] && [[ -n "$APACHE_HTTPS_PORT_NUMBER" ]]; then
-        if [[ "$APACHE_HTTP_PORT_NUMBER" -eq "$APACHE_HTTPS_PORT_NUMBER" ]]; then
-            print_validation_error "APACHE_HTTP_PORT_NUMBER and APACHE_HTTPS_PORT_NUMBER are bound to the same port!"
-        fi
-    fi
-
-    [[ -n "$APACHE_HTTP_PORT_NUMBER" ]] && check_allowed_port APACHE_HTTP_PORT_NUMBER
-    [[ -n "$APACHE_HTTPS_PORT_NUMBER" ]] && check_allowed_port APACHE_HTTPS_PORT_NUMBER
-
-    [[ "$error_code" -eq 0 ]] || exit "$error_code"
-}
-
-########################
-# Configure Apache's HTTP port
-# Globals:
-#   APACHE_CONF_FILE, APACHE_CONF_DIR
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-apache_configure_http_port() {
-    local -r port=${1:?missing port}
-    local -r listen_exp="s|^\s*Listen\s+([^:]*:)?[0-9]+\s*$|Listen ${port}|"
-    local -r server_name_exp="s|^\s*#?\s*ServerName\s+([^:\s]+)(:[0-9]+)?$|ServerName \1:${port}|"
-    local -r vhost_exp="s|VirtualHost\s+([^:>]+)(:[0-9]+)|VirtualHost \1:${port}|"
-    local apache_configuration
-
-    if [[ -w "$APACHE_CONF_FILE" ]]; then
-        debug "Configuring port ${port} on file ${APACHE_CONF_FILE}"
-        apache_configuration="$(sed -E -e "$listen_exp" -e "$server_name_exp" "$APACHE_CONF_FILE")"
-        echo "$apache_configuration" > "$APACHE_CONF_FILE"
-    fi
-
-    if [[ -w "${APACHE_CONF_DIR}/bitnami/bitnami.conf" ]]; then
-        debug "Configuring port ${port} on file ${APACHE_CONF_DIR}/bitnami/bitnami.conf"
-        apache_configuration="$(sed -E "$vhost_exp" "${APACHE_CONF_DIR}/bitnami/bitnami.conf")"
-        echo "$apache_configuration" > "${APACHE_CONF_DIR}/bitnami/bitnami.conf"
-    fi
-
-    if [[ -w "${APACHE_VHOSTS_DIR}/00_status-vhost.conf" ]]; then
-        debug "Configuring port ${port} on file ${APACHE_VHOSTS_DIR}/00_status-vhost.conf"
-        apache_configuration="$(sed -E "$vhost_exp" "${APACHE_VHOSTS_DIR}/00_status-vhost.conf")"
-        echo "$apache_configuration" > "${APACHE_VHOSTS_DIR}/00_status-vhost.conf"
-    fi
-}
-
-########################
-# Configure Apache's HTTPS port
-# Globals:
-#   APACHE_CONF_DIR
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-apache_configure_https_port() {
-    local -r port=${1:?missing port}
-    local -r listen_exp="s|^\s*Listen\s+([^:]*:)?[0-9]+\s*$|Listen ${port}|"
-    local -r vhost_exp="s|VirtualHost\s+([^:>]+)(:[0-9]+)|VirtualHost \1:${port}|"
-    local apache_configuration
-
-    if [[ -w "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf" ]]; then
-        debug "Configuring port ${port} on file ${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf"
-        apache_configuration="$(sed -E -e "$listen_exp" -e "$vhost_exp" "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf")"
-        echo "$apache_configuration" > "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf"
-    fi
-}
-
-########################
-# Ensure Apache is initialized
-# Globals:
-#   APACHE_*
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-apache_initialize() {
-    # Copy vhosts files
-    if ! is_dir_empty "/vhosts"; then
-        info "Found mounted virtual hosts in '/vhosts'. Copying them to '/opt/bitnami/apache/conf/vhosts'"
-        cp -Lr "/vhosts/." "${APACHE_VHOSTS_DIR}"
-    fi
-
-    # Mount certificate files
-    if ! is_dir_empty "/opt/bitnami/apache/certs"; then
-        warn "The directory '/opt/bitnami/apache/certs' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '/certs' instead. Find an example at: https://github.com/bitnami/bitnami-docker-apache#using-custom-ssl-certificates"
-        warn "Restoring certificates at '/opt/bitnami/apache/certs' to '/opt/bitnami/apache/conf/bitnami/certs'..."
-        rm -rf "/opt/bitnami/apache/conf/bitnami/certs"
-        ln -sf "/opt/bitnami/apache/certs" "/opt/bitnami/apache/conf/bitnami/certs"
-    elif ! is_dir_empty "/certs"; then
-        info "Mounting certificates files from '/certs'..."
-        rm -rf "/opt/bitnami/apache/conf/bitnami/certs"
-        ln -sf "/certs" "/opt/bitnami/apache/conf/bitnami/certs"
-    fi
-
-    # Mount application files
-    if ! is_dir_empty "/app"; then
-        info "Mounting application files from '/app'..."
-        rm -rf "$APACHE_HTDOCS_DIR"
-        ln -sf "/app" "$APACHE_HTDOCS_DIR"
-    fi
-
-    # Port configuration
-    [[ -n "$APACHE_HTTP_PORT_NUMBER" ]] && info "Configuring the HTTP port" && apache_configure_http_port "$APACHE_HTTP_PORT_NUMBER"
-    [[ -n "$APACHE_HTTPS_PORT_NUMBER" ]] && info "Configuring the HTTPS port" && apache_configure_https_port "$APACHE_HTTPS_PORT_NUMBER"
-
-    # Restore persisted configuration files (deprecated)
-    if ! is_dir_empty "/bitnami/apache/conf"; then
-        warn "The directory '/bitnami/apache/conf' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '${APACHE_CONF_DIR}' instead. Find an example at: https://github.com/bitnami/bitnami-docker-apache#full-configuration"
-        warn "Restoring configuration at '/bitnami/apache/conf' to '${APACHE_CONF_DIR}'..."
-        rm -rf "$APACHE_CONF_DIR"
-        ln -sf "/bitnami/apache/conf" "$APACHE_CONF_DIR"
-    fi
-}
-
-########################
-# Enable a module in the Apache configuration file
-# Globals:
-#   APACHE_CONF_FILE
-# Arguments:
-#   $1 - Module to enable
-# Returns:
-#   None
-#########################
-apache_enable_module() {
-    local -r module="${1:?missing module}"
-    local -r expression="s|^\s*#+\s*(LoadModule\s+[^ ]+\s+modules/${module}\.so.*)$|\1|"
-    local apache_configuration
-
-    debug "Enabling module '${module}'..."
-
-    if [[ -w "$APACHE_CONF_FILE" ]]; then
-        apache_configuration="$(sed -E "$expression" "$APACHE_CONF_FILE")"
-        echo "$apache_configuration" > "$APACHE_CONF_FILE"
-    fi
-}
-
-########################
-# Disable a module in the Apache configuration file
-# Globals:
-#   APACHE_CONF_FILE
-# Arguments:
-#   $1 - Module to disable
-# Returns:
-#   None
-#########################
-apache_disable_module() {
-    local -r module="${1:?missing module}"
-    local -r expression="s|^\s*(LoadModule\s+[^ ]+\s+modules/${module}\.so.*)$|#\1|"
-    local apache_configuration
-
-    debug "Disabling module '${module}'..."
-
-    if [[ -w "$APACHE_CONF_FILE" ]]; then
-        apache_configuration="$(sed -E "$expression" "$APACHE_CONF_FILE")"
-        echo "$apache_configuration" > "$APACHE_CONF_FILE"
-    fi
-}
-
-########################
-# Enable a configuration entry in the Apache configuration file
-# Globals:
-#   APACHE_CONF_FILE
-# Arguments:
-#   $1 - Entry to enable
-# Returns:
-#   None
-#########################
-apache_enable_configuration_entry() {
-    local -r entry="${1:?missing entry}"
-    local -r expression="s|^\s*#+\s*(${entry}\s*)$|\1|"
-    local apache_configuration
-
-    debug "Enabling entry '${entry}'..."
-
-    if [[ -w "$APACHE_CONF_FILE" ]]; then
-        apache_configuration="$(sed -E "$expression" "$APACHE_CONF_FILE")"
-        echo "$apache_configuration" > "$APACHE_CONF_FILE"
-    fi
-}
diff --git a/bitnami/apache/2.4/ol-7/rootfs/licenses/licenses.txt b/bitnami/apache/2.4/ol-7/rootfs/licenses/licenses.txt
deleted file mode 100644
index c76ba31f3b8a..000000000000
--- a/bitnami/apache/2.4/ol-7/rootfs/licenses/licenses.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Bitnami containers ship with software bundles. You can find the licenses under:
-/opt/bitnami/nami/COPYING
-/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt
diff --git a/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/bitnami-templates/bitnami-ssl.conf.tpl b/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/bitnami-templates/bitnami-ssl.conf.tpl
deleted file mode 100644
index c783a0cd5069..000000000000
--- a/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/bitnami-templates/bitnami-ssl.conf.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-# Default SSL Virtual Host configuration.
-
-<IfModule !ssl_module>
-  LoadModule ssl_module modules/mod_ssl.so
-</IfModule>
-
-Listen 443
-SSLProtocol all -SSLv2 -SSLv3
-SSLHonorCipherOrder on
-SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS !EDH !RC4"
-SSLPassPhraseDialog  builtin
-SSLSessionCache "shmcb:{{APACHE_LOG_DIR}}/ssl_scache(512000)"
-SSLSessionCacheTimeout  300
-
-<VirtualHost _default_:443>
-  DocumentRoot "{{APACHE_BASE_DIR}}/htdocs"
-  SSLEngine on
-  SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt"
-  SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key"
-
-  <Directory "{{APACHE_BASE_DIR}}/htdocs">
-    Options Indexes FollowSymLinks
-    AllowOverride All
-    Require all granted
-  </Directory>
-
-  # Error Documents
-  ErrorDocument 503 /503.html
-
-</VirtualHost>
diff --git a/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/bitnami-templates/bitnami.conf.tpl b/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/bitnami-templates/bitnami.conf.tpl
deleted file mode 100644
index 1b74b53bb6d7..000000000000
--- a/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/bitnami-templates/bitnami.conf.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-# Default Virtual Host configuration.
-
-# Let apache know we're behind a SSL reverse proxy
-SetEnvIf X-Forwarded-Proto https HTTPS=on
-
-<VirtualHost _default_:80>
-  DocumentRoot "{{APACHE_BASE_DIR}}/htdocs"
-  <Directory "{{APACHE_BASE_DIR}}/htdocs">
-    Options Indexes FollowSymLinks
-    AllowOverride All
-    Require all granted
-  </Directory>
-
-  # Error Documents
-  ErrorDocument 503 /503.html
-
-</VirtualHost>
-
-Include "{{APACHE_CONF_DIR}}/bitnami/bitnami-ssl.conf"
diff --git a/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.crt b/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.crt
deleted file mode 100644
index 466bbeab9ff4..000000000000
--- a/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.crt
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICqDCCAZACCQCz8T3726LYsjANBgkqhkiG9w0BAQUFADAWMRQwEgYDVQQDDAtl
-eGFtcGxlLmNvbTAeFw0xMjExMTQxMTE4MjdaFw0yMjExMTIxMTE4MjdaMBYxFDAS
-BgNVBAMMC2V4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA5NHl5TfZtO6zugau2tp5mWIcQYJhuwKTmYeXDLYAGJpoD2SixwPL5c8glneI
-Rz1N2EQIZVeaWGbS0FLFlPdOkCkplpW9isYVC4XqKrk5b4HW4+YC+Cup0k+Kd4NM
-eZOTUvWr5N6dIpdibkVumBc/pao8VtdwywlCL/PwGRsQtkXrRICzdtRa3MXqTmEF
-foyVCGgBRtronlB9x4Plfb8Psk4GrPkjrWYgO8peKrl0O5+F+sYg7Gj95zCH73BQ
-ANzCVNrgD9fs9cyx3ru9CUdEoIxAAJwQFkjm7xr6xqhIlSgnQ7B0uOSTNRcXY6rw
-s+PxGneec/kRPRgzjC/QHY6n8QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBbyMqF
-RDsX8zX1EW5qA8AQ8Jb2XqWrVeSO8blMV3WagJ2airMm3+c/82FCwsd/cZ08UXhA
-/Kou0gi/F16tV26PiiUdp590Qao3d8H2qxc1rzzULimZPgxH4iA4vRyMHtyZN6h4
-7Fdn7O9xNMPu8siOz8rrzsEdEX5URbOMkDLCZsbTIUWVv2XmqrR0K10d5VuLWeLi
-r+4G6c6jpa244WmqT9ClqceJ12G1Wnmezy7ybiW0l5M2iuIKFEiRP5Hj0J15o1I2
-pXAbKysAdWRHsJSQOtcgO8Vh9k0wo3tKg4HDp1hbrEzoGzOv92Vjg3lG8X+hzbMJ
-MQURotHkD4Gk57wL
------END CERTIFICATE-----
diff --git a/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.key b/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.key
deleted file mode 100644
index 1904ca7090ae..000000000000
--- a/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA5NHl5TfZtO6zugau2tp5mWIcQYJhuwKTmYeXDLYAGJpoD2Si
-xwPL5c8glneIRz1N2EQIZVeaWGbS0FLFlPdOkCkplpW9isYVC4XqKrk5b4HW4+YC
-+Cup0k+Kd4NMeZOTUvWr5N6dIpdibkVumBc/pao8VtdwywlCL/PwGRsQtkXrRICz
-dtRa3MXqTmEFfoyVCGgBRtronlB9x4Plfb8Psk4GrPkjrWYgO8peKrl0O5+F+sYg
-7Gj95zCH73BQANzCVNrgD9fs9cyx3ru9CUdEoIxAAJwQFkjm7xr6xqhIlSgnQ7B0
-uOSTNRcXY6rws+PxGneec/kRPRgzjC/QHY6n8QIDAQABAoIBACo3G131tuGtpFTu
-xLW11vdYZXQklNlGuWp63IBI162yVv54B5wF9Ek6tH1uIiNaiREcRBxGVEB4/+3V
-R4SbN9Ba98RDbgu7TcipdTFaqOEMqFO1bNjSXWtip14zSBmqA2Ur1AHOnFj0awGD
-J8tBhsmOpcEz0Ch1VdO5ApPvLV8jH9wQiMI/Q6yYQMtmzTMCUMYdMqe+LOziIOzL
-oqN/WXnKL5E5TiO1bIxSpWPbT+IVn1c3/PShmvmRrLWsFUQlkwXJKMYZPO+rCCfe
-b+Q9lMLMnj+vOnM3z16WC3aiiJGCZjVTvQ+x22YrBTRPxZmHO2eZ4H/cUQM7Y/tw
-I7RjEM0CgYEA9Kxt1t8bWonzBii3P0rwyx0IECvg63k+pp4BpxpeWQKL7NVdSzk3
-AyJVcNjUoZgi2kVPdxzZGLrnZfuZ691xQB3oZF0LwBzQ4GFHkTRCB0s8ZA5lcJaI
-9pBu91bhz2VOZSTeQWpdMMURjXVyTXZInU1mwzmjVOIAYmO33shH9gcCgYEA72mX
-UoIrFPLkOTSZOb7UbjYH01vf6ThQiYCEWg7mD3CbY7n9oobIcQMzNnt7xN4wOl/V
-eKfZ7G56q8enfqm45Dyo9aCBCENVzmwO8wLe5UnvJBNL20KjvtwG8w5A6UZQzC7p
-3QS+U2zxVQNEeaE6a8Wrq2d1PlhVAHYw8odgNEcCgYBN38+58xrmrz99d1oTuAt5
-6kyVsRGOgPGS4HmQMRFUbT4R7DscZSKASd4945WRtTVqmWLYe4MRnvNlfzYXX0zb
-ZmmAAClsRP+qWuwHaEWXwrd+9SIOOqtvJrta1/lZJFpWUOy4j10H18Flb7sosnwc
-LPWHL4Iv0xriNfDg5Iga4wKBgQDLJBU59SkJBW+Q+oho7vrg6QeK15IOGbJ8eYfT
-woCC6VFwNQh5N1QsUELMH8rNKJpTba18SzAl5ThBOY9tciVnw/C5Og9CK6BLHnUw
-zWbDtxAq1BSxXsIB2EAtTBLX3MoB9myJFNVJhE7hi3w2mA8yEu+u6IIa/Ghjk+XE
-ZAnFUQKBgQDjMinRZrK5wA09jcetI+dNiLnKHoQG6OaXDDsNCatex0O2F36BvVXE
-P78qDz/i5aBMWsLx6VDvWJAkBIpZoNS5UsOn17tFaocGUSkcm48bs8Dn6VvsE8Bd
-XMPAHyKuILlKYifBvNq5T22KhqKX7yGmk/AeOOiKr2KeMnh27JYrCA==
------END RSA PRIVATE KEY-----
diff --git a/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/deflate.conf b/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/deflate.conf
deleted file mode 100644
index ca9bc1d6e4b6..000000000000
--- a/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/deflate.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<IfModule mod_deflate.c>
-  AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
-  AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript
-  AddOutputFilterByType DEFLATE application/rss+xml
-</IfModule>
diff --git a/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/vhosts/00_status-vhost.conf b/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/vhosts/00_status-vhost.conf
deleted file mode 100644
index a0b032243bd2..000000000000
--- a/bitnami/apache/2.4/ol-7/rootfs/opt/bitnami/apache/conf/vhosts/00_status-vhost.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-<VirtualHost localhost:80>
-  ServerName status.localhost
-  <Location /server-status>
-    SetHandler server-status
-  </Location>
-</VirtualHost>
diff --git a/bitnami/apache/2.4/ol-7/rootfs/postunpack.sh b/bitnami/apache/2.4/ol-7/rootfs/postunpack.sh
deleted file mode 100755
index c94f31292e43..000000000000
--- a/bitnami/apache/2.4/ol-7/rootfs/postunpack.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-
-# shellcheck disable=SC1091
-
-set -o errexit
-set -o nounset
-set -o pipefail
-# set -o xtrace # Uncomment this line for debugging purpose
-
-. /libapache.sh
-. /libfs.sh
-. /liblog.sh
-
-########################
-# Sets up the default Bitnami configuration
-# Globals:
-#   APACHE_*
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-apache_setup_bitnami_config() {
-    local -r template_dir="${APACHE_CONF_DIR}/bitnami-templates"
-
-    # Enable Apache modules
-    modules_to_enable="mod_version mod_socache_shmcb mod_negotiation mod_ssl mod_slotmem_shm mod_deflate mod_rewrite mod_proxy.* mod_status"
-    for module in $modules_to_enable; do
-        apache_enable_module "$module"
-    done
-
-    # Disable Apache modules
-    modules_to_disable="mod_proxy_hcheck mod_http2"
-    for module in $modules_to_disable; do
-        apache_disable_module "$module"
-    done
-
-    apache_enable_configuration_entry "Include conf/extra/httpd-default.conf"
-
-    # Bitnami customizations
-    render-template "${template_dir}/bitnami.conf.tpl" > "${APACHE_CONF_DIR}/bitnami/bitnami.conf"
-    render-template "${template_dir}/bitnami-ssl.conf.tpl" > "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf"
-    rm -rf "$template_dir"
-
-    cat >>"${APACHE_CONF_FILE}" <<EOF
-PidFile "${APACHE_PID_FILE}"
-TraceEnable Off
-Include ${APACHE_CONF_DIR}/deflate.conf
-IncludeOptional ${APACHE_VHOSTS_DIR}/*.conf
-Include ${APACHE_CONF_DIR}/bitnami/bitnami.conf
-EOF
-
-    # Configure the default ports since the container is non root by default
-    apache_configure_http_port "8080"
-    apache_configure_https_port "8443"
-
-    # Patch the HTTPoxy vulnerability - see: https://docs.bitnami.com/general/security/security-2016-07-18/
-    apache_patch_httpoxy_vulnerability
-
-    # Remove unneeded directories that come with the tarball
-    rm -rf "/opt/bitnami/certs" "/opt/bitnami/conf"
-}
-
-########################
-# Patches the HTTPoxy vulnerability - see: https://docs.bitnami.com/general/security/security-2016-07-18/
-# Globals:
-#   APACHE_CONF_FILE
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-apache_patch_httpoxy_vulnerability() {
-    cat >>"${APACHE_CONF_FILE}" <<EOF
-<IfModule mod_headers.c>
-  RequestHeader unset Proxy
-</IfModule>
-EOF
-}
-
-# Load Apache environment
-eval "$(apache_env)"
-
-apache_setup_bitnami_config
-
-# Ensure non-root user has write permissions on a set of directories
-for dir in "$APACHE_TMP_DIR" "$APACHE_CONF_DIR" "$APACHE_LOG_DIR" "$APACHE_VHOSTS_DIR" "$APACHE_HTACCESS_DIR" "$APACHE_HTDOCS_DIR"; do
-    ensure_dir_exists "$dir"
-    chmod -R g+rwX "$dir"
-done
-
-ln -sf "/dev/stdout" "${APACHE_LOG_DIR}/access_log"
-ln -sf "/dev/stderr" "${APACHE_LOG_DIR}/error_log"
diff --git a/bitnami/apache/2.4/ol-7/rootfs/run.sh b/bitnami/apache/2.4/ol-7/rootfs/run.sh
deleted file mode 100755
index 78850cc9079c..000000000000
--- a/bitnami/apache/2.4/ol-7/rootfs/run.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# shellcheck disable=SC1091
-
-set -o errexit
-set -o nounset
-set -o pipefail
-# set -o xtrace # Uncomment this line for debugging purpose
-
-# Load libraries
-. /libapache.sh
-. /liblog.sh
-
-# Load Apache environment
-eval "$(apache_env)"
-
-info "** Starting apache **"
-exec "${APACHE_BIN_DIR}/httpd" -f "$APACHE_CONF_FILE" -D "FOREGROUND"
diff --git a/bitnami/apache/2.4/ol-7/rootfs/setup.sh b/bitnami/apache/2.4/ol-7/rootfs/setup.sh
deleted file mode 100755
index ba149ff282aa..000000000000
--- a/bitnami/apache/2.4/ol-7/rootfs/setup.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# shellcheck disable=SC1091
-
-set -o errexit
-set -o nounset
-set -o pipefail
-# set -o xtrace # Uncomment this line for debugging purpose
-
-# Load libraries
-. /libapache.sh
-
-# Load Apache environment
-eval "$(apache_env)"
-
-# Ensure apache environment variables are valid
-apache_validate
-
-# Ensure apache is initialized
-apache_initialize