diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 85420300c8..f486c99ed5 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1610,6 +1610,10 @@ jobs:
           - ^.*\.rst$
           - ^doc/.*$
 
+  # With composable services, we don't have Puppet code in THT anymore.
+  - name: ^gate-tripleo-heat-templates-puppet-(lint|syntax-.*)$
+    branch: ^stable/mitaka$
+
   # tripleo multinode and undercloud jobs were introduced during Newton cycle.
   - name: ^gate-tripleo-ci-.*(multinode|undercloud).*$
     branch: ^(?!stable/(liberty|mitaka)).*$