diff --git a/.env b/.env
new file mode 100644
index 0000000..a5fe5e6
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+COMPOSER_VERSION=2.6.4
diff --git a/Makefile b/Makefile
index 2b986bc..8bf72ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,20 @@
+#!make
+include .env
+
 build-72:
-	cd ./v7.2 && docker build --tag=php-for-dev:7.2 `pwd`
+	cd ./v7.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:7.2 `pwd`
 
 build-73:
-	cd ./v7.3 && docker build --tag=php-for-dev:7.3 `pwd`
+	cd ./v7.3 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:7.3 `pwd`
 
 build-74:
-	cd ./v7.4 && docker build --tag=php-for-dev:7.4 `pwd`
+	cd ./v7.4 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:7.4 `pwd`
 
 build-80:
-	cd ./v8.0 && docker build --tag=php-for-dev:8.0 `pwd`
+	cd ./v8.0 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:8.0 `pwd`
 
 build-81:
-	cd ./v8.1 && docker build --tag=php-for-dev:8.1 `pwd`
+	cd ./v8.x && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:8.1 `pwd`
 
 build-82:
-	cd ./v8.2 && docker build --tag=php-for-dev:8.2 `pwd`
+	cd ./v8.x && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:8.2 `pwd`
diff --git a/readme.md b/readme.md
index 56e9270..8a17db0 100644
--- a/readme.md
+++ b/readme.md
@@ -6,27 +6,24 @@ Images can be found on [docker hub](https://hub.docker.com/repository/docker/dan
 
 #### Supported versions
 
-* php 8.2.11
-  * composer 2.6.4
+all images includes:
+* composer 2.6.5
+
+* php 8.2.12
   * xdebug 3.2.2
-* php 8.1.24
-  * composer 2.6.4
+* php 8.1.25
   * xdebug 3.2.2
 * php 8.0.30
-  * composer 2.6.4
   * xdebug 3.2.2
 * php 7.4.33 (latest)
-  * composer 2.6.4
   * xdebug 2.9.8
   * rdkafka 6.0.3
   * timecop 1.2.10
 * php 7.3.33
-  * composer 2.6.4
   * xdebug 2.9.8
   * rdkafka 6.0.3
   * timecop 1.2.10
 * php 7.2.34
-  * composer 2.6.4
   * xdebug 2.7.2
   * rdkafka 6.0.3
   * timecop 1.2.10
diff --git a/v7.2/Dockerfile b/v7.2/Dockerfile
index b09504a..e5eae87 100644
--- a/v7.2/Dockerfile
+++ b/v7.2/Dockerfile
@@ -1,9 +1,9 @@
 FROM php:7.2.34-alpine
 
+ARG COMPOSER_VERSION
 ARG PHP_XDEBUG_VERSION=2.7.2
 ARG PHP_RDKAFKA_VERSION=6.0.3
 ARG PHP_TIMECOP_VERSION=1.2.10
-ARG COMPOSER_VERSION=2.6.4
 
 RUN apk update && apk add --no-cache $PHPIZE_DEPS \
     && apk add --no-cache zlib-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev openssl-dev \
diff --git a/v7.3/Dockerfile b/v7.3/Dockerfile
index e4410e7..9f9c384 100644
--- a/v7.3/Dockerfile
+++ b/v7.3/Dockerfile
@@ -1,9 +1,9 @@
 FROM php:7.3.33-alpine
 
+ARG COMPOSER_VERSION
 ARG PHP_XDEBUG_VERSION=2.9.8
 ARG PHP_RDKAFKA_VERSION=6.0.3
 ARG PHP_TIMECOP_VERSION=1.2.10
-ARG COMPOSER_VERSION=2.6.4
 
 RUN apk update && apk add --no-cache $PHPIZE_DEPS \
     && apk add --no-cache zlib-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev openssl-dev \
diff --git a/v7.4/Dockerfile b/v7.4/Dockerfile
index ad828a6..6919d73 100644
--- a/v7.4/Dockerfile
+++ b/v7.4/Dockerfile
@@ -1,9 +1,9 @@
 FROM php:7.4.33-alpine
 
+ARG COMPOSER_VERSION
 ARG PHP_XDEBUG_VERSION=2.9.8
 ARG PHP_RDKAFKA_VERSION=6.0.3
 ARG PHP_TIMECOP_VERSION=1.2.10
-ARG COMPOSER_VERSION=2.6.4
 
 RUN apk update && apk add --no-cache $PHPIZE_DEPS \
     && apk add --no-cache zlib-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev openssl-dev \
diff --git a/v8.0/Dockerfile b/v8.0/Dockerfile
index 99d873c..d56904e 100644
--- a/v8.0/Dockerfile
+++ b/v8.0/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:8.0.30-alpine
 
+ARG COMPOSER_VERSION
 ARG PHP_XDEBUG_VERSION=3.2.2
-ARG COMPOSER_VERSION=2.6.4
 
 RUN apk update && apk add --no-cache $PHPIZE_DEPS \
     && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \
diff --git a/v8.1/Dockerfile b/v8.1/Dockerfile
index b86f8b6..83f6fbb 100644
--- a/v8.1/Dockerfile
+++ b/v8.1/Dockerfile
@@ -1,7 +1,7 @@
-FROM php:8.1.24-alpine
+FROM php:8.1.25-alpine
 
+ARG COMPOSER_VERSION
 ARG PHP_XDEBUG_VERSION=3.2.2
-ARG COMPOSER_VERSION=2.6.4
 
 RUN apk update && apk add --no-cache $PHPIZE_DEPS \
     && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \
diff --git a/v8.2/Dockerfile b/v8.2/Dockerfile
index 54893ff..b73dbb7 100644
--- a/v8.2/Dockerfile
+++ b/v8.2/Dockerfile
@@ -1,7 +1,7 @@
-FROM php:8.2.11-alpine
+FROM php:8.2.12-alpine
 
+ARG COMPOSER_VERSION
 ARG PHP_XDEBUG_VERSION=3.2.2
-ARG COMPOSER_VERSION=2.6.4
 
 RUN apk update && apk add --no-cache $PHPIZE_DEPS \
     && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \