diff --git a/templates/zuulv3.conf.erb b/templates/zuulv3.conf.erb
index eb0cd76..6939b74 100644
--- a/templates/zuulv3.conf.erb
+++ b/templates/zuulv3.conf.erb
@@ -24,14 +24,16 @@ ssl_cert=/etc/zuul/ssl/server.pem
 ssl_key=/etc/zuul/ssl/server.key
 <% end -%>
 
-[zuul]
+[scheduler]
 tenant_config=/etc/zuul/layout/<%= @tenant_file_name %>
 log_config=/etc/zuul/logging.conf
 state_dir=/var/lib/zuul
-url_pattern=<%= @url_pattern %>
+
+[webapp]
 status_url=<%= @status_url %>
-job_name_in_report=<%= @job_name_in_report %>
-zookeeper_hosts=<%= @zookeeper_hosts %>
+
+[zookeeper]
+hosts=<%= @zookeeper_hosts %>
 
 [merger]
 git_dir=/var/lib/zuul/git