diff --git a/ci-templates/core.yml b/ci-templates/core.yml
index 859514fed173341feaea9cd77dd6b7e4a9e1c368..80029b73913b9dd7d0a82eb371d825855135e46f 100644
--- a/ci-templates/core.yml
+++ b/ci-templates/core.yml
@@ -21,6 +21,7 @@ stages:
 before_script:
   - apk add --update bash coreutils tar wget
   - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
+  - pip install anybadge
 
 include :
   - ci-templates/syntax-check.yml
diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index 9f2516f5a719cbabb7d93dc82ce22c3148ffc57e..f982450d9e2e1bd91e6652eb6621c3a3a7e80bc9 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -6,13 +6,20 @@
     - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config
     - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
     - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
-  script: .ci_config/gitlab.sh
+  script:
+    - RET=0 && VALUE=passing
+    - .ci_config/gitlab.sh || RET=1 && VALUE=failed
+    - mkdir -p ./badges && anybadge -v $VALUE --label=$ROS_DISTRO -o --file badges/$ROS_DISTRO.svg passing=green failed=red
+    - exit $RET
   variables:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
     ADDITIONAL_DEBS: curl
     PARALLEL_BUILDS: 2 # keep this for now, since there seems to be memory limit issues in the ci VM
     AFTER_SETUP_TARGET_WORKSPACE: "rosenv && bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$current_ws"
     CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
+  artifacts:
+    paths:
+      ./badges
 
 
 .industrial_ci_deploy: