diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index f63650314e..ca964a5e37 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.
 
-# Wed Oct 12 13:35:54 UTC 2022 - trigger rebuild
+# Thu Oct 13 23:53:46 UTC 2022 - trigger rebuild
 
 FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder
 
diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml
index f66bca3412..1cb02372a3 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -57,32 +57,31 @@
         override-checkout: stable-3.5
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.5.2
+        override-checkout: v3.5.3
       - name: gerrit.googlesource.com/plugins/delete-project
         override-checkout: stable-3.5
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.5.2
+        override-checkout: v3.5.3
       - name: gerrit.googlesource.com/plugins/its-base
-        # There is no 3.5 branch
-        override-checkout: master
+        override-checkout: stable-3.5
       - name: gerrit.googlesource.com/plugins/its-storyboard
         # There is no 3.5 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.5.2
+        override-checkout: v3.5.3
       - name: gerrit.googlesource.com/plugins/replication
         override-checkout: stable-3.5
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.5.2
+        override-checkout: v3.5.3
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.5.2
+        override-checkout: v3.5.3
       - name: gerrit.googlesource.com/plugins/webhooks
         override-checkout: stable-3.5
       # UI behavior plugins
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.5.2
+        override-checkout: v3.5.3
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.5.2
+        override-checkout: v3.5.3
       - name: gerrit.googlesource.com/plugins/gitiles
         override-checkout: stable-3.5
       - name: gerrit.googlesource.com/plugins/zuul-results-summary
@@ -91,7 +90,7 @@
       - name: gerrit.googlesource.com/jgit
         override-checkout: master
       - name: gerrit.googlesource.com/polymer-bridges
-        override-checkout: v3.5.2
+        override-checkout: v3.5.3
     vars: &gerrit_vars_3_5
       docker_images:
         - context: docker/gerrit/bazel
@@ -148,41 +147,41 @@
         override-checkout: stable-3.6
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.6.1
+        override-checkout: v3.6.2
       - name: gerrit.googlesource.com/plugins/delete-project
-        override-checkout: v3.6.1
+        override-checkout: v3.6.2
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.6.1
+        override-checkout: v3.6.2
       - name: gerrit.googlesource.com/plugins/its-base
         # There is no 3.6 branch
-        override-checkout: stable-3.6
+        override-checkout: master
       - name: gerrit.googlesource.com/plugins/its-storyboard
         # There is no 3.6 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.6.1
+        override-checkout: v3.6.2
       - name: gerrit.googlesource.com/plugins/replication
-        override-checkout: v3.6.1
+        override-checkout: v3.6.2
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.6.1
+        override-checkout: v3.6.2
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.6.1
+        override-checkout: v3.6.2
       - name: gerrit.googlesource.com/plugins/webhooks
-        override-checkout: v3.6.1
+        override-checkout: v3.6.2
       # UI behavior plugins
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.6.1
+        override-checkout: v3.6.2
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.6.1
+        override-checkout: v3.6.2
       - name: gerrit.googlesource.com/plugins/gitiles
-        override-checkout: v3.6.1
+        override-checkout: v3.6.2
       - 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.6.1
+        override-checkout: v3.6.2
     vars: &gerrit_vars_3_6
       docker_images:
         - context: docker/gerrit/bazel