diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index bd1a6120d..a7440166f 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -34,7 +34,7 @@
         - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
         - puppet-openstack-libraries-puppet-unit-4.8-centos-7
         - puppet-openstack-libraries-puppet-unit-5.5-centos-7
-        - puppet-openstack-libraries-puppet-unit-6.0-ubuntu-bionic
+        - puppet-openstack-libraries-puppet-unit-6.4-ubuntu-bionic
         - puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
         - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
         - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
@@ -46,7 +46,7 @@
         - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
         - puppet-openstack-libraries-puppet-unit-4.8-centos-7
         - puppet-openstack-libraries-puppet-unit-5.5-centos-7
-        - puppet-openstack-libraries-puppet-unit-6.0-ubuntu-bionic
+        - puppet-openstack-libraries-puppet-unit-6.4-ubuntu-bionic
         - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
 
 # integration jobs
diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml
index 6a12a6932..ae9797576 100644
--- a/zuul.d/libraries.yaml
+++ b/zuul.d/libraries.yaml
@@ -17,12 +17,12 @@
 
 
 - job:
-    name: puppet-openstack-libraries-puppet-unit-6.0-ubuntu-bionic
+    name: puppet-openstack-libraries-puppet-unit-6.4-ubuntu-bionic
     parent: puppet-openstack-libraries-puppet-unit-base
-    branches: ^master
+    branches: ^(stable/stein|master)$
     nodeset: ubuntu-bionic
     vars:
-      puppet_gem_version: 6.0
+      puppet_gem_version: 6.4
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
diff --git a/zuul.d/linters.yaml b/zuul.d/linters.yaml
index d8af39fb1..fdd8ea607 100644
--- a/zuul.d/linters.yaml
+++ b/zuul.d/linters.yaml
@@ -24,6 +24,7 @@
 - job:
     name: puppet-openstack-syntax-6-ubuntu-bionic
     parent: puppet-openstack-syntax-base
+    branches: ^(stable/stein|master)$
     vars:
       puppet: 6
 
@@ -68,5 +69,6 @@
 - job:
     name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
     parent: puppet-openstack-libraries-puppet-syntax
+    branches: ^(stable/stein|master)$
     vars:
       puppet: 6
diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml
index 17f1c0b08..71da12b5a 100644
--- a/zuul.d/unit.yaml
+++ b/zuul.d/unit.yaml
@@ -16,12 +16,12 @@
       puppet_gem_version: 5.5
 
 - job:
-    name: puppet-openstack-unit-6.0-ubuntu-bionic
+    name: puppet-openstack-unit-6.4-ubuntu-bionic
     parent: puppet-openstack-unit-base
     nodeset: ubuntu-bionic
-    branches: ^master
+    branches: ^(stable/stein|master)$
     vars:
-      puppet_gem_version: 6.0
+      puppet_gem_version: 6.4
 
 - job:
     name: puppet-openstack-unit-latest-ubuntu-bionic
@@ -41,10 +41,10 @@
       jobs:
         - puppet-openstack-unit-4.8-centos-7
         - puppet-openstack-unit-5.5-centos-7
-        - puppet-openstack-unit-6.0-ubuntu-bionic
+        - puppet-openstack-unit-6.4-ubuntu-bionic
         - puppet-openstack-unit-latest-ubuntu-bionic
     gate:
       jobs:
         - puppet-openstack-unit-4.8-centos-7
         - puppet-openstack-unit-5.5-centos-7
-        - puppet-openstack-unit-6.0-ubuntu-bionic
+        - puppet-openstack-unit-6.4-ubuntu-bionic