diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index 60236b625b..f8159a060c 100644
--- a/docker/gerrit/base/Dockerfile
+++ b/docker/gerrit/base/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Tue Aug  3 16:04:54 UTC 2021 - trigger rebuild
+# Fri Aug 20 22:55:30 UTC 2021 - trigger rebuild
 
 FROM docker.io/opendevorg/python-builder:3.7 as builder
 
diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml
index f962d575eb..b19f09eff9 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -57,9 +57,9 @@
         override-checkout: stable-3.2
       # 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.11
+        override-checkout: v3.2.12
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.2.11
+        override-checkout: v3.2.12
       - name: gerrit.googlesource.com/plugins/its-base
         override-checkout: stable-3.2
       - name: gerrit.googlesource.com/plugins/its-storyboard
@@ -74,27 +74,27 @@
         override-checkout: stable-3.2
       # Plugins common to every build without branches or refs for every build
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.2.11
+        override-checkout: v3.2.12
       - name: gerrit.googlesource.com/plugins/singleusergroup
         override-checkout: stable-3.2
       # Plugins not common to every build
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.2.11
+        override-checkout: v3.2.12
       - name: gerrit.googlesource.com/plugins/delete-project
         override-checkout: stable-3.2
       - name: gerrit.googlesource.com/plugins/gitiles
         override-checkout: stable-3.2
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.2.11
+        override-checkout: v3.2.12
       - name: gerrit.googlesource.com/plugins/webhooks
-        override-checkout: v3.2.11
+        override-checkout: v3.2.12
       - name: gerrit.googlesource.com/plugins/zuul-results-summary
         override-checkout: main
       # Non plugin submodules
       - name: gerrit.googlesource.com/jgit
         override-checkout: master
       - name: gerrit.googlesource.com/polymer-bridges
-        override-checkout: v3.2.11
+        override-checkout: v3.2.12
     vars: &gerrit_vars_3_2
       docker_images:
         - context: docker/gerrit/bazel
@@ -151,9 +151,9 @@
         override-checkout: stable-3.3
       # Plugins common to every build with branches or refs for every build
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.3.5
+        override-checkout: v3.3.6
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.3.5
+        override-checkout: v3.3.6
       - name: gerrit.googlesource.com/plugins/its-base
         # There is no 3.3 branch
         override-checkout: master
@@ -166,30 +166,30 @@
       - name: gerrit.googlesource.com/plugins/replication
         override-checkout: stable-3.3
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.3.5
+        override-checkout: v3.3.6
       # Plugins common to every build without branches or refs for every build
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.3.5
+        override-checkout: v3.3.6
       - name: gerrit.googlesource.com/plugins/singleusergroup
         override-checkout: stable-3.3
       # Plugins not common to every build
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.3.5
+        override-checkout: v3.3.6
       - name: gerrit.googlesource.com/plugins/delete-project
-        override-checkout: v3.3.5
+        override-checkout: v3.3.6
       - name: gerrit.googlesource.com/plugins/gitiles
         override-checkout: stable-3.3
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.3.5
+        override-checkout: v3.3.6
       - name: gerrit.googlesource.com/plugins/webhooks
-        override-checkout: v3.3.5
+        override-checkout: v3.3.6
       - name: gerrit.googlesource.com/plugins/zuul-results-summary
         override-checkout: main
       # Non plugin submodules
       - name: gerrit.googlesource.com/jgit
         override-checkout: master
       - name: gerrit.googlesource.com/polymer-bridges
-        override-checkout: v3.3.5
+        override-checkout: v3.3.6
     vars: &gerrit_vars_3_3
       docker_images:
         - context: docker/gerrit/bazel