diff --git a/.docker/php/php81/Dockerfile b/.docker/php81.Dockerfile
similarity index 100%
rename from .docker/php/php81/Dockerfile
rename to .docker/php81.Dockerfile
diff --git a/.docker/php/php82/Dockerfile b/.docker/php82.Dockerfile
similarity index 100%
rename from .docker/php/php82/Dockerfile
rename to .docker/php82.Dockerfile
diff --git a/.docker/php/php83/Dockerfile b/.docker/php83.Dockerfile
similarity index 100%
rename from .docker/php/php83/Dockerfile
rename to .docker/php83.Dockerfile
diff --git a/.docker/php/php84/Dockerfile b/.docker/php84.Dockerfile
similarity index 100%
rename from .docker/php/php84/Dockerfile
rename to .docker/php84.Dockerfile
diff --git a/.docker/php85.Dockerfile b/.docker/php85.Dockerfile
new file mode 100644
index 0000000..10f031a
--- /dev/null
+++ b/.docker/php85.Dockerfile
@@ -0,0 +1,22 @@
+# ----------------------
+# The FPM base container
+# ----------------------
+FROM php:8.5-cli-alpine AS dev
+
+RUN apk add --no-cache --virtual .build-deps \
+    $PHPIZE_DEPS
+
+# Cleanup apk cache and temp files
+RUN rm -rf /var/cache/apk/* /tmp/*
+
+# ----------------------
+# Composer install step
+# ----------------------
+
+# Get latest Composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+# ----------------------
+# The FPM production container
+# ----------------------
+FROM dev
diff --git a/docker-compose.yaml b/compose.yml
similarity index 63%
rename from docker-compose.yaml
rename to compose.yml
index 79b58fc..36c5179 100644
--- a/docker-compose.yaml
+++ b/compose.yml
@@ -1,11 +1,10 @@
-version: "3.9"
 services:
   php81:
     container_name: laravel-ban-lib-81
     image: laravel-ban-lib-81
     build:
       context: ./
-      dockerfile: ./.docker/php/php81/Dockerfile
+      dockerfile: ./.docker/php81.Dockerfile
     tty: true
     working_dir: /app
     volumes:
@@ -16,7 +15,7 @@ services:
     image: laravel-ban-lib-82
     build:
       context: ./
-      dockerfile: ./.docker/php/php82/Dockerfile
+      dockerfile: ./.docker/php82.Dockerfile
     tty: true
     working_dir: /app
     volumes:
@@ -27,7 +26,7 @@ services:
     image: laravel-ban-lib-83
     build:
       context: ./
-      dockerfile: ./.docker/php/php83/Dockerfile
+      dockerfile: ./.docker/php83.Dockerfile
     tty: true
     working_dir: /app
     volumes:
@@ -38,7 +37,18 @@ services:
     image: laravel-ban-lib-84
     build:
       context: ./
-      dockerfile: ./.docker/php/php84/Dockerfile
+      dockerfile: ./.docker/php84.Dockerfile
+    tty: true
+    working_dir: /app
+    volumes:
+      - ./:/app
+
+  php85:
+    container_name: laravel-ban-lib-85
+    image: laravel-ban-lib-85
+    build:
+      context: ./
+      dockerfile: ./.docker/php85.Dockerfile
     tty: true
     working_dir: /app
     volumes: