diff --git a/.docker/nginx.conf b/.docker/nginx.conf
index e1908065..91abf624 100644
--- a/.docker/nginx.conf
+++ b/.docker/nginx.conf
@@ -6,7 +6,7 @@ types {
 }
 
 upstream php-pimcore10 {
-    server php-fpm:9000;
+    server php:9000;
 }
 
 map $args $static_page_root {
diff --git a/.github/workflows/pimcore-demo.yml b/.github/workflows/pimcore-demo.yml
index 8a1b2d39..70c6d81a 100644
--- a/.github/workflows/pimcore-demo.yml
+++ b/.github/workflows/pimcore-demo.yml
@@ -72,14 +72,14 @@ jobs:
         docker-compose pull --quiet
         docker-compose up -d
 
-        # Install dockerize into the php-fpm container. We need it to block until
+        # Install dockerize into the php container. We need it to block until
         # database is ready to serve connections.
-        docker-compose exec -T -- php-fpm bash -c '\
+        docker-compose exec -T -- php bash -c '\
           curl -sfL https://github.com/powerman/dockerize/releases/download/v0.11.5/dockerize-`uname -s`-`uname -m` \
           | install /dev/stdin /usr/local/bin/dockerize'
 
         # Wait for the database to set up.
-        docker-compose exec -T -- php-fpm dockerize -wait tcp://db:3306 -timeout 5m
+        docker-compose exec -T -- php dockerize -wait tcp://db:3306 -timeout 5m
 
         # Run pimcore installation.
         docker-compose exec -T \
@@ -88,4 +88,4 @@ jobs:
         -e PIMCORE_INSTALL_MYSQL_USERNAME=pimcore \
         -e PIMCORE_INSTALL_MYSQL_PASSWORD=pimcore \
         -- \
-        php-fpm vendor/bin/pimcore-install -n --mysql-host-socket=db --mysql-database=pimcore
+        php vendor/bin/pimcore-install -n --mysql-host-socket=db --mysql-database=pimcore
diff --git a/README.md b/README.md
index e393faca..ea8e99a5 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ You don't need to have a PHP environment with composer installed.
 ### Follow these steps
 
 1. Initialize the demo project using the `pimcore/pimcore` image
-    ``docker run -u `id -u`:`id -g` --rm -v `pwd`:/var/www/html pimcore/pimcore:PHP8.0-fpm composer create-project pimcore/demo my-project``
+    ``docker run -u `id -u`:`id -g` --rm -v `pwd`:/var/www/html pimcore/pimcore:php8.1-latest composer create-project pimcore/demo my-project``
 1. Go to your new project
     `cd my-project/`
 1. Part of the new project is a docker compose file
@@ -38,7 +38,7 @@ You don't need to have a PHP environment with composer installed.
     * Open the `docker-compose.yml` file in an editor, uncomment all the `user: '1000:1000'` lines and update the ids if necessary
     * Start the needed services with `docker-compose up -d`
 1. Install pimcore and initialize the DB
-    `docker-compose exec php-fpm vendor/bin/pimcore-install --mysql-host-socket=db --mysql-username=pimcore --mysql-password=pimcore --mysql-database=pimcore`
+    `docker-compose exec php vendor/bin/pimcore-install --mysql-host-socket=db --mysql-username=pimcore --mysql-password=pimcore --mysql-database=pimcore`
     * When asked for admin user and password: Choose freely
     * This can take a while, up to 20 minutes
 1. :heavy_check_mark: DONE - You can now visit your pimcore-demo:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 9ff211a8..f250d523 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,7 +6,7 @@ services:
     db:
         image: mariadb:10.7
         working_dir: /application
-        command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --innodb-file-per-table=1]
+        command: [ mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --innodb-file-per-table=1 ]
         volumes:
             - pimcore-demo-database:/var/lib/mysql
         environment:
@@ -23,11 +23,11 @@ services:
             - .:/var/www/html:ro
             - ./.docker/nginx.conf:/etc/nginx/conf.d/default.conf:ro
         depends_on:
-            - php-fpm
+            - php
 
-    php-fpm:
+    php:
         #user: '1000:1000' # set to your uid:gid
-        image: pimcore/pimcore:PHP8.1-fpm-debug
+        image: pimcore/pimcore:php8.1-debug-latest
         environment:
             COMPOSER_HOME: /var/www/html
             PHP_IDE_CONFIG: serverName=localhost
@@ -38,7 +38,7 @@ services:
 
     supervisord:
         #user: '1000:1000' # set to your uid:gid
-        image: pimcore/pimcore:PHP8.1-supervisord
+        image: pimcore/pimcore:php8.1-supervisord-latest
         depends_on:
             - db
         volumes: