diff --git a/app/Dockerfile b/app/Dockerfile
index 3eacddf..36e67e8 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -4,6 +4,7 @@ LABEL maintainer="JJTC <oci@jjtc.eu>"
 
 ENV PPM_VERSION=2.2.1 \
     PPM_HTTP_VERSION=2.0.6 \
+    COMPOSER_VERSION=2.0.11 \
     BOOKSTACK=BookStack \
     BOOKSTACK_VERSION=0.31.6 \
     BOOKSTACK_HOME="/app"
@@ -25,37 +26,39 @@ RUN set -ex \
      multirun \
      nginx \
      tar \
-     php7 \
-     php7-cgi \
-     php7-ctype \
-     php7-curl \
-     php7-dom \
-     php7-exif \
-     php7-fileinfo \
-     php7-gd \
-     php7-iconv \
-     php7-intl \
-     php7-json \
-     php7-ldap \
-     php7-mbstring \
-     php7-mcrypt \
-     php7-opcache \
-     php7-openssl \
-     php7-pcntl \
-     php7-pdo_mysql \
-     php7-pecl-imagick \
-     php7-phar \
-     php7-posix \
-     php7-redis \
-     php7-session \
-     php7-simplexml \
-     php7-sockets \
-     php7-tokenizer \
-     php7-xml \
-     php7-xmlwriter \
-     php7-zip \
-     php7-zlib \
-     composer \
+     php8 \
+     php8-cgi \
+     php8-ctype \
+     php8-curl \
+     php8-dom \
+     php8-exif \
+     php8-fileinfo \
+     php8-gd \
+     php8-iconv \
+     php8-intl \
+     php8-json \
+     php8-ldap \
+     php8-mbstring \
+     php8-opcache \
+     php8-openssl \
+     php8-pcntl \
+     php8-pdo_mysql \
+     php8-pecl-imagick \
+     php8-phar \
+     php8-posix \
+     php8-redis \
+     php8-session \
+     php8-simplexml \
+     php8-sockets \
+     php8-tokenizer \
+     php8-xml \
+     php8-xmlwriter \
+     php8-zip \
+     php8-zlib \
+  && echo "Setting up Composer" \
+  && ln -sf /usr/bin/php8 /usr/bin/php \
+  && curl https://getcomposer.org/download/$COMPOSER_VERSION/composer.phar  -o /usr/bin/composer \
+  && chmod 0755 /usr/bin/composer \
   && echo "Setting up PPM:" \
   && mkdir -p /ppm/run \
   && cd /ppm \
diff --git a/app/ppm.json b/app/ppm.json
index f89c5f5..1d11b99 100644
--- a/app/ppm.json
+++ b/app/ppm.json
@@ -16,5 +16,5 @@
     "socket-path": "\/ppm\/run\/",
     "pidfile": "\/ppm\/ppm.pid",
     "reload-timeout": 30,
-    "cgi-path": "\/usr\/bin\/php-cgi7"
+    "cgi-path": "\/usr\/bin\/php-cgi8"
 }