diff --git a/hiera/group/zuul-executor.yaml b/hiera/group/zuul-executor.yaml
index b2f88dec27..63e1e1c73d 100644
--- a/hiera/group/zuul-executor.yaml
+++ b/hiera/group/zuul-executor.yaml
@@ -2,8 +2,8 @@
 zuul_connections:
   - name: 'gerrit'
     driver: 'gerrit'
-    server: 'review.openstack.org'
-    canonical_hostname: 'git.openstack.org'
+    server: 'review.opendev.org'
+    canonical_hostname: 'opendev.org'
     user: 'zuul'
     sshkey: '/var/lib/zuul/ssh/id_rsa'
 
diff --git a/hiera/group/zuul-merger.yaml b/hiera/group/zuul-merger.yaml
index 4575492c24..4e41185083 100644
--- a/hiera/group/zuul-merger.yaml
+++ b/hiera/group/zuul-merger.yaml
@@ -32,8 +32,8 @@ zuul_nodes: []
 zuul_connections:
   - name: 'gerrit'
     driver: 'gerrit'
-    server: 'review.openstack.org'
-    canonical_hostname: 'git.openstack.org'
+    server: 'review.opendev.org'
+    canonical_hostname: 'opendev.org'
     user: 'zuul'
     sshkey: '/var/lib/zuul/ssh/id_rsa'
 
diff --git a/hiera/group/zuul-scheduler.yaml b/hiera/group/zuul-scheduler.yaml
index b34d7ac999..67b664ef0e 100644
--- a/hiera/group/zuul-scheduler.yaml
+++ b/hiera/group/zuul-scheduler.yaml
@@ -9,11 +9,11 @@ zuul_connections:
 
   - name: 'gerrit'
     driver: 'gerrit'
-    server: 'review.openstack.org'
-    canonical_hostname: 'git.openstack.org'
+    server: 'review.opendev.org'
+    canonical_hostname: 'opendev.org'
     user: 'zuul'
     sshkey: '/var/lib/zuul/ssh/id_rsa'
-    gitweb_url_template: 'https://git.openstack.org/cgit/{project.name}/commit/?id={sha}'
+    gitweb_url_template: 'https://opendev.org/{project.name}/commit/{sha}'
 
   - name: 'opendaylight'
     driver: 'gerrit'