diff --git a/ci-templates/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml
index 617101856bf8895b9f541325e785746b477421cc..4921c978f900fd4012d63f9ec282777de455f08d 100644
--- a/ci-templates/auto-rules/no-default.yml
+++ b/ci-templates/auto-rules/no-default.yml
@@ -49,8 +49,7 @@ industrial_ci_humble:
     - if: $DEFAULT_DISTRO == "humble"
     - if: $BUILD_HUMBLE
 
-py3_template:
-  extends: .py3_template
+.py3_rules:
   rules:
     - if: $DEFAULT_DISTRO == "noetic"
       when: always
@@ -60,10 +59,23 @@ py3_template:
       when: always
     - if: $BUILD_HUMBLE
       when: always
-  when: always
 
-py2_template:
-  extends: .py2_template
+py3-flake8:
+  extends:
+    - .py3_rules
+    - .py3-flake8
+
+py3-flake8_extended:
+  extends:
+    - .py3_rules
+    - .py3-flake8_extended
+
+py3-security:
+  extends:
+    - .py3_rules
+    - .py3-security
+
+.py2_rules:
   rules:
     - if: $DEFAULT_DISTRO == "kinetic"
       when: always
@@ -74,6 +86,16 @@ py2_template:
     - if: $BUILD_MELODIC
       when: always
 
+py2-flake8:
+  extends:
+    - .py2_rules
+    - .py2-flake8
+
+py2-flake8_extended:
+  extends:
+    - .py2_rules
+    - .py2-flake8_extended
+
 ddeploy:
   extends: .ddeploy
   rules: