diff --git a/framework/docs/source/docker/enable-tls.rst b/framework/docs/source/docker/enable-tls.rst
index eaa853298439..10ef7877d772 100644
--- a/framework/docs/source/docker/enable-tls.rst
+++ b/framework/docs/source/docker/enable-tls.rst
@@ -13,8 +13,11 @@ Transport Layer Security (TLS) for each Flower component to ensure secure commun
 
 .. note::
 
-    Because Flower containers, by default, run with a non-root user ``app``, the mounted
-    files and directories must have the proper permissions for the user ID ``49999``.
+    When working with Docker on Linux, you may need to change the ownership of the
+    directory containing the certificates to ensure proper access and permissions.
+
+    By default, Flower containers run with a non-root user ``app``. The mounted files
+    and directories must have the proper permissions for the user ID ``49999``.
 
     For example, to change the user ID of all files in the ``certificates/`` directory,
     you can run ``sudo chown -R 49999:49999 certificates/*``.
diff --git a/framework/docs/source/docker/persist-superlink-state.rst b/framework/docs/source/docker/persist-superlink-state.rst
index e61fcd3a63c2..5e6f4dc1bfc7 100644
--- a/framework/docs/source/docker/persist-superlink-state.rst
+++ b/framework/docs/source/docker/persist-superlink-state.rst
@@ -9,8 +9,9 @@ do is specify a directory where you want to save the file on your host system an
 for the database file.
 
 By default, the SuperLink container runs with a non-root user called ``app`` with the
-user ID ``49999``. It is recommended to create a new directory and change the user ID of
-the directory to ``49999`` to ensure the mounted directory has the proper permissions.
+user ID ``49999``. When working with Docker on Linux, it is recommended to create a new
+directory and set the user ID to ``49999`` to ensure the mounted directory has the
+proper permissions.
 
 If you later want to delete the directory, you can change the user ID back to the
 current user ID by running ``sudo chown -R $USER:$(id -gn) state``.
diff --git a/src/docker/base/alpine/Dockerfile b/src/docker/base/alpine/Dockerfile
index ee1e11b2d070..82d812f2c2c7 100644
--- a/src/docker/base/alpine/Dockerfile
+++ b/src/docker/base/alpine/Dockerfile
@@ -30,7 +30,7 @@ FROM python:${PYTHON_VERSION}-${DISTRO}${DISTRO_VERSION} AS compile
 
 # Install system dependencies
 RUN apk add --no-cache \
-    # require for compiling grpcio on ARM64
+    # required for compiling grpcio on ARM64
     g++ \
     libffi-dev \
     # required for installing flwr via git
diff --git a/src/docker/complete/compose.yml b/src/docker/complete/compose.yml
index 90e4f356fbfe..0df4bf68393d 100644
--- a/src/docker/complete/compose.yml
+++ b/src/docker/complete/compose.yml
@@ -38,7 +38,7 @@ services:
     depends_on:
       - superlink
 
-  # create a two SuperNode service with different node configs
+  # create a two SuperNode services with different node configs
   supernode-1:
     image: flwr/supernode:${FLWR_VERSION:-1.15.0}
     command:
@@ -86,6 +86,7 @@ services:
   #   depends_on:
   #     - superlink
 
+  # create a two ClientApp services
   clientapp-1:
     build:
       context: ${PROJECT_DIR:-.}