diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d957411..4af41f8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
 jobs:
     micro_ros_demos:
         runs-on: ubuntu-20.04
-        container: microros/base:rolling
+        container: microros/base:iron
         defaults:
           run:
             shell: bash
@@ -19,7 +19,7 @@ jobs:
             cd /uros_ws
             apt update
             rosdep update
-            source /opt/ros/rolling/setup.bash
+            source /opt/ros/iron/setup.bash
             source install/local_setup.bash
             rosdep update
             ros2 run micro_ros_setup create_firmware_ws.sh host
@@ -30,6 +30,6 @@ jobs:
         - name: Build
           run: |
             cd /uros_ws
-            source /opt/ros/rolling/setup.bash
+            source /opt/ros/iron/setup.bash
             source install/local_setup.bash
             ros2 run micro_ros_setup build_firmware.sh
diff --git a/messages/complex_msg/CHANGELOG.rst b/messages/complex_msg/CHANGELOG.rst
index c7f88ba..29eb5b8 100644
--- a/messages/complex_msg/CHANGELOG.rst
+++ b/messages/complex_msg/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package complex_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+4.1.1 (2024-05-31)
+------------------
+
+4.1.0 (2023-06-12)
+------------------
+
 4.0.0 (2022-05-25)
 ------------------
 * Foxy migration (`#25 <https://github.com/micro-ROS/micro-ROS-demos/issues/25>`_)
diff --git a/messages/complex_msg/package.xml b/messages/complex_msg/package.xml
index 32497d7..55c5594 100644
--- a/messages/complex_msg/package.xml
+++ b/messages/complex_msg/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>complex_msgs</name>
-  <version>4.0.0</version>
+  <version>4.1.1</version>
   <description>Example of a complex msg.</description>
   <maintainer email="javiermoreno@eproxima.com">Javier Moreno</maintainer>
   <license>Apache-2.0</license>
diff --git a/rclc/CHANGELOG.rst b/rclc/CHANGELOG.rst
index c0b5dff..c30d570 100644
--- a/rclc/CHANGELOG.rst
+++ b/rclc/CHANGELOG.rst
@@ -2,6 +2,14 @@
 Changelog for package micro_ros_demos_rclc
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+4.1.1 (2024-05-31)
+------------------
+* addtwoints_server: correct node name (`#75 <https://github.com/micro-ROS/micro-ROS-demos/issues/75>`_)
+* Contributors: G.A. vd. Hoorn
+
+4.1.0 (2023-06-12)
+------------------
+
 4.0.0 (2022-05-25)
 ------------------
 * Update rclc parameter demo (`#62 <https://github.com/micro-ROS/micro-ROS-demos/issues/62>`_)
diff --git a/rclc/addtwoints_server/main.c b/rclc/addtwoints_server/main.c
index 900472b..9dc31cb 100644
--- a/rclc/addtwoints_server/main.c
+++ b/rclc/addtwoints_server/main.c
@@ -30,7 +30,7 @@ void main(void)
 
     // create node
     rcl_node_t node;
-    RCCHECK(rclc_node_init_default(&node, "add_twoints_client_rclc", "", &support));
+    RCCHECK(rclc_node_init_default(&node, "add_twoints_server_rclc", "", &support));
 
     // create service
     rcl_service_t service;
diff --git a/rclc/package.xml b/rclc/package.xml
index a1ad6b0..da6cb9e 100644
--- a/rclc/package.xml
+++ b/rclc/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>micro_ros_demos_rclc</name>
-  <version>4.0.0</version>
+  <version>4.1.1</version>
   <description>Examples using RCL+RCLC API</description>
   <maintainer email="pablogarrido@eprosima.com">Pablo Garrido</maintainer>
   <license>Apache-2.0</license>