diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index aa4dcbc..18020b1 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
     - name: Set up CI Image Metadata
       id: docker_meta_ci
@@ -37,7 +37,7 @@ jobs:
         outputs: type=docker,dest=/tmp/image-bookstack.tar
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: image-bookstack-master
         path: /tmp/image-bookstack.tar
@@ -48,10 +48,10 @@ jobs:
     needs: build
     steps:
     - name: Checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
     - name: Download artifact
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
       with:
         name: image-bookstack-master
         path: /tmp
@@ -66,7 +66,7 @@ jobs:
     needs: e2e
     steps:
     - name: Checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
     - name:  Set up Docker Hub Image Metadata
       id: docker_meta
@@ -81,7 +81,7 @@ jobs:
           type=ref,event=branch
 
     - name: Download artifact
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
       with:
         name: image-bookstack-master
         path: /tmp
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index d1bf1e4..1795f01 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
     - name: Docker meta ci
       id: docker_meta_ci
@@ -38,7 +38,7 @@ jobs:
         outputs: type=docker,dest=/tmp/image-bookstack.tar
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: image-bookstack
         path: /tmp/image-bookstack.tar
@@ -49,10 +49,10 @@ jobs:
     needs: build
     steps:
     - name: Checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
     - name: Download artifact
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
       with:
         name: image-bookstack
         path: /tmp
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c0f69e6..24f27dd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
     - name: Set up CI Image Metadata
       id: docker_meta_ci
@@ -37,7 +37,7 @@ jobs:
         outputs: type=docker,dest=/tmp/image-bookstack.tar
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: image-bookstack-master
         path: /tmp/image-bookstack.tar
@@ -47,10 +47,10 @@ jobs:
     needs: build
     steps:
     - name: Checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
     - name: Download artifact
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
       with:
         name: image-bookstack-master
         path: /tmp
@@ -65,7 +65,7 @@ jobs:
     needs: e2e
     steps:
     - name: Checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
     - name:  Set up Docker Hub Image Metadata
       id: docker_meta
@@ -87,7 +87,7 @@ jobs:
           type=semver,pattern={{major}}.{{minor}}.{{patch}}
 
     - name: Download artifact
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
       with:
         name: image-bookstack-master
         path: /tmp
@@ -136,7 +136,7 @@ jobs:
     steps:
       # To use this repository's private action, you must check out the repository
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
       - name: Generate changelog
         id: changelog
diff --git a/Dockerfile b/Dockerfile
index d738175..fdb3631 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 AS bookstack
-ENV BOOKSTACK_VERSION=v25.05.2
+ENV BOOKSTACK_VERSION=v25.11.4
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz  \
@@ -19,6 +19,7 @@ RUN set -x; \
         libpng-dev  \
         libldap2-dev  \
         libtidy-dev  \
+        libwebp-dev \
         libxml2-dev  \
         fontconfig  \
         fonts-freefont-ttf   \
@@ -27,10 +28,10 @@ RUN set -x; \
         curl \
         libzip-dev \
         unzip \
-    && docker-php-ext-install -j$(nproc) dom pdo pdo_mysql zip tidy  \
+    && docker-php-ext-install -j$(nproc) pdo pdo_mysql zip tidy  \
     && docker-php-ext-configure ldap \
     && docker-php-ext-install -j$(nproc) ldap \
-    && docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ \
+    && docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include/ \
     && docker-php-ext-install -j$(nproc) gd
 
 RUN a2enmod rewrite remoteip; \
@@ -50,12 +51,9 @@ COPY bookstack.conf /etc/apache2/sites-available/000-default.conf
 
 COPY --from=bookstack --chown=33:33 /bookstack/ /var/www/bookstack/
 
-ARG COMPOSER_VERSION=2.7.6
 RUN set -x; \
     cd /var/www/bookstack \
-    && curl -sS https://getcomposer.org/installer | php -- --version=$COMPOSER_VERSION \
-    && /var/www/bookstack/composer.phar install -v -d /var/www/bookstack/ \
-    && rm -rf /var/www/bookstack/composer.phar /root/.composer \
+    && ./bookstack-system-cli download-vendor \
     && chown -R www-data:www-data /var/www/bookstack
 
 COPY php.ini /usr/local/etc/php/php.ini
diff --git a/README.md b/README.md
index b1eeddb..5722095 100644
--- a/README.md
+++ b/README.md
@@ -79,8 +79,8 @@ Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDA
    -e APP_URL=http://localhost:8080 \
    -e APP_KEY=SomeRandomStringWith32Characters \
    -p 8080:8080 \
-   --name="bookstack_25.5.2" \
-    solidnerd/bookstack:25.5.2
+   --name="bookstack_25.11.4" \
+    solidnerd/bookstack:25.11.4
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index b16577c..c3e0400 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-25.5.2
+25.11.4
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 7caf048..d0116fa 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,4 +1,3 @@
-version: '2.4'
 services:
   sut:
     image: appropriate/curl
diff --git a/docker-compose.yml b/docker-compose.yml
index 7959341..92a99d3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   mysql:
     image: mysql:9.2
@@ -11,7 +10,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:25.5.2
+    image: solidnerd/bookstack:25.11.4
     depends_on:
     - mysql
     environment: