diff --git a/bitnami/apache/2.4/Dockerfile b/bitnami/apache/2.4/Dockerfile
index da83315b368e..9814f5b6e33b 100644
--- a/bitnami/apache/2.4/Dockerfile
+++ b/bitnami/apache/2.4/Dockerfile
@@ -1,11 +1,7 @@
-FROM bitnami/minideb-extras:jessie-r14
-MAINTAINER Bitnami <containers@bitnami.com>
+FROM bitnami/minideb-extras:jessie-r16
+LABEL maintainer "Bitnami <containers@bitnami.com>"
+
 
-ENV APACHE_HTTPS_PORT="443" \
-    APACHE_HTTP_PORT="80" \
-    BITNAMI_APP_NAME="apache" \
-    BITNAMI_IMAGE_VERSION="2.4.25-r4" \
-    PATH="/opt/bitnami/apache/bin:$PATH"
 
 # Install required system packages and dependencies
 RUN install_packages libapr1 libaprutil1 libc6 libexpat1 libffi6 libgmp10 libgnutls-deb0-28 libhogweed2 libldap-2.4-2 libnettle4 libp11-kit0 libpcre3 libsasl2-2 libssl1.0.0 libtasn1-6 libuuid1 zlib1g
@@ -14,6 +10,14 @@ RUN ln -sf /opt/bitnami/apache/htdocs /app
 
 COPY rootfs /
 
+ENV APACHE_HTTPS_PORT_NUMBER="443" \
+    APACHE_HTTP_PORT_NUMBER="80" \
+    BITNAMI_APP_NAME="apache" \
+    BITNAMI_IMAGE_VERSION="2.4.25-r5" \
+    PATH="/opt/bitnami/apache/bin:$PATH"
+
+
+
 VOLUME ["/bitnami/apache"]
 
 EXPOSE 80 443
diff --git a/bitnami/apache/2.4/rootfs/apache-inputs.json b/bitnami/apache/2.4/rootfs/apache-inputs.json
index 2351b006ed67..493f9fc7b0fa 100644
--- a/bitnami/apache/2.4/rootfs/apache-inputs.json
+++ b/bitnami/apache/2.4/rootfs/apache-inputs.json
@@ -1,4 +1,4 @@
 {
-  "httpPort": "{{$global.env.APACHE_HTTP_PORT}}",
-  "httpsPort": "{{$global.env.APACHE_HTTPS_PORT}}"
+  "httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}",
+  "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}"
 }
\ No newline at end of file
diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md
index fc10b10372f4..aa4cd6eec3f3 100644
--- a/bitnami/apache/README.md
+++ b/bitnami/apache/README.md
@@ -8,7 +8,7 @@
 
 [http://httpd.apache.org/](http://httpd.apache.org/)
 
-# TL;DR
+# TL;DR;
 
 ```bash
 docker run --name apache bitnami/apache:latest
@@ -29,7 +29,7 @@ services:
 
 ## Kubernetes
 
-> **WARNING**: This is a beta configuration, currently unsupported.
+> **WARNING:** This is a beta configuration, currently unsupported.
 
 Get the raw URL pointing to the kubernetes.yml manifest and use kubectl to create the resources on your Kubernetes cluster like so:
 
diff --git a/bitnami/apache/circle.yml b/bitnami/apache/circle.yml
index b9f52becf5db..e444398c450a 100644
--- a/bitnami/apache/circle.yml
+++ b/bitnami/apache/circle.yml
@@ -5,7 +5,7 @@ machine:
     RELEASE_SERIES_LIST: 2.4
     LATEST_STABLE: 2.4
     IMAGE_NAME: apache
-    CHART_NAME: apache
+    CHART_NAME:
     CHART_REPO: https://github.com/bitnami/charts
     DOCKER_PROJECT: bitnami
     QUAY_PROJECT: bitnami