diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 999d2938b..33c50095d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -27,8 +27,8 @@ jobs:
           # FIXME: https://github.com/actions/checkout/issues/290
           git fetch --force --tags
 
-          one="{ \"build-peertube\": true, \"file\": \"./support/docker/production/Dockerfile.bookworm\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bookworm\" }"
-          two="{ \"build-peertube\": true, \"file\": \"./support/docker/production/Dockerfile.bookworm\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bookworm,chocobozzz/peertube:$(git describe --abbrev=0)-bookworm\" }"
+          one="{ \"build-peertube\": true, \"file\": \"./support/docker/production/Dockerfile\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-trixie,chocobozzz/peertube:develop\" }"
+          two="{ \"build-peertube\": true, \"file\": \"./support/docker/production/Dockerfile\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bookworm,chocobozzz/peertube:$(git describe --abbrev=0)-bookworm\" }"
           three="{ \"build-peertube\": false, \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\" }"
 
           matrix="[$one,$two,$three]"
diff --git a/support/doc/docker.md b/support/doc/docker.md
index 004dae5bd..118769eb5 100644
--- a/support/doc/docker.md
+++ b/support/doc/docker.md
@@ -172,7 +172,7 @@ docker compose up -d
 ```shell
 git clone https://github.com/chocobozzz/PeerTube /tmp/peertube
 cd /tmp/peertube
-docker build . -f ./support/docker/production/Dockerfile.bookworm
+docker build . -f ./support/docker/production/Dockerfile
 ```
 
 ### Development
diff --git a/support/docker/production/Dockerfile.bookworm b/support/docker/production/Dockerfile
similarity index 97%
rename from support/docker/production/Dockerfile.bookworm
rename to support/docker/production/Dockerfile
index a8aed9a76..f27181e80 100644
--- a/support/docker/production/Dockerfile.bookworm
+++ b/support/docker/production/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20-bookworm-slim
+FROM node:20-trixie-slim
 
 ARG ALREADY_BUILT=0
 
@@ -8,6 +8,8 @@ RUN apt update \
  && gosu nobody true \
  && rm /var/lib/apt/lists/* -fR
 
+RUN npm install -g pnpm
+
 # Node images hardcode the node uid to 1000 so that number is not available.
 # The "peertube" user is created as a system account which selects a UID from
 # the range of SYS_UID_MIN to SYS_UID_MAX (-1 to 1000] and consistently
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index 0fbaab9f0..c35855c06 100644
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -43,7 +43,7 @@ services:
     # If you don't want to use the official image and build one from sources:
     # build:
     #   context: .
-    #   dockerfile: ./support/docker/production/Dockerfile.bookworm
+    #   dockerfile: ./support/docker/production/Dockerfile
     image: chocobozzz/peertube:production-bookworm
     # Use a static IP for this container because nginx does not handle proxy host change without reload
     # This container could be restarted on crash or until the postgresql database is ready for connection