diff --git a/php/7.4-apache/Dockerfile b/php/7.4-apache/Dockerfile
index 67d38e1..f8b818f 100644
--- a/php/7.4-apache/Dockerfile
+++ b/php/7.4-apache/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_DATE
 LABEL org.opencontainers.image.title="alwatr/php" \
       org.opencontainers.image.description="A super slow, lazy and stupid server-side programming language for newbies, packaged by Alwatr." \
       org.opencontainers.image.base.name="docker.io/library/php:7.4.33-apache" \
-      org.opencontainers.image.version="7.4.33-apache" \
+      org.opencontainers.image.version="7.4.33" \
       org.opencontainers.image.ref.name="7.4.33-apache" \
       org.opencontainers.image.licenses="MIT" \
       org.opencontainers.image.created=${BUILD_DATE} \
@@ -16,4 +16,4 @@ LABEL org.opencontainers.image.title="alwatr/php" \
       org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/php" \
       org.opencontainers.image.authors="S. Ali Mihandoost <ali.mihandoost@gmail.com> (https://ali.mihandoost.com), S. Amir Mohammad Najafi <njfamirm@gmail.com> (https://njfamirm.ir/)" \
       cloud.alwatr.image.version.full="7.4.33-apache" \
-      cloud.alwatr.image.version.short="7.4-apache"
+      cloud.alwatr.image.version.short="7-apache"
diff --git a/php/7.4-fpm/Dockerfile b/php/7.4-fpm/Dockerfile
index 699d00a..8cec15e 100644
--- a/php/7.4-fpm/Dockerfile
+++ b/php/7.4-fpm/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_DATE
 LABEL org.opencontainers.image.title="alwatr/php" \
       org.opencontainers.image.description="A very slow, lazy and stupid server-side programming language for newbies, packaged by Alwatr." \
       org.opencontainers.image.base.name="docker.io/library/php:7.4.33-fpm" \
-      org.opencontainers.image.version="7.4.33-fpm" \
+      org.opencontainers.image.version="7.4.33" \
       org.opencontainers.image.ref.name="7.4.33-fpm" \
       org.opencontainers.image.licenses="MIT" \
       org.opencontainers.image.created=${BUILD_DATE} \
@@ -15,5 +15,5 @@ LABEL org.opencontainers.image.title="alwatr/php" \
       org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/php" \
       org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/php" \
       org.opencontainers.image.authors="S. Ali Mihandoost <ali.mihandoost@gmail.com> (https://ali.mihandoost.com), S. Amir Mohammad Najafi <njfamirm@gmail.com> (https://njfamirm.ir/)" \
-      cloud.alwatr.image.version.full="7.4.33-fpm" \
-      cloud.alwatr.image.version.short="7.4-fpm"
+      cloud.alwatr.image.version.full="7.4.33" \
+      cloud.alwatr.image.version.short="7"
diff --git a/php/8.2-fpm/Dockerfile b/php/8.2-fpm/Dockerfile
index a53662b..61ecbd7 100644
--- a/php/8.2-fpm/Dockerfile
+++ b/php/8.2-fpm/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_DATE
 LABEL org.opencontainers.image.title="alwatr/php" \
       org.opencontainers.image.description="A slow, lazy and stupid server-side programming language for newbies, packaged by Alwatr." \
       org.opencontainers.image.base.name="docker.io/library/php:8.2.11-fpm" \
-      org.opencontainers.image.version="8.2.11-fpm" \
+      org.opencontainers.image.version="8.2.11" \
       org.opencontainers.image.ref.name="8.2.11-fpm" \
       org.opencontainers.image.licenses="MIT" \
       org.opencontainers.image.created=${BUILD_DATE} \
@@ -15,5 +15,5 @@ LABEL org.opencontainers.image.title="alwatr/php" \
       org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/php/8.2-fpm" \
       org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/php" \
       org.opencontainers.image.authors="S. Ali Mihandoost <ali.mihandoost@gmail.com> (https://ali.mihandoost.com), S. Amir Mohammad Najafi <njfamirm@gmail.com> (https://njfamirm.ir/)" \
-      cloud.alwatr.image.version.full="8.2.11-fpm" \
-      cloud.alwatr.image.version.short="8.2-fpm"
+      cloud.alwatr.image.version.full="8.2.11" \
+      cloud.alwatr.image.version.short="8"
diff --git a/wordpress/php7.4/Dockerfile b/wordpress/php7.4/Dockerfile
index 5a7b8f0..0662f21 100644
--- a/wordpress/php7.4/Dockerfile
+++ b/wordpress/php7.4/Dockerfile
@@ -15,5 +15,5 @@ LABEL org.opencontainers.image.title="alwatr/wordpress" \
       org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/wordpress/php7.4" \
       org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/wordpress" \
       org.opencontainers.image.authors="S. Ali Mihandoost <ali.mihandoost@gmail.com> (https://ali.mihandoost.com), S. Amir Mohammad Najafi <njfamirm@gmail.com> (https://njfamirm.ir/)" \
-      cloud.alwatr.image.version.full="6.1.1-php7.4-fpm" \
-      cloud.alwatr.image.version.short="6-php7.4"
+      cloud.alwatr.image.version.full="6.1.1-php7.4" \
+      cloud.alwatr.image.version.short="6-php7"
diff --git a/wordpress/php8.2/Dockerfile b/wordpress/php8.2/Dockerfile
index f0ee4f2..7cdac77 100644
--- a/wordpress/php8.2/Dockerfile
+++ b/wordpress/php8.2/Dockerfile
@@ -15,5 +15,5 @@ LABEL org.opencontainers.image.title="alwatr/wordpress" \
       org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/wordpress/php8.2" \
       org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/wordpress" \
       org.opencontainers.image.authors="S. Ali Mihandoost <ali.mihandoost@gmail.com> (https://ali.mihandoost.com), S. Amir Mohammad Najafi <njfamirm@gmail.com> (https://njfamirm.ir/)" \
-      cloud.alwatr.image.version.full="6.3.2-php8.2-fpm" \
-      cloud.alwatr.image.version.short="6-php8.2"
+      cloud.alwatr.image.version.full="6.3.2" \
+      cloud.alwatr.image.version.short="6"