diff --git a/ci-templates/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml
index 011021ad9f51b2852300b57c1689e0f6135a9b1b..023c1daa4f9226be5400b7b7ef1ca35b60917b59 100644
--- a/ci-templates/auto-rules/no-default.yml
+++ b/ci-templates/auto-rules/no-default.yml
@@ -38,6 +38,25 @@ industrial_ci_noetic:
     - if: $DEFAULT_DISTRO == "noetic"
     - if: $BUILD_NOETIC
 
+
+python3_syntax:
+  extends: .python_syntax_template
+  variables:
+    PYTHON_VERSION: python3
+  rules:
+    - if: $DEFAULT_DISTRO == "noetic"
+    - if: $BUILD_NOETIC
+
+python2_syntax:
+  extends: .python_syntax_template
+  variables:
+    PYTHON_VERSION: python2
+  rules:
+    - if: $DEFAULT_DISTRO == "kinetic"
+    - if: $BUILD_KINETIC
+    - if: $DEFAULT_DISTRO == "melodic"
+    - if: $BUILD_MELODIC
+
 ddeploy:
   extends: .ddeploy
   rules:
diff --git a/ci-templates/syntax-check.yml b/ci-templates/syntax-check.yml
index ccf1df27eed73b357173f453efb031414b956e53..15dde7901bf7136ddf7a5cf57c417c0298bebfa6 100644
--- a/ci-templates/syntax-check.yml
+++ b/ci-templates/syntax-check.yml
@@ -5,7 +5,7 @@
 clang_format:
   stage: .post
   before_script:
-    - apk add --update bash coreutils tar wget
+    - apk add --update git bash coreutils tar wget
     - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
     - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/clang-format -O .clang-format
   script: .ci_config/gitlab.sh
@@ -19,11 +19,11 @@ clang_format:
 ## Simple check for basic Python syntax errors; this is much less thorough than
 ## other options like pylint, but much faster and less strict
 ##########################################################
-python_syntax:
+.python_syntax_template:
   before_script:
-    - apk add --update python2
+    - apk add --update ${PYTHON_VERSION}
   stage: build
-  script: python -m compileall -q .
+  script: ${PYTHON_VERSION} -m compileall -q .
   when: always
 
 ##########################################################