diff --git a/create_algorithm_package.sh b/create_algorithm_package.sh
index bc0af6dfcf47d2418f0010565bb27a06690a78b0..b2333c1a4777e644169c0fe3cfbd4ab33d6de904 100755
--- a/create_algorithm_package.sh
+++ b/create_algorithm_package.sh
@@ -191,6 +191,7 @@ sed -e "s/template/${project_name}/g" < ${IRI_ROS_SCRIPTS_PATH}/common_templates
 ################################################################################
 pushd "${project_name}" > /dev/null
 change_license_to_LGPL
+change_maintainer_email_domain_to_iri_upc_edu
 popd > /dev/null
 ################################################################################
 echo "Project ${project_name} has been successfully created!!"
diff --git a/create_driver_package.sh b/create_driver_package.sh
index affdfe8c4a4088c5af299aa0c07d432c6fe9169f..f7f9956d2f0aff6ad4da59d4caabee59a29d3b52 100755
--- a/create_driver_package.sh
+++ b/create_driver_package.sh
@@ -193,6 +193,7 @@ sed -e "s/template/${project_name}/g" < ${IRI_ROS_SCRIPTS_PATH}/common_templates
 ################################################################################
 pushd "${project_name}" > /dev/null
 change_license_to_LGPL
+change_maintainer_email_domain_to_iri_upc_edu
 popd > /dev/null
 ################################################################################
 echo "Project ${project_name} has been successfully created!!"
diff --git a/libraries/scripts_library.sh b/libraries/scripts_library.sh
index d96c2621d697a133a63e417f550aaa97999d4e94..5b0d3a1315ba7b9d846f9f472998c314d48d7655 100755
--- a/libraries/scripts_library.sh
+++ b/libraries/scripts_library.sh
@@ -491,6 +491,11 @@ function change_license_to_LGPL
   find . -name package.xml -exec sed -i -e 's:<license>.*</license>:<license>LGPL</license>:g' {} \;
 }
 
+function change_maintainer_email_domain_to_iri_upc_edu
+{
+  find . -name package.xml -exec sed -i -e 's:@todo.todo:@iri.upc.edu:g' {} \;
+}
+
 function goto_catkin_workspace
 {
   roscd