diff --git a/hiera/group/zuul-executor.yaml b/hiera/group/zuul-executor.yaml
index 63e1e1c73d..ff11b1119e 100644
--- a/hiera/group/zuul-executor.yaml
+++ b/hiera/group/zuul-executor.yaml
@@ -11,5 +11,8 @@ zuul_connections:
     driver: 'github'
 
   - name: 'googlesource'
-    driver: 'git'
-    baseurl: https://gerrit.googlesource.com
+    driver: 'gerrit'
+    server: 'gerrit-review.googlesource.com'
+    canonical_hostname: 'gerrit.googlesource.com'
+    user: 'git-infra-root.openstack.org'
+    stream_events: 'false'
diff --git a/hiera/group/zuul-merger.yaml b/hiera/group/zuul-merger.yaml
index 4e41185083..56d0f2364f 100644
--- a/hiera/group/zuul-merger.yaml
+++ b/hiera/group/zuul-merger.yaml
@@ -41,5 +41,8 @@ zuul_connections:
     driver: 'github'
 
   - name: 'googlesource'
-    driver: 'git'
-    baseurl: https://gerrit.googlesource.com
+    driver: 'gerrit'
+    server: 'gerrit-review.googlesource.com'
+    canonical_hostname: 'gerrit.googlesource.com'
+    user: 'git-infra-root.openstack.org'
+    stream_events: 'false'
diff --git a/hiera/group/zuul-scheduler.yaml b/hiera/group/zuul-scheduler.yaml
index 67b664ef0e..d084c330b3 100644
--- a/hiera/group/zuul-scheduler.yaml
+++ b/hiera/group/zuul-scheduler.yaml
@@ -31,8 +31,11 @@ zuul_connections:
     rate_limit_logging: 'false'
 
   - name: 'googlesource'
-    driver: 'git'
-    baseurl: https://gerrit.googlesource.com
+    driver: 'gerrit'
+    server: 'gerrit-review.googlesource.com'
+    canonical_hostname: 'gerrit.googlesource.com'
+    user: 'git-infra-root.openstack.org'
+    stream_events: 'false'
 
 gearman_server_ssl_cert: |
   -----BEGIN CERTIFICATE-----