diff --git a/docker/Dockerfile b/docker/Dockerfile
index 36f0eba7..247cafe9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ros:jazzy-ros-base
+FROM ros:jazzy-ros-base-noble
 
 # change default shell to bash
 SHELL ["/bin/bash", "-c"]
diff --git a/docker/doc/docker.rst b/docker/doc/docker.rst
index 1a7b20d1..3acc1074 100644
--- a/docker/doc/docker.rst
+++ b/docker/doc/docker.rst
@@ -14,16 +14,17 @@ To run the ``lbr_fri_ros2_stack`` in a Docker container, follow the instructions
 
     export FRI_CLIENT_VERSION=1.15 # replace by your FRI client version
     mkdir -p lbr-stack/src && cd lbr-stack
+    git clone https://github.com/lbr-stack/lbr_fri_ros2_stack.git -b jazzy src/lbr_fri_ros2_stack --depth 1
     vcs import src --input https://raw.githubusercontent.com/lbr-stack/lbr_fri_ros2_stack/jazzy/lbr_fri_ros2_stack/repos-fri-${FRI_CLIENT_VERSION}.yaml
 
 #. Install `Docker <https://docs.docker.com/engine/install/>`_:octicon:`link-external`.
 
-#. Copy the Dockerfile and the container scripts to the ``lbr-stack`` directory. Build and start the container
+#. Copy the Dockerfile and the container scripts to the ``lbr-stack`` directory. Build and start the container (make sure Docker is configured to run as non-root user: `linux-postinstall <https://docs.docker.com/engine/install/linux-postinstall>`_:octicon:`link-external`).
 
    .. code-block:: bash
 
     cp -r src/lbr_fri_ros2_stack/docker/* .
-    sudo ./container_build.sh # this will run the container once finished
+    ./container_build.sh # this will run the container once finished
 
 #. Once inside the container, launch e.g. the mock setup via