diff --git a/.github/workflows/generate_agent_docker.yml b/.github/workflows/generate_agent_docker.yml
index 51a3b9d..a709de1 100644
--- a/.github/workflows/generate_agent_docker.yml
+++ b/.github/workflows/generate_agent_docker.yml
@@ -37,5 +37,5 @@ jobs:
         with:
           context: ./micro-ROS-Agent/
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           tags: microros/micro-ros-agent:${{ matrix.ros_distribution }}
\ No newline at end of file
diff --git a/.github/workflows/generate_base_docker.yml b/.github/workflows/generate_base_docker.yml
index 3ade8a1..e6e3cc6 100644
--- a/.github/workflows/generate_base_docker.yml
+++ b/.github/workflows/generate_base_docker.yml
@@ -37,5 +37,5 @@ jobs:
         with:
           context: ./base/
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           tags: microros/base:${{ matrix.ros_distribution }}
\ No newline at end of file
diff --git a/.github/workflows/generate_libgen_docker.yml b/.github/workflows/generate_libgen_docker.yml
index 75a1972..d95f5b4 100644
--- a/.github/workflows/generate_libgen_docker.yml
+++ b/.github/workflows/generate_libgen_docker.yml
@@ -37,5 +37,5 @@ jobs:
         with:
           context: ./micro-ROS-static-library-builder/
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           tags: microros/micro_ros_static_library_builder:${{ matrix.ros_distribution }}
\ No newline at end of file
diff --git a/package.xml b/package.xml
index b5fa4d4..5974cca 100644
--- a/package.xml
+++ b/package.xml
@@ -4,6 +4,7 @@
   <name>micro_ros_dockers</name>
   <version>5.0.0</version>
   <description>Dockerfiles for micro-ROS environments</description>
-  <maintainer email="pablogarrido@eprosima.com">Pablo Garrido</maintainer>
+  <maintainer email="eugeniocollado@eprosima.com">Eugenio Collado</maintainer>
+  <maintainer email="carlosespinoza@eprosima.com">Carlos Espinoza</maintainer>
   <license>Apache License 2.0</license>
 </package>