diff --git a/.env.sample b/.env.sample
index 24e956e..4176c93 100644
--- a/.env.sample
+++ b/.env.sample
@@ -12,6 +12,11 @@ COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
 # COMPOSE_FILE="$COMPOSE_FILE:compose.forgejo.yml"
 # SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43
 
+# Enable Git LFS on plain gitea (not needed with forgejo, which bundles it).
+# Mounts the lfs_jwt_secret secret and sets GITEA_LFS_START_SERVER=true.
+# COMPOSE_FILE="$COMPOSE_FILE:compose.lfs.yml"
+# SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43
+
 GITEA_DOMAIN=git.example.com
 GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true
 GITEA_APP_NAME="Git with solidaritea"
diff --git a/abra.sh b/abra.sh
index ecb8721..54bf0f3 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
-export APP_INI_VERSION=v21
+export APP_INI_VERSION=v22
 export DOCKER_SETUP_SH_VERSION=v1
 export PG_BACKUP_VERSION=v1
 
diff --git a/app.ini.tmpl b/app.ini.tmpl
index 9d5ceb2..fbd09a6 100644
--- a/app.ini.tmpl
+++ b/app.ini.tmpl
@@ -61,7 +61,7 @@ SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }}
 SSH_PORT = {{ env "GITEA_SSH_PORT" }}
 START_SSH_SERVER = true
 LFS_START_SERVER = {{ env "GITEA_LFS_START_SERVER" }}
-{{ if eq (env "FORGE") "forgejo" }}
+{{ if or (eq (env "FORGE") "forgejo") (eq (env "GITEA_LFS_START_SERVER") "true") }}
 LFS_JWT_SECRET = {{ secret "lfs_jwt_secret" }}
 {{ end }}
 
diff --git a/compose.lfs.yml b/compose.lfs.yml
new file mode 100644
index 0000000..e5c6750
--- /dev/null
+++ b/compose.lfs.yml
@@ -0,0 +1,13 @@
+version: "3.8"
+
+services:
+  app:
+    environment:
+      - GITEA_LFS_START_SERVER=true
+    secrets:
+      - lfs_jwt_secret
+
+secrets:
+  lfs_jwt_secret:
+    name: ${STACK_NAME}_lfs_jwt_secret_${SECRET_LFS_JWT_SECRET_VERSION}
+    external: true
diff --git a/compose.yml b/compose.yml
index 76fda73..88265c2 100644
--- a/compose.yml
+++ b/compose.yml
@@ -88,7 +88,7 @@ services:
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true"
-        - coop-cloud.${STACK_NAME}.version=3.5.3+1.24.2-rootless
+        - coop-cloud.${STACK_NAME}.version=3.6.0+1.24.2-rootless
 
 
 networks: