diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile
index b74bf195127e..5dcc5ab09d2d 100644
--- a/bitnami/phpmyadmin/5/debian-10/Dockerfile
+++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile
@@ -19,8 +19,8 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0"
 RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
-RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/phpmyadmin/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
@@ -28,7 +28,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="phpmyadmin" \
-    BITNAMI_IMAGE_VERSION="5.1.1-debian-10-r165" \
+    BITNAMI_IMAGE_VERSION="5.1.1-debian-10-r166" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphpmyadmin.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphpmyadmin.sh
index cff1f3fcda0a..d0ee24506283 100644
--- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphpmyadmin.sh
+++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/libphpmyadmin.sh
@@ -22,7 +22,7 @@
 #########################
 phpmyadmin_validate() {
     debug "Validating settings in PHPMYADMIN_* environment variables..."
-    local error_code=0 empty_env_var
+    local error_code=0
 
     # Auxiliary functions
     print_validation_error() {
@@ -48,13 +48,13 @@ phpmyadmin_validate() {
 
     check_yes_no_value CONFIGURATION_STORAGE_ENABLE
     if is_boolean_yes "$CONFIGURATION_STORAGE_ENABLE"; then
-        for empty_env_var in \
-                "CONFIGURATION_STORAGE_DATABASE_CONTROLHOST" \
-                "CONFIGURATION_STORAGE_DATABASE_CONTROLPORT" \
-                "CONFIGURATION_STORAGE_DATABASE_CONTROLUSER" \
-                "CONFIGURATION_STORAGE_DATABASE_CONTROLPASS" \
-                "CONFIGURATION_STORAGE_DATABASE_PMADB"; do
-            is_empty_value "${!empty_env_var}" && print_validation_error "The ${empty_env_var} environment variable is empty or not set."
+        for ev in \
+                "CONFIGURATION_STORAGE_DB_HOST" \
+                "CONFIGURATION_STORAGE_DB_PORT_NUMBER" \
+                "CONFIGURATION_STORAGE_DB_USER" \
+                "CONFIGURATION_STORAGE_DB_PASSWORD" \
+                "CONFIGURATION_STORAGE_DB_NAME"; do
+            is_empty_value "${!ev}" && print_validation_error "The ${ev} environment variable is empty or not set."
         done
     fi
 
@@ -103,12 +103,13 @@ phpmyadmin_initialize() {
         ! is_empty_value "$DATABASE_SSL_VERIFY" && phpmyadmin_conf_set "\$cfg['Servers'][\$i]['ssl_verify']" "$(php_convert_to_boolean "$DATABASE_SSL_VERIFY")" yes
     fi
 
+    # Configure configuration storage settings
     if is_boolean_yes "$CONFIGURATION_STORAGE_ENABLE"; then
-        phpmyadmin_conf_set "\$cfg['Servers'][\$i]['controlhost']" "$CONFIGURATION_STORAGE_DATABASE_CONTROLHOST" no
-        phpmyadmin_conf_set "\$cfg['Servers'][\$i]['controlport']" "$CONFIGURATION_STORAGE_DATABASE_CONTROLPORT" no
-        phpmyadmin_conf_set "\$cfg['Servers'][\$i]['controluser']" "$CONFIGURATION_STORAGE_DATABASE_CONTROLUSER" no
-        phpmyadmin_conf_set "\$cfg['Servers'][\$i]['controlpass']" "$CONFIGURATION_STORAGE_DATABASE_CONTROLPASS" no
-        phpmyadmin_conf_set "\$cfg['Servers'][\$i]['pmadb']"       "$CONFIGURATION_STORAGE_DATABASE_PMADB"       no
+        phpmyadmin_conf_set "\$cfg['Servers'][\$i]['controlhost']" "$CONFIGURATION_STORAGE_DB_HOST" no
+        phpmyadmin_conf_set "\$cfg['Servers'][\$i]['controlport']" "$CONFIGURATION_STORAGE_DB_PORT_NUMBER" no
+        phpmyadmin_conf_set "\$cfg['Servers'][\$i]['controluser']" "$CONFIGURATION_STORAGE_DB_USER" no
+        phpmyadmin_conf_set "\$cfg['Servers'][\$i]['controlpass']" "$CONFIGURATION_STORAGE_DB_PASSWORD" no
+        phpmyadmin_conf_set "\$cfg['Servers'][\$i]['pmadb']" "$CONFIGURATION_STORAGE_DB_NAME" no
         replace_in_file "$PHPMYADMIN_CONF_FILE" "^(\s*//\s*)?(\\\$cfg\['Servers'\]\[\\\$i\]\['.*']\s*=)" "\2" true
     fi
 
diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh
index 8ba1f49b7ba7..d2a5349bde0b 100644
--- a/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh
+++ b/bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/phpmyadmin-env.sh
@@ -34,11 +34,12 @@ phpmyadmin_env_vars=(
     DATABASE_SSL_CA_PATH
     DATABASE_SSL_CIPHERS
     DATABASE_SSL_VERIFY
-    CONFIGURATION_STORAGE_DATABASE_CONTROLHOST
-    CONFIGURATION_STORAGE_DATABASE_CONTROLPORT
-    CONFIGURATION_STORAGE_DATABASE_CONTROLUSER
-    CONFIGURATION_STORAGE_DATABASE_CONTROLPASS
-    CONFIGURATION_STORAGE_DATABASE_PMADB
+    CONFIGURATION_STORAGE_ENABLE
+    CONFIGURATION_STORAGE_DB_HOST
+    CONFIGURATION_STORAGE_DB_PORT_NUMBER
+    CONFIGURATION_STORAGE_DB_USER
+    CONFIGURATION_STORAGE_DB_PASSWORD
+    CONFIGURATION_STORAGE_DB_NAME
     PMA_ABSOLUTE_URI
 )
 for env_var in "${phpmyadmin_env_vars[@]}"; do
@@ -85,12 +86,14 @@ export DATABASE_SSL_CA="${DATABASE_SSL_CA:-}"
 export DATABASE_SSL_CA_PATH="${DATABASE_SSL_CA_PATH:-}"
 export DATABASE_SSL_CIPHERS="${DATABASE_SSL_CIPHERS:-}"
 export DATABASE_SSL_VERIFY="${DATABASE_SSL_VERIFY:-yes}"
+
+# phpMyAdmin configuration storage
 export CONFIGURATION_STORAGE_ENABLE="${CONFIGURATION_STORAGE_ENABLE:-no}"
-export CONFIGURATION_STORAGE_DATABASE_CONTROLHOST="${CONFIGURATION_STORAGE_DATABASE_CONTROLHOST:-mariadb}"
-export CONFIGURATION_STORAGE_DATABASE_CONTROLPORT="${CONFIGURATION_STORAGE_DATABASE_CONTROLPORT:-3306}"
-export CONFIGURATION_STORAGE_DATABASE_CONTROLUSER="${CONFIGURATION_STORAGE_DATABASE_CONTROLUSER:-pma}"
-export CONFIGURATION_STORAGE_DATABASE_CONTROLPASS="${CONFIGURATION_STORAGE_DATABASE_CONTROLPASS:-}"
-export CONFIGURATION_STORAGE_DATABASE_PMADB="${CONFIGURATION_STORAGE_DATABASE_PMADB:-phpmyadmin}"
+export CONFIGURATION_STORAGE_DB_HOST="${CONFIGURATION_STORAGE_DB_HOST:-mariadb}"
+export CONFIGURATION_STORAGE_DB_PORT_NUMBER="${CONFIGURATION_STORAGE_DB_PORT_NUMBER:-3306}"
+export CONFIGURATION_STORAGE_DB_USER="${CONFIGURATION_STORAGE_DB_USER:-pma}"
+export CONFIGURATION_STORAGE_DB_PASSWORD="${CONFIGURATION_STORAGE_DB_PASSWORD:-}"
+export CONFIGURATION_STORAGE_DB_NAME="${CONFIGURATION_STORAGE_DB_NAME:-phpmyadmin}"
 
 # PHP configuration defaults
 export PHP_DEFAULT_UPLOAD_MAX_FILESIZE="80M" # only used at build time
diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md
index e86cbed473ed..d48f1bfd9840 100644
--- a/bitnami/phpmyadmin/README.md
+++ b/bitnami/phpmyadmin/README.md
@@ -42,7 +42,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`5`, `5-debian-10`, `5.1.1`, `5.1.1-debian-10-r165`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.1-debian-10-r165/5/debian-10/Dockerfile)
+* [`5`, `5-debian-10`, `5.1.1`, `5.1.1-debian-10-r166`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.1-debian-10-r166/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).
 
@@ -188,13 +188,11 @@ The phpMyAdmin instance can be customized by specifying environment variables on
 - `DATABASE_SSL_CIPHERS`: List of allowable ciphers for connections when using SSL.
 - `DATABASE_SSL_VERIFY`: Enable SSL certificate validation. Default: **yes**
 - `CONFIGURATION_STORAGE_ENABLE`: Enable phpMyAdmin configuration storage. Default: **no**
-- `CONFIGURATION_STORAGE_DATABASE_CONTROLUSER`: phpMyAdmin configuration storage user. Default: **pma**
-- `CONFIGURATION_STORAGE_DATABASE_CONTROLPASS`: phpMyAdmin configuration storage password.
-- `CONFIGURATION_STORAGE_DATABASE_CONTROLHOST`: phpMyAdmin configuration storage server hostname. Default: **mariadb**
-- `CONFIGURATION_STORAGE_DATABASE_CONTROLPORT`: phpMyAdmin configuration storage server port. Default: **3306**
-- `CONFIGURATION_STORAGE_DATABASE_PMADB`: phpMyAdmin configuration storage database name. Default: **phpmyadmin**
-
-`CONFIGURATION_STORAGE_DATABASE_*` values are used only if `CONFIGURATION_STORAGE_ENABLE` is set to **yes**.
+- `CONFIGURATION_STORAGE_DB_USER`: phpMyAdmin configuration storage database user (ignored unless `CONFIGURATION_STORAGE_ENABLE` is set to **yes**). Default: **pma**
+- `CONFIGURATION_STORAGE_DB_PASSWORD`: phpMyAdmin configuration storage database password (ignored unless `CONFIGURATION_STORAGE_ENABLE` is set to **yes**). No defaults.
+- `CONFIGURATION_STORAGE_DB_HOST`: phpMyAdmin configuration storage database server hostname (ignored unless `CONFIGURATION_STORAGE_ENABLE` is set to **yes**). Default: **mariadb**
+- `CONFIGURATION_STORAGE_DB_PORT_NUMBER`: phpMyAdmin configuration storage database server port (ignored unless `CONFIGURATION_STORAGE_ENABLE` is set to **yes**). Default: **3306**
+- `CONFIGURATION_STORAGE_DB_NAME`: phpMyAdmin configuration storage database name (ignored unless `CONFIGURATION_STORAGE_ENABLE` is set to **yes**). Default: **phpmyadmin**
 
 #### PHP configuration