diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 17adff38..4faa38c5 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -40,12 +40,12 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
-ENV PMA_SSL_DIR /etc/phpmyadmin/ssl
-ENV MAX_EXECUTION_TIME 600
-ENV MEMORY_LIMIT 512M
-ENV UPLOAD_LIMIT 2048K
-ENV TZ UTC
-ENV SESSION_SAVE_PATH /sessions
+ENV PMA_SSL_DIR=/etc/phpmyadmin/ssl
+ENV MAX_EXECUTION_TIME=600
+ENV MEMORY_LIMIT=512M
+ENV UPLOAD_LIMIT=2048K
+ENV TZ=UTC
+ENV SESSION_SAVE_PATH=/sessions
 RUN set -ex; \
     mkdir $SESSION_SAVE_PATH; \
     mkdir -p $PMA_SSL_DIR; \
@@ -82,9 +82,9 @@ RUN set -ex; \
 USER www-data:www-data
 
 # Calculate download URL
-ENV VERSION %%VERSION%%
-ENV SHA256 %%SHA256%%
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ENV VERSION=%%VERSION%%
+ENV SHA256=%%SHA256%%
+ENV URL=https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
 
 LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
     org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 45a936b1..1ba69c1d 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -55,12 +55,12 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
-ENV PMA_SSL_DIR /etc/phpmyadmin/ssl
-ENV MAX_EXECUTION_TIME 600
-ENV MEMORY_LIMIT 512M
-ENV UPLOAD_LIMIT 2048K
-ENV TZ UTC
-ENV SESSION_SAVE_PATH /sessions
+ENV PMA_SSL_DIR=/etc/phpmyadmin/ssl
+ENV MAX_EXECUTION_TIME=600
+ENV MEMORY_LIMIT=512M
+ENV UPLOAD_LIMIT=2048K
+ENV TZ=UTC
+ENV SESSION_SAVE_PATH=/sessions
 RUN set -ex; \
     mkdir $SESSION_SAVE_PATH; \
     mkdir -p $PMA_SSL_DIR; \
@@ -97,9 +97,9 @@ RUN set -ex; \
 USER www-data:www-data
 
 # Calculate download URL
-ENV VERSION %%VERSION%%
-ENV SHA256 %%SHA256%%
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ENV VERSION=%%VERSION%%
+ENV SHA256=%%SHA256%%
+ENV URL=https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
 
 LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
     org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
diff --git a/apache/Dockerfile b/apache/Dockerfile
index a9da31ac..80152759 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -56,12 +56,12 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
-ENV PMA_SSL_DIR /etc/phpmyadmin/ssl
-ENV MAX_EXECUTION_TIME 600
-ENV MEMORY_LIMIT 512M
-ENV UPLOAD_LIMIT 2048K
-ENV TZ UTC
-ENV SESSION_SAVE_PATH /sessions
+ENV PMA_SSL_DIR=/etc/phpmyadmin/ssl
+ENV MAX_EXECUTION_TIME=600
+ENV MEMORY_LIMIT=512M
+ENV UPLOAD_LIMIT=2048K
+ENV TZ=UTC
+ENV SESSION_SAVE_PATH=/sessions
 RUN set -ex; \
     mkdir $SESSION_SAVE_PATH; \
     mkdir -p $PMA_SSL_DIR; \
@@ -98,9 +98,9 @@ RUN set -ex; \
 USER www-data:www-data
 
 # Calculate download URL
-ENV VERSION 5.2.2
-ENV SHA256 f881819a3b11e653b0212afaf0cc105db85c767715cb3f5852670f7fc36c9669
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ENV VERSION=5.2.2
+ENV SHA256=f881819a3b11e653b0212afaf0cc105db85c767715cb3f5852670f7fc36c9669
+ENV URL=https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
 
 LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
     org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index 6d3d2894..07b36739 100644
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -41,12 +41,12 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
-ENV PMA_SSL_DIR /etc/phpmyadmin/ssl
-ENV MAX_EXECUTION_TIME 600
-ENV MEMORY_LIMIT 512M
-ENV UPLOAD_LIMIT 2048K
-ENV TZ UTC
-ENV SESSION_SAVE_PATH /sessions
+ENV PMA_SSL_DIR=/etc/phpmyadmin/ssl
+ENV MAX_EXECUTION_TIME=600
+ENV MEMORY_LIMIT=512M
+ENV UPLOAD_LIMIT=2048K
+ENV TZ=UTC
+ENV SESSION_SAVE_PATH=/sessions
 RUN set -ex; \
     mkdir $SESSION_SAVE_PATH; \
     mkdir -p $PMA_SSL_DIR; \
@@ -83,9 +83,9 @@ RUN set -ex; \
 USER www-data:www-data
 
 # Calculate download URL
-ENV VERSION 5.2.2
-ENV SHA256 f881819a3b11e653b0212afaf0cc105db85c767715cb3f5852670f7fc36c9669
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ENV VERSION=5.2.2
+ENV SHA256=f881819a3b11e653b0212afaf0cc105db85c767715cb3f5852670f7fc36c9669
+ENV URL=https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
 
 LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
     org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index b1c02004..8609056d 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -53,12 +53,12 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
-ENV PMA_SSL_DIR /etc/phpmyadmin/ssl
-ENV MAX_EXECUTION_TIME 600
-ENV MEMORY_LIMIT 512M
-ENV UPLOAD_LIMIT 2048K
-ENV TZ UTC
-ENV SESSION_SAVE_PATH /sessions
+ENV PMA_SSL_DIR=/etc/phpmyadmin/ssl
+ENV MAX_EXECUTION_TIME=600
+ENV MEMORY_LIMIT=512M
+ENV UPLOAD_LIMIT=2048K
+ENV TZ=UTC
+ENV SESSION_SAVE_PATH=/sessions
 RUN set -ex; \
     mkdir $SESSION_SAVE_PATH; \
     mkdir -p $PMA_SSL_DIR; \
@@ -95,9 +95,9 @@ RUN set -ex; \
 USER www-data:www-data
 
 # Calculate download URL
-ENV VERSION 5.2.2
-ENV SHA256 f881819a3b11e653b0212afaf0cc105db85c767715cb3f5852670f7fc36c9669
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ENV VERSION=5.2.2
+ENV SHA256=f881819a3b11e653b0212afaf0cc105db85c767715cb3f5852670f7fc36c9669
+ENV URL=https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
 
 LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
     org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \