diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8c9dfc5..d83f43a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Build
         run: |
           cp .env.dist .env
-          XDEBUG=1 docker-compose build
+          XDEBUG=1 docker compose build
 
       - name: Test
         run: |
@@ -25,7 +25,8 @@ jobs:
           set -x
           ln -sr docker-compose.dev.yml docker-compose.override.yml
           docker/console php -i
-          docker-compose up -d
+          docker compose up -d
+          sleep 3
           curl -f localhost:8080
           docker/console id
           docker/redis-cli info
diff --git a/README.md b/README.md
index 385d3c9..7b2dde9 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Ready to run docker containers for php development.
 1. Configure `.env` if you need.
 1. Copy `.env`, `docker`, `docker-compose.dev.yml` and `docker-compose.yml` to your app's root folder.
 1. Enable dev mode `ln -sr docker-compose.dev.yml docker-compose.override.yml`.
-1. Run `docker-compose up -d`.
+1. Run `docker compose up -d`.
 1. Open in your browser http://localhost:8080/ to access the app.
 
 ## Useful tips
diff --git a/dev.sh b/dev.sh
index e42f690..b1fab1f 100755
--- a/dev.sh
+++ b/dev.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose up --build app web mailhog
+docker compose up --build app web mailhog
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 901f90b..2f11868 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,4 +1,3 @@
-version: '2.4'
 services:
     db:
         ports:
diff --git a/docker-compose.yml b/docker-compose.yml
index 316a8a8..885968b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2.4'
 services:
     redis:
         image: redis:3
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
index 2391192..061daac 100644
--- a/docker/app/Dockerfile
+++ b/docker/app/Dockerfile
@@ -1,11 +1,11 @@
-ARG PHP_VERSION=8.1
+ARG PHP_VERSION=8.4
 
 FROM php:$PHP_VERSION-fpm
 
 ARG PECL_EXTENSIONS="apcu redis"
 
 RUN apt-get -y update && \
-    apt-get -y install --no-install-recommends git unzip libpng-dev libjpeg-dev libfreetype6-dev libicu-dev libzip-dev libxml2-dev libxslt-dev libwebp-dev python2 && \
+    apt-get -y install --no-install-recommends git unzip libpng-dev libjpeg-dev libfreetype6-dev libicu-dev libzip-dev libxml2-dev libxslt-dev libwebp-dev python3 && \
     docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr && \
     docker-php-ext-install -j$(nproc) pdo_mysql bcmath gd intl opcache zip soap xsl && \
     pecl install $PECL_EXTENSIONS && \
@@ -18,7 +18,7 @@ RUN apt-get -y update && \
 RUN curl -Lo /usr/bin/composer https://getcomposer.org/composer-stable.phar && \
     chmod +x /usr/bin/composer
 
-ARG NODE_VERSION=16
+ARG NODE_VERSION=22
 
 RUN curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash && \
     apt-get install -y nodejs
diff --git a/docker/console b/docker/console
index 6a1fadd..a6cd109 100755
--- a/docker/console
+++ b/docker/console
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm app $@
\ No newline at end of file
+docker compose run --rm app $@
\ No newline at end of file
diff --git a/docker/redis-cli b/docker/redis-cli
index 1a6facf..657c690 100755
--- a/docker/redis-cli
+++ b/docker/redis-cli
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose exec -T redis redis-cli $@
\ No newline at end of file
+docker compose exec -T redis redis-cli $@
\ No newline at end of file