diff --git a/inventory/service/host_vars/review-dev01.opendev.org.yaml b/inventory/service/host_vars/review-dev01.opendev.org.yaml
index fb145c7329..40a0814bec 100644
--- a/inventory/service/host_vars/review-dev01.opendev.org.yaml
+++ b/inventory/service/host_vars/review-dev01.opendev.org.yaml
@@ -8,6 +8,7 @@ letsencrypt_certs:
 letsencrypt_gid: 3001
 gerrit_storyboard_url: https://storyboard-dev.openstack.org
 gerrit_vhost_name: review-dev.opendev.org
+gerrit_serverid: eab9c642-ec65-4bed-95be-8ca1b11d212c
 gerrit_redirect_vhost: review-dev.openstack.org
 gerrit_project_creator_user: openstack-dev-project-creator
 gerrit_self_hostkey: '[review-dev.opendev.org]:29418,[review-dev.openstack.org]:29418,[23.253.109.153]:29418,[2001:4800:7819:104:be76:4eff:fe04:8e55]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4J4BJ/C6kl1PcfD5ZdpYIwWXA+vRiB4USncZQHW9+Idtdr4dZRA05RlBAfiTkKKhjarJpt8PQP2hYt8aJL1miZZjp1s05d9mxGVHfoH7Vyg85vhRa7Jg4VZS0cu34R909q23cBcjSNQSyVKP9neOqovoV/DyB8HHEg0kbsOWC3qzdA+6aVdVV7Mtx/0t0MyiTz0xA5ZCRFwF6IuiMPHLNk128qDhjO2UXnrhyP5A7Kl/JHpIWToLKGIorePndFcFyNXlWIhBoQRDcX6FYjPdavjAGlK1S/Jd5DVJ184Z7rEXL682o487c0NQ/lAV4QF3iz0Aw9QRVrUw21xWvfU4R'
diff --git a/inventory/service/host_vars/review-test.opendev.org.yaml b/inventory/service/host_vars/review-test.opendev.org.yaml
index 67ef0edfcb..57634015b5 100644
--- a/inventory/service/host_vars/review-test.opendev.org.yaml
+++ b/inventory/service/host_vars/review-test.opendev.org.yaml
@@ -1,6 +1,7 @@
 gerrit_replication: []
 gerrit_storyboard_url: https://storyboard.openstack.org
 gerrit_vhost_name: review-test.opendev.org
+gerrit_serverid: adf32efa-43c9-4163-b047-c4449d8997da
 gerrit_heap_limit: 48g
 gerrit_track_upstream: false
 letsencrypt_certs:
diff --git a/inventory/service/host_vars/review01.openstack.org.yaml b/inventory/service/host_vars/review01.openstack.org.yaml
index 29dbe95594..a80f7c167c 100644
--- a/inventory/service/host_vars/review01.openstack.org.yaml
+++ b/inventory/service/host_vars/review01.openstack.org.yaml
@@ -57,6 +57,7 @@ gerrit_replication:
     threads: '4'
 gerrit_storyboard_url: https://storyboard.openstack.org
 gerrit_vhost_name: review.opendev.org
+gerrit_serverid: 4a232e18-c5a9-48ee-94c0-e04e7cca6543
 gerrit_redirect_vhost: review.openstack.org
 gerrit_heap_limit: 48g
 letsencrypt_certs:
diff --git a/playbooks/roles/gerrit/templates/gerrit.config b/playbooks/roles/gerrit/templates/gerrit.config
index 290d276957..21b715b99a 100644
--- a/playbooks/roles/gerrit/templates/gerrit.config
+++ b/playbooks/roles/gerrit/templates/gerrit.config
@@ -8,6 +8,7 @@
 	reportBugText = Get Help
 	reportBugUrl = https://docs.openstack.org/infra/system-config/project.html#contributing
 	gitHttpUrl = https://{{ gerrit_vhost_name }}/
+	serverId = {{ gerrit_serverid }}
 [database]
 {% if gerrit_database_type == 'MYSQL' %}
 	type = MYSQL