diff --git a/jenkins/jobs/puppet-module-jobs.yaml b/jenkins/jobs/puppet-module-jobs.yaml
index c95c3d2e7a..c405b8a55c 100644
--- a/jenkins/jobs/puppet-module-jobs.yaml
+++ b/jenkins/jobs/puppet-module-jobs.yaml
@@ -138,5 +138,6 @@
       - 3.4
       - 3.6
       - 3.7
+      - 4.0
     jobs:
       - 'gate-{name}-puppet-unit-{puppet_version}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c8bbc6e89c..a43b115389 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -484,12 +484,14 @@ project-templates:
       # 3.5 was swiftly replaced with 3.6
       - gate-{name}-puppet-unit-3.6
       - gate-{name}-puppet-unit-3.7
+      - gate-{name}-puppet-unit-4.0
     gate:
       - gate-{name}-puppet-unit-3.3
       - gate-{name}-puppet-unit-3.4
       # 3.5 was swiftly replaced with 3.6
       - gate-{name}-puppet-unit-3.6
       - gate-{name}-puppet-unit-3.7
+      # TODO(emilienm): add 4.0 when it will vote
 
   - name: infra-puppet-apply-jobs
     check:
@@ -1085,6 +1087,9 @@ jobs:
     voting: false
   - name: ^(gate-)?devstack-publish-docs
     branch: ^master
+  # TODO(emilienm): Enable voting when all tests pass for all modules
+  - name: ^gate-puppet-.*-puppet-unit-4.0$
+    voting: false
   - name: ^gate-puppet-.*-puppet-beaker-rspec$
     voting: false
   - name: ^gate-puppet-.*-puppet-syntax-future$