diff --git a/hiera/fqdn/zuulv3.openstack.org.yaml b/hiera/fqdn/zuulv3.openstack.org.yaml
new file mode 100644
index 0000000000..074e018045
--- /dev/null
+++ b/hiera/fqdn/zuulv3.openstack.org.yaml
@@ -0,0 +1,15 @@
+---
+zuul_connections:
+  - name: 'smtp'
+    driver: 'smtp'
+    server: 'localhost'
+    port: '25'
+    default_from: 'zuul@zuulv3.openstack.org'
+    default_to: 'zuul.reports@zuulv3.openstack.org'
+
+  - name: 'gerrit'
+    driver: 'gerrit'
+    server: 'review.openstack.org'
+    canonical_hostname: 'git.openstack.org'
+    user: 'zuul'
+    sshkey: '/var/lib/zuul/ssh/id_rsa'
diff --git a/manifests/site.pp b/manifests/site.pp
index f4e9bb0c5c..f2cb129b11 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1162,6 +1162,9 @@ node 'zuulv3.openstack.org' {
     git_name             => $git_name,
     revision             => $revision,
     python_version       => 3,
+    zookeeper_hosts      => 'nodepool.openstack.org:2181',
+    zuulv3               => true,
+    connections          => hiera('zuul_connections', []),
   }
 
   class { '::zuul::scheduler':