diff --git a/10.11/Dockerfile.c10s b/10.11/Dockerfile.c10s
index 291a2f4..70a1eb7 100644
--- a/10.11/Dockerfile.c10s
+++ b/10.11/Dockerfile.c10s
@@ -10,9 +10,11 @@ FROM quay.io/sclorg/s2i-core-c10s:c10s
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=10.11 \
-    MYSQL_SHORT_VERSION=1011 \
-    VERSION="${MYSQL_VERSION}" \
+    MYSQL_SHORT_VERSION=1011
+
+ENV VERSION="${MYSQL_VERSION}" \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \
     NAME=mariadb \
diff --git a/10.11/Dockerfile.c9s b/10.11/Dockerfile.c9s
index a0319ff..d37bad0 100644
--- a/10.11/Dockerfile.c9s
+++ b/10.11/Dockerfile.c9s
@@ -10,9 +10,11 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=10.11 \
-    MYSQL_SHORT_VERSION=1011 \
-    VERSION="${MYSQL_VERSION}" \
+    MYSQL_SHORT_VERSION=1011  
+
+ENV VERSION="${MYSQL_VERSION}" \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \
     NAME=mariadb \
diff --git a/10.11/Dockerfile.fedora b/10.11/Dockerfile.fedora
index ef2eebf..ff81752 100644
--- a/10.11/Dockerfile.fedora
+++ b/10.11/Dockerfile.fedora
@@ -10,9 +10,11 @@ FROM quay.io/fedora/s2i-core:42
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=10.11 \
-    MYSQL_SHORT_VERSION=1011 \
-    VERSION="${MYSQL_VERSION}" \
+    MYSQL_SHORT_VERSION=1011  
+
+ENV VERSION="${MYSQL_VERSION}" \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \
     NAME=mariadb \
diff --git a/10.11/Dockerfile.rhel10 b/10.11/Dockerfile.rhel10
index 9dfcf5f..a20125a 100644
--- a/10.11/Dockerfile.rhel10
+++ b/10.11/Dockerfile.rhel10
@@ -10,13 +10,14 @@ FROM ubi10/s2i-core
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=10.11 \
-    MYSQL_SHORT_VERSION=1011 \
-    VERSION="${MYSQL_VERSION}" \
+    MYSQL_SHORT_VERSION=1011  
+
+ENV VERSION="${MYSQL_VERSION}" \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \
     NAME=mariadb \
-    VERSION=${MYSQL_VERSION} \
     SUMMARY="MariaDB ${MYSQL_VERSION} SQL database server" \
     DESCRIPTION="MariaDB is a multi-user, multi-threaded SQL database server. The container \
 image provides a containerized packaging of the MariaDB mysqld daemon and client application. \
diff --git a/10.11/Dockerfile.rhel9 b/10.11/Dockerfile.rhel9
index 1024524..62dc134 100644
--- a/10.11/Dockerfile.rhel9
+++ b/10.11/Dockerfile.rhel9
@@ -10,9 +10,11 @@ FROM ubi9/s2i-core
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=10.11 \
-    MYSQL_SHORT_VERSION=1011 \
-    VERSION="${MYSQL_VERSION}" \
+    MYSQL_SHORT_VERSION=1011  
+
+ENV VERSION="${MYSQL_VERSION}" \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \
     NAME=mariadb \
diff --git a/10.5/Dockerfile.c9s b/10.5/Dockerfile.c9s
index 61b6081..27226bc 100644
--- a/10.5/Dockerfile.c9s
+++ b/10.5/Dockerfile.c9s
@@ -10,9 +10,11 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=10.5 \
-    MYSQL_SHORT_VERSION=105 \
-    VERSION="${MYSQL_VERSION}" \
+    MYSQL_SHORT_VERSION=105  
+
+ENV VERSION="${MYSQL_VERSION}" \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \
     NAME=mariadb \
diff --git a/10.5/Dockerfile.rhel9 b/10.5/Dockerfile.rhel9
index 6d5ebd6..557167a 100644
--- a/10.5/Dockerfile.rhel9
+++ b/10.5/Dockerfile.rhel9
@@ -10,9 +10,11 @@ FROM ubi9/s2i-core
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=10.5 \
-    MYSQL_SHORT_VERSION=105 \
-    VERSION="${MYSQL_VERSION}" \
+    MYSQL_SHORT_VERSION=105 
+
+ENV VERSION="${MYSQL_VERSION}" \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \
     NAME=mariadb \