diff --git a/docker-compose.yml b/docker-compose.yml
index 2c76578f..b74af56a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -782,6 +782,7 @@ services:
       PMA_HOST: database-mysql
       PMA_USER: root
       PMA_PASSWORD: nextcloud
+      UPLOAD_LIMIT: 512M
 
   ldapadmin:
     image: osixia/phpldapadmin
diff --git a/docker/Dockerfile.php.template b/docker/Dockerfile.php.template
index 2d4b5353..868f22c8 100644
--- a/docker/Dockerfile.php.template
+++ b/docker/Dockerfile.php.template
@@ -29,22 +29,37 @@ RUN install-php-extensions \
 
 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9 \
-    && ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # Install NVM
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
     && export NVM_DIR="/root/.nvm" \
     && . "$NVM_DIR/nvm.sh" \
     && nvm install node \
-    && nvm alias default node
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -63,13 +78,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini
 ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 
 # Setup blackfire probe
-RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
-    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \
-    ) || echo "Skipped blackfire as the installation failed" \
-    && rm -rf /var/lib/apt/lists/*
+RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
diff --git a/docker/Dockerfile.php71 b/docker/Dockerfile.php71
index bcf2cae7..41054fd7 100644
--- a/docker/Dockerfile.php71
+++ b/docker/Dockerfile.php71
@@ -29,22 +29,37 @@ RUN install-php-extensions \
 
 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9 \
-    && ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # Install NVM
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
     && export NVM_DIR="/root/.nvm" \
     && . "$NVM_DIR/nvm.sh" \
     && nvm install node \
-    && nvm alias default node
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -63,13 +78,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini
 ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 
 # Setup blackfire probe
-RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
-    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \
-    ) || echo "Skipped blackfire as the installation failed" \
-    && rm -rf /var/lib/apt/lists/*
+RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
diff --git a/docker/Dockerfile.php72 b/docker/Dockerfile.php72
index 8bf34995..e3451c67 100644
--- a/docker/Dockerfile.php72
+++ b/docker/Dockerfile.php72
@@ -29,22 +29,37 @@ RUN install-php-extensions \
 
 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9 \
-    && ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # Install NVM
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
     && export NVM_DIR="/root/.nvm" \
     && . "$NVM_DIR/nvm.sh" \
     && nvm install node \
-    && nvm alias default node
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -63,13 +78,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini
 ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 
 # Setup blackfire probe
-RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
-    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \
-    ) || echo "Skipped blackfire as the installation failed" \
-    && rm -rf /var/lib/apt/lists/*
+RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
diff --git a/docker/Dockerfile.php73 b/docker/Dockerfile.php73
index 5c3bad25..896512ca 100644
--- a/docker/Dockerfile.php73
+++ b/docker/Dockerfile.php73
@@ -29,22 +29,37 @@ RUN install-php-extensions \
 
 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9 \
-    && ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # Install NVM
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
     && export NVM_DIR="/root/.nvm" \
     && . "$NVM_DIR/nvm.sh" \
     && nvm install node \
-    && nvm alias default node
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -63,13 +78,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini
 ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 
 # Setup blackfire probe
-RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
-    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \
-    ) || echo "Skipped blackfire as the installation failed" \
-    && rm -rf /var/lib/apt/lists/*
+RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
diff --git a/docker/Dockerfile.php74 b/docker/Dockerfile.php74
index 57f1f550..bb607af9 100644
--- a/docker/Dockerfile.php74
+++ b/docker/Dockerfile.php74
@@ -29,22 +29,37 @@ RUN install-php-extensions \
 
 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9 \
-    && ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # Install NVM
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
     && export NVM_DIR="/root/.nvm" \
     && . "$NVM_DIR/nvm.sh" \
     && nvm install node \
-    && nvm alias default node
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -63,13 +78,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini
 ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 
 # Setup blackfire probe
-RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
-    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \
-    ) || echo "Skipped blackfire as the installation failed" \
-    && rm -rf /var/lib/apt/lists/*
+RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
diff --git a/docker/Dockerfile.php80 b/docker/Dockerfile.php80
index fcd6d5ad..46265a35 100644
--- a/docker/Dockerfile.php80
+++ b/docker/Dockerfile.php80
@@ -29,22 +29,37 @@ RUN install-php-extensions \
 
 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9 \
-    && ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # Install NVM
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
     && export NVM_DIR="/root/.nvm" \
     && . "$NVM_DIR/nvm.sh" \
     && nvm install node \
-    && nvm alias default node
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -63,13 +78,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini
 ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 
 # Setup blackfire probe
-RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
-    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \
-    ) || echo "Skipped blackfire as the installation failed" \
-    && rm -rf /var/lib/apt/lists/*
+RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
diff --git a/docker/Dockerfile.php81 b/docker/Dockerfile.php81
index 1bed3c75..40f2acd4 100644
--- a/docker/Dockerfile.php81
+++ b/docker/Dockerfile.php81
@@ -29,22 +29,37 @@ RUN install-php-extensions \
 
 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9 \
-    && ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # Install NVM
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
     && export NVM_DIR="/root/.nvm" \
     && . "$NVM_DIR/nvm.sh" \
     && nvm install node \
-    && nvm alias default node
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -63,13 +78,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini
 ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 
 # Setup blackfire probe
-RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
-    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \
-    ) || echo "Skipped blackfire as the installation failed" \
-    && rm -rf /var/lib/apt/lists/*
+RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
diff --git a/docker/nginx/my_proxy.conf b/docker/nginx/my_proxy.conf
index 5a1edbbc..f1a6fd2f 100644
--- a/docker/nginx/my_proxy.conf
+++ b/docker/nginx/my_proxy.conf
@@ -5,7 +5,11 @@ proxy_read_timeout 3600;
 proxy_send_timeout 3600;
 proxy_connect_timeout 3600;
 
-proxy_set_header X-Forwarded-Proto $scheme;
+#proxy_http_version 1.1;
+#proxy_set_header Upgrade $http_upgrade;
+#proxy_set_header Connection "Upgrade";
+
+proxy_set_header X-Forwarded-Proto https;
 # FIXME: remove this when onlyoffice is fixed https to http proxying
 # https://github.com/ONLYOFFICE/DocumentServer/issues/2186
-proxy_set_header CloudFront-Forwarded-Proto $scheme;
\ No newline at end of file
+proxy_set_header CloudFront-Forwarded-Proto $scheme;
diff --git a/docker/php82/Dockerfile b/docker/php82/Dockerfile
index 2d4b5353..868f22c8 100644
--- a/docker/php82/Dockerfile
+++ b/docker/php82/Dockerfile
@@ -29,22 +29,37 @@ RUN install-php-extensions \
 
 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9 \
-    && ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # Install NVM
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
     && export NVM_DIR="/root/.nvm" \
     && . "$NVM_DIR/nvm.sh" \
     && nvm install node \
-    && nvm alias default node
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -63,13 +78,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini
 ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 
 # Setup blackfire probe
-RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
-    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \
-    ) || echo "Skipped blackfire as the installation failed" \
-    && rm -rf /var/lib/apt/lists/*
+RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
diff --git a/docker/php83/Dockerfile b/docker/php83/Dockerfile
index a36f93a3..db204bd5 100644
--- a/docker/php83/Dockerfile
+++ b/docker/php83/Dockerfile
@@ -29,22 +29,37 @@ RUN install-php-extensions \
 
 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9 \
-    && ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # Install NVM
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
     && export NVM_DIR="/root/.nvm" \
     && . "$NVM_DIR/nvm.sh" \
     && nvm install node \
-    && nvm alias default node
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -63,13 +78,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini
 ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 
 # Setup blackfire probe
-RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
-    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \
-    ) || echo "Skipped blackfire as the installation failed" \
-    && rm -rf /var/lib/apt/lists/*
+RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
diff --git a/docker/php84/Dockerfile b/docker/php84/Dockerfile
index 83b9e31a..aff06d8a 100644
--- a/docker/php84/Dockerfile
+++ b/docker/php84/Dockerfile
@@ -29,22 +29,37 @@ RUN install-php-extensions \
 
 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim nano sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9 \
-    && ln -s /usr/local/bin/phpunit9 /usr/local/bin/phpunit
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # Install NVM
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
     && export NVM_DIR="/root/.nvm" \
     && . "$NVM_DIR/nvm.sh" \
     && nvm install node \
-    && nvm alias default node
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -63,13 +78,7 @@ ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini
 ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 
 # Setup blackfire probe
-RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
-    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \
-    ) || echo "Skipped blackfire as the installation failed" \
-    && rm -rf /var/lib/apt/lists/*
+RUN mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
diff --git a/scripts/enable-onlyoffice b/scripts/enable-onlyoffice
index c62e35c9..76fa0460 100755
--- a/scripts/enable-onlyoffice
+++ b/scripts/enable-onlyoffice
@@ -29,3 +29,5 @@ occ onlyoffice:documentserver --check
 
 
 docker_compose exec onlyoffice /var/www/onlyoffice/documentserver/npm/json -f /etc/onlyoffice/documentserver/local.json 'services.CoAuthoring.secret.session.string'
+
+docker_compose exec onlyoffice supervisorctl start ds:example