diff --git a/bitnami/apache/2.4/ol-7/Dockerfile b/bitnami/apache/2.4/ol-7/Dockerfile
index 07f3ba0dc096..76a65f422ffb 100644
--- a/bitnami/apache/2.4/ol-7/Dockerfile
+++ b/bitnami/apache/2.4/ol-7/Dockerfile
@@ -2,27 +2,30 @@ FROM bitnami/oraclelinux-extras:7-r351
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
-    BITNAMI_PKG_EXTRA_DIRS="/bitnami/apache/conf /opt/bitnami/apache/tmp /opt/bitnami/apache/conf" \
     HOME="/"
 
 # Install required system packages and dependencies
 RUN install_packages cyrus-sasl-lib expat glibc keyutils-libs krb5-libs libcom_err libnghttp2 libselinux nspr nss nss-softokn-freebl nss-util openldap openssl-libs pcre zlib
-RUN bitnami-pkg unpack apache-2.4.39-1 --checksum 7f435021b5146a191298f8c161f13582ff449e2f8a7e0d9c2c46cfb2c43171f8
-RUN ln -sf /opt/bitnami/apache/htdocs /app
+RUN bitnami-pkg unpack apache-2.4.39-2 --checksum bd13d67036ecb691256893b0ba4034364b90c05747b2afbaa3c097fb218bc2e1
 RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/access_log
 RUN ln -sf /dev/stderr /opt/bitnami/apache/logs/error_log
+RUN chmod -R g+rwX /opt/bitnami/apache/tmp /opt/bitnami/apache/conf
 
 COPY rootfs /
 ENV APACHE_HTTPS_PORT_NUMBER="8443" \
     APACHE_HTTP_PORT_NUMBER="8080" \
+    APACHE_SET_HTTPS_PORT="no" \
+    APACHE_SET_HTTP_PORT="no" \
     BITNAMI_APP_NAME="apache" \
-    BITNAMI_IMAGE_VERSION="2.4.39-ol-7-r49" \
+    BITNAMI_IMAGE_VERSION="2.4.39-ol-7-r50" \
     NAMI_PREFIX="/.nami" \
     PATH="/opt/bitnami/apache/bin:$PATH"
 
+VOLUME [ "/certs", "/app" ]
+
 EXPOSE 8080 8443
 
 WORKDIR /app
 USER 1001
 ENTRYPOINT [ "/app-entrypoint.sh" ]
-CMD [ "/run.sh" ]
+CMD [ "httpd", "-f", "/opt/bitnami/apache/conf/httpd.conf", "-DFOREGROUND" ]
diff --git a/bitnami/apache/2.4/ol-7/docker-compose.yml b/bitnami/apache/2.4/ol-7/docker-compose.yml
index 3021f156dce7..6ff0218bb7c4 100644
--- a/bitnami/apache/2.4/ol-7/docker-compose.yml
+++ b/bitnami/apache/2.4/ol-7/docker-compose.yml
@@ -6,8 +6,3 @@ services:
     ports:
       - '80:8080'
       - '443:8443'
-    volumes:
-      - 'apache_data:/bitnami'
-volumes:
-  apache_data:
-    driver: local
diff --git a/bitnami/apache/2.4/ol-7/rootfs/apache-init.sh b/bitnami/apache/2.4/ol-7/rootfs/apache-init.sh
new file mode 100644
index 000000000000..1a07308790b0
--- /dev/null
+++ b/bitnami/apache/2.4/ol-7/rootfs/apache-init.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Check whether Apache ports must be configured
+if [[ -n "${APACHE_HTTP_PORT_NUMBER:-}" ]]; then
+    export APACHE_SET_HTTP_PORT="yes"
+fi
+if [[ -n "${APACHE_HTTPS_PORT_NUMBER:-}" ]]; then
+    export APACHE_SET_HTTPS_PORT="yes"
+fi
+
+# Mount certificate files
+if [[ -d "/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 '/opt/bitnami/apache/conf/bitnami/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 [ "$(ls -A /certs 2>/dev/null)" ]; 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 [ "$(ls -A /app 2>/dev/null)" ]; then
+    info "Mounting application files from /app..."
+    rm -rf /opt/bitnami/apache/htdocs
+    ln -sf /app /opt/bitnami/apache/htdocs
+fi
diff --git a/bitnami/apache/2.4/ol-7/rootfs/apache-inputs.json b/bitnami/apache/2.4/ol-7/rootfs/apache-inputs.json
index 493f9fc7b0fa..25e01aaf4e76 100644
--- a/bitnami/apache/2.4/ol-7/rootfs/apache-inputs.json
+++ b/bitnami/apache/2.4/ol-7/rootfs/apache-inputs.json
@@ -1,4 +1,6 @@
 {
   "httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}",
-  "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}"
+  "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}",
+  "setHttpPort": "{{$global.env.APACHE_SET_HTTP_PORT}}",
+  "setHttpsPort": "{{$global.env.APACHE_SET_HTTPS_PORT}}"
 }
\ No newline at end of file
diff --git a/bitnami/apache/2.4/ol-7/rootfs/app-entrypoint.sh b/bitnami/apache/2.4/ol-7/rootfs/app-entrypoint.sh
index ac3d9c470114..82834a284e11 100755
--- a/bitnami/apache/2.4/ol-7/rootfs/app-entrypoint.sh
+++ b/bitnami/apache/2.4/ol-7/rootfs/app-entrypoint.sh
@@ -5,7 +5,8 @@
 
 print_welcome_page
 
-if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "httpd" ]]; then
+  . /apache-init.sh
   nami_initialize apache
   info "Starting apache... "
 fi
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 7a1cdf3b8a76..000000000000
--- a/bitnami/apache/2.4/ol-7/rootfs/run.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-. /opt/bitnami/base/functions
-. /opt/bitnami/base/helpers
-
-
-DAEMON=httpd
-EXEC=$(which "$DAEMON")
-
-ARGS="-f /opt/bitnami/apache/conf/httpd.conf -D FOREGROUND"
-
-info "Starting ${DAEMON}..."
-exec ${EXEC} ${ARGS}
diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md
index e5ee42a0d3fa..df375edf4c67 100644
--- a/bitnami/apache/README.md
+++ b/bitnami/apache/README.md
@@ -48,7 +48,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`2.4-rhel-7`, `2.4.39-rhel-7-r14` (2.4/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.39-rhel-7-r14/2.4/rhel-7/Dockerfile)
-* [`2.4-ol-7`, `2.4.39-ol-7-r49` (2.4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.39-ol-7-r49/2.4/ol-7/Dockerfile)
+* [`2.4-ol-7`, `2.4.39-ol-7-r50` (2.4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.39-ol-7-r50/2.4/ol-7/Dockerfile)
 * [`2.4-debian-9`, `2.4.39-debian-9-r39`, `2.4`, `2.4.39`, `2.4.39-r39`, `latest` (2.4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.39-debian-9-r39/2.4/debian-9/Dockerfile)
 
 # Get this image
@@ -132,18 +132,11 @@ version: '2'
 services:
   apache:
     image: 'bitnami/apache:latest'
-    labels:
-      kompose.service.type: nodeport
     ports:
       - '80:8081'
       - '443:8443'
     environment:
       - APACHE_HTTP_PORT_NUMBER=8081
-    volumes:
-      - 'apache_data:/bitnami'
-volumes:
-  apache_data:
-    driver: local
 ```
 
  * For manual execution add a `-e` option with each variable and value:
@@ -152,7 +145,6 @@ volumes:
 $ docker run -d --name apache -p 80:8081 -p 443:443 \
   --network apache-tier \
   --e APACHE_HTTP_PORT_NUMBER=8081 \
-  --volume /path/to/apache-persistence:/bitnami \
   bitnami/apache:latest
 ```
 
@@ -163,11 +155,11 @@ Available variables:
 
 ## Adding custom virtual hosts
 
-The default `httpd.conf` includes virtual hosts placed in `/bitnami/apache/conf/vhosts/`. You can mount a `my_vhost.conf` file containing your custom virtual hosts at this location.
+The default `httpd.conf` includes virtual hosts placed in `/opt/bitnami/apache/conf/vhosts/`. You can mount a `my_vhost.conf` file containing your custom virtual hosts at this location.
 
 For example, in order add a vhost for `www.example.com`:
 
-# Step 1: Write your `my_vhost.conf` file with the following content.
+### Step 1: Write your `my_vhost.conf` file with the following content.
 
 ```apache
 <VirtualHost *:8080>
@@ -181,11 +173,11 @@ For example, in order add a vhost for `www.example.com`:
 </VirtualHost>
 ```
 
-# Step 2: Mount the configuration as a volume.
+### Step 2: Mount the configuration as a volume.
 
 ```bash
 $ docker run --name apache \
-  -v /path/to/my_vhost.conf:/bitnami/apache/conf/vhosts/my_vhost.conf:ro \
+  -v /path/to/my_vhost.conf:/opt/bitnami/apache/conf/vhosts/my_vhost.conf:ro \
   bitnami/apache:latest
 ```
 
@@ -201,14 +193,14 @@ services:
       - '80:8080'
       - '443:8443'
     volumes:
-      - /path/to/my_vhost.conf:/bitnami/apache/conf/vhosts/my_vhost.conf:ro
+      - /path/to/my_vhost.conf:/opt/bitnami/apache/conf/vhosts/my_vhost.conf:ro
 ```
 
 ## Using custom SSL certificates
 
 *NOTE:* The steps below assume that you are using a custom domain name and that you have already configured the custom domain name to point to your server.
 
-This container comes with SSL support already pre-configured and with a dummy certificate in place (`server.crt` and `server.key` files in `/bitnami/apache/conf/bitnami/certs`). If you want to use your own certificate (`.crt`) and certificate key (`.key`) files, follow the steps below:
+This container comes with SSL support already pre-configured and with a dummy certificate in place (`server.crt` and `server.key` files in `/certs`). If you want to use your own certificate (`.crt`) and certificate key (`.key`) files, follow the steps below:
 
 ### Step 1: Prepare your certificate files
 
@@ -226,7 +218,7 @@ Run the Apache image, mounting the certificates directory from your host.
 
 ```bash
 $ docker run --name apache \
-  -v /path/to/apache-certs:/opt/bitnami/apache/certs \
+  -v /path/to/apache-certs:/certs \
   bitnami/apache:latest
 ```
 
@@ -242,20 +234,16 @@ services:
       - '80:8080'
       - '443:8443'
     volumes:
-      - /path/to/apache-certs:/opt/bitnami/apache/certs
+      - /path/to/apache-certs:/certs
 ```
 
 ## Full configuration
 
-The image looks for configurations in `/bitnami/apache/conf/`. You can mount a volume at `/bitnami` and copy/edit the configurations in the `/bitnami/apache/conf/`. The default configurations will be populated in the `conf/` directory if it's empty.
-
-### Step 1: Run the Apache image
-
-Run the Apache image, mounting a directory from your host.
+The image looks for configurations in `/opt/bitnami/apache/conf`. You can overwrite the `httpd.conf` file using your own custom configuration file.
 
 ```bash
 $ docker run --name apache \
-  -v /path/to/apache-persistence:/bitnami \
+  -v /path/to/httpd.conf:/opt/bitnami/apache/conf/httpd.conf \
   bitnami/apache:latest
 ```
 
@@ -271,29 +259,7 @@ services:
       - '80:8080'
       - '443:8443'
     volumes:
-      - /path/to/apache-persistence:/bitnami
-```
-
-### Step 2: Edit the configuration
-
-Edit the configuration on your host using your favorite editor.
-
-```bash
-$ vi /path/to/apache-persistence/apache/conf/httpd.conf
-```
-
-### Step 4: Restart Apache
-
-After changing the configuration, restart your Apache container for the changes to take effect.
-
-```bash
-$ docker restart apache
-```
-
-or using Docker Compose:
-
-```bash
-$ docker-compose restart apache
+      - /path/to/httpd.conf:/opt/bitnami/apache/conf/httpd.conf
 ```
 
 # Reverse proxy to other containers
@@ -320,6 +286,123 @@ $ docker-compose logs apache
 
 You can configure the containers [logging driver](https://docs.docker.com/engine/admin/logging/overview/) using the `--log-driver` option if you wish to consume the container logs differently. In the default configuration docker uses the `json-file` driver.
 
+# Understand the structure of this image
+
+The Bitnami Apache Docker image is built using a Dockerfile with the structure below:
+
+```Dockerfile
+FROM bitnami/minideb-extras
+...
+# Install required system packages and dependencies
+RUN install_packages xxx yyy zzz
+RUN bitnami-pkg unpack apache-aa.bb.cc-dd
+...
+COPY rootfs /
+ENV APACHE_PARAMETER="xyz" ...
+VOLUME [ "/app", "/certs" ]
+EXPOSE 8080 8443
+WORKDIR /app
+USER 1001
+ENTRYPOINT [ "/app-entrypoint.sh" ]
+CMD [ "httpd", "-f", "/opt/bitnami/apache/conf/httpd.conf", "-DFOREGROUND" ]
+```
+
+We can identify several sections within the Dockerfile:
+
+- Components installation.
+- Components static configuration.
+- Environment variables.
+- Volumes.
+- Ports to be exposed.
+- Working directory and user.
+  - Note that once the user is set to 1001, unprivileged commands cannot be executed anymore.
+- Entrypoint and command.
+  - Take into account these actions are not executed until the container is started.
+
+# Customize this image
+
+The Bitnami Apache Docker image is designed to be extended so it can be used as the base image for your custom web applications.
+
+> Note: It's recommended to read the [previous section](#understand-the-structure-of-this-image) to understand the Dockerfile structure, before extending this image.
+
+## Extend this image
+
+Before extending this image, please note there are certain configuration settings you can modify using the original image:
+
+- Settings that can be adapted using environment variables. For instance, you can change the ports used by Apache for HTTP and HTTPS, by setting the environment variables `APACHE_HTTP_PORT_NUMBER` and `APACHE_HTTPS_PORT_NUMBER` respectively.
+- [Adding custom virtual hosts](#adding-custom-virtual-hosts).
+- [Replacing the 'httpd.conf' file](#full-configuration).
+- [Using custom SSL certificates](#using-custom-ssl-certificates).
+
+If your desired customizations cannot be covered using the methods mentioned above, extend the image. To do so, create your own image using a Dockerfile with the format below:
+
+```Dockerfile
+FROM bitnami/apache
+## Put your customizations below
+...
+```
+
+In this example, we provide an extended with the following modifications:
+
+- Install `vim` editor.
+- Modify the Apache configuration file.
+- Modify the ports used by Apache.
+- Change the user that runs the container.
+
+```Dockerfile
+FROM bitnami/apache
+LABEL maintainer "Bitnami <containers@bitnami.com>"
+
+## Install 'vim'
+USER 0 # Required to perform privileged actions
+RUN install_packages vim
+USER 1001 # Revert to the original non-root user
+
+## Enable mod_ratelimit module
+RUN sed -i -r 's/#LoadModule ratelimit_module/LoadModule ratelimit_module/' /opt/bitnami/apache/conf/httpd.conf
+
+## Modify the ports used by Apache by default
+ENV APACHE_HTTP_PORT_NUMBER=8181 # It is also possible to change this environment variable at runtime
+EXPOSE 8181 8443
+
+## Modify the default container user
+USER 1002
+```
+
+Based on the extended image, you can use a Docker Compose like the one below to add other features:
+
+- Adding custom server block
+- Adding custom certificates
+- Cloning your web app and serve it trough Apache
+
+```yaml
+version: '2'
+
+services:
+  apache:
+    build: .
+    ports:
+      - '80:8181'
+      - '443:8443'
+    depends_on:
+      - cloner
+    volumes:
+      - ./config/my_vhost.conf:/opt/bitnami/apache/conf/vhosts/my_vhost.conf:ro
+      - ./certs:/certs
+      - data:/app
+  cloner:
+    image: 'bitnami/git:latest'
+    command:
+      - clone
+      - https://github.com/cloudacademy/static-website-example
+      - /app
+    volumes:
+      - data:/app
+volumes:
+  data:
+    driver: local
+```
+
 # Maintenance
 
 ## Upgrade this image
@@ -390,6 +473,13 @@ $ docker-compose up apache
 
 # Notable Changes
 
+## 2.4.39-debian-9-r40 and 2.4.39-ol-7-r50
+
+- This image has been adapted so it's easier to customize. See the [Customize this image](#customize-this-image) section for more information.
+- The Apache configuration volume (`/bitnami/apache`) has been deprecated, and support for this feature will be dropped in the near future. Until then, the container will enable the Apache configuration from that volume if it exists. By default, and if the configuration volume does not exist, the configuration files will be regenerated each time the container is created. Users wanting to apply custom Apache configuration files are advised to mount a volume for the configuration at `/opt/bitnami/apache/conf`, or mount specific configuration files individually.
+- The PHP configuration volume (`/bitnami/php`) has been deprecated, and support for this feature will be dropped in the near future. Until then, the container will enable the PHP configuration from that volume if it exists. By default, and if the configuration volume does not exist, the configuration files will be regenerated each time the container is created. Users wanting to apply custom PHP configuration files are advised to mount a volume for the configuration at `/opt/bitnami/php/conf`, or mount specific configuration files individually.
+- Enabling custom Apache certificates by placing them at `/opt/bitnami/apache/certs` has been deprecated, and support for this functionality will be dropped in the near future. Users wanting to enable custom certificates are advised to mount their certificate files on top of the preconfigured ones at `/certs`. Find an example at [Using custom SSL certificates](#using-custom-ssl-certificates).
+
 ## 2.4.34-r8
 
 - The Apache container has been migrated to a non-root user approach. Previously the container ran as the `root` user and the Apache daemon was started as the `apache` user. From now on, both the container and the Apache daemon run as user `1001`. As a consequence, the HTTP/HTTPS ports exposed by the container are now 8080/8443 instead of 80/443. You can revert this behavior by changing `USER 1001` to `USER root` in the Dockerfile.