diff --git a/.gitea/workflows/deploy-verso.yml b/.gitea/workflows/deploy-verso.yml
index 21f480379b..1e0a7659bf 100644
--- a/.gitea/workflows/deploy-verso.yml
+++ b/.gitea/workflows/deploy-verso.yml
@@ -7,16 +7,17 @@ on:
   workflow_dispatch:
 
 env:
-  IMAGE: registry.alocoq.fr/verso:latest
   REPO_URL: https://git.alocoq.fr/alois/verso.git
+  BASE_IMAGE: registry.alocoq.fr/verso-base:latest
+  IMAGE: registry.alocoq.fr/verso:latest
 
 jobs:
   deploy:
     runs-on: native
-    timeout-minutes: 90
+    timeout-minutes: 180
 
     steps:
-      - name: Build and push image with BuildKit
+      - name: Build and push Verso images with BuildKit
         run: |
           kubectl -n ci delete job verso-buildkit --ignore-not-found=true
 
@@ -56,12 +57,21 @@ jobs:
                       - |
                         set -eux
 
+                        buildctl-daemonless.sh build \
+                          --frontend=dockerfile.v0 \
+                          --local context=/workspace/repo \
+                          --local dockerfile=/workspace/repo/server-ce \
+                          --opt filename=Dockerfile-base \
+                          --output type=image,name=registry.alocoq.fr/verso-base:latest,push=true
+
                         buildctl-daemonless.sh build \
                           --frontend=dockerfile.v0 \
                           --local context=/workspace/repo \
                           --local dockerfile=/workspace/repo/server-ce \
                           --opt filename=Dockerfile \
+                          --opt build-arg:OVERLEAF_BASE_TAG=registry.alocoq.fr/verso-base:latest \
                           --output type=image,name=registry.alocoq.fr/verso:latest,push=true
+
                     volumeMounts:
                       - name: workspace
                         mountPath: /workspace
@@ -73,7 +83,7 @@ jobs:
 
       - name: Wait for build
         run: |
-          kubectl -n ci wait --for=condition=complete job/verso-buildkit --timeout=5400s
+          kubectl -n ci wait --for=condition=complete job/verso-buildkit --timeout=10800s
 
       - name: Show logs
         if: always()