diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml
index 17829c590bc0d04a0c2b79bb331bb5cd741f3c41..fc54220865f5530a24f826d53c6eff58cf08b273 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.11
+    image: mailserver2/mailserver:1.1.12
     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:23-0-11-22
+    image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:24-0-8-7
     container_name: nextcloud
     restart: always
     networks:
diff --git a/upgrade-guides/minor-version-upgrades.md b/upgrade-guides/minor-version-upgrades.md
new file mode 100644
index 0000000000000000000000000000000000000000..b723e8c5ab94ef43416f34cd3f6c42c661a53113
--- /dev/null
+++ b/upgrade-guides/minor-version-upgrades.md
@@ -0,0 +1,19 @@
+# To perform a minor version upgrade(version 24.0.8 onwards)
+
+- Check the [releases](https://gitlab.e.foundation/e/infra/ecloud/nextcloud/-/releases/) page for a new minor version release
+- In your `docker-compose.yml` file update the following:
+  - Set the nextcloud image to the new tag as found from the releases page
+    - For example, if the release is "24.0.9.1", the image entry should look like:
+      ```yaml
+      image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:24-0-9-1
+      ```
+
+- Run `docker-compose stop nextcloud`
+- Run `docker-compose pull nextcloud`
+- If pulls are OK, run `docker-compose up -d nextcloud`
+- 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`
+
+
+- Check all settings subsections starting from `/settings/admin/overview` while logged in with the admin user account to identify any issues found post upgrade
\ No newline at end of file
diff --git a/upgrade-guides/upgrade-to-24.0.8.7.md b/upgrade-guides/upgrade-to-24.0.8.7.md
new file mode 100644
index 0000000000000000000000000000000000000000..346b929b591626160bdaa1498bf3643f37383ea4
--- /dev/null
+++ b/upgrade-guides/upgrade-to-24.0.8.7.md
@@ -0,0 +1,24 @@
+# To upgrade from ecloud 23.x.x.x to 24.0.8.7
+
+- 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
+
+- Go to `/mnt/repo_base`, then run:
+  - `docker-compose stop`
+  - `git pull origin master`
+
+- In your `docker-compose.yml` file update the following:
+  - Set the nextcloud image to `registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:24-0-8-7`
+  - Set the mailserver image to `mailserver2/mailserver:1.1.12`
+
+- Run `docker-compose pull`
+- If pulls are OK, 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`
+
+- Check all settings subsections starting from `/settings/admin/overview` while logged in with the admin user account to identify any issues found post upgrade
\ No newline at end of file