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