diff --git a/.docker/php7.3/Dockerfile b/.docker/php7.3/Dockerfile
index 1ded683..24a4cc2 100644
--- a/.docker/php7.3/Dockerfile
+++ b/.docker/php7.3/Dockerfile
@@ -2,9 +2,9 @@ FROM php:7.3-alpine
 
 COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/
 
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+COPY --from=composer/composer:latest-bin /composer /usr/bin/composer
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
 WORKDIR /docker
 # Workaround to keep container running
-CMD ["tail", "-f", "/dev/null"]
\ No newline at end of file
+CMD ["tail", "-f", "/dev/null"]
diff --git a/.docker/php7.4/Dockerfile b/.docker/php7.4/Dockerfile
index ef04b69..9084273 100644
--- a/.docker/php7.4/Dockerfile
+++ b/.docker/php7.4/Dockerfile
@@ -2,9 +2,9 @@ FROM php:7.4-alpine
 
 COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/
 
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+COPY --from=composer/composer:latest-bin /composer /usr/bin/composer
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
 WORKDIR /docker
 # Workaround to keep container running
-CMD ["tail", "-f", "/dev/null"]
\ No newline at end of file
+CMD ["tail", "-f", "/dev/null"]
diff --git a/.docker/php8.0/Dockerfile b/.docker/php8.0/Dockerfile
index 7a77ff3..5c6f23c 100644
--- a/.docker/php8.0/Dockerfile
+++ b/.docker/php8.0/Dockerfile
@@ -1,10 +1,10 @@
-FROM php:8.0.0RC2-alpine
+FROM php:8.0-alpine
 
 COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/
 
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+COPY --from=composer/composer:latest-bin /composer /usr/bin/composer
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
 WORKDIR /docker
 # Workaround to keep container running
-CMD ["tail", "-f", "/dev/null"]
\ No newline at end of file
+CMD ["tail", "-f", "/dev/null"]
diff --git a/.docker/php8.1/Dockerfile b/.docker/php8.1/Dockerfile
new file mode 100644
index 0000000..266c78f
--- /dev/null
+++ b/.docker/php8.1/Dockerfile
@@ -0,0 +1,10 @@
+FROM php:8.1-alpine
+
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/
+
+COPY --from=composer/composer:latest-bin /composer /usr/bin/composer
+ENV COMPOSER_ALLOW_SUPERUSER 1
+
+WORKDIR /docker
+# Workaround to keep container running
+CMD ["tail", "-f", "/dev/null"]
diff --git a/.docker/php8.2/Dockerfile b/.docker/php8.2/Dockerfile
new file mode 100644
index 0000000..067978a
--- /dev/null
+++ b/.docker/php8.2/Dockerfile
@@ -0,0 +1,10 @@
+FROM php:8.2.0RC5-alpine
+
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/
+
+COPY --from=composer/composer:latest-bin /composer /usr/bin/composer
+ENV COMPOSER_ALLOW_SUPERUSER 1
+
+WORKDIR /docker
+# Workaround to keep container running
+CMD ["tail", "-f", "/dev/null"]
diff --git a/docker-compose.yml b/docker-compose.yml
index d749dbc..ed33e2a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,4 +20,18 @@ services:
     container_name: systemctl-php-8.0
     volumes:
       - .:/docker:rw
-    tty: true
\ No newline at end of file
+    tty: true
+
+  php8.1:
+    build: .docker/php8.1
+    container_name: systemctl-php-8.1
+    volumes:
+      - .:/docker:rw
+    tty: true
+
+  php8.2:
+    build: .docker/php8.2
+    container_name: systemctl-php-8.2
+    volumes:
+      - .:/docker:rw
+    tty: true