diff --git a/ci-templates/core.yml b/ci-templates/core.yml
index 1651c6e5b298f17707d1d695723b9fd3cc8ee4bc..f43b64b0489dbd66b7fadcd4eea408680c294e04 100644
--- a/ci-templates/core.yml
+++ b/ci-templates/core.yml
@@ -16,7 +16,6 @@ services:
 
 stages:
   - build
-  - test
 
 before_script:
   - apk add --update bash coreutils tar wget py-pip
@@ -30,3 +29,14 @@ include:
 default:
   tags:
     - docker
+
+
+badges:
+  stage: .post
+  script:
+    - if [ ! -f "./badges/kinetic.svg" ]; then anybadge -l kinetic -v undefined -c gray -f ./badges/kinetic.svg; fi
+    - if [ ! -f "./badges/melodic.svg" ]; then anybadge -l melodic -v undefined -c gray -f ./badges/melodic.svg; fi
+    - if [ ! -f "./badges/noetic.svg" ]; then anybadge -l noetic -v undefined -c gray -f ./badges/noetic.svg; fi
+  artifacts:
+    paths:
+      - ./badges
diff --git a/ci-templates/syntax-check.yml b/ci-templates/syntax-check.yml
index e39ae1741141bc36a2be9923ddee2089bfc92ae4..ccf1df27eed73b357173f453efb031414b956e53 100644
--- a/ci-templates/syntax-check.yml
+++ b/ci-templates/syntax-check.yml
@@ -3,7 +3,7 @@
 ##########################################################
 
 clang_format:
-  stage: test
+  stage: .post
   before_script:
     - apk add --update bash coreutils tar wget
     - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
@@ -33,7 +33,7 @@ python_syntax:
 bash_syntax:
   before_script:
     - apk add --update shellcheck
-  stage: test
+  stage: .post
   script:
     - RET=0
     - find . -type f -name '*.sh' -exec shellcheck -s sh {} + || RET=1
@@ -49,7 +49,7 @@ bash_syntax:
 ## https://github.com/markdownlint/markdownlint/blob/master/docs/RULES.md
 ##########################################################
 markdown_syntax:
-  stage: test
+  stage: .post
   script: docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
   when: always
 
@@ -60,7 +60,7 @@ markdown_syntax:
 ## Uses https://github.com/cytopia/awesome-ci
 ##########################################################
 file_syntax:
-  stage: test
+  stage: .post
   script:
     - RET=0
     - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
@@ -74,7 +74,7 @@ file_syntax:
 ## so this is a custom-made "dirty" script
 ##########################################################
 adoc_syntax:
-  stage: test
+  stage: .post
   image: tecnalia-docker-dev.artifact.tecnalia.com/alpine
   before_script:
     - apk add --update curl asciidoctor bash