diff --git a/Dockerfile.hbs b/Dockerfile.hbs
index bbf0c359f..1c9ebe54f 100644
--- a/Dockerfile.hbs
+++ b/Dockerfile.hbs
@@ -1,8 +1,9 @@
 FROM quay.io/alexcheng1982/apache2-php7:{{phpVersion}}
 
 LABEL maintainer="alexcheng1982@gmail.com"
-LABEL version="{{magento2Version}}"
-LABEL description="Magento {{magento2Version}}"
+LABEL php_version="{{phpVersion}}"
+LABEL magento_version="{{magento2Version}}"
+LABEL description="Magento {{magento2Version}} with PHP {{phpVersion}}"
 
 ENV MAGENTO_VERSION {{magento2Version}}
 ENV INSTALL_DIR /var/www/html
diff --git a/developer/Dockerfile b/developer/Dockerfile
index 74f6e287d..807f9e8a5 100644
--- a/developer/Dockerfile
+++ b/developer/Dockerfile
@@ -1,8 +1,9 @@
 FROM quay.io/alexcheng1982/apache2-php7:7.1.24
 
 LABEL maintainer="alexcheng1982@gmail.com"
-LABEL version="2.2.6"
-LABEL description="Magento 2.2.6"
+LABEL php_version="7.1.24"
+LABEL magento_version="2.2.6"
+LABEL description="Magento 2.2.6 with PHP 7.1.24"
 
 ENV MAGENTO_VERSION 2.2.6
 ENV INSTALL_DIR /var/www/html
diff --git a/integrator/Dockerfile b/integrator/Dockerfile
index 062cebd21..da8b9ad6c 100644
--- a/integrator/Dockerfile
+++ b/integrator/Dockerfile
@@ -1,8 +1,9 @@
 FROM quay.io/alexcheng1982/apache2-php7:7.1.24
 
 LABEL maintainer="alexcheng1982@gmail.com"
-LABEL version="2.2.6"
-LABEL description="Magento 2.2.6"
+LABEL php_version="7.1.24"
+LABEL magento_version="2.2.6"
+LABEL description="Magento 2.2.6 with PHP 7.1.24"
 
 ENV MAGENTO_VERSION 2.2.6
 ENV INSTALL_DIR /var/www/html