diff --git a/bitnami/phpmyadmin/4/.dockerignore b/bitnami/phpmyadmin/4/.dockerignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/bitnami/phpmyadmin/4/Dockerfile b/bitnami/phpmyadmin/4/Dockerfile
index bc04fb66fe62..18ffab1c3a3c 100644
--- a/bitnami/phpmyadmin/4/Dockerfile
+++ b/bitnami/phpmyadmin/4/Dockerfile
@@ -1,34 +1,29 @@
-FROM bitnami/minideb-extras:jessie-r13
+FROM bitnami/minideb-extras:jessie-r15
+LABEL maintainer "Bitnami <containers@bitnami.com>"
 
-MAINTAINER Bitnami <containers@bitnami.com>
-
-ENV BITNAMI_APP_NAME=phpmyadmin \
-    BITNAMI_IMAGE_VERSION=4.6.6-r2 \
-    PATH=/opt/bitnami/php/bin:$PATH
-
-# System packages required
-RUN install_packages libssl1.0.0 libaprutil1 libapr1 libc6 libuuid1 libexpat1 libpcre3 libldap-2.4-2 libsasl2-2 libgnutls-deb0-28 zlib1g libp11-kit0 libtasn1-6 libnettle4 libhogweed2 libgmp10 libffi6 libxslt1.1 libtidy-0.99-0 libreadline6 libncurses5 libtinfo5 libsybdb5 libmcrypt4 libstdc++6 libpng12-0 libjpeg62-turbo libbz2-1.0 libxml2 libcurl3 libfreetype6 libicu52 libgcc1 libgcrypt20 libgssapi-krb5-2 liblzma5 libidn11 librtmp1 libssh2-1 libkrb5-3 libk5crypto3 libcomerr2 libgpg-error0 libkrb5support0 libkeyutils1
-
-# Additional modules required
+# Install required system packages and dependencies
+RUN install_packages libapr1 libaprutil1 libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls-deb0-28 libgpg-error0 libgssapi-krb5-2 libhogweed2 libicu52 libidn11 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libncurses5 libnettle4 libp11-kit0 libpcre3 libpng12-0 libpq5 libreadline6 librtmp1 libsasl2-2 libssh2-1 libssl1.0.0 libstdc++6 libsybdb5 libtasn1-6 libtidy-0.99-0 libtinfo5 libuuid1 libxml2 libxslt1.1 zlib1g
 RUN bitnami-pkg unpack apache-2.4.25-0 --checksum 8b46af7d737772d7d301da8b30a2770b7e549674e33b8a5b07480f53c39f5c3f
-RUN bitnami-pkg install libphp-5.6.30-0 --checksum b9689caaab61862444c97756b1a9bf575731c4d0e71aa962d58518a231b33155
-RUN bitnami-pkg unpack php-5.6.30-1 --checksum 96835743d668832c0b8464711587e5339969a96cafa1b319ca058697efd2857c
-
-# Install phpmyadmin
-RUN bitnami-pkg unpack phpmyadmin-4.6.6-0 --checksum 66fa6e4367448b7256b8f86900217c914116d42cd6fd5452a3a60aa66c978fc1
+RUN bitnami-pkg unpack php-5.6.30-3 --checksum af6c238825d4394fc6352c5ad48c1e6423e21520df927097dab592f0d4ad4662
+RUN bitnami-pkg install libphp-5.6.30-1 --checksum a62cad2320fa2d141309e75663aed3d1bd82626d51b784678d18ec3f985d83bf
+RUN bitnami-pkg unpack phpmyadmin-4.7.0-1 --checksum 64d5643e56167d919c5206f11be00d74311fd1a629aa4f07224f808d2fb47638
 
 COPY rootfs /
 
-ENV APACHE_HTTP_PORT="80" \
-    APACHE_HTTPS_PORT="443" \
-    REQUIRE_LOCAL="0" \
+ENV APACHE_HTTPS_PORT="443" \
+    APACHE_HTTP_PORT="80" \
+    BITNAMI_APP_NAME="phpmyadmin" \
+    BITNAMI_IMAGE_VERSION="4.7.0-r0" \
     DATABASE_HOST="mariadb" \
-    DATABASE_PORT="3306"
+    DATABASE_PORT="3306" \
+    PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:$PATH" \
+    PHPMYADMIN_ALLOW_ARBITRARY_SERVER="" \
+    PHPMYADMIN_ALLOW_NO_PASSWORD="true" \
+    REQUIRE_LOCAL="0"
 
-VOLUME ["/bitnami/apache", "/bitnami/php", "/bitnami/phpmyadmin"]
+VOLUME ["/bitnami/apache","/bitnami/php","/bitnami/phpmyadmin"]
 
 EXPOSE 80 443
 
 ENTRYPOINT ["/app-entrypoint.sh"]
-
 CMD ["nami","start","--foreground","apache"]
diff --git a/bitnami/phpmyadmin/4/rootfs/app-entrypoint.sh b/bitnami/phpmyadmin/4/rootfs/app-entrypoint.sh
index cad4ab949596..fe1b44e82b2a 100755
--- a/bitnami/phpmyadmin/4/rootfs/app-entrypoint.sh
+++ b/bitnami/phpmyadmin/4/rootfs/app-entrypoint.sh
@@ -1,4 +1,5 @@
 #!/bin/bash -e
+
 . /opt/bitnami/base/functions
 . /opt/bitnami/base/helpers
 
@@ -7,7 +8,7 @@ check_for_updates &
 
 if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
   nami_initialize apache php phpmyadmin
-  info "Starting phpmyadmin..."
+  info "Starting phpmyadmin... "
 fi
 
 exec tini -- "$@"
diff --git a/bitnami/phpmyadmin/4/rootfs/phpmyadmin-inputs.json b/bitnami/phpmyadmin/4/rootfs/phpmyadmin-inputs.json
index 6f65a23ee7db..9d354646b87a 100644
--- a/bitnami/phpmyadmin/4/rootfs/phpmyadmin-inputs.json
+++ b/bitnami/phpmyadmin/4/rootfs/phpmyadmin-inputs.json
@@ -1,7 +1,7 @@
 {
-  "requireLocal": "{{$global.env.REQUIRE_LOCAL}}",
+  "allowArbitraryServer": "{{$global.env.PHPMYADMIN_ALLOW_ARBITRARY_SERVER}}",
+  "allowNoPassword": "{{$global.env.PHPMYADMIN_ALLOW_NO_PASSWORD}}",
   "databaseServerHost": "{{$global.env.DATABASE_HOST}}",
   "databaseServerPort": "{{$global.env.DATABASE_PORT}}",
-  "allowArbitraryServer": "{{$global.env.PHPMYADMIN_ALLOW_ARBITRARY_SERVER}}",
-  "allowNoPassword": "{{$global.env.PHPMYADMIN_ALLOW_NO_PASSWORD}}"
+  "requireLocal": "{{$global.env.REQUIRE_LOCAL}}"
 }
\ No newline at end of file
diff --git a/bitnami/phpmyadmin/circle.yml b/bitnami/phpmyadmin/circle.yml
index bac293db56ca..beebe579b643 100644
--- a/bitnami/phpmyadmin/circle.yml
+++ b/bitnami/phpmyadmin/circle.yml
@@ -5,6 +5,8 @@ machine:
     RELEASE_SERIES_LIST: 4
     LATEST_STABLE: 4
     IMAGE_NAME: phpmyadmin
+    CHART_NAME:
+    CHART_REPO:
     DOCKER_PROJECT: bitnami
     QUAY_PROJECT: bitnami
     GCLOUD_PROJECT: bitnami-containers