diff --git a/.docker/php80/Dockerfile b/.docker/php80.Dockerfile
similarity index 100%
rename from .docker/php80/Dockerfile
rename to .docker/php80.Dockerfile
diff --git a/.docker/php81/Dockerfile b/.docker/php81.Dockerfile
similarity index 100%
rename from .docker/php81/Dockerfile
rename to .docker/php81.Dockerfile
diff --git a/.docker/php82/Dockerfile b/.docker/php82.Dockerfile
similarity index 100%
rename from .docker/php82/Dockerfile
rename to .docker/php82.Dockerfile
diff --git a/.docker/php83/Dockerfile b/.docker/php83.Dockerfile
similarity index 100%
rename from .docker/php83/Dockerfile
rename to .docker/php83.Dockerfile
diff --git a/.docker/php84.Dockerfile b/.docker/php84.Dockerfile
new file mode 100644
index 0000000..5ca38c2
--- /dev/null
+++ b/.docker/php84.Dockerfile
@@ -0,0 +1,22 @@
+# ----------------------
+# The FPM base container
+# ----------------------
+FROM php:8.4-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/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/.gitattributes b/.gitattributes
index c9b3927..f5b0ffb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,4 +7,5 @@
 .gitignore export-ignore
 /CODE_OF_CONDUCT.md export-ignore
 /CONTRIBUTING.md export-ignore
+/compose.yml export-ignore
 /phpunit.xml.dist export-ignore
diff --git a/docker-compose.yml b/compose.yml
similarity index 64%
rename from docker-compose.yml
rename to compose.yml
index bfbf950..a463318 100644
--- a/docker-compose.yml
+++ b/compose.yml
@@ -4,7 +4,7 @@ services:
     image: php-opentsdb-client-lib-80
     build:
       context: ./
-      dockerfile: ./.docker/php80/Dockerfile
+      dockerfile: ./.docker/php80.Dockerfile
     tty: true
     working_dir: /app
     volumes:
@@ -17,7 +17,7 @@ services:
     image: php-opentsdb-client-lib-81
     build:
       context: ./
-      dockerfile: ./.docker/php81/Dockerfile
+      dockerfile: ./.docker/php81.Dockerfile
     tty: true
     working_dir: /app
     volumes:
@@ -30,7 +30,7 @@ services:
     image: php-opentsdb-client-lib-82
     build:
       context: ./
-      dockerfile: ./.docker/php82/Dockerfile
+      dockerfile: ./.docker/php82.Dockerfile
     tty: true
     working_dir: /app
     volumes:
@@ -43,7 +43,33 @@ services:
     image: php-opentsdb-client-lib-83
     build:
       context: ./
-      dockerfile: ./.docker/php83/Dockerfile
+      dockerfile: ./.docker/php83.Dockerfile
+    tty: true
+    working_dir: /app
+    volumes:
+      - ./:/app
+    networks:
+      - php-opentsdb-client-lib
+
+  php84:
+    container_name: php-opentsdb-client-lib-php-84
+    image: php-opentsdb-client-lib-84
+    build:
+      context: ./
+      dockerfile: ./.docker/php84.Dockerfile
+    tty: true
+    working_dir: /app
+    volumes:
+      - ./:/app
+    networks:
+      - php-opentsdb-client-lib
+
+  php85:
+    container_name: php-opentsdb-client-lib-php-85
+    image: php-opentsdb-client-lib-85
+    build:
+      context: ./
+      dockerfile: ./.docker/php85.Dockerfile
     tty: true
     working_dir: /app
     volumes: