diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 619e5e5eb0..4c3c2ceac6 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
 	},
 	"workspaceMount": "source=${localWorkspaceFolder},target=/tmp/doc_repository,type=bind",
 	"workspaceFolder": "/tmp/doc_repository",
-	"postCreateCommand": "pip3 install --no-warn-script-location --user -r requirements.txt -c constraints.txt",
+	"postCreateCommand": "pip3 install --no-warn-script-location --user -r requirements.txt -c constraints.txt --break-system-packages",
 	"features": {
 		"ghcr.io/devcontainers/features/git:1": {}
 	},
diff --git a/README.md b/README.md
index 77224e4eba..0d8ac593ae 100644
--- a/README.md
+++ b/README.md
@@ -20,11 +20,19 @@ To build this you need to install
 * graphviz
 * python virtualenv
 
-
-In the virtualenv 
+With virtualenv
 
 ```
+# activate the virtualenv
+virtualenv ros2doc
+...<snip>
+source ros2doc/bin/activate
+
+# install required packages
 pip install -r requirements.txt -c constraints.txt
+
+# deactivate the virtualenv
+(ros2doc) deactivate
 ```
 
 ### Pinned versions
@@ -36,6 +44,7 @@ To upgrade the system validate that things are working and then use `pip freeze
 ## Building HTML
 
 ### Local development test
+
 For local testing of the current tree use:
 
 `make html`
diff --git a/docker/image/Dockerfile b/docker/image/Dockerfile
index e87d6fb1e3..17d152c10f 100644
--- a/docker/image/Dockerfile
+++ b/docker/image/Dockerfile
@@ -3,7 +3,7 @@
 #
 # docker build -f docker/image/Dockerfile .
 
-FROM ubuntu:jammy
+FROM ubuntu:24.04
 
 ARG user=rosindex
 ARG uid=1000
@@ -11,6 +11,9 @@ ARG uid=1000
 ENV DEBIAN_FRONTEND noninteractive
 ENV SHELL /bin/bash
 
+# Delete user if it exists in container (e.g Ubuntu Noble: ubuntu)
+RUN if id -u $uid ; then userdel `id -un $uid` ; fi
+
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \
         git-all \
@@ -31,4 +34,4 @@ WORKDIR /tmp/doc_repository
 
 USER $user
 
-CMD pip3 install --no-warn-script-location --user -r requirements.txt -c constraints.txt && make multiversion
+CMD pip3 install --no-warn-script-location --user -r requirements.txt -c constraints.txt --break-system-packages && make multiversion
diff --git a/source/The-ROS2-Project/Contributing/Contributing-To-ROS-2-Documentation.rst b/source/The-ROS2-Project/Contributing/Contributing-To-ROS-2-Documentation.rst
index 9c14912603..9397a3dc57 100644
--- a/source/The-ROS2-Project/Contributing/Contributing-To-ROS-2-Documentation.rst
+++ b/source/The-ROS2-Project/Contributing/Contributing-To-ROS-2-Documentation.rst
@@ -57,6 +57,10 @@ Start by installing requirements located in the ``requirements.txt`` file:
 
       python -m pip install --user --upgrade -r requirements.txt
 
+.. note::
+
+  It is recommended to use `virtualenv <https://pypi.org/project/virtualenv/>`__ to build, otherwise you might need to add ``--break-system-packages`` option with ``pip install`` because of `PEP 668 <https://peps.python.org/pep-0668/>`__.
+
 In order for Sphinx to be able to generate diagrams, the ``dot`` command must be available.
 
 .. tabs::
@@ -232,6 +236,38 @@ Finally, to view the site, you can click on the "Go Live" button in the right bo
    :width: 100%
    :alt: Live Server
 
+Building the Site with Devcontainer
+-----------------------------------
+
+`ROS 2 Documentation GitHub repository <https://github.com/ros2/ros2_documentation>`__ also supports ``Devcontainer`` development environment with Visual Studio Code.
+This will enable you to build the documentation much easier without changing your operating system.
+
+See :doc:`../../How-To-Guides/Setup-ROS-2-with-VSCode-and-Docker-Container` to install VS Code and Docker before the following procedure.
+
+Clone repository and start VS Code:
+
+.. code-block:: console
+
+   git clone https://github.com/ros2/ros2_documentation
+   cd ./ros2_documentation
+   code .
+
+To use ``Devcontainer``, you need to install "Remote Development" Extension within VS Code search in Extensions (CTRL+SHIFT+X) for it.
+
+And then, use ``View->Command Palette...`` or ``Ctrl+Shift+P`` to open the command palette.
+Search for the command ``Dev Containers: Reopen in Container`` and execute it.
+This will build your development docker container for you automatically.
+
+To build the documentation, open a terminal using ``View->Terminal`` or ``Ctrl+Shift+``` and ``New Terminal`` in VS Code.
+Inside the terminal, you can build the documentation:
+
+.. code-block:: console
+
+   make html
+
+.. image:: images/vscode_devcontainer.png
+   :width: 100%
+   :alt: VS Code Devcontainer
 
 Writing pages
 -------------
diff --git a/source/The-ROS2-Project/Contributing/images/vscode_devcontainer.png b/source/The-ROS2-Project/Contributing/images/vscode_devcontainer.png
new file mode 100644
index 0000000000..531294d583
Binary files /dev/null and b/source/The-ROS2-Project/Contributing/images/vscode_devcontainer.png differ