diff --git a/manifests/single_node_ci.pp b/manifests/single_node_ci.pp
index 56fb398..593dec6 100644
--- a/manifests/single_node_ci.pp
+++ b/manifests/single_node_ci.pp
@@ -162,7 +162,7 @@ class openstackci::single_node_ci (
   $smtp_default_from             = "zuul@${vhost_name}",
   $smtp_default_to               = "zuul.reports@${vhost_name}",
   $zuul_revision                 = 'master',
-  $zuul_git_source_repo          =  'https://git.openstack.org/openstack-infra/zuul',
+  $zuul_git_source_repo          = 'https://git.openstack.org/openstack-infra/zuul',
 
   # Nodepool configurations
   $oscc_file_contents            = undef,
diff --git a/manifests/zuul_merger.pp b/manifests/zuul_merger.pp
index 842f9a8..9bd1d58 100644
--- a/manifests/zuul_merger.pp
+++ b/manifests/zuul_merger.pp
@@ -23,6 +23,7 @@ class openstackci::zuul_merger(
   $gerrit_user = '',
   $known_hosts_content = '',
   $zuul_ssh_private_key = '',
+  $layout_file_name = 'layout.yaml',
   $zuul_url = "http://${::fqdn}/p",
   $git_email = 'zuul@domain.example',
   $git_name = 'Zuul',
@@ -38,6 +39,7 @@ class openstackci::zuul_merger(
       gerrit_server        => $gerrit_server,
       gerrit_user          => $gerrit_user,
       zuul_ssh_private_key => $zuul_ssh_private_key,
+      layout_file_name     => $layout_file_name,
       zuul_url             => $zuul_url,
       git_email            => $git_email,
       git_name             => $git_name,
diff --git a/manifests/zuul_scheduler.pp b/manifests/zuul_scheduler.pp
index 652eb56..6bb19ae 100644
--- a/manifests/zuul_scheduler.pp
+++ b/manifests/zuul_scheduler.pp
@@ -23,6 +23,7 @@ class openstackci::zuul_scheduler(
   $gerrit_user = '',
   $known_hosts_content = '',
   $zuul_ssh_private_key = '',
+  $layout_file_name = 'layout.yaml',
   $url_pattern = '',
   $zuul_url = '',
   $job_name_in_report = true,
@@ -68,6 +69,7 @@ class openstackci::zuul_scheduler(
     gerrit_user                    => $gerrit_user,
     zuul_ssh_private_key           => $zuul_ssh_private_key,
     url_pattern                    => $url_pattern,
+    layout_file_name               => $layout_file_name,
     zuul_url                       => $zuul_url,
     job_name_in_report             => $job_name_in_report,
     status_url                     => $status_url,