diff --git a/.zuul.yaml b/.zuul.yaml
index 874d218abe..2347198416 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -157,7 +157,8 @@
 - project:
     check:
       jobs:
-        - zuul-build-image
+        - zuul-build-image:
+            voting: false
         - tox-docs
         - tox-pep8
         - tox-py35:
@@ -194,7 +195,8 @@
             voting: false
     gate:
       jobs:
-        - zuul-upload-image
+        - zuul-upload-image:
+            voting: false
         - tox-docs
         - tox-pep8
         - tox-py35:
diff --git a/doc/source/admin/examples/docker-compose.yaml b/doc/source/admin/examples/docker-compose.yaml
index 20c9d36226..91919bae34 100644
--- a/doc/source/admin/examples/docker-compose.yaml
+++ b/doc/source/admin/examples/docker-compose.yaml
@@ -4,7 +4,7 @@ version: '2'
 
 services:
   gerrit:
-    image: gerritcodereview/gerrit
+    image: gerritcodereview/gerrit:2.16.8
     ports:
       - "8080:8080"
       - "29418:29418"
diff --git a/zuul/driver/bubblewrap/__init__.py b/zuul/driver/bubblewrap/__init__.py
index b015d62796..5133030739 100644
--- a/zuul/driver/bubblewrap/__init__.py
+++ b/zuul/driver/bubblewrap/__init__.py
@@ -216,6 +216,7 @@ class BubblewrapDriver(Driver, WrapperInterface):
                      '/etc/lsb-release.d',
                      '/etc/alternatives',
                      '/etc/ssl/certs',
+                     '/etc/subuid',
                      ]:
             if os.path.exists(path):
                 bwrap_command.extend(['--ro-bind', path, path])