diff --git a/doc/resources/images/ROSCon2024.png b/doc/resources/images/ROSCon2024.png
new file mode 100644
index 00000000000..0f2848c2382
Binary files /dev/null and b/doc/resources/images/ROSCon2024.png differ
diff --git a/doc/roscon2024_workshop.rst b/doc/roscon2024_workshop.rst
new file mode 100644
index 00000000000..bd999d8d259
--- /dev/null
+++ b/doc/roscon2024_workshop.rst
@@ -0,0 +1,43 @@
+.. _roscon2024_workshop:
+
+ROSCon 2024 Workshop
+====================
+
+**Location: Room 202**
+
+**Time: 13:00-17:00, 21. October 2024**
+
+ros2_control: Fun with Controllers
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  .. image:: resources/images/ROSCon2024.png
+      :scale: 50%
+
+Summary
+-------
+
+If you already know that the ros2_control framework acts as a Kernel for ROS 2 robotics systems you are using but need help with application complexity, then this workshop is for you. The workshop covers the use of ros2_control controllers in products from various industries and shows solutions for all the little issues when running 24/7.
+
+You will get a practical overview of concepts like controller chaining - used for cascade control and real-time state estimators; and asynchronous and "side-load" controllers that enable you to run complex calculations without jitter in your control loops. We expect your active involvement!
+
+Before coming to the conference
+-------------------------------
+
+Recommended system setup:
+
+* Ubuntu 22.04 or Ubuntu 24.04
+* docker engine & docker compose installed
+
+If you don't have docker, follow `the docker instructions <https://docs.docker.com/engine/install/ubuntu>`_ to install it.
+
+If you don't have docker compose, run ``sudo apt-get install docker-compose-plugin`` or follow `the docker compose instructions <https://docs.docker.com/compose/install/linux/>`_ to install it.
+
+Stay tuned for more!
+
+People
+------
+
+This workshop was brought to you by
+
+* Dr. Denis Stogl, `Stogl Robotics Consulting <https://stoglrobotics.de>`_
+* Dr. Bence Magyar, `Locus Robotics <https://locusrobotics.com>`_
diff --git a/index.rst b/index.rst
index 921be23f321..169cb8a7f18 100644
--- a/index.rst
+++ b/index.rst
@@ -6,6 +6,7 @@ Welcome to the ros2_control documentation - Jazzy!
 .. toctree::
    :hidden:
 
+   doc/roscon2024_workshop.rst
    doc/getting_started/getting_started.rst
    doc/ros2_control/doc/index.rst
    doc/ros2_controllers/doc/controllers_index.rst