diff --git a/modules/openstack_project/manifests/zuul_dev.pp b/modules/openstack_project/manifests/zuul_dev.pp
index f7c5306f5c..a83acd9467 100644
--- a/modules/openstack_project/manifests/zuul_dev.pp
+++ b/modules/openstack_project/manifests/zuul_dev.pp
@@ -65,13 +65,13 @@ class openstack_project::zuul_dev(
     }
   }
 
-  file { '/etc/zuul/layout.yaml':
+  file { '/etc/zuul/layout/layout.yaml':
     ensure => present,
     source => 'puppet:///modules/openstack_project/zuul/layout-dev.yaml',
     notify => Exec['zuul-reload'],
   }
 
-  file { '/etc/zuul/openstack_functions.py':
+  file { '/etc/zuul/layout/openstack_functions.py':
     ensure => present,
     source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py',
     notify => Exec['zuul-reload'],
diff --git a/modules/openstack_project/manifests/zuul_prod.pp b/modules/openstack_project/manifests/zuul_prod.pp
index 5400620900..9671963a97 100644
--- a/modules/openstack_project/manifests/zuul_prod.pp
+++ b/modules/openstack_project/manifests/zuul_prod.pp
@@ -75,13 +75,13 @@ class openstack_project::zuul_prod(
     }
   }
 
-  file { '/etc/zuul/layout.yaml':
+  file { '/etc/zuul/layout/layout.yaml':
     ensure => present,
     source => 'puppet:///modules/openstack_project/zuul/layout.yaml',
     notify => Exec['zuul-reload'],
   }
 
-  file { '/etc/zuul/openstack_functions.py':
+  file { '/etc/zuul/layout/openstack_functions.py':
     ensure => present,
     source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py',
     notify => Exec['zuul-reload'],
diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 59bcd3f6b7..8b2b5ec837 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -146,6 +146,11 @@ class zuul (
     ensure => directory,
   }
 
+  file { '/etc/zuul/layout':
+    ensure  => directory,
+    require => File['/etc/zuul'],
+  }
+
 # TODO: We should put in  notify either Service['zuul'] or Exec['zuul-reload']
 #       at some point, but that still has some problems.
   file { '/etc/zuul/zuul.conf':
diff --git a/modules/zuul/templates/zuul.conf.erb b/modules/zuul/templates/zuul.conf.erb
index b158443200..1c3b081801 100644
--- a/modules/zuul/templates/zuul.conf.erb
+++ b/modules/zuul/templates/zuul.conf.erb
@@ -14,7 +14,7 @@ baseurl=<%= gerrit_baseurl %>
 <% end -%>
 
 [zuul]
-layout_config=/etc/zuul/layout.yaml
+layout_config=/etc/zuul/layout/layout.yaml
 log_config=/etc/zuul/logging.conf
 state_dir=/var/lib/zuul
 git_dir=/var/lib/zuul/git