diff --git a/2.4.0/Dockerfile b/2.4.0/Dockerfile
index 6b63b0d..5cfe875 100644
--- a/2.4.0/Dockerfile
+++ b/2.4.0/Dockerfile
@@ -4,7 +4,7 @@ FROM python:2.7-slim-buster
 # Set one or more individual labels
 LABEL maintainer="Ramon Bartl"
 LABEL email="rb@ridingbytes.com"
-LABEL senaite.core.version="2.3.0"
+LABEL senaite.core.version="2.4.0"
 
 # Set environment variables
 ENV PLONE_MAJOR=5.2 \
diff --git a/README.md b/README.md
index ce2c5d5..ec84864 100644
--- a/README.md
+++ b/README.md
@@ -198,6 +198,12 @@ Finally, push the image to Docker Hub:
 docker image push senaite/senaite:v2.4.0
 ```
 
+### Update the PWD stack
+
+After each new release, the PWD configuration needs to be adapted to the latest version.
+Open `stack.yml` and update the image versions to the new released version.
+
+
 ### Further information
 
 Please refer to this documentation for further information:
diff --git a/latest/buildout.cfg b/latest/buildout.cfg
index a73196b..1d79859 100644
--- a/latest/buildout.cfg
+++ b/latest/buildout.cfg
@@ -1,7 +1,3 @@
-# Note: Changing the latest PR will force a new buildout run and therefore, a
-# new git checkout of the senaite sources!
-#
-# Latest `senaite.core` PR: #1933
 [buildout]
 index = https://pypi.python.org/simple/
 extends =
@@ -24,6 +20,8 @@ parts +=
 
 eggs +=
     senaite.lims
+    senaite.databox
+    senaite.storage
 
 sources = sources
 auto-checkout = *
@@ -37,6 +35,8 @@ senaite.databox = git https://github.com/senaite/senaite.databox.git branch=mast
 senaite.impress = git https://github.com/senaite/senaite.impress.git branch=2.x
 senaite.jsonapi = git https://github.com/senaite/senaite.jsonapi.git  branch=2.x
 senaite.lims = git https://github.com/senaite/senaite.lims.git branch=2.x
+senaite.databox = git https://github.com/senaite/senaite.databox.git branch=master
+senaite.storage = git https://github.com/senaite/senaite.storage.git branch=2.x
 
 [client1]
 recipe =
diff --git a/latest/docker-compose.yml b/latest/docker-compose.yml
index 9e758e5..f5bdd2f 100644
--- a/latest/docker-compose.yml
+++ b/latest/docker-compose.yml
@@ -3,13 +3,13 @@ version: "3.9"
 services:
 
   zeo:
-    image: senaite/senaite:edge
+    image: senaite/senaite:2.x
     command: zeo
     volumes:
       - ./data:/data
 
   instance1:
-    image: senaite/senaite:edge
+    image: senaite/senaite:2.x
     ports:
       - 8081:8080
     links:
@@ -18,12 +18,12 @@ services:
       resources:
         limits:
           cpus: "1"
-          memory: 500MB
+          memory: 1024MB
     environment:
       ZEO_ADDRESS: "zeo:8080"
 
   instance2:
-    image: senaite/senaite:edge
+    image: senaite/senaite:2.x
     ports:
       - 8082:8080
     links:
@@ -32,7 +32,7 @@ services:
       resources:
         limits:
           cpus: "1"
-          memory: 500MB
+          memory: 1024MB
     environment:
       ZEO_ADDRESS: "zeo:8080"
 
diff --git a/latest/requirements.txt b/latest/requirements.txt
index 8c147be..b3b8ab8 100644
--- a/latest/requirements.txt
+++ b/latest/requirements.txt
@@ -1 +1 @@
--r https://dist.plone.org/release/5.2.9/requirements.txt
+-r https://dist.plone.org/release/5.2.11/requirements.txt
diff --git a/stack.yml b/stack.yml
index 520b765..b97183a 100644
--- a/stack.yml
+++ b/stack.yml
@@ -1,7 +1,17 @@
 version: "3"
 services:
-  senaite:
-    image: senaite/senaite:v2.2.0
+  zeo:
+    image: senaite/senaite:2.4.0
+    command: zeo
+    volumes:
+      - ./data:/data
+
+  instance:
+    image: senaite/senaite:v2.4.0
     restart: "unless-stopped"
     ports:
       - "8080:8080"
+
+volumes:
+  data:
+    external: true