diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml
index d049c891cb810746d5a7a1cc928653675e9c59c2..384a664a83376e5bc4de4b6c13c4a17da554d466 100644
--- a/templates/docker-compose/docker-compose.yml
+++ b/templates/docker-compose/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   mailserver:
-    image: mailserver2/mailserver:1.1.4
+    image: mailserver2/mailserver:1.1.11
     container_name: mailserver
     domainname: ${DOMAIN} # Mail server A/MX/FQDN & reverse PTR = mail.${DOMAIN}.
     hostname: mail
@@ -126,7 +126,7 @@ services:
       - "${DOMAIN}:${NC_HOST_IP}"
 
   nextcloud:
-    image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:selfhost-21-0-9-12
+    image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:22-2-10-11
     container_name: nextcloud
     restart: always
     networks:
diff --git a/upgrade-guides/upgrade-to-22.2.10.11.md b/upgrade-guides/upgrade-to-22.2.10.11.md
new file mode 100644
index 0000000000000000000000000000000000000000..2b7075b4c88c450ec6c1a7c85d7843ad15f16f18
--- /dev/null
+++ b/upgrade-guides/upgrade-to-22.2.10.11.md
@@ -0,0 +1,17 @@
+# To upgrade from ecloud 21.x.x.x to 22.2.10.11
+
+- As usual, upgrade your OS with latest patchs, optionally take backup/snapshot
+
+  - NB: you may want to filter out incomming email (TCP 25 & 587) during this upgrade, to avoid losing any messages in case of a rollback
+
+- In your `docker-compose.yml` file update the following:
+  - Set the nextcloud image to `registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:22-2-10-11`
+  - Set the mailserver image to `mailserver2/mailserver:1.1.10`
+- Run `docker-compose pull`
+- Run `docker-compose up -d`
+
+- Examine `docker-compose logs --tail=500 nextcloud` for the following messages:
+  - `nextcloud       | Upgrading nextcloud from x.x.x.x ...` (x.x.x.x is your previous Nextcloud version)
+  - `nextcloud       | Update successful`
+
+- Run `docker-compose exec -T --user www-data nextcloud php occ db:add-missing-indices`