diff --git a/.zuul.yaml b/.zuul.yaml
index f34f28f9b4..9cc4b923d5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1092,9 +1092,9 @@
         - name: bridge.openstack.org
           label: ubuntu-bionic
         - name: review01.openstack.org
-          label: ubuntu-bionic
+          label: ubuntu-xenial
         - name: review-dev01.opendev.org
-          label: ubuntu-bionic
+          label: ubuntu-xenial
     vars:
       run_playbooks:
         - playbooks/service-letsencrypt.yaml
diff --git a/playbooks/roles/gerrit/templates/docker-compose.yaml.j2 b/playbooks/roles/gerrit/templates/docker-compose.yaml.j2
index 2f3e32acea..8753e6d591 100644
--- a/playbooks/roles/gerrit/templates/docker-compose.yaml.j2
+++ b/playbooks/roles/gerrit/templates/docker-compose.yaml.j2
@@ -1,4 +1,4 @@
-version: '3'
+version: '2'
 
 services:
   gerrit: