diff --git a/docker/gerrit/bazel/Dockerfile b/docker/gerrit/bazel/Dockerfile
index 81c55cf73d..923bfeeb99 100644
--- a/docker/gerrit/bazel/Dockerfile
+++ b/docker/gerrit/bazel/Dockerfile
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# This comment is here to be edited to force rebuilds
+
 FROM docker.io/opendevorg/gerrit-base as gerrit
 
 COPY release.war /var/gerrit/bin/gerrit.war
diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml
index ccb4d73c2d..5bce80d773 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -87,7 +87,7 @@
       - name: opendev/system-config
         override-checkout: master
       - name: gerrit.googlesource.com/gerrit
-        override-checkout: stable-2.14
+        override-checkout: stable-2.14-2020-11.notedb-refs-tags
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
         override-checkout: v2.14.21
       - name: gerrit.googlesource.com/plugins/download-commands
@@ -153,7 +153,7 @@
       - name: opendev/system-config
         override-checkout: master
       - name: gerrit.googlesource.com/gerrit
-        override-checkout: stable-2.15
+        override-checkout: stable-2.15-2020-11.notedb-refs-tags
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
         override-checkout: v2.15.19
       - name: gerrit.googlesource.com/plugins/download-commands
@@ -219,7 +219,7 @@
       - name: opendev/system-config
         override-checkout: master
       - name: gerrit.googlesource.com/gerrit
-        override-checkout: stable-2.16
+        override-checkout: stable-2.16-2020-11.notedb-refs-tags
       - name: gerrit.googlesource.com/plugins/codemirror-editor
         override-checkout: v2.16.23
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
@@ -289,7 +289,7 @@
       - name: opendev/system-config
         override-checkout: master
       - name: gerrit.googlesource.com/gerrit
-        override-checkout: stable-3.0
+        override-checkout: stable-3.0-2020-11.notedb-refs-tags
       - name: gerrit.googlesource.com/plugins/codemirror-editor
         override-checkout: v3.0.13
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
@@ -373,7 +373,7 @@
       - name: opendev/system-config
         override-checkout: master
       - name: gerrit.googlesource.com/gerrit
-        override-checkout: stable-3.1
+        override-checkout: stable-3.1-2020-11.notedb-refs-tags
       # Plugins common to every build with branches or refs for every build
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
         override-checkout: v3.1.8
@@ -465,7 +465,7 @@
       - name: opendev/system-config
         override-checkout: master
       - name: gerrit.googlesource.com/gerrit
-        override-checkout: stable-3.2
+        override-checkout: stable-3.2-2020-11.notedb-refs-tags
       # Plugins common to every build with branches or refs for every build
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
         override-checkout: v3.2.3